From 2a93a38bfa8feab7e7f9be7332f75f2d2b0036e7 Mon Sep 17 00:00:00 2001 From: enneract Date: Wed, 19 Nov 2014 11:31:42 +0100 Subject: Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot. --- assets/models/weapons/abuild/flash0.wav | Bin 0 -> 6188 bytes assets/models/weapons/abuild/impactflesh0.wav | Bin 0 -> 40492 bytes assets/models/weapons/abuild/weapon.cfg | 12 ++++++++++-- assets/models/weapons/abuildupg/flash0.wav | Bin 6188 -> 0 bytes assets/models/weapons/abuildupg/impactflesh0.wav | Bin 40492 -> 0 bytes assets/models/weapons/abuildupg/weapon.cfg | 19 ------------------- 6 files changed, 10 insertions(+), 21 deletions(-) create mode 100644 assets/models/weapons/abuild/flash0.wav create mode 100644 assets/models/weapons/abuild/impactflesh0.wav delete mode 100644 assets/models/weapons/abuildupg/flash0.wav delete mode 100644 assets/models/weapons/abuildupg/impactflesh0.wav delete mode 100644 assets/models/weapons/abuildupg/weapon.cfg (limited to 'assets/models/weapons') diff --git a/assets/models/weapons/abuild/flash0.wav b/assets/models/weapons/abuild/flash0.wav new file mode 100644 index 0000000..97e12c9 Binary files /dev/null and b/assets/models/weapons/abuild/flash0.wav differ diff --git a/assets/models/weapons/abuild/impactflesh0.wav b/assets/models/weapons/abuild/impactflesh0.wav new file mode 100644 index 0000000..53476e8 Binary files /dev/null and b/assets/models/weapons/abuild/impactflesh0.wav differ diff --git a/assets/models/weapons/abuild/weapon.cfg b/assets/models/weapons/abuild/weapon.cfg index 46cfdaa..a359c2e 100644 --- a/assets/models/weapons/abuild/weapon.cfg +++ b/assets/models/weapons/abuild/weapon.cfg @@ -5,7 +5,15 @@ icon icons/icona_builder secondary { - flashSound 0 models/weapons/abuildupg/flash0.wav - impactFleshSound 0 models/weapons/abuildupg/impactflesh0.wav + flashSound 0 models/weapons/abuild/flash0.wav + impactFleshSound 0 models/weapons/abuild/impactflesh0.wav alwaysImpact } + +tertiary +{ + missileModel models/weapons/level3upg/missile.md3 + + impactMark 64 granger_spit + impactSound 0 sound/misc/organic_bounce.wav +} diff --git a/assets/models/weapons/abuildupg/flash0.wav b/assets/models/weapons/abuildupg/flash0.wav deleted file mode 100644 index 97e12c9..0000000 Binary files a/assets/models/weapons/abuildupg/flash0.wav and /dev/null differ diff --git a/assets/models/weapons/abuildupg/impactflesh0.wav b/assets/models/weapons/abuildupg/impactflesh0.wav deleted file mode 100644 index 53476e8..0000000 Binary files a/assets/models/weapons/abuildupg/impactflesh0.wav and /dev/null differ diff --git a/assets/models/weapons/abuildupg/weapon.cfg b/assets/models/weapons/abuildupg/weapon.cfg deleted file mode 100644 index 45d154c..0000000 --- a/assets/models/weapons/abuildupg/weapon.cfg +++ /dev/null @@ -1,19 +0,0 @@ -disableIn3rdPerson -crosshair 15 gfx/2d/crosshair-alien_s - -icon icons/icona_builder - -secondary -{ - flashSound 0 models/weapons/abuildupg/flash0.wav - impactFleshSound 0 models/weapons/abuildupg/impactflesh0.wav - alwaysImpact -} - -tertiary -{ - missileModel models/weapons/level3upg/missile.md3 - - impactMark 64 granger_spit - impactSound 0 sound/misc/organic_bounce.wav -} -- cgit