From 99569f46182493c5daacfd1bcbf792f8f832ed62 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 20 Apr 2007 11:59:00 +0000 Subject: [PATCH] deleted ent files not needed any more; now using all 6 bounce sounds (fine for 2.2.3 clients) git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2367 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/maps/basementctf.ent | 334 ----------------- data/maps/stormkeep.ent | 479 ------------------------- data/qcsrc/server/g_world.qc | 3 + data/qcsrc/server/w_grenadelauncher.qc | 10 +- 4 files changed, 11 insertions(+), 815 deletions(-) delete mode 100644 data/maps/basementctf.ent delete mode 100644 data/maps/stormkeep.ent diff --git a/data/maps/basementctf.ent b/data/maps/basementctf.ent deleted file mode 100644 index 477ddf1b9..000000000 --- a/data/maps/basementctf.ent +++ /dev/null @@ -1,334 +0,0 @@ -{ -"message" "The Basement remake for CTF" -"classname" "worldspawn" -} -{ -"classname" "weapon_machinegun" -"origin" "-1024 -896 16" -} -{ -"classname" "item_health1" -"origin" "-1088 -704 16" -} -{ -"origin" "-1088 -640 16" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "-1088 -576 16" -} -{ -"classname" "item_armor1" -"origin" "-832 -896 16" -} -{ -"origin" "-768 -896 16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-704 -896 16" -} -{ -"classname" "ammo_grenades" -"origin" "-448 -896 16" -} -{ -"classname" "ammo_rockets" -"origin" "-512 -896 16" -} -{ -"classname" "weapon_grenadelauncher" -"origin" "-768 -640 208" -} -{ -"classname" "item_health25" -"origin" "-384 320 272" -} -{ -"classname" "item_armor1" -"origin" "-320 320 272" -} -{ -"origin" "-256 320 272" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-192 320 272" -} -{ -"classname" "weapon_electro" -"origin" "64 -320 16" -} -{ -"classname" "item_health25" -"origin" "64 -704 16" -} -{ -"classname" "ammo_bullets" -"origin" "0 -704 16" -} -{ -"classname" "ammo_shells" -"origin" "-480 -288 208" -} -{ -"classname" "weapon_hagar" -"origin" "-576 -64 16" -} -{ -"classname" "item_armor25" -"origin" "-480 -288 16" -} -{ -"classname" "item_health_large" -"origin" "-768 448 16" -} -{ -"classname" "item_armor1" -"origin" "-960 448 16" -} -{ -"origin" "-1024 448 16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-896 448 16" -} -{ -"origin" "-1664 -832 16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-1536 -832 16" -} -{ -"origin" "-1600 -832 16" -"classname" "item_armor1" -} -{ -"origin" "-1792 -832 16" -"classname" "item_health_large" -} -{ -"origin" "-2080 -96 16" -"classname" "item_armor25" -} -{ -"origin" "-1984 -320 16" -"classname" "weapon_hagar" -} -{ -"origin" "-2080 -96 208" -"classname" "ammo_shells" -} -{ -"origin" "-2560 320 16" -"classname" "ammo_bullets" -} -{ -"origin" "-2624 320 16" -"classname" "item_health25" -} -{ -"origin" "-2624 -64 16" -"classname" "weapon_electro" -} -{ -"origin" "-2368 -704 272" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-2304 -704 272" -} -{ -"origin" "-2240 -704 272" -"classname" "item_armor1" -} -{ -"origin" "-2176 -704 272" -"classname" "item_health25" -} -{ -"origin" "-1792 256 208" -"classname" "weapon_grenadelauncher" -} -{ -"origin" "-2048 512 16" -"classname" "ammo_rockets" -} -{ -"origin" "-2112 512 16" -"classname" "ammo_grenades" -} -{ -"origin" "-1856 512 16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-1792 512 16" -} -{ -"origin" "-1728 512 16" -"classname" "item_armor1" -} -{ -"origin" "-1472 192 16" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "-1472 256 16" -} -{ -"origin" "-1472 320 16" -"classname" "item_health1" -} -{ -"origin" "-1536 512 16" -"classname" "weapon_machinegun" -} -{ -"origin" "-1280 -192 16" -"classname" "item_strength" -} -{ -"angle" "360" -"origin" "-1888 -352 216" -"classname" "info_player_team2" -} -{ -"classname" "info_player_team2" -"origin" "-1536 576 24" -"angle" "270" -} -{ -"angle" "315" -"origin" "-2208 608 24" -"classname" "info_player_team2" -} -{ -"classname" "info_player_team2" -"origin" "-2304 256 216" -"angle" "360" -} -{ -"angle" "360" -"origin" "-2720 -64 24" -"classname" "info_player_team2" -} -{ -"classname" "info_player_team2" -"origin" "-2400 -416 280" -"angle" "90" -} -{ -"angle" "90" -"origin" "-2112 -704 280" -"classname" "info_player_team2" -} -{ -"model" "models/ctf/flag_blue.md3" -"origin" "-2576 -656 280" -"classname" "item_flag_team2" -} -{ -"angle" "135" -"origin" "-672 -96 216" -"classname" "info_player_team1" -} -{ -"classname" "info_player_team1" -"origin" "-1024 -960 24" -"angle" "90" -} -{ -"angle" "135" -"origin" "-352 -992 24" -"classname" "info_player_team1" -} -{ -"classname" "info_player_team1" -"origin" "-256 -640 216" -"angle" "180" -} -{ -"angle" "180" -"origin" "128 -320 24" -"classname" "info_player_team1" -} -{ -"classname" "info_player_team1" -"origin" "-120 64 280" -"angle" "270" -} -{ -"angle" "270" -"origin" "-448 320 280" -"classname" "info_player_team1" -} -{ -"model" "models/ctf/flag_red.md3" -"origin" "16 272 280" -"classname" "item_flag_team1" -} -{ -"origin" "-1216 -128 24" -"classname" "info_player_deathmatch" -} -{ -"height" "248" -"classname" "func_plat" -"model" "*1" -} -{ -"height" "248" -"classname" "func_plat" -"model" "*2" -} -{ -"classname" "trigger_push" -"target" "t1" -"model" "*3" -} -{ -"classname" "target_position" -"origin" "0 56 320" -"targetname" "t1" -} -{ -"targetname" "t2" -"origin" "-184 -640 256" -"classname" "target_position" -} -{ -"target" "t2" -"classname" "trigger_push" -"model" "*4" -} -{ -"classname" "trigger_push" -"target" "t3" -"model" "*5" -} -{ -"classname" "target_position" -"origin" "-2376 256 256" -"targetname" "t3" -} -{ -"targetname" "t4" -"origin" "-2560 -440 320" -"classname" "target_position" -} -{ -"target" "t4" -"classname" "trigger_push" -"model" "*6" -} diff --git a/data/maps/stormkeep.ent b/data/maps/stormkeep.ent deleted file mode 100644 index 70a00b7ba..000000000 --- a/data/maps/stormkeep.ent +++ /dev/null @@ -1,479 +0,0 @@ -{ -"message" "Stormkeep" -"light" "25" -"classname" "worldspawn" -} -{ -"target" "hagarjump" -"classname" "trigger_push" -"model" "*1" -} -{ -"origin" "32 456 -8" -"classname" "item_strength" -} -{ -"classname" "target_position" -"targetname" "crylinkjump" -"origin" "-1120 1240 216" -} -{ -"classname" "item_armor1" -"origin" "-936 1128 8" -} -{ -"origin" "-936 1176 8" -"classname" "item_armor1" -} -{ -"origin" "-1256 640 -24" -"classname" "item_health25" -} -{ -"origin" "-1256 784 -24" -"classname" "item_rockets" -} -{ -"origin" "288 -256 -152" -"classname" "weapon_grenadelauncher" -} -{ -"origin" "-1120 968 144" -"classname" "weapon_crylink" -} -{ -"angle" "180" -"classname" "item_health25" -"origin" "176 1240 -16" -} -{ -"angle" "180" -"origin" "176 1336 -16" -"classname" "item_health25" -} -{ -"targetname" "electrojump" -"origin" "920 1312 192" -"classname" "target_position" -} -{ -"targetname" "hagarjump" -"origin" "-472 -840 16" -"classname" "target_position" -} -{ -"classname" "info_player_deathmatch" -"origin" "-200 464 24" -} -{ -"classname" "weapon_hagar" -"origin" "-992 -800 88" -} -{ -"classname" "item_armor25" -"origin" "-924 -144 88" -} -{ -"classname" "trigger_push" -"target" "strengthjump" -"model" "*2" -} -{ -"classname" "target_position" -"origin" "32 712 216" -"targetname" "strengthjump" -} -{ -"classname" "item_armor1" -"origin" "1760 304 -16" -} -{ -"origin" "1752 360 -16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "1736 416 -16" -} -{ -"origin" "1704 472 -16" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "1656 520 -16" -} -{ -"classname" "item_health100" -"origin" "1696 -264 -16" -} -{ -"classname" "weapon_rocketlauncher" -"origin" "1344 -128 -144" -} -{ -"classname" "trigger_push" -"target" "crylinkjump" -"model" "*3" -} -{ -"classname" "trigger_push" -"target" "electrojump" -"model" "*4" -} -{ -"classname" "item_cells" -"origin" "528 1448 144" -} -{ -"classname" "item_cells" -"origin" "608 1448 144" -} -{ -"classname" "item_health25" -"origin" "-408 -448 -8" -} -{ -"origin" "-464 -448 -8" -"classname" "item_health25" -} -{ -"classname" "func_sparks" -"origin" "-472 40 -8" -} -{ -"angle" "90" -"origin" "1304 -488 -144" -"classname" "item_rockets" -} -{ -"origin" "1368 1312 8" -"classname" "weapon_electro" -} -{ -"origin" "1024 896 -16" -"classname" "item_cells" -} -{ -"classname" "item_cells" -"origin" "1408 896 -16" -} -{ -"origin" "1208 -752 0" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "1280 -824 0" -} -{ -"origin" "1376 -872 0" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "1512 -872 0" -} -{ -"origin" "1608 -824 0" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "1664 -776 0" -} -{ -"origin" "1704 -712 0" -"classname" "item_armor1" -} -{ -"angle" "135" -"origin" "568 -800 -128" -"classname" "item_health25" -} -{ -"classname" "item_health25" -"origin" "200 -800 -128" -"angle" "45" -} -{ -"angle" "135" -"origin" "16 -256 -176" -"classname" "item_rockets" -} -{ -"angle" "315" -"classname" "item_rockets" -"origin" "-240 -256 -176" -} -{ -"angle" "270" -"origin" "-920 1624 8" -"classname" "item_health25" -} -{ -"angle" "270" -"classname" "item_health25" -"origin" "-824 1624 8" -} -{ -"origin" "32 -24 24" -"classname" "weapon_nex" -} -{ -"origin" "-464 200 32" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "-464 264 32" -} -{ -"origin" "-464 328 32" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "-464 392 32" -} -{ -"origin" "-464 456 32" -"classname" "item_health1" -} -{ -"origin" "192 -920 8" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "256 -920 8" -} -{ -"origin" "320 -920 8" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "384 -920 8" -} -{ -"origin" "448 -920 8" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "512 -920 8" -} -{ -"origin" "576 -920 8" -"classname" "item_health1" -} -{ -"classname" "item_health1" -"origin" "640 -920 8" -} -{ -"origin" "-936 1032 8" -"classname" "item_armor1" -} -{ -"classname" "item_armor1" -"origin" "-936 1080 8" -} -{ -"classname" "item_armor1" -"origin" "-936 936 8" -} -{ -"origin" "-936 984 8" -"classname" "item_armor1" -} -{ -"origin" "480 -808 -128" -"classname" "item_cells" -} -{ -"classname" "item_cells" -"origin" "256 -808 -128" -} -{ -"origin" "-288 1344 16" -"classname" "item_cells" -} -{ -"classname" "item_cells" -"origin" "-192 1344 16" -} -{ -"origin" "-96 1344 16" -"classname" "item_cells" -} -{ -"classname" "item_rockets" -"origin" "-1056 -384 -24" -} -{ -"origin" "-1056 -576 -24" -"classname" "item_rockets" -} -{ -"origin" "536 1336 200" -"classname" "info_player_deathmatch" -} -{ -"origin" "-80 -240 40" -"classname" "info_player_deathmatch" -} -{ -"angle" "315" -"origin" "960 888 40" -"classname" "info_player_deathmatch" -} -{ -"angle" "270" -"origin" "-672 1032 192" -"classname" "info_player_deathmatch" -} -{ -"origin" "-1040 -448 8" -"classname" "info_player_deathmatch" -} -{ -"angle" "315" -"origin" "1144 120 -120" -"classname" "info_player_deathmatch" -} -{ -"target" "tele1" -"classname" "trigger_teleport" -"model" "*5" -} -{ -"target" "tele2" -"classname" "trigger_teleport" -"model" "*6" -} -{ -"targetname" "tele1" -"angle" "90" -"origin" "1216 312 0" -"classname" "misc_teleporter_dest" -} -{ -"targetname" "tele2" -"classname" "misc_teleporter_dest" -"origin" "-704 232 40" -"angle" "180" -} -{ -"angle" "315" -"origin" "1144 120 -120" -"classname" "info_player_deathmatch" -} -{ -"classname" "dom_team" -"netname" "" -"model" "models/domination/dom_unclaimed.md3" -} -{ -"classname" "dom_team" -"netname" "^4Blue Team^3" -"cnt" "13" -"noise" "domination/claim.wav" -"noise1" "domination/claim.wav" -"message" "Blue team has captured a control point" -"model" "models/domination/dom_blue.md3" -} -{ -"classname" "dom_team" -"netname" "^1Red Team^3" -"cnt" "4" -"noise" "domination/claim.wav" -"noise1" "domination/claim.wav" -"message" "Red team has captured a control point" -"model" "models/domination/dom_red.md3" -} -{ -"classname" "dom_team" -"netname" "^6Pink Team^3" -"cnt" "9" -"noise" "domination/claim.wav" -"noise1" "domination/claim.wav" -"message" "Pink team has captured a control point" -"model" "models/domination/dom_pink.md3" -} -{ -"classname" "dom_controlpoint" -"message" " has captured the ^1Hallways" -"origin" "-206.0 -488.8 -150.0" -"frags" "3" -"wait" "5" -} -{ -"classname" "dom_controlpoint" -"message" " has captured the ^1Lavaroom" -"origin" "1457.1 19.9 -110.0" -"frags" "1" -"wait" "5" -} -{ -"classname" "dom_controlpoint" -"message" " controls the ^1Nex & Strength" -"origin" "-259.8 299.3 5" -"frags" "1" -"wait" "5" -} -{ -"classname" "dom_controlpoint" -"message" " has captured the ^1Upper Platform" -"origin" "539.7 1206.0 182.0" -"frags" "1" -"wait" "5" -} -{ -"classname" "dom_controlpoint" -"message" " has captured the ^1Teleport Room" -"origin" "-1000.0 636.2 -16.0" -"frags" "1" -"wait" "5" -} -{ -"classname" "runematch_spawn_point" -"origin" "-210 -490 -150" -} -{ -"classname" "runematch_spawn_point" -"origin" "1460 20 -110" -} -{ -"classname" "runematch_spawn_point" -"origin" "-260 300 5" -} -{ -"classname" "runematch_spawn_point" -"origin" "540 1210 182" -} -{ -"classname" "runematch_spawn_point" -"origin" "-1000 640 -16" -} -{ -"classname" "runematch_spawn_point" -"origin" "-1140 1320 -16" -} -{ -"classname" "runematch_spawn_point" -"origin" "-920 -280 -8" -} -{ -"classname" "runematch_spawn_point" -"origin" "1450 -860 -8" -} -{ -"classname" "runematch_spawn_point" -"origin" "720 -750 -8" -} -{ -"classname" "runematch_spawn_point" -"origin" "1230 620 -8" -} diff --git a/data/qcsrc/server/g_world.qc b/data/qcsrc/server/g_world.qc index 74ae3260f..17bbdd315 100644 --- a/data/qcsrc/server/g_world.qc +++ b/data/qcsrc/server/g_world.qc @@ -222,6 +222,9 @@ void worldspawn (void) precache_sound ("weapons/grenade_bounce1.ogg"); precache_sound ("weapons/grenade_bounce2.ogg"); precache_sound ("weapons/grenade_bounce3.ogg"); + precache_sound ("weapons/grenade_bounce4.ogg"); + precache_sound ("weapons/grenade_bounce5.ogg"); + precache_sound ("weapons/grenade_bounce6.ogg"); precache_sound ("weapons/grenade_fire.ogg"); precache_sound ("weapons/grenade_impact.ogg"); precache_sound ("weapons/hagar_fire.ogg"); diff --git a/data/qcsrc/server/w_grenadelauncher.qc b/data/qcsrc/server/w_grenadelauncher.qc index d4212c3ff..82756d1b4 100644 --- a/data/qcsrc/server/w_grenadelauncher.qc +++ b/data/qcsrc/server/w_grenadelauncher.qc @@ -49,13 +49,19 @@ void W_Grenade_Touch2 (void) else { float r; - r = random() * 3; + r = random() * 6; if(r < 1) sound (self, CHAN_IMPACT, "weapons/grenade_bounce1.ogg", 1, ATTN_NORM); else if(r < 2) sound (self, CHAN_IMPACT, "weapons/grenade_bounce2.ogg", 1, ATTN_NORM); - else + else if(r < 3) sound (self, CHAN_IMPACT, "weapons/grenade_bounce3.ogg", 1, ATTN_NORM); + else if(r < 4) + sound (self, CHAN_IMPACT, "weapons/grenade_bounce4.ogg", 1, ATTN_NORM); + else if(r < 5) + sound (self, CHAN_IMPACT, "weapons/grenade_bounce5.ogg", 1, ATTN_NORM); + else + sound (self, CHAN_IMPACT, "weapons/grenade_bounce6.ogg", 1, ATTN_NORM); } } -- 2.39.2