From: LegendaryGuard Date: Tue, 27 Dec 2022 18:49:13 +0000 (+0100) Subject: Refactor weapon filenames included sounds and skins, still model materials and other... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d388a356437871f011a11c58e802e986128821e0;p=xonotic%2Fxonotic-data.pk3dir.git Refactor weapon filenames included sounds and skins, still model materials and other inner model stuff need to be renamed to work --- diff --git a/gfx/crosshair_ring_nexgun.tga b/gfx/crosshair_ring_nexgun.tga deleted file mode 100644 index 6100096bf..000000000 Binary files a/gfx/crosshair_ring_nexgun.tga and /dev/null differ diff --git a/gfx/crosshair_ring_vortex.tga b/gfx/crosshair_ring_vortex.tga new file mode 100644 index 000000000..6100096bf Binary files /dev/null and b/gfx/crosshair_ring_vortex.tga differ diff --git a/gfx/crosshairblaster.tga b/gfx/crosshairblaster.tga new file mode 100644 index 000000000..30e9bf3c8 Binary files /dev/null and b/gfx/crosshairblaster.tga differ diff --git a/gfx/crosshairdevastator.tga b/gfx/crosshairdevastator.tga new file mode 100644 index 000000000..e77996d97 Binary files /dev/null and b/gfx/crosshairdevastator.tga differ diff --git a/gfx/crosshairgrenadelauncher.tga b/gfx/crosshairgrenadelauncher.tga deleted file mode 100644 index 3b93b76e5..000000000 Binary files a/gfx/crosshairgrenadelauncher.tga and /dev/null differ diff --git a/gfx/crosshairlaser.tga b/gfx/crosshairlaser.tga deleted file mode 100644 index 30e9bf3c8..000000000 Binary files a/gfx/crosshairlaser.tga and /dev/null differ diff --git a/gfx/crosshairmachinegun.tga b/gfx/crosshairmachinegun.tga new file mode 100644 index 000000000..1f7e96947 Binary files /dev/null and b/gfx/crosshairmachinegun.tga differ diff --git a/gfx/crosshairminstanex.tga b/gfx/crosshairminstanex.tga deleted file mode 100644 index f2810cce2..000000000 Binary files a/gfx/crosshairminstanex.tga and /dev/null differ diff --git a/gfx/crosshairmortar.tga b/gfx/crosshairmortar.tga new file mode 100644 index 000000000..3b93b76e5 Binary files /dev/null and b/gfx/crosshairmortar.tga differ diff --git a/gfx/crosshairnex.tga b/gfx/crosshairnex.tga deleted file mode 100644 index c304046e8..000000000 Binary files a/gfx/crosshairnex.tga and /dev/null differ diff --git a/gfx/crosshairrocketlauncher.tga b/gfx/crosshairrocketlauncher.tga deleted file mode 100644 index e77996d97..000000000 Binary files a/gfx/crosshairrocketlauncher.tga and /dev/null differ diff --git a/gfx/crosshairuzi.tga b/gfx/crosshairuzi.tga deleted file mode 100644 index 1f7e96947..000000000 Binary files a/gfx/crosshairuzi.tga and /dev/null differ diff --git a/gfx/crosshairvaporizer.tga b/gfx/crosshairvaporizer.tga new file mode 100644 index 000000000..f2810cce2 Binary files /dev/null and b/gfx/crosshairvaporizer.tga differ diff --git a/gfx/crosshairvortex.tga b/gfx/crosshairvortex.tga new file mode 100644 index 000000000..c304046e8 Binary files /dev/null and b/gfx/crosshairvortex.tga differ diff --git a/gfx/reticle_nex.tga b/gfx/reticle_nex.tga deleted file mode 100644 index 3e0c1423e..000000000 Binary files a/gfx/reticle_nex.tga and /dev/null differ diff --git a/gfx/reticle_vortex.tga b/gfx/reticle_vortex.tga new file mode 100644 index 000000000..3e0c1423e Binary files /dev/null and b/gfx/reticle_vortex.tga differ diff --git a/models/weapons/g_blaster.md3 b/models/weapons/g_blaster.md3 new file mode 100644 index 000000000..fd3f1e74a Binary files /dev/null and b/models/weapons/g_blaster.md3 differ diff --git a/models/weapons/g_blaster_luma.iqm b/models/weapons/g_blaster_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_blaster_luma.iqm differ diff --git a/models/weapons/g_blaster_luma.iqm_0.skin b/models/weapons/g_blaster_luma.iqm_0.skin new file mode 100644 index 000000000..10fcd0055 --- /dev/null +++ b/models/weapons/g_blaster_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_blaster_luma diff --git a/models/weapons/g_blaster_luma.tga b/models/weapons/g_blaster_luma.tga new file mode 100644 index 000000000..6c9d426cc Binary files /dev/null and b/models/weapons/g_blaster_luma.tga differ diff --git a/models/weapons/g_blaster_simple.iqm b/models/weapons/g_blaster_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_blaster_simple.iqm differ diff --git a/models/weapons/g_blaster_simple.iqm_0.skin b/models/weapons/g_blaster_simple.iqm_0.skin new file mode 100644 index 000000000..96698d174 --- /dev/null +++ b/models/weapons/g_blaster_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_blaster_simple \ No newline at end of file diff --git a/models/weapons/g_blaster_simple.tga b/models/weapons/g_blaster_simple.tga new file mode 100644 index 000000000..66223a342 Binary files /dev/null and b/models/weapons/g_blaster_simple.tga differ diff --git a/models/weapons/g_campingrifle.md3 b/models/weapons/g_campingrifle.md3 deleted file mode 100644 index fd829833e..000000000 Binary files a/models/weapons/g_campingrifle.md3 and /dev/null differ diff --git a/models/weapons/g_campingrifle_luma.iqm b/models/weapons/g_campingrifle_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_campingrifle_luma.iqm and /dev/null differ diff --git a/models/weapons/g_campingrifle_luma.iqm_0.skin b/models/weapons/g_campingrifle_luma.iqm_0.skin deleted file mode 100644 index 3900fba57..000000000 --- a/models/weapons/g_campingrifle_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_campingrifle_luma diff --git a/models/weapons/g_campingrifle_luma.tga b/models/weapons/g_campingrifle_luma.tga deleted file mode 100644 index 5f8e13548..000000000 Binary files a/models/weapons/g_campingrifle_luma.tga and /dev/null differ diff --git a/models/weapons/g_campingrifle_simple.iqm b/models/weapons/g_campingrifle_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_campingrifle_simple.iqm and /dev/null differ diff --git a/models/weapons/g_campingrifle_simple.iqm_0.skin b/models/weapons/g_campingrifle_simple.iqm_0.skin deleted file mode 100644 index 6b2726f49..000000000 --- a/models/weapons/g_campingrifle_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_campingrifle_simple \ No newline at end of file diff --git a/models/weapons/g_campingrifle_simple.tga b/models/weapons/g_campingrifle_simple.tga deleted file mode 100644 index 2a9c44969..000000000 Binary files a/models/weapons/g_campingrifle_simple.tga and /dev/null differ diff --git a/models/weapons/g_devastator.md3 b/models/weapons/g_devastator.md3 new file mode 100644 index 000000000..b158d1ba3 Binary files /dev/null and b/models/weapons/g_devastator.md3 differ diff --git a/models/weapons/g_devastator_luma.iqm b/models/weapons/g_devastator_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_devastator_luma.iqm differ diff --git a/models/weapons/g_devastator_luma.iqm_0.skin b/models/weapons/g_devastator_luma.iqm_0.skin new file mode 100644 index 000000000..3d8a45397 --- /dev/null +++ b/models/weapons/g_devastator_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_devastator_luma diff --git a/models/weapons/g_devastator_luma.tga b/models/weapons/g_devastator_luma.tga new file mode 100644 index 000000000..16bd44220 Binary files /dev/null and b/models/weapons/g_devastator_luma.tga differ diff --git a/models/weapons/g_devastator_simple.iqm b/models/weapons/g_devastator_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_devastator_simple.iqm differ diff --git a/models/weapons/g_devastator_simple.iqm_0.skin b/models/weapons/g_devastator_simple.iqm_0.skin new file mode 100644 index 000000000..322784a81 --- /dev/null +++ b/models/weapons/g_devastator_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_devastator_simple \ No newline at end of file diff --git a/models/weapons/g_devastator_simple.tga b/models/weapons/g_devastator_simple.tga new file mode 100644 index 000000000..2ac19c8f5 Binary files /dev/null and b/models/weapons/g_devastator_simple.tga differ diff --git a/models/weapons/g_gl.md3 b/models/weapons/g_gl.md3 deleted file mode 100644 index 0fd67bbb7..000000000 Binary files a/models/weapons/g_gl.md3 and /dev/null differ diff --git a/models/weapons/g_gl_luma.iqm b/models/weapons/g_gl_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_gl_luma.iqm and /dev/null differ diff --git a/models/weapons/g_gl_luma.iqm_0.skin b/models/weapons/g_gl_luma.iqm_0.skin deleted file mode 100644 index 2356bb6c9..000000000 --- a/models/weapons/g_gl_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_gl_luma diff --git a/models/weapons/g_gl_luma.tga b/models/weapons/g_gl_luma.tga deleted file mode 100644 index 4e0ac91a3..000000000 Binary files a/models/weapons/g_gl_luma.tga and /dev/null differ diff --git a/models/weapons/g_gl_simple.iqm b/models/weapons/g_gl_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_gl_simple.iqm and /dev/null differ diff --git a/models/weapons/g_gl_simple.iqm_0.skin b/models/weapons/g_gl_simple.iqm_0.skin deleted file mode 100644 index cbb574dff..000000000 --- a/models/weapons/g_gl_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_gl_simple \ No newline at end of file diff --git a/models/weapons/g_gl_simple.tga b/models/weapons/g_gl_simple.tga deleted file mode 100644 index 114c6f25f..000000000 Binary files a/models/weapons/g_gl_simple.tga and /dev/null differ diff --git a/models/weapons/g_hook.md3 b/models/weapons/g_hook.md3 new file mode 100644 index 000000000..9c25b737a Binary files /dev/null and b/models/weapons/g_hook.md3 differ diff --git a/models/weapons/g_hook_luma.iqm b/models/weapons/g_hook_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_hook_luma.iqm differ diff --git a/models/weapons/g_hook_luma.iqm_0.skin b/models/weapons/g_hook_luma.iqm_0.skin new file mode 100644 index 000000000..f36fd85bb --- /dev/null +++ b/models/weapons/g_hook_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_hook_luma diff --git a/models/weapons/g_hook_luma.tga b/models/weapons/g_hook_luma.tga new file mode 100644 index 000000000..4ce22fb31 Binary files /dev/null and b/models/weapons/g_hook_luma.tga differ diff --git a/models/weapons/g_hook_simple.iqm b/models/weapons/g_hook_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_hook_simple.iqm differ diff --git a/models/weapons/g_hook_simple.iqm_0.skin b/models/weapons/g_hook_simple.iqm_0.skin new file mode 100644 index 000000000..ec6e951df --- /dev/null +++ b/models/weapons/g_hook_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_hook_simple \ No newline at end of file diff --git a/models/weapons/g_hook_simple.tga b/models/weapons/g_hook_simple.tga new file mode 100644 index 000000000..be44b817f Binary files /dev/null and b/models/weapons/g_hook_simple.tga differ diff --git a/models/weapons/g_hookgun.md3 b/models/weapons/g_hookgun.md3 deleted file mode 100644 index 9c25b737a..000000000 Binary files a/models/weapons/g_hookgun.md3 and /dev/null differ diff --git a/models/weapons/g_hookgun_luma.iqm b/models/weapons/g_hookgun_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_hookgun_luma.iqm and /dev/null differ diff --git a/models/weapons/g_hookgun_luma.iqm_0.skin b/models/weapons/g_hookgun_luma.iqm_0.skin deleted file mode 100644 index 76f5a3686..000000000 --- a/models/weapons/g_hookgun_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_hookgun_luma diff --git a/models/weapons/g_hookgun_luma.tga b/models/weapons/g_hookgun_luma.tga deleted file mode 100644 index 4ce22fb31..000000000 Binary files a/models/weapons/g_hookgun_luma.tga and /dev/null differ diff --git a/models/weapons/g_hookgun_simple.iqm b/models/weapons/g_hookgun_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_hookgun_simple.iqm and /dev/null differ diff --git a/models/weapons/g_hookgun_simple.iqm_0.skin b/models/weapons/g_hookgun_simple.iqm_0.skin deleted file mode 100644 index 2c8bd5fff..000000000 --- a/models/weapons/g_hookgun_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_hookgun_simple \ No newline at end of file diff --git a/models/weapons/g_hookgun_simple.tga b/models/weapons/g_hookgun_simple.tga deleted file mode 100644 index be44b817f..000000000 Binary files a/models/weapons/g_hookgun_simple.tga and /dev/null differ diff --git a/models/weapons/g_laser.md3 b/models/weapons/g_laser.md3 deleted file mode 100644 index fd3f1e74a..000000000 Binary files a/models/weapons/g_laser.md3 and /dev/null differ diff --git a/models/weapons/g_laser_luma.iqm b/models/weapons/g_laser_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_laser_luma.iqm and /dev/null differ diff --git a/models/weapons/g_laser_luma.iqm_0.skin b/models/weapons/g_laser_luma.iqm_0.skin deleted file mode 100644 index 7f433fbf4..000000000 --- a/models/weapons/g_laser_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_laser_luma diff --git a/models/weapons/g_laser_luma.tga b/models/weapons/g_laser_luma.tga deleted file mode 100644 index 6c9d426cc..000000000 Binary files a/models/weapons/g_laser_luma.tga and /dev/null differ diff --git a/models/weapons/g_laser_simple.iqm b/models/weapons/g_laser_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_laser_simple.iqm and /dev/null differ diff --git a/models/weapons/g_laser_simple.iqm_0.skin b/models/weapons/g_laser_simple.iqm_0.skin deleted file mode 100644 index 02e24bc1e..000000000 --- a/models/weapons/g_laser_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_laser_simple \ No newline at end of file diff --git a/models/weapons/g_laser_simple.tga b/models/weapons/g_laser_simple.tga deleted file mode 100644 index 66223a342..000000000 Binary files a/models/weapons/g_laser_simple.tga and /dev/null differ diff --git a/models/weapons/g_machinegun.md3 b/models/weapons/g_machinegun.md3 new file mode 100644 index 000000000..76062c6d4 Binary files /dev/null and b/models/weapons/g_machinegun.md3 differ diff --git a/models/weapons/g_machinegun_luma.iqm b/models/weapons/g_machinegun_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_machinegun_luma.iqm differ diff --git a/models/weapons/g_machinegun_luma.iqm_0.skin b/models/weapons/g_machinegun_luma.iqm_0.skin new file mode 100644 index 000000000..2a3f68975 --- /dev/null +++ b/models/weapons/g_machinegun_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_machinegun_luma diff --git a/models/weapons/g_machinegun_luma.tga b/models/weapons/g_machinegun_luma.tga new file mode 100644 index 000000000..8a05499b8 Binary files /dev/null and b/models/weapons/g_machinegun_luma.tga differ diff --git a/models/weapons/g_machinegun_simple.iqm b/models/weapons/g_machinegun_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_machinegun_simple.iqm differ diff --git a/models/weapons/g_machinegun_simple.iqm_0.skin b/models/weapons/g_machinegun_simple.iqm_0.skin new file mode 100644 index 000000000..63f88c415 --- /dev/null +++ b/models/weapons/g_machinegun_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_machinegun_simple \ No newline at end of file diff --git a/models/weapons/g_machinegun_simple.tga b/models/weapons/g_machinegun_simple.tga new file mode 100644 index 000000000..55d68cd93 Binary files /dev/null and b/models/weapons/g_machinegun_simple.tga differ diff --git a/models/weapons/g_minstanex.md3 b/models/weapons/g_minstanex.md3 deleted file mode 100644 index 847e3149c..000000000 Binary files a/models/weapons/g_minstanex.md3 and /dev/null differ diff --git a/models/weapons/g_minstanex_luma.iqm b/models/weapons/g_minstanex_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_minstanex_luma.iqm and /dev/null differ diff --git a/models/weapons/g_minstanex_luma.iqm_0.skin b/models/weapons/g_minstanex_luma.iqm_0.skin deleted file mode 100644 index 7085d26e1..000000000 --- a/models/weapons/g_minstanex_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_minstanex_luma diff --git a/models/weapons/g_minstanex_luma.tga b/models/weapons/g_minstanex_luma.tga deleted file mode 100644 index 3134a16e5..000000000 Binary files a/models/weapons/g_minstanex_luma.tga and /dev/null differ diff --git a/models/weapons/g_minstanex_simple.iqm b/models/weapons/g_minstanex_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_minstanex_simple.iqm and /dev/null differ diff --git a/models/weapons/g_minstanex_simple.iqm_0.skin b/models/weapons/g_minstanex_simple.iqm_0.skin deleted file mode 100644 index 3a255b4aa..000000000 --- a/models/weapons/g_minstanex_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_minstanex_simple \ No newline at end of file diff --git a/models/weapons/g_minstanex_simple.tga b/models/weapons/g_minstanex_simple.tga deleted file mode 100644 index 68bf31157..000000000 Binary files a/models/weapons/g_minstanex_simple.tga and /dev/null differ diff --git a/models/weapons/g_mortar.md3 b/models/weapons/g_mortar.md3 new file mode 100644 index 000000000..0fd67bbb7 Binary files /dev/null and b/models/weapons/g_mortar.md3 differ diff --git a/models/weapons/g_mortar_luma.iqm b/models/weapons/g_mortar_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_mortar_luma.iqm differ diff --git a/models/weapons/g_mortar_luma.iqm_0.skin b/models/weapons/g_mortar_luma.iqm_0.skin new file mode 100644 index 000000000..0d568ebd2 --- /dev/null +++ b/models/weapons/g_mortar_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_mortar_luma diff --git a/models/weapons/g_mortar_luma.tga b/models/weapons/g_mortar_luma.tga new file mode 100644 index 000000000..4e0ac91a3 Binary files /dev/null and b/models/weapons/g_mortar_luma.tga differ diff --git a/models/weapons/g_mortar_simple.iqm b/models/weapons/g_mortar_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_mortar_simple.iqm differ diff --git a/models/weapons/g_mortar_simple.iqm_0.skin b/models/weapons/g_mortar_simple.iqm_0.skin new file mode 100644 index 000000000..174240bb5 --- /dev/null +++ b/models/weapons/g_mortar_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_mortar_simple \ No newline at end of file diff --git a/models/weapons/g_mortar_simple.tga b/models/weapons/g_mortar_simple.tga new file mode 100644 index 000000000..114c6f25f Binary files /dev/null and b/models/weapons/g_mortar_simple.tga differ diff --git a/models/weapons/g_nex.md3 b/models/weapons/g_nex.md3 deleted file mode 100644 index 6ecb0aaba..000000000 Binary files a/models/weapons/g_nex.md3 and /dev/null differ diff --git a/models/weapons/g_nex_luma.iqm b/models/weapons/g_nex_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_nex_luma.iqm and /dev/null differ diff --git a/models/weapons/g_nex_luma.iqm_0.skin b/models/weapons/g_nex_luma.iqm_0.skin deleted file mode 100644 index c1b5ac511..000000000 --- a/models/weapons/g_nex_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_nex_luma diff --git a/models/weapons/g_nex_luma.tga b/models/weapons/g_nex_luma.tga deleted file mode 100644 index a116aaa27..000000000 Binary files a/models/weapons/g_nex_luma.tga and /dev/null differ diff --git a/models/weapons/g_nex_simple.iqm b/models/weapons/g_nex_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_nex_simple.iqm and /dev/null differ diff --git a/models/weapons/g_nex_simple.iqm_0.skin b/models/weapons/g_nex_simple.iqm_0.skin deleted file mode 100644 index 55a8cc4dd..000000000 --- a/models/weapons/g_nex_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_nex_simple \ No newline at end of file diff --git a/models/weapons/g_nex_simple.tga b/models/weapons/g_nex_simple.tga deleted file mode 100644 index a254e962d..000000000 Binary files a/models/weapons/g_nex_simple.tga and /dev/null differ diff --git a/models/weapons/g_ok_nex.md3 b/models/weapons/g_ok_nex.md3 new file mode 100644 index 000000000..669f4c7ac Binary files /dev/null and b/models/weapons/g_ok_nex.md3 differ diff --git a/models/weapons/g_ok_rl.md3 b/models/weapons/g_ok_rl.md3 deleted file mode 100644 index c677b1b38..000000000 Binary files a/models/weapons/g_ok_rl.md3 and /dev/null differ diff --git a/models/weapons/g_ok_rl_luma.iqm b/models/weapons/g_ok_rl_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_ok_rl_luma.iqm and /dev/null differ diff --git a/models/weapons/g_ok_rl_luma.iqm_0.skin b/models/weapons/g_ok_rl_luma.iqm_0.skin deleted file mode 100644 index 502ff5b25..000000000 --- a/models/weapons/g_ok_rl_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_ok_rl_luma diff --git a/models/weapons/g_ok_rl_luma.tga b/models/weapons/g_ok_rl_luma.tga deleted file mode 100644 index b2471c8dd..000000000 Binary files a/models/weapons/g_ok_rl_luma.tga and /dev/null differ diff --git a/models/weapons/g_ok_rl_simple.iqm b/models/weapons/g_ok_rl_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_ok_rl_simple.iqm and /dev/null differ diff --git a/models/weapons/g_ok_rl_simple.iqm_0.skin b/models/weapons/g_ok_rl_simple.iqm_0.skin deleted file mode 100644 index 804fe521f..000000000 --- a/models/weapons/g_ok_rl_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_ok_rl_simple \ No newline at end of file diff --git a/models/weapons/g_ok_rl_simple.tga b/models/weapons/g_ok_rl_simple.tga deleted file mode 100644 index 53f1be567..000000000 Binary files a/models/weapons/g_ok_rl_simple.tga and /dev/null differ diff --git a/models/weapons/g_ok_rpc.md3 b/models/weapons/g_ok_rpc.md3 new file mode 100644 index 000000000..c677b1b38 Binary files /dev/null and b/models/weapons/g_ok_rpc.md3 differ diff --git a/models/weapons/g_ok_rpc_luma.iqm b/models/weapons/g_ok_rpc_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_rpc_luma.iqm differ diff --git a/models/weapons/g_ok_rpc_luma.iqm_0.skin b/models/weapons/g_ok_rpc_luma.iqm_0.skin new file mode 100644 index 000000000..fe3d71c73 --- /dev/null +++ b/models/weapons/g_ok_rpc_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_rpc_luma diff --git a/models/weapons/g_ok_rpc_luma.tga b/models/weapons/g_ok_rpc_luma.tga new file mode 100644 index 000000000..b2471c8dd Binary files /dev/null and b/models/weapons/g_ok_rpc_luma.tga differ diff --git a/models/weapons/g_ok_rpc_simple.iqm b/models/weapons/g_ok_rpc_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_ok_rpc_simple.iqm differ diff --git a/models/weapons/g_ok_rpc_simple.iqm_0.skin b/models/weapons/g_ok_rpc_simple.iqm_0.skin new file mode 100644 index 000000000..525bb21ad --- /dev/null +++ b/models/weapons/g_ok_rpc_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_ok_rpc_simple \ No newline at end of file diff --git a/models/weapons/g_ok_rpc_simple.tga b/models/weapons/g_ok_rpc_simple.tga new file mode 100644 index 000000000..53f1be567 Binary files /dev/null and b/models/weapons/g_ok_rpc_simple.tga differ diff --git a/models/weapons/g_ok_sniper.md3 b/models/weapons/g_ok_sniper.md3 deleted file mode 100644 index 669f4c7ac..000000000 Binary files a/models/weapons/g_ok_sniper.md3 and /dev/null differ diff --git a/models/weapons/g_rifle.md3 b/models/weapons/g_rifle.md3 new file mode 100644 index 000000000..fd829833e Binary files /dev/null and b/models/weapons/g_rifle.md3 differ diff --git a/models/weapons/g_rifle_luma.iqm b/models/weapons/g_rifle_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_rifle_luma.iqm differ diff --git a/models/weapons/g_rifle_luma.iqm_0.skin b/models/weapons/g_rifle_luma.iqm_0.skin new file mode 100644 index 000000000..fa78d0201 --- /dev/null +++ b/models/weapons/g_rifle_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_rifle_luma diff --git a/models/weapons/g_rifle_luma.tga b/models/weapons/g_rifle_luma.tga new file mode 100644 index 000000000..5f8e13548 Binary files /dev/null and b/models/weapons/g_rifle_luma.tga differ diff --git a/models/weapons/g_rifle_simple.iqm b/models/weapons/g_rifle_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_rifle_simple.iqm differ diff --git a/models/weapons/g_rifle_simple.iqm_0.skin b/models/weapons/g_rifle_simple.iqm_0.skin new file mode 100644 index 000000000..6c6e2715c --- /dev/null +++ b/models/weapons/g_rifle_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_rifle_simple \ No newline at end of file diff --git a/models/weapons/g_rifle_simple.tga b/models/weapons/g_rifle_simple.tga new file mode 100644 index 000000000..2a9c44969 Binary files /dev/null and b/models/weapons/g_rifle_simple.tga differ diff --git a/models/weapons/g_rl.md3 b/models/weapons/g_rl.md3 deleted file mode 100644 index b158d1ba3..000000000 Binary files a/models/weapons/g_rl.md3 and /dev/null differ diff --git a/models/weapons/g_rl_luma.iqm b/models/weapons/g_rl_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_rl_luma.iqm and /dev/null differ diff --git a/models/weapons/g_rl_luma.iqm_0.skin b/models/weapons/g_rl_luma.iqm_0.skin deleted file mode 100644 index 5be56dbb1..000000000 --- a/models/weapons/g_rl_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_rl_luma diff --git a/models/weapons/g_rl_luma.tga b/models/weapons/g_rl_luma.tga deleted file mode 100644 index 16bd44220..000000000 Binary files a/models/weapons/g_rl_luma.tga and /dev/null differ diff --git a/models/weapons/g_rl_simple.iqm b/models/weapons/g_rl_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_rl_simple.iqm and /dev/null differ diff --git a/models/weapons/g_rl_simple.iqm_0.skin b/models/weapons/g_rl_simple.iqm_0.skin deleted file mode 100644 index bcb054edc..000000000 --- a/models/weapons/g_rl_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_rl_simple \ No newline at end of file diff --git a/models/weapons/g_rl_simple.tga b/models/weapons/g_rl_simple.tga deleted file mode 100644 index 2ac19c8f5..000000000 Binary files a/models/weapons/g_rl_simple.tga and /dev/null differ diff --git a/models/weapons/g_uzi.md3 b/models/weapons/g_uzi.md3 deleted file mode 100644 index 76062c6d4..000000000 Binary files a/models/weapons/g_uzi.md3 and /dev/null differ diff --git a/models/weapons/g_uzi_luma.iqm b/models/weapons/g_uzi_luma.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_uzi_luma.iqm and /dev/null differ diff --git a/models/weapons/g_uzi_luma.iqm_0.skin b/models/weapons/g_uzi_luma.iqm_0.skin deleted file mode 100644 index fb808bd66..000000000 --- a/models/weapons/g_uzi_luma.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_uzi_luma diff --git a/models/weapons/g_uzi_luma.tga b/models/weapons/g_uzi_luma.tga deleted file mode 100644 index 8a05499b8..000000000 Binary files a/models/weapons/g_uzi_luma.tga and /dev/null differ diff --git a/models/weapons/g_uzi_simple.iqm b/models/weapons/g_uzi_simple.iqm deleted file mode 100644 index a5cc3e602..000000000 Binary files a/models/weapons/g_uzi_simple.iqm and /dev/null differ diff --git a/models/weapons/g_uzi_simple.iqm_0.skin b/models/weapons/g_uzi_simple.iqm_0.skin deleted file mode 100644 index 043974b34..000000000 --- a/models/weapons/g_uzi_simple.iqm_0.skin +++ /dev/null @@ -1 +0,0 @@ -Plane,g_uzi_simple \ No newline at end of file diff --git a/models/weapons/g_uzi_simple.tga b/models/weapons/g_uzi_simple.tga deleted file mode 100644 index 55d68cd93..000000000 Binary files a/models/weapons/g_uzi_simple.tga and /dev/null differ diff --git a/models/weapons/g_vaporizer.md3 b/models/weapons/g_vaporizer.md3 new file mode 100644 index 000000000..847e3149c Binary files /dev/null and b/models/weapons/g_vaporizer.md3 differ diff --git a/models/weapons/g_vaporizer_luma.iqm b/models/weapons/g_vaporizer_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_vaporizer_luma.iqm differ diff --git a/models/weapons/g_vaporizer_luma.iqm_0.skin b/models/weapons/g_vaporizer_luma.iqm_0.skin new file mode 100644 index 000000000..491df116c --- /dev/null +++ b/models/weapons/g_vaporizer_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_vaporizer_luma diff --git a/models/weapons/g_vaporizer_luma.tga b/models/weapons/g_vaporizer_luma.tga new file mode 100644 index 000000000..3134a16e5 Binary files /dev/null and b/models/weapons/g_vaporizer_luma.tga differ diff --git a/models/weapons/g_vaporizer_simple.iqm b/models/weapons/g_vaporizer_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_vaporizer_simple.iqm differ diff --git a/models/weapons/g_vaporizer_simple.iqm_0.skin b/models/weapons/g_vaporizer_simple.iqm_0.skin new file mode 100644 index 000000000..709f387c3 --- /dev/null +++ b/models/weapons/g_vaporizer_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_vaporizer_simple \ No newline at end of file diff --git a/models/weapons/g_vaporizer_simple.tga b/models/weapons/g_vaporizer_simple.tga new file mode 100644 index 000000000..68bf31157 Binary files /dev/null and b/models/weapons/g_vaporizer_simple.tga differ diff --git a/models/weapons/g_vortex.md3 b/models/weapons/g_vortex.md3 new file mode 100644 index 000000000..6ecb0aaba Binary files /dev/null and b/models/weapons/g_vortex.md3 differ diff --git a/models/weapons/g_vortex_luma.iqm b/models/weapons/g_vortex_luma.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_vortex_luma.iqm differ diff --git a/models/weapons/g_vortex_luma.iqm_0.skin b/models/weapons/g_vortex_luma.iqm_0.skin new file mode 100644 index 000000000..8645bbf9b --- /dev/null +++ b/models/weapons/g_vortex_luma.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_vortex_luma diff --git a/models/weapons/g_vortex_luma.tga b/models/weapons/g_vortex_luma.tga new file mode 100644 index 000000000..a116aaa27 Binary files /dev/null and b/models/weapons/g_vortex_luma.tga differ diff --git a/models/weapons/g_vortex_simple.iqm b/models/weapons/g_vortex_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_vortex_simple.iqm differ diff --git a/models/weapons/g_vortex_simple.iqm_0.skin b/models/weapons/g_vortex_simple.iqm_0.skin new file mode 100644 index 000000000..399e66b92 --- /dev/null +++ b/models/weapons/g_vortex_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_vortex_simple \ No newline at end of file diff --git a/models/weapons/g_vortex_simple.tga b/models/weapons/g_vortex_simple.tga new file mode 100644 index 000000000..a254e962d Binary files /dev/null and b/models/weapons/g_vortex_simple.tga differ diff --git a/models/weapons/h_blaster.iqm b/models/weapons/h_blaster.iqm new file mode 100644 index 000000000..25fefcaf8 Binary files /dev/null and b/models/weapons/h_blaster.iqm differ diff --git a/models/weapons/h_blaster.iqm.framegroups b/models/weapons/h_blaster.iqm.framegroups new file mode 100644 index 000000000..0a59625b6 --- /dev/null +++ b/models/weapons/h_blaster.iqm.framegroups @@ -0,0 +1,4 @@ +1 8 20 0 // fire +9 5 20 0 // fire2 +15 200 20 1 // idle +215 40 20 0 // reload diff --git a/models/weapons/h_campingrifle.iqm b/models/weapons/h_campingrifle.iqm deleted file mode 100644 index 6ab754888..000000000 Binary files a/models/weapons/h_campingrifle.iqm and /dev/null differ diff --git a/models/weapons/h_campingrifle.iqm.framegroups b/models/weapons/h_campingrifle.iqm.framegroups deleted file mode 100644 index 474f093a9..000000000 --- a/models/weapons/h_campingrifle.iqm.framegroups +++ /dev/null @@ -1,4 +0,0 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 39 20 0 // reload diff --git a/models/weapons/h_devastator.iqm b/models/weapons/h_devastator.iqm new file mode 100644 index 000000000..1868b2c02 Binary files /dev/null and b/models/weapons/h_devastator.iqm differ diff --git a/models/weapons/h_devastator.iqm.framegroups b/models/weapons/h_devastator.iqm.framegroups new file mode 100644 index 000000000..f418b6a13 --- /dev/null +++ b/models/weapons/h_devastator.iqm.framegroups @@ -0,0 +1,9 @@ +/* +Generated framegroups file for h_devastator +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 31 30 0 // h_devastator fire +32 31 30 0 // h_devastator fire +63 101 3 1 // h_devastator idle +164 101 3 1 // h_devastator idle diff --git a/models/weapons/h_gl.iqm b/models/weapons/h_gl.iqm deleted file mode 100644 index 63f514b44..000000000 Binary files a/models/weapons/h_gl.iqm and /dev/null differ diff --git a/models/weapons/h_gl.iqm.framegroups b/models/weapons/h_gl.iqm.framegroups deleted file mode 100644 index c7e79a91a..000000000 --- a/models/weapons/h_gl.iqm.framegroups +++ /dev/null @@ -1,9 +0,0 @@ -/* -Generated framegroups file for h_gl -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 25 30 0 // h_gl fire -26 25 30 0 // h_gl fire -51 101 3 1 // h_gl idle -152 101 3 1 // h_gl idle diff --git a/models/weapons/h_hook.iqm b/models/weapons/h_hook.iqm new file mode 100644 index 000000000..003ebad37 Binary files /dev/null and b/models/weapons/h_hook.iqm differ diff --git a/models/weapons/h_hook.iqm.framegroups b/models/weapons/h_hook.iqm.framegroups new file mode 100644 index 000000000..0a59625b6 --- /dev/null +++ b/models/weapons/h_hook.iqm.framegroups @@ -0,0 +1,4 @@ +1 8 20 0 // fire +9 5 20 0 // fire2 +15 200 20 1 // idle +215 40 20 0 // reload diff --git a/models/weapons/h_hookgun.iqm b/models/weapons/h_hookgun.iqm deleted file mode 100644 index 003ebad37..000000000 Binary files a/models/weapons/h_hookgun.iqm and /dev/null differ diff --git a/models/weapons/h_hookgun.iqm.framegroups b/models/weapons/h_hookgun.iqm.framegroups deleted file mode 100644 index 0a59625b6..000000000 --- a/models/weapons/h_hookgun.iqm.framegroups +++ /dev/null @@ -1,4 +0,0 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 40 20 0 // reload diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm deleted file mode 100644 index 25fefcaf8..000000000 Binary files a/models/weapons/h_laser.iqm and /dev/null differ diff --git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups deleted file mode 100644 index 0a59625b6..000000000 --- a/models/weapons/h_laser.iqm.framegroups +++ /dev/null @@ -1,4 +0,0 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 40 20 0 // reload diff --git a/models/weapons/h_machinegun.iqm b/models/weapons/h_machinegun.iqm new file mode 100644 index 000000000..523ef998a Binary files /dev/null and b/models/weapons/h_machinegun.iqm differ diff --git a/models/weapons/h_machinegun.iqm.framegroups b/models/weapons/h_machinegun.iqm.framegroups new file mode 100644 index 000000000..0a59625b6 --- /dev/null +++ b/models/weapons/h_machinegun.iqm.framegroups @@ -0,0 +1,4 @@ +1 8 20 0 // fire +9 5 20 0 // fire2 +15 200 20 1 // idle +215 40 20 0 // reload diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm deleted file mode 100644 index 61fed1377..000000000 Binary files a/models/weapons/h_minstanex.iqm and /dev/null differ diff --git a/models/weapons/h_minstanex.iqm.framegroups b/models/weapons/h_minstanex.iqm.framegroups deleted file mode 100644 index ba97a6dec..000000000 --- a/models/weapons/h_minstanex.iqm.framegroups +++ /dev/null @@ -1,9 +0,0 @@ -/* -Generated framegroups file for h_minstanex -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 21 20 0 // h_minstanex fire -22 21 20 0 // h_minstanex fire -43 101 6 1 // h_minstanex idle -144 101 30 0 // h_minstanex reload diff --git a/models/weapons/h_mortar.iqm b/models/weapons/h_mortar.iqm new file mode 100644 index 000000000..63f514b44 Binary files /dev/null and b/models/weapons/h_mortar.iqm differ diff --git a/models/weapons/h_mortar.iqm.framegroups b/models/weapons/h_mortar.iqm.framegroups new file mode 100644 index 000000000..446fce61d --- /dev/null +++ b/models/weapons/h_mortar.iqm.framegroups @@ -0,0 +1,9 @@ +/* +Generated framegroups file for h_mortar +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 25 30 0 // h_mortar fire +26 25 30 0 // h_mortar fire +51 101 3 1 // h_mortar idle +152 101 3 1 // h_mortar idle diff --git a/models/weapons/h_nex.iqm b/models/weapons/h_nex.iqm deleted file mode 100644 index 39857cf79..000000000 Binary files a/models/weapons/h_nex.iqm and /dev/null differ diff --git a/models/weapons/h_nex.iqm.framegroups b/models/weapons/h_nex.iqm.framegroups deleted file mode 100644 index 0a59625b6..000000000 --- a/models/weapons/h_nex.iqm.framegroups +++ /dev/null @@ -1,4 +0,0 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 40 20 0 // reload diff --git a/models/weapons/h_ok_nex.iqm b/models/weapons/h_ok_nex.iqm new file mode 100644 index 000000000..abc34f406 Binary files /dev/null and b/models/weapons/h_ok_nex.iqm differ diff --git a/models/weapons/h_ok_nex.iqm.framegroups b/models/weapons/h_ok_nex.iqm.framegroups new file mode 100644 index 000000000..38b7f8728 --- /dev/null +++ b/models/weapons/h_ok_nex.iqm.framegroups @@ -0,0 +1,9 @@ +/* +Generated framegroups file for h_ok_sniper +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 31 30 0 // h_ok_sniper fire +32 31 30 0 // h_ok_sniper fire +63 121 5 1 // h_ok_sniper idle +184 31 30 0 // h_ok_sniper reload diff --git a/models/weapons/h_ok_rl.iqm b/models/weapons/h_ok_rl.iqm deleted file mode 100644 index 2870b04d8..000000000 Binary files a/models/weapons/h_ok_rl.iqm and /dev/null differ diff --git a/models/weapons/h_ok_rl.iqm.framegroups b/models/weapons/h_ok_rl.iqm.framegroups deleted file mode 100644 index fae30c94d..000000000 --- a/models/weapons/h_ok_rl.iqm.framegroups +++ /dev/null @@ -1,10 +0,0 @@ -/* -Generated framegroups file for h_uzi -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 61 30 0 // h_uzi mgafire -62 61 30 0 // h_uzi mgafire -123 101 3 1 // h_uzi mgaidle -224 61 30 0 // h_uzi mgafire -285 61 30 0 // h_uzi mgafire diff --git a/models/weapons/h_ok_rpc.iqm b/models/weapons/h_ok_rpc.iqm new file mode 100644 index 000000000..2870b04d8 Binary files /dev/null and b/models/weapons/h_ok_rpc.iqm differ diff --git a/models/weapons/h_ok_rpc.iqm.framegroups b/models/weapons/h_ok_rpc.iqm.framegroups new file mode 100644 index 000000000..fae30c94d --- /dev/null +++ b/models/weapons/h_ok_rpc.iqm.framegroups @@ -0,0 +1,10 @@ +/* +Generated framegroups file for h_uzi +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 61 30 0 // h_uzi mgafire +62 61 30 0 // h_uzi mgafire +123 101 3 1 // h_uzi mgaidle +224 61 30 0 // h_uzi mgafire +285 61 30 0 // h_uzi mgafire diff --git a/models/weapons/h_ok_sniper.iqm b/models/weapons/h_ok_sniper.iqm deleted file mode 100644 index abc34f406..000000000 Binary files a/models/weapons/h_ok_sniper.iqm and /dev/null differ diff --git a/models/weapons/h_ok_sniper.iqm.framegroups b/models/weapons/h_ok_sniper.iqm.framegroups deleted file mode 100644 index 38b7f8728..000000000 --- a/models/weapons/h_ok_sniper.iqm.framegroups +++ /dev/null @@ -1,9 +0,0 @@ -/* -Generated framegroups file for h_ok_sniper -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 31 30 0 // h_ok_sniper fire -32 31 30 0 // h_ok_sniper fire -63 121 5 1 // h_ok_sniper idle -184 31 30 0 // h_ok_sniper reload diff --git a/models/weapons/h_rifle.iqm b/models/weapons/h_rifle.iqm new file mode 100644 index 000000000..6ab754888 Binary files /dev/null and b/models/weapons/h_rifle.iqm differ diff --git a/models/weapons/h_rifle.iqm.framegroups b/models/weapons/h_rifle.iqm.framegroups new file mode 100644 index 000000000..474f093a9 --- /dev/null +++ b/models/weapons/h_rifle.iqm.framegroups @@ -0,0 +1,4 @@ +1 8 20 0 // fire +9 5 20 0 // fire2 +15 200 20 1 // idle +215 39 20 0 // reload diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm deleted file mode 100644 index 1868b2c02..000000000 Binary files a/models/weapons/h_rl.iqm and /dev/null differ diff --git a/models/weapons/h_rl.iqm.framegroups b/models/weapons/h_rl.iqm.framegroups deleted file mode 100644 index c4f4127e7..000000000 --- a/models/weapons/h_rl.iqm.framegroups +++ /dev/null @@ -1,9 +0,0 @@ -/* -Generated framegroups file for h_rl -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 31 30 0 // h_rl fire -32 31 30 0 // h_rl fire -63 101 3 1 // h_rl idle -164 101 3 1 // h_rl idle diff --git a/models/weapons/h_uzi.iqm b/models/weapons/h_uzi.iqm deleted file mode 100644 index 523ef998a..000000000 Binary files a/models/weapons/h_uzi.iqm and /dev/null differ diff --git a/models/weapons/h_uzi.iqm.framegroups b/models/weapons/h_uzi.iqm.framegroups deleted file mode 100644 index 0a59625b6..000000000 --- a/models/weapons/h_uzi.iqm.framegroups +++ /dev/null @@ -1,4 +0,0 @@ -1 8 20 0 // fire -9 5 20 0 // fire2 -15 200 20 1 // idle -215 40 20 0 // reload diff --git a/models/weapons/h_vaporizer.iqm b/models/weapons/h_vaporizer.iqm new file mode 100644 index 000000000..61fed1377 Binary files /dev/null and b/models/weapons/h_vaporizer.iqm differ diff --git a/models/weapons/h_vaporizer.iqm.framegroups b/models/weapons/h_vaporizer.iqm.framegroups new file mode 100644 index 000000000..f54ebcb86 --- /dev/null +++ b/models/weapons/h_vaporizer.iqm.framegroups @@ -0,0 +1,9 @@ +/* +Generated framegroups file for h_vaporizer +Used by DarkPlaces to simulate frame groups in DPM models. +*/ + +1 21 20 0 // h_vaporizer fire +22 21 20 0 // h_vaporizer fire +43 101 6 1 // h_vaporizer idle +144 101 30 0 // h_vaporizer reload diff --git a/models/weapons/h_vortex.iqm b/models/weapons/h_vortex.iqm new file mode 100644 index 000000000..39857cf79 Binary files /dev/null and b/models/weapons/h_vortex.iqm differ diff --git a/models/weapons/h_vortex.iqm.framegroups b/models/weapons/h_vortex.iqm.framegroups new file mode 100644 index 000000000..0a59625b6 --- /dev/null +++ b/models/weapons/h_vortex.iqm.framegroups @@ -0,0 +1,4 @@ +1 8 20 0 // fire +9 5 20 0 // fire2 +15 200 20 1 // idle +215 40 20 0 // reload diff --git a/models/weapons/make-sprites.sh b/models/weapons/make-sprites.sh index 3b8c43721..b169eb6b3 100755 --- a/models/weapons/make-sprites.sh +++ b/models/weapons/make-sprites.sh @@ -61,22 +61,22 @@ sprite() # grep '* color' ../../qcsrc/common/weapons/w_*.qc | awk '{ print $1 " \t" $4 " " $5 " " $6 }' # def h(r,g,b): return '#{:02x}{:02x}{:02x}'.format(int(round(r*255)),int(round(g*255)),int(round(b*255))) sprite arc "Arc" ffffff # White -sprite laser "Blaster" ff8080 # Vivid Tangerine +sprite blaster "Blaster" ff8080 # Vivid Tangerine sprite crylink "Crylink" ff80ff # Blush Pink -sprite rl "Devastator" ffff00 # Yellow +sprite devastator "Devastator" ffff00 # Yellow sprite electro "Electro" 0080ff # Azure Radiance sprite fireball "Fireball" ff8000 # Flush Orange sprite hagar "Hagar" ffff80 # Dolly sprite hlac "HLAC" 00ff00 # Green -sprite hookgun "Grappling\nHook" 008000 # Japanese Laurel -sprite uzi "Machine\nGun" ffff00 # Yellow +sprite hook "Grappling\nHook" 008000 # Japanese Laurel +sprite machinegun "Machine\nGun" ffff00 # Yellow sprite minelayer "Mine\nLayer" bfff00 # Lime -sprite gl "Mortar" ff0000 # Red +sprite mortar "Mortar" ff0000 # Red sprite porto "Port-O-Launch" 808080 # Gray -sprite campingrifle "Rifle" 80ff00 # Chartreuse +sprite rifle "Rifle" 80ff00 # Chartreuse sprite seeker "T.A.G.\nSeeker" 80ff00 # Chartreuse #sprite shockwave "Shockwave" 804000 # Cinnamon sprite shotgun "Shotgun" 804000 # Cinnamon sprite tuba "Tuba" 00ff00 # Green -sprite minstanex "Vaporizer" 80ffff # Anakiwa -sprite nex "Vortex" 80ffff # Anakiwa +sprite vaporizer "Vaporizer" 80ffff # Anakiwa +sprite vortex "Vortex" 80ffff # Anakiwa diff --git a/models/weapons/v_blaster.md3 b/models/weapons/v_blaster.md3 new file mode 100644 index 000000000..18b802347 Binary files /dev/null and b/models/weapons/v_blaster.md3 differ diff --git a/models/weapons/v_campingrifle.md3 b/models/weapons/v_campingrifle.md3 deleted file mode 100644 index 6497b9ac0..000000000 Binary files a/models/weapons/v_campingrifle.md3 and /dev/null differ diff --git a/models/weapons/v_devastator.md3 b/models/weapons/v_devastator.md3 new file mode 100644 index 000000000..534e616ac Binary files /dev/null and b/models/weapons/v_devastator.md3 differ diff --git a/models/weapons/v_gl.md3 b/models/weapons/v_gl.md3 deleted file mode 100644 index 970ca86ce..000000000 Binary files a/models/weapons/v_gl.md3 and /dev/null differ diff --git a/models/weapons/v_hook.md3 b/models/weapons/v_hook.md3 new file mode 100644 index 000000000..8b96df038 Binary files /dev/null and b/models/weapons/v_hook.md3 differ diff --git a/models/weapons/v_hookgun.md3 b/models/weapons/v_hookgun.md3 deleted file mode 100644 index 8b96df038..000000000 Binary files a/models/weapons/v_hookgun.md3 and /dev/null differ diff --git a/models/weapons/v_laser.md3 b/models/weapons/v_laser.md3 deleted file mode 100644 index 18b802347..000000000 Binary files a/models/weapons/v_laser.md3 and /dev/null differ diff --git a/models/weapons/v_machinegun.md3 b/models/weapons/v_machinegun.md3 new file mode 100644 index 000000000..53b27c6b5 Binary files /dev/null and b/models/weapons/v_machinegun.md3 differ diff --git a/models/weapons/v_minstanex.md3 b/models/weapons/v_minstanex.md3 deleted file mode 100644 index d08b8feff..000000000 Binary files a/models/weapons/v_minstanex.md3 and /dev/null differ diff --git a/models/weapons/v_mortar.md3 b/models/weapons/v_mortar.md3 new file mode 100644 index 000000000..970ca86ce Binary files /dev/null and b/models/weapons/v_mortar.md3 differ diff --git a/models/weapons/v_nex.md3 b/models/weapons/v_nex.md3 deleted file mode 100644 index 4cafdd10f..000000000 Binary files a/models/weapons/v_nex.md3 and /dev/null differ diff --git a/models/weapons/v_ok_nex.md3 b/models/weapons/v_ok_nex.md3 new file mode 100644 index 000000000..511f3a3cf Binary files /dev/null and b/models/weapons/v_ok_nex.md3 differ diff --git a/models/weapons/v_ok_rl.md3 b/models/weapons/v_ok_rl.md3 deleted file mode 100644 index e43158ea7..000000000 Binary files a/models/weapons/v_ok_rl.md3 and /dev/null differ diff --git a/models/weapons/v_ok_rpc.md3 b/models/weapons/v_ok_rpc.md3 new file mode 100644 index 000000000..e43158ea7 Binary files /dev/null and b/models/weapons/v_ok_rpc.md3 differ diff --git a/models/weapons/v_ok_sniper.md3 b/models/weapons/v_ok_sniper.md3 deleted file mode 100644 index 511f3a3cf..000000000 Binary files a/models/weapons/v_ok_sniper.md3 and /dev/null differ diff --git a/models/weapons/v_rifle.md3 b/models/weapons/v_rifle.md3 new file mode 100644 index 000000000..6497b9ac0 Binary files /dev/null and b/models/weapons/v_rifle.md3 differ diff --git a/models/weapons/v_rl.md3 b/models/weapons/v_rl.md3 deleted file mode 100644 index 534e616ac..000000000 Binary files a/models/weapons/v_rl.md3 and /dev/null differ diff --git a/models/weapons/v_uzi.md3 b/models/weapons/v_uzi.md3 deleted file mode 100644 index 53b27c6b5..000000000 Binary files a/models/weapons/v_uzi.md3 and /dev/null differ diff --git a/models/weapons/v_vaporizer.md3 b/models/weapons/v_vaporizer.md3 new file mode 100644 index 000000000..d08b8feff Binary files /dev/null and b/models/weapons/v_vaporizer.md3 differ diff --git a/models/weapons/v_vortex.md3 b/models/weapons/v_vortex.md3 new file mode 100644 index 000000000..4cafdd10f Binary files /dev/null and b/models/weapons/v_vortex.md3 differ diff --git a/qcsrc/common/models/all.inc b/qcsrc/common/models/all.inc index b8fc08f38..02691f00a 100644 --- a/qcsrc/common/models/all.inc +++ b/qcsrc/common/models/all.inc @@ -22,7 +22,7 @@ MODEL(KH_KEY_CARRIED, "models/keyhunt/key-carried.md3"); MODEL(OK_HMG, W_Model("g_ok_hmg.md3")); -MODEL(OK_RPC, W_Model("g_ok_rl.md3")); +MODEL(OK_RPC, W_Model("g_ok_rpc.md3")); MODEL(OK_MG_VIEW, W_Model("h_ok_mg.iqm")); MODEL(OK_MG_WORLD, W_Model("v_ok_mg.md3")); @@ -32,9 +32,9 @@ MODEL(OK_SHOTGUN_VIEW, W_Model("h_ok_shotgun.iqm")); MODEL(OK_SHOTGUN_WORLD, W_Model("v_ok_shotgun.md3")); MODEL(OK_SHOTGUN_ITEM, W_Model("g_ok_shotgun.md3")); -MODEL(OK_SNIPER_VIEW, W_Model("h_ok_sniper.iqm")); -MODEL(OK_SNIPER_WORLD, W_Model("v_ok_sniper.md3")); -MODEL(OK_SNIPER_ITEM, W_Model("g_ok_sniper.md3")); +MODEL(OK_NEX_VIEW, W_Model("h_ok_nex.iqm")); +MODEL(OK_NEX_WORLD, W_Model("v_ok_nex.md3")); +MODEL(OK_NEX_ITEM, W_Model("g_ok_nex.md3")); MODEL(ONS_CP, "models/onslaught/controlpoint_icon.md3"); MODEL(ONS_CP_SHIELD, "models/onslaught/controlpoint_shield.md3"); @@ -155,9 +155,9 @@ MODEL(CASING_BULLET, "models/casing_bronze.iqm"); MODEL(BUFF, "models/relics/relic.md3"); -MODEL(BLASTER_VIEW, W_Model("h_laser.iqm")); -MODEL(BLASTER_WORLD, W_Model("v_laser.md3")); -MODEL(BLASTER_ITEM, W_Model("g_laser.md3")); +MODEL(BLASTER_VIEW, W_Model("h_blaster.iqm")); +MODEL(BLASTER_WORLD, W_Model("v_blaster.md3")); +MODEL(BLASTER_ITEM, W_Model("g_blaster.md3")); MODEL(SHOTGUN_MUZZLEFLASH, "models/uziflash.md3"); MODEL(SHOTGUN_VIEW, W_Model("h_shotgun.iqm")); @@ -165,13 +165,13 @@ MODEL(SHOTGUN_WORLD, W_Model("v_shotgun.md3")); MODEL(SHOTGUN_ITEM, W_Model("g_shotgun.md3")); MODEL(MACHINEGUN_MUZZLEFLASH, "models/uziflash.md3"); -MODEL(MACHINEGUN_VIEW, W_Model("h_uzi.iqm")); -MODEL(MACHINEGUN_WORLD, W_Model("v_uzi.md3")); -MODEL(MACHINEGUN_ITEM, W_Model("g_uzi.md3")); +MODEL(MACHINEGUN_VIEW, W_Model("h_machinegun.iqm")); +MODEL(MACHINEGUN_WORLD, W_Model("v_machinegun.md3")); +MODEL(MACHINEGUN_ITEM, W_Model("g_machinegun.md3")); -MODEL(MORTAR_VIEW, W_Model("h_gl.iqm")); -MODEL(MORTAR_WORLD, W_Model("v_gl.md3")); -MODEL(MORTAR_ITEM, W_Model("g_gl.md3")); +MODEL(MORTAR_VIEW, W_Model("h_mortar.iqm")); +MODEL(MORTAR_WORLD, W_Model("v_mortar.md3")); +MODEL(MORTAR_ITEM, W_Model("g_mortar.md3")); MODEL(MINELAYER_MUZZLEFLASH, "models/flash.md3"); MODEL(MINELAYER_MINE, "models/mine.md3"); @@ -188,18 +188,18 @@ MODEL(CRYLINK_WORLD, W_Model("v_crylink.md3")); MODEL(CRYLINK_ITEM, W_Model("g_crylink.md3")); MODEL(VORTEX_MUZZLEFLASH, "models/nexflash.md3"); -MODEL(VORTEX_VIEW, W_Model("h_nex.iqm")); -MODEL(VORTEX_WORLD, W_Model("v_nex.md3")); -MODEL(VORTEX_ITEM, W_Model("g_nex.md3")); +MODEL(VORTEX_VIEW, W_Model("h_vortex.iqm")); +MODEL(VORTEX_WORLD, W_Model("v_vortex.md3")); +MODEL(VORTEX_ITEM, W_Model("g_vortex.md3")); MODEL(HAGAR_VIEW, W_Model("h_hagar.iqm")); MODEL(HAGAR_WORLD, W_Model("v_hagar.md3")); MODEL(HAGAR_ITEM, W_Model("g_hagar.md3")); MODEL(DEVASTATOR_MUZZLEFLASH, "models/flash.md3"); -MODEL(DEVASTATOR_VIEW, W_Model("h_rl.iqm")); -MODEL(DEVASTATOR_WORLD, W_Model("v_rl.md3")); -MODEL(DEVASTATOR_ITEM, W_Model("g_rl.md3")); +MODEL(DEVASTATOR_VIEW, W_Model("h_devastator.iqm")); +MODEL(DEVASTATOR_WORLD, W_Model("v_devastator.md3")); +MODEL(DEVASTATOR_ITEM, W_Model("g_devastator.md3")); MODEL(PORTAL, "models/portal.md3"); MODEL(PORTO_VIEW, W_Model("h_porto.iqm")); @@ -207,14 +207,14 @@ MODEL(PORTO_WORLD, W_Model("v_porto.md3")); MODEL(PORTO_ITEM, W_Model("g_porto.md3")); MODEL(VAPORIZER_MUZZLEFLASH, "models/nexflash.md3"); -MODEL(VAPORIZER_VIEW, W_Model("h_minstanex.iqm")); -MODEL(VAPORIZER_WORLD, W_Model("v_minstanex.md3")); -MODEL(VAPORIZER_ITEM, W_Model("g_minstanex.md3")); +MODEL(VAPORIZER_VIEW, W_Model("h_vaporizer.iqm")); +MODEL(VAPORIZER_WORLD, W_Model("v_vaporizer.md3")); +MODEL(VAPORIZER_ITEM, W_Model("g_vaporizer.md3")); MODEL(HOOK, "models/hook.md3"); -MODEL(HOOK_VIEW, W_Model("h_hookgun.iqm")); -MODEL(HOOK_WORLD, W_Model("v_hookgun.md3")); -MODEL(HOOK_ITEM, W_Model("g_hookgun.md3")); +MODEL(HOOK_VIEW, W_Model("h_hook.iqm")); +MODEL(HOOK_WORLD, W_Model("v_hook.md3")); +MODEL(HOOK_ITEM, W_Model("g_hook.md3")); MODEL(HLAC_VIEW, W_Model("h_hlac.iqm")); MODEL(HLAC_WORLD, W_Model("v_hlac.md3")); @@ -228,9 +228,9 @@ MODEL(ACCORDION_WORLD, W_Model("v_akordeon.md3")); MODEL(KLEINBOTTLE_VIEW, W_Model("h_kleinbottle.iqm")); MODEL(KLEINBOTTLE_WORLD, W_Model("v_kleinbottle.md3")); -MODEL(RIFLE_VIEW, W_Model("h_campingrifle.iqm")); -MODEL(RIFLE_WORLD, W_Model("v_campingrifle.md3")); -MODEL(RIFLE_ITEM, W_Model("g_campingrifle.md3")); +MODEL(RIFLE_VIEW, W_Model("h_rifle.iqm")); +MODEL(RIFLE_WORLD, W_Model("v_rifle.md3")); +MODEL(RIFLE_ITEM, W_Model("g_rifle.md3")); MODEL(FIREBALL_SPHERE, "models/sphere/sphere.md3"); MODEL(FIREBALL_VIEW, W_Model("h_fireball.iqm")); @@ -257,9 +257,9 @@ MODEL(HMG_WORLD, W_Model("v_ok_hmg.md3")); MODEL(HMG_ITEM, W_Model("g_ok_hmg.md3")); MODEL(RPC_MUZZLEFLASH, "models/flash.md3"); -MODEL(RPC_VIEW, W_Model("h_ok_rl.iqm")); -MODEL(RPC_WORLD, W_Model("v_ok_rl.md3")); -MODEL(RPC_ITEM, W_Model("g_ok_rl.md3")); +MODEL(RPC_VIEW, W_Model("h_ok_rpc.iqm")); +MODEL(RPC_WORLD, W_Model("v_ok_rpc.md3")); +MODEL(RPC_ITEM, W_Model("g_ok_rpc.md3")); MODEL(TUR_GIB_BASE1, "models/turrets/base-gib1.md3"); MODEL(TUR_GIB_BASE2, "models/turrets/base-gib2.md3"); diff --git a/qcsrc/common/mutators/mutator/overkill/okhmg.qc b/qcsrc/common/mutators/mutator/overkill/okhmg.qc index d5a2ba2e3..a1530b2b7 100644 --- a/qcsrc/common/mutators/mutator/overkill/okhmg.qc +++ b/qcsrc/common/mutators/mutator/overkill/okhmg.qc @@ -27,7 +27,7 @@ void W_OverkillHeavyMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity W_DecreaseAmmo(WEP_OVERKILL_HMG, actor, WEP_CVAR_PRI(okhmg, ammo), weaponentity); - W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR_PRI(okhmg, damage), WEP_OVERKILL_HMG.m_id); + W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, WEP_CVAR_PRI(okhmg, damage), WEP_OVERKILL_HMG.m_id); if(!autocvar_g_norecoil) { diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc index 20db8d961..1fa77911f 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc @@ -22,7 +22,7 @@ void W_OverkillMachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weap W_DecreaseAmmo(WEP_OVERKILL_MACHINEGUN, actor, WEP_CVAR_PRI(okmachinegun, ammo), weaponentity); - W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR_PRI(okmachinegun, damage), WEP_OVERKILL_MACHINEGUN.m_id); + W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, WEP_CVAR_PRI(okmachinegun, damage), WEP_OVERKILL_MACHINEGUN.m_id); if(!autocvar_g_norecoil) { actor.punchangle_x = random() - 0.5; diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index 85f337140..ded9d70a3 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -83,10 +83,10 @@ void W_OverkillNex_Attack(Weapon thiswep, entity actor, .entity weaponentity, fl mydmg *= charge; myforce *= charge; - W_SetupShot(actor, weaponentity, true, 5, SND_NEXFIRE, CH_WEAPON_A, mydmg, thiswep.m_id); + W_SetupShot(actor, weaponentity, true, 5, SND_VORTEX_FIRE, CH_WEAPON_A, mydmg, thiswep.m_id); if(charge > WEP_CVAR(oknex, charge_animlimit) && WEP_CVAR(oknex, charge_animlimit)) // if the OverkillNex is overcharged, we play an extra sound { - sound(actor, CH_WEAPON_B, SND_NEXCHARGE, VOL_BASE * (charge - 0.5 * WEP_CVAR(oknex, charge_animlimit)) / (1 - 0.5 * WEP_CVAR(oknex, charge_animlimit)), ATTN_NORM); + sound(actor, CH_WEAPON_B, SND_VORTEX_CHARGE, VOL_BASE * (charge - 0.5 * WEP_CVAR(oknex, charge_animlimit)) / (1 - 0.5 * WEP_CVAR(oknex, charge_animlimit)), ATTN_NORM); } yoda = 0; @@ -327,14 +327,14 @@ METHOD(OverkillNex, wr_impacteffect, void(entity thiswep, entity actor)) vector org2 = w_org + w_backoff * 6; pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); if(!w_issilent) - sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM); + sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM); } METHOD(OverkillNex, wr_init, void(entity thiswep)) { if(autocvar_cl_reticle && autocvar_cl_reticle_weapon) { - precache_pic("gfx/reticle_nex"); + precache_pic("gfx/reticle_vortex"); } } diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 21bbfaa2f..3f8d9a9a1 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -7,13 +7,13 @@ CLASS(OverkillNex, Weapon) /* flags */ ATTRIB(OverkillNex, spawnflags, int, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_MUTATORBLOCKED); /* rating */ ATTRIB(OverkillNex, bot_pickupbasevalue, float, 8000); /* color */ ATTRIB(OverkillNex, wpcolor, vector, '0.5 1 1'); -/* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_sniper"); +/* modelname */ ATTRIB(OverkillNex, mdl, string, "ok_nex"); #ifdef GAMEQC -/* model */ ATTRIB(OverkillNex, m_model, Model, MDL_OK_SNIPER_ITEM); +/* model */ ATTRIB(OverkillNex, m_model, Model, MDL_OK_NEX_ITEM); #endif -/* crosshair */ ATTRIB(OverkillNex, w_crosshair, string, "gfx/crosshairnex"); +/* crosshair */ ATTRIB(OverkillNex, w_crosshair, string, "gfx/crosshairvortex"); /* crosshair */ ATTRIB(OverkillNex, w_crosshair_size, float, 0.65); -/* reticle */ ATTRIB(OverkillNex, w_reticle, string, "gfx/reticle_nex"); +/* reticle */ ATTRIB(OverkillNex, w_reticle, string, "gfx/reticle_vortex"); /* wepimg */ ATTRIB(OverkillNex, model2, string, "ok_weapon_rail"); /* refname */ ATTRIB(OverkillNex, netname, string, "oknex"); /* wepname */ ATTRIB(OverkillNex, m_name, string, _("Overkill Nex")); diff --git a/qcsrc/common/sounds/all.inc b/qcsrc/common/sounds/all.inc index d8d60c4a1..60e0b91a6 100644 --- a/qcsrc/common/sounds/all.inc +++ b/qcsrc/common/sounds/all.inc @@ -11,8 +11,6 @@ SOUND(ARC_FIRE, W_Sound("arc_fire")); SOUND(ARC_LOOP, W_Sound("arc_loop")); SOUND(ARC_LOOP_OVERHEAT, W_Sound("arc_loop_overheat")); SOUND(ARC_STOP, W_Sound("arc_stop")); -SOUND(CAMPINGRIFLE_FIRE2, W_Sound("campingrifle_fire2")); -SOUND(CAMPINGRIFLE_FIRE, W_Sound("campingrifle_fire")); SOUND(CRYLINK_FIRE2, W_Sound("crylink_fire2")); SOUND(CRYLINK_FIRE, W_Sound("crylink_fire")); SOUND(CRYLINK_IMPACT2, W_Sound("crylink_impact2")); @@ -61,15 +59,18 @@ SOUND(HOOK_IMPACT, W_Sound("hook_impact")); SOUND(LASERGUN_FIRE, W_Sound("lasergun_fire")); SOUND(LASERIMPACT, W_Sound("laserimpact")); SOUND(LGBEAM_FLY, W_Sound("lgbeam_fly")); +SOUND(MACHINEGUN_FIRE, W_Sound("machinegun_fire")); SOUND(MINE_DET, W_Sound("mine_det")); SOUND(MINE_EXP, W_Sound("mine_exp")); SOUND(MINE_FIRE, W_Sound("mine_fire")); SOUND(MINE_STICK, W_Sound("mine_stick")); SOUND(MINE_TRIGGER, W_Sound("mine_trigger")); -SOUND(MINSTANEXFIRE, W_Sound("minstanexfire")); -SOUND(NEXCHARGE, W_Sound("nexcharge")); -SOUND(NEXFIRE, W_Sound("nexfire")); -SOUND(NEXIMPACT, W_Sound("neximpact")); +SOUND(RIFLE_FIRE2, W_Sound("rifle_fire2")); +SOUND(RIFLE_FIRE, W_Sound("rifle_fire")); +SOUND(VAPORIZER_FIRE, W_Sound("vaporizer_fire")); +SOUND(VORTEX_CHARGE, W_Sound("vortex_charge")); +SOUND(VORTEX_FIRE, W_Sound("vortex_fire")); +SOUND(VORTEX_IMPACT, W_Sound("vortex_impact")); SOUND(NEXWHOOSH1, W_Sound("nexwhoosh1")); SOUND(NEXWHOOSH2, W_Sound("nexwhoosh2")); SOUND(NEXWHOOSH3, W_Sound("nexwhoosh3")); @@ -104,7 +105,6 @@ SOUND(TAG_FIRE, W_Sound("tag_fire")); SOUND(TAG_IMPACT, W_Sound("tag_impact")); SOUND(TAG_ROCKET_FLY, W_Sound("tag_rocket_fly")); SOUND(UNAVAILABLE, W_Sound("unavailable")); -SOUND(UZI_FIRE, W_Sound("uzi_fire")); SOUND(WEAPONPICKUP, W_Sound("weaponpickup")); SOUND(WEAPONPICKUP_NEW_TOYS, W_Sound("weaponpickup_new_toys")); SOUND(WEAPON_SWITCH, W_Sound("weapon_switch")); diff --git a/qcsrc/common/turrets/turret/phaser_weapon.qc b/qcsrc/common/turrets/turret/phaser_weapon.qc index e4d09d193..296fd75a4 100644 --- a/qcsrc/common/turrets/turret/phaser_weapon.qc +++ b/qcsrc/common/turrets/turret/phaser_weapon.qc @@ -44,7 +44,7 @@ METHOD(PhaserTurretAttack, wr_think, void(entity thiswep, entity actor, .entity setattachment(beam, actor.tur_head, "tag_fire"); - soundat (actor, trace_endpos, CH_SHOTS, SND(NEXIMPACT), VOL_BASE, ATTEN_NORM); + soundat (actor, trace_endpos, CH_SHOTS, SND(VORTEX_IMPACT), VOL_BASE, ATTEN_NORM); if (!isPlayer) if (actor.tur_head.frame == 0) actor.tur_head.frame = 1; diff --git a/qcsrc/common/turrets/turret/walker_weapon.qc b/qcsrc/common/turrets/turret/walker_weapon.qc index c16d13014..89c79b9b1 100644 --- a/qcsrc/common/turrets/turret/walker_weapon.qc +++ b/qcsrc/common/turrets/turret/walker_weapon.qc @@ -15,7 +15,7 @@ METHOD(WalkerTurretAttack, wr_think, void(entity thiswep, entity actor, .entity actor.tur_head = actor; weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(electro, animtime), w_ready); } - sound (actor, CH_WEAPON_A, SND_UZI_FIRE, VOL_BASE, ATTEN_NORM); + sound (actor, CH_WEAPON_A, SND_MACHINEGUN_FIRE, VOL_BASE, ATTEN_NORM); fireBullet(actor, weaponentity, actor.tur_shotorg, actor.tur_shotdir_updated, actor.shot_spread, 0, actor.shot_dmg, 0, actor.shot_force, DEATH_TURRET_WALK_GUN.m_id, EFFECT_BULLET); Send_Effect(EFFECT_BLASTER_MUZZLEFLASH, actor.tur_shotorg, actor.tur_shotdir_updated * 1000, 1); } diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc index d6a371b76..9d1122b5d 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc @@ -272,7 +272,7 @@ bool spiderbot_frame(entity this, float dt) fireBullet(this, weaponentity, v, v_forward, autocvar_g_vehicle_spiderbot_minigun_spread, autocvar_g_vehicle_spiderbot_minigun_solidpenetration, autocvar_g_vehicle_spiderbot_minigun_damage, 0, autocvar_g_vehicle_spiderbot_minigun_force, DEATH_VH_SPID_MINIGUN.m_id, EFFECT_BULLET); - sound (gun, CH_WEAPON_A, SND_UZI_FIRE, VOL_BASE, ATTEN_NORM); + sound (gun, CH_WEAPON_A, SND_MACHINEGUN_FIRE, VOL_BASE, ATTEN_NORM); //trailparticles(this, _particleeffectnum("spiderbot_minigun_trail"), v, trace_endpos); Send_Effect(EFFECT_SPIDERBOT_MINIGUN_MUZZLEFLASH, v, v_forward * 2500, 1); diff --git a/qcsrc/common/weapons/weapon/blaster.qh b/qcsrc/common/weapons/weapon/blaster.qh index d768abfaf..9f07959d6 100644 --- a/qcsrc/common/weapons/weapon/blaster.qh +++ b/qcsrc/common/weapons/weapon/blaster.qh @@ -7,15 +7,15 @@ CLASS(Blaster, Weapon) /* flags */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0); /* color */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5'); -/* modelname */ ATTRIB(Blaster, mdl, string, "laser"); +/* modelname */ ATTRIB(Blaster, mdl, string, "blaster"); #ifdef GAMEQC /* model */ ATTRIB(Blaster, m_model, Model, MDL_BLASTER_ITEM); /* flash mdl */ ATTRIB(Blaster, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Blaster, m_muzzleeffect, entity, EFFECT_BLASTER_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairlaser"); +/* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairblaster"); /* crosshair */ ATTRIB(Blaster, w_crosshair_size, float, 0.5); -/* wepimg */ ATTRIB(Blaster, model2, string, "weaponlaser"); +/* wepimg */ ATTRIB(Blaster, model2, string, "weaponblaster"); /* refname */ ATTRIB(Blaster, netname, string, "blaster"); /* wepname */ ATTRIB(Blaster, m_name, string, _("Blaster")); diff --git a/qcsrc/common/weapons/weapon/devastator.qh b/qcsrc/common/weapons/weapon/devastator.qh index 70c72f52c..bb3418aa0 100644 --- a/qcsrc/common/weapons/weapon/devastator.qh +++ b/qcsrc/common/weapons/weapon/devastator.qh @@ -7,15 +7,15 @@ CLASS(Devastator, Weapon) /* flags */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH); /* rating */ ATTRIB(Devastator, bot_pickupbasevalue, float, 8000); /* color */ ATTRIB(Devastator, wpcolor, vector, '1 1 0'); -/* modelname */ ATTRIB(Devastator, mdl, string, "rl"); +/* modelname */ ATTRIB(Devastator, mdl, string, "devastator"); #ifdef GAMEQC /* model */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM); /* flash mdl */ ATTRIB(Devastator, m_muzzlemodel, Model, MDL_DEVASTATOR_MUZZLEFLASH); /* flash eff */ ATTRIB(Devastator, m_muzzleeffect, entity, EFFECT_ROCKET_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairrocketlauncher"); +/* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairdevastator"); /* crosshair */ ATTRIB(Devastator, w_crosshair_size, float, 0.7); -/* wepimg */ ATTRIB(Devastator, model2, string, "weaponrocketlauncher"); +/* wepimg */ ATTRIB(Devastator, model2, string, "weapondevastator"); /* refname */ ATTRIB(Devastator, netname, string, "devastator"); /* wepname */ ATTRIB(Devastator, m_name, string, _("Devastator")); diff --git a/qcsrc/common/weapons/weapon/hook.qh b/qcsrc/common/weapons/weapon/hook.qh index 25b1be507..ca1f9ee50 100644 --- a/qcsrc/common/weapons/weapon/hook.qh +++ b/qcsrc/common/weapons/weapon/hook.qh @@ -7,7 +7,7 @@ CLASS(Hook, Weapon) /* flags */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Hook, bot_pickupbasevalue, float, 0); /* color */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0'); -/* modelname */ ATTRIB(Hook, mdl, string, "hookgun"); +/* modelname */ ATTRIB(Hook, mdl, string, "hook"); #ifdef GAMEQC /* model */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM); /* flash mdl */ ATTRIB(Hook, m_muzzlemodel, Model, MDL_Null); diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc index 15a4d6a3c..9b9cbf9f5 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qc +++ b/qcsrc/common/weapons/weapon/machinegun.qc @@ -4,7 +4,7 @@ void W_MachineGun_Attack(Weapon thiswep, int deathtype, entity actor, .entity weaponentity) { - W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(machinegun, first_damage) : WEP_CVAR(machinegun, sustained_damage)), deathtype); + W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, ((actor.(weaponentity).misc_bulletcounter == 1) ? WEP_CVAR(machinegun, first_damage) : WEP_CVAR(machinegun, sustained_damage)), deathtype); if(!autocvar_g_norecoil) { actor.punchangle_x = random() - 0.5; @@ -79,7 +79,7 @@ void W_MachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity W_DecreaseAmmo(thiswep, actor, WEP_CVAR(machinegun, sustained_ammo), weaponentity); - W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR(machinegun, sustained_damage), thiswep.m_id); + W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, WEP_CVAR(machinegun, sustained_damage), thiswep.m_id); if(!autocvar_g_norecoil) { actor.punchangle_x = random() - 0.5; @@ -105,7 +105,7 @@ void W_MachineGun_Attack_Auto(Weapon thiswep, entity actor, .entity weaponentity void W_MachineGun_Attack_Burst(Weapon thiswep, entity actor, .entity weaponentity, int fire) { - W_SetupShot(actor, weaponentity, true, 0, SND_UZI_FIRE, CH_WEAPON_A, WEP_CVAR(machinegun, sustained_damage), thiswep.m_id); + W_SetupShot(actor, weaponentity, true, 0, SND_MACHINEGUN_FIRE, CH_WEAPON_A, WEP_CVAR(machinegun, sustained_damage), thiswep.m_id); if(!autocvar_g_norecoil) { actor.punchangle_x = random() - 0.5; diff --git a/qcsrc/common/weapons/weapon/machinegun.qh b/qcsrc/common/weapons/weapon/machinegun.qh index 9a2adf46c..0139e209d 100644 --- a/qcsrc/common/weapons/weapon/machinegun.qh +++ b/qcsrc/common/weapons/weapon/machinegun.qh @@ -7,15 +7,15 @@ CLASS(MachineGun, Weapon) /* flags */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS | WEP_FLAG_BLEED); /* rating */ ATTRIB(MachineGun, bot_pickupbasevalue, float, 7000); /* color */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0'); -/* modelname */ ATTRIB(MachineGun, mdl, string, "uzi"); +/* modelname */ ATTRIB(MachineGun, mdl, string, "machinegun"); #ifdef GAMEQC /* model */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM); /* flash mdl */ ATTRIB(MachineGun, m_muzzlemodel, Model, MDL_MACHINEGUN_MUZZLEFLASH); /* flash eff */ ATTRIB(MachineGun, m_muzzleeffect, entity, EFFECT_MACHINEGUN_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairuzi"); +/* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairmachinegun"); /* crosshair */ ATTRIB(MachineGun, w_crosshair_size, float, 0.6); -/* wepimg */ ATTRIB(MachineGun, model2, string, "weaponuzi"); +/* wepimg */ ATTRIB(MachineGun, model2, string, "weaponmachinegun"); /* refname */ ATTRIB(MachineGun, netname, string, "machinegun"); /* wepname */ ATTRIB(MachineGun, m_name, string, _("MachineGun")); diff --git a/qcsrc/common/weapons/weapon/mortar.qh b/qcsrc/common/weapons/weapon/mortar.qh index 118e5c5f0..d3c397ea8 100644 --- a/qcsrc/common/weapons/weapon/mortar.qh +++ b/qcsrc/common/weapons/weapon/mortar.qh @@ -7,15 +7,15 @@ CLASS(Mortar, Weapon) /* flags */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH | WEP_FLAG_NOTRUEAIM); /* rating */ ATTRIB(Mortar, bot_pickupbasevalue, float, 7000); /* color */ ATTRIB(Mortar, wpcolor, vector, '1 0 0'); -/* modelname */ ATTRIB(Mortar, mdl, string, "gl"); +/* modelname */ ATTRIB(Mortar, mdl, string, "mortar"); #ifdef GAMEQC /* model */ ATTRIB(Mortar, m_model, Model, MDL_MORTAR_ITEM); /* flash mdl */ ATTRIB(Mortar, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Mortar, m_muzzleeffect, entity, EFFECT_GRENADE_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairgrenadelauncher"); +/* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairmortar"); /* crosshair */ ATTRIB(Mortar, w_crosshair_size, float, 0.7); -/* wepimg */ ATTRIB(Mortar, model2, string, "weapongrenadelauncher"); +/* wepimg */ ATTRIB(Mortar, model2, string, "weaponmortar"); /* refname */ ATTRIB(Mortar, netname, string, "mortar"); /* wepname */ ATTRIB(Mortar, m_name, string, _("Mortar")); diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc index 803930cc0..0b7f0e433 100644 --- a/qcsrc/common/weapons/weapon/rifle.qc +++ b/qcsrc/common/weapons/weapon/rifle.qc @@ -30,12 +30,12 @@ void W_Rifle_FireBullet(Weapon thiswep, .entity weaponentity, float pSpread, flo void W_Rifle_Attack(Weapon thiswep, entity actor, .entity weaponentity) { - W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_PRI(rifle, spread), WEP_CVAR_PRI(rifle, damage), WEP_CVAR_PRI(rifle, headshot_multiplier), WEP_CVAR_PRI(rifle, force), WEP_CVAR_PRI(rifle, solidpenetration), WEP_CVAR_PRI(rifle, ammo), thiswep.m_id, WEP_CVAR_PRI(rifle, tracer), WEP_CVAR_PRI(rifle, shots), SND_CAMPINGRIFLE_FIRE, actor); + W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_PRI(rifle, spread), WEP_CVAR_PRI(rifle, damage), WEP_CVAR_PRI(rifle, headshot_multiplier), WEP_CVAR_PRI(rifle, force), WEP_CVAR_PRI(rifle, solidpenetration), WEP_CVAR_PRI(rifle, ammo), thiswep.m_id, WEP_CVAR_PRI(rifle, tracer), WEP_CVAR_PRI(rifle, shots), SND_RIFLE_FIRE, actor); } void W_Rifle_Attack2(Weapon thiswep, entity actor, .entity weaponentity) { - W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_SEC(rifle, spread), WEP_CVAR_SEC(rifle, damage), WEP_CVAR_SEC(rifle, headshot_multiplier), WEP_CVAR_SEC(rifle, force), WEP_CVAR_SEC(rifle, solidpenetration), WEP_CVAR_SEC(rifle, ammo), thiswep.m_id | HITTYPE_SECONDARY, WEP_CVAR_SEC(rifle, tracer), WEP_CVAR_SEC(rifle, shots), SND_CAMPINGRIFLE_FIRE2, actor); + W_Rifle_FireBullet(thiswep, weaponentity, WEP_CVAR_SEC(rifle, spread), WEP_CVAR_SEC(rifle, damage), WEP_CVAR_SEC(rifle, headshot_multiplier), WEP_CVAR_SEC(rifle, force), WEP_CVAR_SEC(rifle, solidpenetration), WEP_CVAR_SEC(rifle, ammo), thiswep.m_id | HITTYPE_SECONDARY, WEP_CVAR_SEC(rifle, tracer), WEP_CVAR_SEC(rifle, shots), SND_RIFLE_FIRE2, actor); } .void(Weapon thiswep, entity actor, .entity weaponentity) rifle_bullethail_attackfunc; @@ -211,7 +211,7 @@ METHOD(Rifle, wr_init, void(entity thiswep)) { if(autocvar_cl_reticle && autocvar_cl_reticle_weapon) { - precache_pic("gfx/reticle_nex"); + precache_pic("gfx/reticle_vortex"); } } METHOD(Rifle, wr_zoom, bool(entity thiswep, entity actor)) diff --git a/qcsrc/common/weapons/weapon/rifle.qh b/qcsrc/common/weapons/weapon/rifle.qh index e5a2cde2b..d5c18f377 100644 --- a/qcsrc/common/weapons/weapon/rifle.qh +++ b/qcsrc/common/weapons/weapon/rifle.qh @@ -7,7 +7,7 @@ CLASS(Rifle, Weapon) /* flags */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_PENETRATEWALLS); /* rating */ ATTRIB(Rifle, bot_pickupbasevalue, float, 7000); /* color */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0'); -/* modelname */ ATTRIB(Rifle, mdl, string, "campingrifle"); +/* modelname */ ATTRIB(Rifle, mdl, string, "rifle"); #ifdef GAMEQC /* model */ ATTRIB(Rifle, m_model, Model, MDL_RIFLE_ITEM); /* flash mdl */ ATTRIB(Rifle, m_muzzlemodel, Model, MDL_Null); @@ -15,7 +15,7 @@ CLASS(Rifle, Weapon) #endif /* crosshair */ ATTRIB(Rifle, w_crosshair, string, "gfx/crosshairrifle"); /* crosshair */ ATTRIB(Rifle, w_crosshair_size, float, 0.6); -/* reticle */ ATTRIB(Rifle, w_reticle, string, "gfx/reticle_nex"); +/* reticle */ ATTRIB(Rifle, w_reticle, string, "gfx/reticle_vortex"); /* wepimg */ ATTRIB(Rifle, model2, string, "weaponrifle"); /* refname */ ATTRIB(Rifle, netname, string, "rifle"); /* wepname */ ATTRIB(Rifle, m_name, string, _("Rifle")); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 25aa1b665..e0172d027 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -120,7 +120,7 @@ void W_Vaporizer_Attack(Weapon thiswep, entity actor, .entity weaponentity) W_SetupShot(actor, weaponentity, true, 0, SND_Null, CH_WEAPON_A, vaporizer_damage, thiswep.m_id); // handle sound separately so we can change the volume // added bonus: no longer plays the strength sound (strength gives no bonus to instakill anyway) - sound (actor, CH_WEAPON_A, SND_MINSTANEXFIRE, VOL_BASE * 0.8, ATTEN_NORM); + sound (actor, CH_WEAPON_A, SND_VAPORIZER_FIRE, VOL_BASE * 0.8, ATTEN_NORM); yoda = 0; impressive_hits = 0; @@ -363,14 +363,14 @@ METHOD(Vaporizer, wr_impacteffect, void(entity thiswep, entity actor)) else { pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); - if(!w_issilent) { sound(actor, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM); } + if(!w_issilent) { sound(actor, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM); } } } METHOD(Vaporizer, wr_init, void(entity thiswep)) { if(autocvar_cl_reticle && autocvar_cl_reticle_weapon) { - precache_pic("gfx/reticle_nex"); + precache_pic("gfx/reticle_vortex"); } } METHOD(Vaporizer, wr_zoom, bool(entity thiswep, entity actor)) diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index 277557e9c..bc9002068 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -7,16 +7,16 @@ CLASS(Vaporizer, Weapon) /* flags */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN | WEP_FLAG_NODUAL); /* rating */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, 10000); /* color */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1'); -/* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex"); +/* modelname */ ATTRIB(Vaporizer, mdl, string, "vaporizer"); #ifdef GAMEQC /* model */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM); /* flash mdl */ ATTRIB(Vaporizer, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Vaporizer, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairminstanex"); +/* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairvaporizer"); /* crosshair */ ATTRIB(Vaporizer, w_crosshair_size, float, 0.6); -/* reticle */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(Vaporizer, model2, string, "weaponminstanex"); +/* reticle */ ATTRIB(Vaporizer, w_reticle, string, "gfx/reticle_vortex"); +/* wepimg */ ATTRIB(Vaporizer, model2, string, "weaponvaporizer"); /* refname */ ATTRIB(Vaporizer, netname, string, "vaporizer"); /* wepname */ ATTRIB(Vaporizer, m_name, string, _("Vaporizer")); diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 5c9ae23a1..2bc84b2b8 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -119,10 +119,10 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i mydmg *= charge; myforce *= charge; - W_SetupShot(actor, weaponentity, true, 5, SND_NEXFIRE, CH_WEAPON_A, mydmg, dtype); + W_SetupShot(actor, weaponentity, true, 5, SND_VORTEX_FIRE, CH_WEAPON_A, mydmg, dtype); if(charge > WEP_CVAR(vortex, charge_animlimit) && WEP_CVAR(vortex, charge_animlimit)) // if the Vortex is overcharged, we play an extra sound { - sound(actor, CH_WEAPON_B, SND_NEXCHARGE, VOL_BASE * (charge - 0.5 * WEP_CVAR(vortex, charge_animlimit)) / (1 - 0.5 * WEP_CVAR(vortex, charge_animlimit)), ATTN_NORM); + sound(actor, CH_WEAPON_B, SND_VORTEX_CHARGE, VOL_BASE * (charge - 0.5 * WEP_CVAR(vortex, charge_animlimit)) / (1 - 0.5 * WEP_CVAR(vortex, charge_animlimit)), ATTN_NORM); } yoda = 0; @@ -324,13 +324,13 @@ METHOD(Vortex, wr_impacteffect, void(entity thiswep, entity actor)) vector org2 = w_org + w_backoff * 6; pointparticles(EFFECT_VORTEX_IMPACT, org2, '0 0 0', 1); if(!w_issilent) - sound(this, CH_SHOTS, SND_NEXIMPACT, VOL_BASE, ATTN_NORM); + sound(this, CH_SHOTS, SND_VORTEX_IMPACT, VOL_BASE, ATTN_NORM); } METHOD(Vortex, wr_init, void(entity thiswep)) { if(autocvar_cl_reticle && autocvar_cl_reticle_weapon) { - precache_pic("gfx/reticle_nex"); + precache_pic("gfx/reticle_vortex"); } } METHOD(Vortex, wr_zoom, bool(entity thiswep, entity actor)) diff --git a/qcsrc/common/weapons/weapon/vortex.qh b/qcsrc/common/weapons/weapon/vortex.qh index babbfe51b..f2b2953fb 100644 --- a/qcsrc/common/weapons/weapon/vortex.qh +++ b/qcsrc/common/weapons/weapon/vortex.qh @@ -7,16 +7,16 @@ CLASS(Vortex, Weapon) /* flags */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN); /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, 8000); /* color */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1'); -/* modelname */ ATTRIB(Vortex, mdl, string, "nex"); +/* modelname */ ATTRIB(Vortex, mdl, string, "vortex"); #ifdef GAMEQC /* model */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM); /* flash mdl */ ATTRIB(Vortex, m_muzzlemodel, Model, MDL_Null); /* flash eff */ ATTRIB(Vortex, m_muzzleeffect, entity, EFFECT_VORTEX_MUZZLEFLASH); #endif -/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairnex"); +/* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairvortex"); /* crosshair */ ATTRIB(Vortex, w_crosshair_size, float, 0.65); -/* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(Vortex, model2, string, "weaponnex"); +/* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_vortex"); +/* wepimg */ ATTRIB(Vortex, model2, string, "weaponvortex"); /* refname */ ATTRIB(Vortex, netname, string, "vortex"); /* wepname */ ATTRIB(Vortex, m_name, string, _("Vortex")); diff --git a/sound/weapons/campingrifle_fire.ogg b/sound/weapons/campingrifle_fire.ogg deleted file mode 100644 index d20a65e01..000000000 Binary files a/sound/weapons/campingrifle_fire.ogg and /dev/null differ diff --git a/sound/weapons/campingrifle_fire2.ogg b/sound/weapons/campingrifle_fire2.ogg deleted file mode 100644 index 721b37b91..000000000 Binary files a/sound/weapons/campingrifle_fire2.ogg and /dev/null differ diff --git a/sound/weapons/machinegun_fire.ogg b/sound/weapons/machinegun_fire.ogg new file mode 100644 index 000000000..9dc389949 Binary files /dev/null and b/sound/weapons/machinegun_fire.ogg differ diff --git a/sound/weapons/minstanexfire.ogg b/sound/weapons/minstanexfire.ogg deleted file mode 100644 index 1dec6ff82..000000000 Binary files a/sound/weapons/minstanexfire.ogg and /dev/null differ diff --git a/sound/weapons/nexcharge.ogg b/sound/weapons/nexcharge.ogg deleted file mode 100644 index 6fa152dc3..000000000 Binary files a/sound/weapons/nexcharge.ogg and /dev/null differ diff --git a/sound/weapons/nexfire.ogg b/sound/weapons/nexfire.ogg deleted file mode 100644 index c576c0a16..000000000 Binary files a/sound/weapons/nexfire.ogg and /dev/null differ diff --git a/sound/weapons/neximpact.ogg b/sound/weapons/neximpact.ogg deleted file mode 100644 index b6476d8bf..000000000 Binary files a/sound/weapons/neximpact.ogg and /dev/null differ diff --git a/sound/weapons/rifle_fire.ogg b/sound/weapons/rifle_fire.ogg new file mode 100644 index 000000000..d20a65e01 Binary files /dev/null and b/sound/weapons/rifle_fire.ogg differ diff --git a/sound/weapons/rifle_fire2.ogg b/sound/weapons/rifle_fire2.ogg new file mode 100644 index 000000000..721b37b91 Binary files /dev/null and b/sound/weapons/rifle_fire2.ogg differ diff --git a/sound/weapons/uzi_fire.ogg b/sound/weapons/uzi_fire.ogg deleted file mode 100644 index 9dc389949..000000000 Binary files a/sound/weapons/uzi_fire.ogg and /dev/null differ diff --git a/sound/weapons/vaporizer_fire.ogg b/sound/weapons/vaporizer_fire.ogg new file mode 100644 index 000000000..1dec6ff82 Binary files /dev/null and b/sound/weapons/vaporizer_fire.ogg differ diff --git a/sound/weapons/vortex_charge.ogg b/sound/weapons/vortex_charge.ogg new file mode 100644 index 000000000..6fa152dc3 Binary files /dev/null and b/sound/weapons/vortex_charge.ogg differ diff --git a/sound/weapons/vortex_fire.ogg b/sound/weapons/vortex_fire.ogg new file mode 100644 index 000000000..c576c0a16 Binary files /dev/null and b/sound/weapons/vortex_fire.ogg differ diff --git a/sound/weapons/vortex_impact.ogg b/sound/weapons/vortex_impact.ogg new file mode 100644 index 000000000..b6476d8bf Binary files /dev/null and b/sound/weapons/vortex_impact.ogg differ