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') 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 From 9e0e1eeeb964f1eaf94622399695e4b4a2d0f1db Mon Sep 17 00:00:00 2001 From: enneract Date: Wed, 19 Nov 2014 19:57:31 +0100 Subject: Implement the Rocket Launcher. --- assets/models/ammo/rocket/rocket.md3 | Bin 0 -> 8668 bytes assets/models/ammo/rocket/rocket.tga | Bin 0 -> 164045 bytes assets/models/ammo/rocket/rocket_1.md3 | Bin 0 -> 4444 bytes assets/models/ammo/rocket/rocket_2.md3 | Bin 0 -> 2860 bytes assets/models/ammo/rocket/thrustc1.tga | Bin 0 -> 49691 bytes assets/models/ammo/rocket/thrustc2.tga | Bin 0 -> 49691 bytes assets/models/ammo/rocket/thrustc3.tga | Bin 0 -> 49691 bytes assets/models/weapons/rocketl/copy of rocketl.md3 | Bin 0 -> 5428 bytes assets/models/weapons/rocketl/flare.tga | Bin 0 -> 12827 bytes assets/models/weapons/rocketl/flarey.tga | Bin 0 -> 66075 bytes assets/models/weapons/rocketl/flash0.wav | Bin 0 -> 99924 bytes assets/models/weapons/rocketl/impact0.wav | Bin 0 -> 276880 bytes assets/models/weapons/rocketl/muzzy.tga | Bin 0 -> 49691 bytes assets/models/weapons/rocketl/newflare.tga | Bin 0 -> 49691 bytes assets/models/weapons/rocketl/rocketl.md3 | Bin 0 -> 5796 bytes assets/models/weapons/rocketl/rocketl_hand.md3 | Bin 0 -> 2964 bytes assets/models/weapons/rocketl/skin.tga | Bin 0 -> 447738 bytes assets/models/weapons/rocketl/weapon.cfg | 19 +++++++++++++++++++ assets/models/weapons/rocketl/wide.tga | Bin 0 -> 49691 bytes 19 files changed, 19 insertions(+) create mode 100644 assets/models/ammo/rocket/rocket.md3 create mode 100644 assets/models/ammo/rocket/rocket.tga create mode 100644 assets/models/ammo/rocket/rocket_1.md3 create mode 100644 assets/models/ammo/rocket/rocket_2.md3 create mode 100644 assets/models/ammo/rocket/thrustc1.tga create mode 100644 assets/models/ammo/rocket/thrustc2.tga create mode 100644 assets/models/ammo/rocket/thrustc3.tga create mode 100644 assets/models/weapons/rocketl/copy of rocketl.md3 create mode 100644 assets/models/weapons/rocketl/flare.tga create mode 100644 assets/models/weapons/rocketl/flarey.tga create mode 100644 assets/models/weapons/rocketl/flash0.wav create mode 100644 assets/models/weapons/rocketl/impact0.wav create mode 100644 assets/models/weapons/rocketl/muzzy.tga create mode 100644 assets/models/weapons/rocketl/newflare.tga create mode 100644 assets/models/weapons/rocketl/rocketl.md3 create mode 100644 assets/models/weapons/rocketl/rocketl_hand.md3 create mode 100644 assets/models/weapons/rocketl/skin.tga create mode 100644 assets/models/weapons/rocketl/weapon.cfg create mode 100644 assets/models/weapons/rocketl/wide.tga (limited to 'assets/models') diff --git a/assets/models/ammo/rocket/rocket.md3 b/assets/models/ammo/rocket/rocket.md3 new file mode 100644 index 0000000..c181114 Binary files /dev/null and b/assets/models/ammo/rocket/rocket.md3 differ diff --git a/assets/models/ammo/rocket/rocket.tga b/assets/models/ammo/rocket/rocket.tga new file mode 100644 index 0000000..47e4606 Binary files /dev/null and b/assets/models/ammo/rocket/rocket.tga differ diff --git a/assets/models/ammo/rocket/rocket_1.md3 b/assets/models/ammo/rocket/rocket_1.md3 new file mode 100644 index 0000000..668f3f9 Binary files /dev/null and b/assets/models/ammo/rocket/rocket_1.md3 differ diff --git a/assets/models/ammo/rocket/rocket_2.md3 b/assets/models/ammo/rocket/rocket_2.md3 new file mode 100644 index 0000000..c2af2a0 Binary files /dev/null and b/assets/models/ammo/rocket/rocket_2.md3 differ diff --git a/assets/models/ammo/rocket/thrustc1.tga b/assets/models/ammo/rocket/thrustc1.tga new file mode 100644 index 0000000..581b972 Binary files /dev/null and b/assets/models/ammo/rocket/thrustc1.tga differ diff --git a/assets/models/ammo/rocket/thrustc2.tga b/assets/models/ammo/rocket/thrustc2.tga new file mode 100644 index 0000000..718f95d Binary files /dev/null and b/assets/models/ammo/rocket/thrustc2.tga differ diff --git a/assets/models/ammo/rocket/thrustc3.tga b/assets/models/ammo/rocket/thrustc3.tga new file mode 100644 index 0000000..ea1cc68 Binary files /dev/null and b/assets/models/ammo/rocket/thrustc3.tga differ diff --git a/assets/models/weapons/rocketl/copy of rocketl.md3 b/assets/models/weapons/rocketl/copy of rocketl.md3 new file mode 100644 index 0000000..a66b033 Binary files /dev/null and b/assets/models/weapons/rocketl/copy of rocketl.md3 differ diff --git a/assets/models/weapons/rocketl/flare.tga b/assets/models/weapons/rocketl/flare.tga new file mode 100644 index 0000000..86516ca Binary files /dev/null and b/assets/models/weapons/rocketl/flare.tga differ diff --git a/assets/models/weapons/rocketl/flarey.tga b/assets/models/weapons/rocketl/flarey.tga new file mode 100644 index 0000000..37f56dc Binary files /dev/null and b/assets/models/weapons/rocketl/flarey.tga differ diff --git a/assets/models/weapons/rocketl/flash0.wav b/assets/models/weapons/rocketl/flash0.wav new file mode 100644 index 0000000..009febe Binary files /dev/null and b/assets/models/weapons/rocketl/flash0.wav differ diff --git a/assets/models/weapons/rocketl/impact0.wav b/assets/models/weapons/rocketl/impact0.wav new file mode 100644 index 0000000..f232ff1 Binary files /dev/null and b/assets/models/weapons/rocketl/impact0.wav differ diff --git a/assets/models/weapons/rocketl/muzzy.tga b/assets/models/weapons/rocketl/muzzy.tga new file mode 100644 index 0000000..a452b3f Binary files /dev/null and b/assets/models/weapons/rocketl/muzzy.tga differ diff --git a/assets/models/weapons/rocketl/newflare.tga b/assets/models/weapons/rocketl/newflare.tga new file mode 100644 index 0000000..fd6866e Binary files /dev/null and b/assets/models/weapons/rocketl/newflare.tga differ diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3 new file mode 100644 index 0000000..4119209 Binary files /dev/null and b/assets/models/weapons/rocketl/rocketl.md3 differ diff --git a/assets/models/weapons/rocketl/rocketl_hand.md3 b/assets/models/weapons/rocketl/rocketl_hand.md3 new file mode 100644 index 0000000..2a03eed Binary files /dev/null and b/assets/models/weapons/rocketl/rocketl_hand.md3 differ diff --git a/assets/models/weapons/rocketl/skin.tga b/assets/models/weapons/rocketl/skin.tga new file mode 100644 index 0000000..59e1399 Binary files /dev/null and b/assets/models/weapons/rocketl/skin.tga differ diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg new file mode 100644 index 0000000..9711bd9 --- /dev/null +++ b/assets/models/weapons/rocketl/weapon.cfg @@ -0,0 +1,19 @@ +weaponModel models/weapons/rocketl/rocketl.md3 +icon icons/iconw_lucifer +crosshair 48 gfx/2d/crosshair-lcannon_s + +primary +{ + missileModel models/ammo/rocket/rocket.md3 + + missileSound models/weapons/lcannon/missle.wav + missileParticleSystem models/weapons/rocketl/missilePS + + flashDlightColor 1.0 0.7 0.0 + flashSound 0 models/weapons/rocketl/flash0.wav + + impactMark 32 gfx/marks/bullet_mrk + impactSound 0 models/weapons/rocketl/impact0.wav + impactParticleSystem models/weapons/rocketl/impactPS +} + diff --git a/assets/models/weapons/rocketl/wide.tga b/assets/models/weapons/rocketl/wide.tga new file mode 100644 index 0000000..04a59b4 Binary files /dev/null and b/assets/models/weapons/rocketl/wide.tga differ -- cgit From ae41a0cdf13d6cf4150d32f089d5a45fe068b241 Mon Sep 17 00:00:00 2001 From: enneract Date: Sat, 22 Nov 2014 19:34:18 +0100 Subject: Add a proper icon for Rocket Launcher. --- assets/models/weapons/rocketl/copy of rocketl.md3 | Bin 5428 -> 0 bytes assets/models/weapons/rocketl/weapon.cfg | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 assets/models/weapons/rocketl/copy of rocketl.md3 (limited to 'assets/models') diff --git a/assets/models/weapons/rocketl/copy of rocketl.md3 b/assets/models/weapons/rocketl/copy of rocketl.md3 deleted file mode 100644 index a66b033..0000000 Binary files a/assets/models/weapons/rocketl/copy of rocketl.md3 and /dev/null differ diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg index 9711bd9..e5dafc6 100644 --- a/assets/models/weapons/rocketl/weapon.cfg +++ b/assets/models/weapons/rocketl/weapon.cfg @@ -1,5 +1,5 @@ weaponModel models/weapons/rocketl/rocketl.md3 -icon icons/iconw_lucifer +icon icons/iconw_rocketl crosshair 48 gfx/2d/crosshair-lcannon_s primary -- cgit