From: Mario Date: Fri, 3 May 2013 19:32:09 +0000 (+1000) Subject: Remove duplicate content X-Git-Tag: xonotic-v0.8.0~366^2~23^2~7 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e52a9528a583d0ede160129dd19829f3e13a902;p=xonotic%2Fxonotic-data.pk3dir.git Remove duplicate content --- diff --git a/models/nade_counter/nade_counter.md3 b/models/nade_counter/nade_counter.md3 deleted file mode 100644 index 7bcd7ef96..000000000 Binary files a/models/nade_counter/nade_counter.md3 and /dev/null differ diff --git a/models/nade_counter/nade_counter.md3_0.skin b/models/nade_counter/nade_counter.md3_0.skin deleted file mode 100644 index 1ce5b1720..000000000 --- a/models/nade_counter/nade_counter.md3_0.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_01 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_1.skin b/models/nade_counter/nade_counter.md3_1.skin deleted file mode 100644 index 2a3f0f748..000000000 --- a/models/nade_counter/nade_counter.md3_1.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_02 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_2.skin b/models/nade_counter/nade_counter.md3_2.skin deleted file mode 100644 index 6fca18955..000000000 --- a/models/nade_counter/nade_counter.md3_2.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_03 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_3.skin b/models/nade_counter/nade_counter.md3_3.skin deleted file mode 100644 index cce115d16..000000000 --- a/models/nade_counter/nade_counter.md3_3.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_04 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_4.skin b/models/nade_counter/nade_counter.md3_4.skin deleted file mode 100644 index b62ff4485..000000000 --- a/models/nade_counter/nade_counter.md3_4.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_05 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_5.skin b/models/nade_counter/nade_counter.md3_5.skin deleted file mode 100644 index c6f3408c3..000000000 --- a/models/nade_counter/nade_counter.md3_5.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_06 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_6.skin b/models/nade_counter/nade_counter.md3_6.skin deleted file mode 100644 index fe2e9ac7d..000000000 --- a/models/nade_counter/nade_counter.md3_6.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_07 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_7.skin b/models/nade_counter/nade_counter.md3_7.skin deleted file mode 100644 index ffb0651ce..000000000 --- a/models/nade_counter/nade_counter.md3_7.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_08 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_8.skin b/models/nade_counter/nade_counter.md3_8.skin deleted file mode 100644 index 40d3c04af..000000000 --- a/models/nade_counter/nade_counter.md3_8.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_09 \ No newline at end of file diff --git a/models/nade_counter/nade_counter.md3_9.skin b/models/nade_counter/nade_counter.md3_9.skin deleted file mode 100644 index 290309248..000000000 --- a/models/nade_counter/nade_counter.md3_9.skin +++ /dev/null @@ -1 +0,0 @@ -sprite,models/nade_counter/nade_counter_10 \ No newline at end of file diff --git a/models/nade_counter/nade_counter_01.tga b/models/nade_counter/nade_counter_01.tga deleted file mode 100644 index c58a70da2..000000000 Binary files a/models/nade_counter/nade_counter_01.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_02.tga b/models/nade_counter/nade_counter_02.tga deleted file mode 100644 index 3d91413b6..000000000 Binary files a/models/nade_counter/nade_counter_02.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_03.tga b/models/nade_counter/nade_counter_03.tga deleted file mode 100644 index eddb7cbcc..000000000 Binary files a/models/nade_counter/nade_counter_03.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_04.tga b/models/nade_counter/nade_counter_04.tga deleted file mode 100644 index 7f14db672..000000000 Binary files a/models/nade_counter/nade_counter_04.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_05.tga b/models/nade_counter/nade_counter_05.tga deleted file mode 100644 index a7cdf8ca2..000000000 Binary files a/models/nade_counter/nade_counter_05.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_06.tga b/models/nade_counter/nade_counter_06.tga deleted file mode 100644 index 150f061ff..000000000 Binary files a/models/nade_counter/nade_counter_06.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_07.tga b/models/nade_counter/nade_counter_07.tga deleted file mode 100644 index 36e5c3b31..000000000 Binary files a/models/nade_counter/nade_counter_07.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_08.tga b/models/nade_counter/nade_counter_08.tga deleted file mode 100644 index 3f4239493..000000000 Binary files a/models/nade_counter/nade_counter_08.tga and /dev/null differ diff --git a/models/nade_counter/nade_counter_09.tga b/models/nade_counter/nade_counter_09.tga deleted file mode 100644 index 31219ab3f..000000000 Binary files a/models/nade_counter/nade_counter_09.tga and /dev/null differ diff --git a/models/ok_nade_counter/ok_nade_counter.md3 b/models/ok_nade_counter/ok_nade_counter.md3 new file mode 100644 index 000000000..7bcd7ef96 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter.md3 differ diff --git a/models/ok_nade_counter/ok_nade_counter.md3_0.skin b/models/ok_nade_counter/ok_nade_counter.md3_0.skin new file mode 100644 index 000000000..f51048689 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_0.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_01 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_1.skin b/models/ok_nade_counter/ok_nade_counter.md3_1.skin new file mode 100644 index 000000000..c7bfc3b11 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_1.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_02 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_2.skin b/models/ok_nade_counter/ok_nade_counter.md3_2.skin new file mode 100644 index 000000000..ee84c4f24 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_2.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_03 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_3.skin b/models/ok_nade_counter/ok_nade_counter.md3_3.skin new file mode 100644 index 000000000..df0b108a7 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_3.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_04 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_4.skin b/models/ok_nade_counter/ok_nade_counter.md3_4.skin new file mode 100644 index 000000000..d76d11092 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_4.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_05 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_5.skin b/models/ok_nade_counter/ok_nade_counter.md3_5.skin new file mode 100644 index 000000000..c25c2b52d --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_5.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_06 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_6.skin b/models/ok_nade_counter/ok_nade_counter.md3_6.skin new file mode 100644 index 000000000..df0393048 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_6.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_07 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_7.skin b/models/ok_nade_counter/ok_nade_counter.md3_7.skin new file mode 100644 index 000000000..3021e514b --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_7.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_08 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_8.skin b/models/ok_nade_counter/ok_nade_counter.md3_8.skin new file mode 100644 index 000000000..e3df814e3 --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_8.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_09 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter.md3_9.skin b/models/ok_nade_counter/ok_nade_counter.md3_9.skin new file mode 100644 index 000000000..1402b7a0b --- /dev/null +++ b/models/ok_nade_counter/ok_nade_counter.md3_9.skin @@ -0,0 +1 @@ +sprite,models/ok_nade_counter/ok_nade_counter_10 \ No newline at end of file diff --git a/models/ok_nade_counter/ok_nade_counter_01.tga b/models/ok_nade_counter/ok_nade_counter_01.tga new file mode 100644 index 000000000..c58a70da2 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_01.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_02.tga b/models/ok_nade_counter/ok_nade_counter_02.tga new file mode 100644 index 000000000..3d91413b6 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_02.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_03.tga b/models/ok_nade_counter/ok_nade_counter_03.tga new file mode 100644 index 000000000..eddb7cbcc Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_03.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_04.tga b/models/ok_nade_counter/ok_nade_counter_04.tga new file mode 100644 index 000000000..7f14db672 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_04.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_05.tga b/models/ok_nade_counter/ok_nade_counter_05.tga new file mode 100644 index 000000000..a7cdf8ca2 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_05.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_06.tga b/models/ok_nade_counter/ok_nade_counter_06.tga new file mode 100644 index 000000000..150f061ff Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_06.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_07.tga b/models/ok_nade_counter/ok_nade_counter_07.tga new file mode 100644 index 000000000..36e5c3b31 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_07.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_08.tga b/models/ok_nade_counter/ok_nade_counter_08.tga new file mode 100644 index 000000000..3f4239493 Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_08.tga differ diff --git a/models/ok_nade_counter/ok_nade_counter_09.tga b/models/ok_nade_counter/ok_nade_counter_09.tga new file mode 100644 index 000000000..31219ab3f Binary files /dev/null and b/models/ok_nade_counter/ok_nade_counter_09.tga differ diff --git a/models/weapons/h_nade.iqm b/models/weapons/h_nade.iqm deleted file mode 100644 index eaffcc2c1..000000000 Binary files a/models/weapons/h_nade.iqm and /dev/null differ diff --git a/models/weapons/h_nade.iqm.framegroups b/models/weapons/h_nade.iqm.framegroups deleted file mode 100644 index ceb09de4f..000000000 --- a/models/weapons/h_nade.iqm.framegroups +++ /dev/null @@ -1,9 +0,0 @@ -/* -Generated framegroups file for h_laser -Used by DarkPlaces to simulate frame groups in DPM models. -*/ - -1 51 50 0 // h_laser hgrenade_fire -52 101 50 0 // h_laser hgrenade_idle -153 101 5 1 // h_laser hgrenade_idle -254 101 5 1 // h_laser hgrenade_idle diff --git a/models/weapons/v_nade.md3 b/models/weapons/v_nade.md3 deleted file mode 100644 index e6f593df3..000000000 Binary files a/models/weapons/v_nade.md3 and /dev/null differ diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc index 2f85c46a0..d3a9af094 100644 --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@ -313,10 +313,10 @@ void Ent_Projectile() case PROJECTILE_BUMBLE_GUN: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; case PROJECTILE_BUMBLE_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; - case PROJECTILE_NADE_RED: setmodel(self, "models/weapons/v_nade.md3");self.traileffect = particleeffectnum("nade_red"); break; - case PROJECTILE_NADE_RED_BURN: setmodel(self, "models/weapons/v_nade.md3");self.traileffect = particleeffectnum("nade_red_burn"); break; - case PROJECTILE_NADE_BLUE: setmodel(self, "models/weapons/v_nade.md3");self.traileffect = particleeffectnum("nade_blue"); break; - case PROJECTILE_NADE_BLUE_BURN: setmodel(self, "models/weapons/v_nade.md3");self.traileffect = particleeffectnum("nade_blue_burn"); break; + case PROJECTILE_NADE_RED: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red"); break; + case PROJECTILE_NADE_RED_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red_burn"); break; + case PROJECTILE_NADE_BLUE: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue"); break; + case PROJECTILE_NADE_BLUE_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue_burn"); break; default: error("Received invalid CSQC projectile, can't work with this!"); diff --git a/qcsrc/server/mutators/mutator_riflearena.qc b/qcsrc/server/mutators/mutator_riflearena.qc index 95759758c..3355f5bae 100644 --- a/qcsrc/server/mutators/mutator_riflearena.qc +++ b/qcsrc/server/mutators/mutator_riflearena.qc @@ -29,7 +29,7 @@ void ra_nade_burn_spawn(entity nade) void ra_nade_spawn(entity nade) { entity timer = spawn(); - setmodel(timer, "models/nade_counter/nade_counter.md3"); + setmodel(timer, "models/ok_nade_counter/ok_nade_counter.md3"); setattachment(timer, nade, ""); timer.classname = "nade_timer"; timer.colormap = nade.colormap; @@ -75,7 +75,7 @@ void ra_nade_touch() void ra_nade_beep() { - sound(self, CH_SHOTS_SINGLE, "weapons/nade.ogg", VOL_BASE, 0.5 *(ATTN_LARGE + ATTN_MAX)); + sound(self, CH_SHOTS_SINGLE, "overkill/grenadebip.wav", VOL_BASE, 0.5 *(ATTN_LARGE + ATTN_MAX)); self.think = ra_nade_boom; self.nextthink = max(self.wait, time); } @@ -152,7 +152,7 @@ void ra_nade_prime() remove(self.ra_nade); self.ra_nade = spawn(); - setmodel(self.ra_nade, "models/weapons/h_nade.iqm"); + setmodel(self.ra_nade, "models/weapons/h_ok_grenade.iqm"); setattachment(self.ra_nade, self.weaponentity, ""); self.ra_nade.classname = "nade"; self.ra_nade.realowner = self; @@ -334,10 +334,10 @@ MUTATOR_DEFINITION(mutator_riflearena) cvar_settemp("g_balance_rifle_secondary_animtime", "0.15"); cvar_settemp("g_balance_rifle_secondary_refire", "0.15"); cvar_settemp("g_balance_rifle_secondary_damage", "40"); - precache_model("models/nade_counter/nade_counter.md3"); + precache_model("models/ok_nade_counter/ok_nade_counter.md3"); - precache_model("models/weapons/h_nade.iqm"); - precache_model("models/weapons/v_nade.md3"); + precache_model("models/weapons/h_ok_grenade.iqm"); + precache_model("models/weapons/v_ok_grenade.md3"); precache_sound("weapons/rocket_impact.wav"); precache_sound("weapons/grenade_bounce1.wav"); precache_sound("weapons/grenade_bounce2.wav"); @@ -345,7 +345,7 @@ MUTATOR_DEFINITION(mutator_riflearena) precache_sound("weapons/grenade_bounce4.wav"); precache_sound("weapons/grenade_bounce5.wav"); precache_sound("weapons/grenade_bounce6.wav"); - precache_sound("weapons/nade.ogg"); + precache_sound("overkill/grenadebip.wav"); weapon_action(WEP_LASER, WR_PRECACHE); weapon_action(WEP_RIFLE, WR_PRECACHE); diff --git a/scripts/nade_counter.shader b/scripts/nade_counter.shader deleted file mode 100644 index 162a68dfd..000000000 --- a/scripts/nade_counter.shader +++ /dev/null @@ -1,90 +0,0 @@ -models/nade_counter/nade_counter_01 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_01" - blendfunc add - } -} -models/nade_counter/nade_counter_02 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_02" - blendfunc add - } -} -models/nade_counter/nade_counter_03 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_03" - blendfunc add - } -} -models/nade_counter/nade_counter_04 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_04" - blendfunc add - } -} -models/nade_counter/nade_counter_05 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_05" - blendfunc add - } -} -models/nade_counter/nade_counter_06 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_06" - blendfunc add - } -} -models/nade_counter/nade_counter_07 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_07" - blendfunc add - } -} -models/nade_counter/nade_counter_08 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_08" - blendfunc add - } -} -models/nade_counter/nade_counter_09 -{ - dpnoshadow - deformVertexes autosprite - dppolygonoffset -6000 - { - map "models/nade_counter/nade_counter_09" - blendfunc add - } -} \ No newline at end of file diff --git a/scripts/ok_nade_counter.shader b/scripts/ok_nade_counter.shader new file mode 100644 index 000000000..130bee7ab --- /dev/null +++ b/scripts/ok_nade_counter.shader @@ -0,0 +1,90 @@ +models/ok_nade_counter/ok_nade_counter_01 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_01" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_02 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_02" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_03 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_03" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_04 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_04" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_05 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_05" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_06 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_06" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_07 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_07" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_08 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_08" + blendfunc add + } +} +models/ok_nade_counter/ok_nade_counter_09 +{ + dpnoshadow + deformVertexes autosprite + dppolygonoffset -6000 + { + map "models/ok_nade_counter/ok_nade_counter_09" + blendfunc add + } +} \ No newline at end of file diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt index 29d01db88..366f24c6d 100644 --- a/scripts/shaderlist.txt +++ b/scripts/shaderlist.txt @@ -14,4 +14,4 @@ tree tuba turrets weapons -nade_counter +ok_nade_counter diff --git a/sound/weapons/nade.ogg b/sound/weapons/nade.ogg deleted file mode 100644 index 54cdea4a5..000000000 Binary files a/sound/weapons/nade.ogg and /dev/null differ