From 86a7feb9aed9c6f9323bd05b5ae5d588a995a387 Mon Sep 17 00:00:00 2001 From: lcatlnx Date: Tue, 13 Dec 2005 00:59:39 +0000 Subject: [PATCH] soundreorga - changed filenames of the announcer sounds in the code and added new robotic announcer git-svn-id: svn://svn.icculus.org/nexuiz/trunk@661 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/gamec/g_damage.c | 29 ++++++++++------------- data/qcsrc/gamec/g_world.c | 47 +++++++++++++++++++------------------ data/qcsrc/gamec/t_items.c | 4 ++-- 3 files changed, 39 insertions(+), 41 deletions(-) diff --git a/data/qcsrc/gamec/g_damage.c b/data/qcsrc/gamec/g_damage.c index ba1f620c9..f74668eba 100644 --- a/data/qcsrc/gamec/g_damage.c +++ b/data/qcsrc/gamec/g_damage.c @@ -137,37 +137,37 @@ void Obituary (entity attacker, entity targ, float deathtype) if (attacker.killcount == 3) { bprint (attacker.netname,"^7 made a ^1TRIPLE FRAG\n"); - stuffcmd(attacker, "play2 announcer/male/triple_frag.ogg\n"); + stuffcmd(attacker, "play2 announcer/male/03kills.ogg\n"); } else if (attacker.killcount == 5) { bprint (attacker.netname,"^7 made a ^1FIVE FRAG COMBO\n"); - stuffcmd(attacker, "play2 announcer/male/five_frag_combo.ogg\n"); + stuffcmd(attacker, "play2 announcer/male/05kills.ogg\n"); } else if (attacker.killcount == 10) { - bprint (attacker.netname,"^7 is a bit annoyed\n"); - stuffcmd(attacker, "play2 announcer/male/girlfriend.ogg\n"); + bprint (attacker.netname,"^7 is on a ^1RAGE\n"); + stuffcmd(attacker, "play2 announcer/male/10kills.ogg\n"); } else if (attacker.killcount == 15) { - bprint (attacker.netname,"^7 is maybe a terrorist!\n"); - stuffcmd(attacker, "play2 announcer/male/worldwide.ogg\n"); + bprint (attacker.netname,"^7 has done a ^1MASSACRE!\n"); + stuffcmd(attacker, "play2 announcer/male/15kills.ogg\n"); } else if (attacker.killcount == 20) { - bprint (attacker.netname,"^7 has done a massacre!\n"); - stuffcmd(attacker, "play2 announcer/male/massacre.ogg\n"); + bprint (attacker.netname,"^7 is ^1UNHUMAN!\n"); + stuffcmd(attacker, "play2 announcer/male/20kills.ogg\n"); } else if (attacker.killcount == 25) { - bprint (attacker.netname,"^7 is a death incarnation!\n"); - stuffcmd(attacker, "play2 announcer/male/death_incarnate.ogg\n"); + bprint (attacker.netname,"^7 is a ^1DEATH INCARNATION!\n"); + stuffcmd(attacker, "play2 announcer/male/25kills.ogg\n"); } else if (attacker.killcount == 30) { - bprint (attacker.netname,"^7 is maybe a aimbotter?!\n"); - stuffcmd(attacker, "play2 announcer/male/aimbotting.ogg\n"); + bprint (attacker.netname,"^7 is maybe a ^1AIMBOTTER?!\n"); + stuffcmd(attacker, "play2 announcer/male/30kills.ogg\n"); } } else @@ -189,10 +189,7 @@ void Obituary (entity attacker, entity targ, float deathtype) bprint ("^1",s, "^1 died\n"); GiveFrags(targ, targ, -1); if(targ.frags == -5) { - stuffcmd(targ, "play2 announcer/male/looked_funny.ogg\n"); - } - else if(targ.frags == -10) { - stuffcmd(targ, "play2 announcer/male/suck.ogg\n"); + stuffcmd(targ, "play2 announcer/male/botlike.ogg\n"); } //targ.frags = targ.frags - 1; diff --git a/data/qcsrc/gamec/g_world.c b/data/qcsrc/gamec/g_world.c index 245929065..95750c489 100644 --- a/data/qcsrc/gamec/g_world.c +++ b/data/qcsrc/gamec/g_world.c @@ -95,11 +95,6 @@ void worldspawn (void) // laser for laser-guided weapons precache_model ("models/laser_dot.mdl"); - precache_sound ("announcer/1fragleft.wav"); - precache_sound ("announcer/1minuteremains.wav"); - precache_sound ("announcer/2fragsleft.wav"); - precache_sound ("announcer/3fragsleft.wav"); - precache_sound ("announcer/male/welcome.ogg"); precache_sound ("misc/armor1.wav"); precache_sound ("misc/armor25.wav"); precache_sound ("misc/armorimpact.wav"); @@ -162,7 +157,6 @@ void worldspawn (void) precache_sound ("weapons/weapon_switch.ogg"); precache_sound ("weapons/weaponpickup.ogg"); - // announcer sounds //precache_sound ("announce/male/kill10.ogg"); //precache_sound ("announce/male/kill15.ogg"); //precache_sound ("announce/male/kill20.ogg"); @@ -176,21 +170,28 @@ void worldspawn (void) //precache_sound ("announce/robotic/last_second_save.ogg"); //precache_sound ("announce/robotic/narrowly_averted.ogg"); //precache_sound ("minstagib/mockery.ogg"); - - precache_sound ("announcer/male/aimbotting.ogg"); - precache_sound ("announcer/male/botlike.ogg"); - precache_sound ("announcer/male/death_incarnate.ogg"); - precache_sound ("announcer/male/five_frag_combo.ogg"); - precache_sound ("announcer/male/girlfriend.ogg"); - precache_sound ("announcer/male/looked_funny.ogg"); - precache_sound ("announcer/male/massacre.ogg"); - precache_sound ("announcer/male/suck.ogg"); - precache_sound ("announcer/male/triple_frag.ogg"); - precache_sound ("announcer/male/voltage.ogg"); - precache_sound ("announcer/male/worldwide.ogg"); + + // announcer sounds - male + precache_sound ("announcer/male/03kills.ogg"); + precache_sound ("announcer/male/05kills.ogg"); + precache_sound ("announcer/male/10kills.ogg"); + precache_sound ("announcer/male/15kills.ogg"); + precache_sound ("announcer/male/20kills.ogg"); + precache_sound ("announcer/male/25kills.ogg"); + precache_sound ("announcer/male/30kills.ogg"); + precache_sound ("announcer/male/botlike.ogg"); + precache_sound ("announcer/male/electrobitch.ogg"); + precache_sound ("announcer/male/welcome.ogg"); precache_sound ("announcer/male/yoda.ogg"); - + // announcer sounds - robotic + precache_sound ("announcer/robotic/1fragleft.ogg"); + precache_sound ("announcer/robotic/1minuteremains.ogg"); + precache_sound ("announcer/robotic/2fragsleft.ogg"); + precache_sound ("announcer/robotic/3fragsleft.ogg"); + precache_sound ("announcer/robotic/lastsecond.ogg"); + precache_sound ("announcer/robotic/narrowly.ogg"); + // plays music for the level if there is any if (self.noise) { @@ -643,7 +644,7 @@ void() CheckRules_World = if (!checkrules_oneminutewarning && timelimit && time > timelimit - 60) { checkrules_oneminutewarning = TRUE; - sound(world, CHAN_AUTO, "announcer/1minuteremains.wav", 1, ATTN_NONE); + sound(world, CHAN_AUTO, "announcer/robotic/1minuteremains.ogg", 1, ATTN_NONE); } // last man camping winning conditions @@ -680,11 +681,11 @@ void() CheckRules_World = if (checkrules_leaderfrags != checkrules_oldleaderfrags) { if (checkrules_leaderfrags == fraglimit - 1) - sound(world, CHAN_AUTO, "announcer/1fragleft.wav", 1, ATTN_NONE); + sound(world, CHAN_AUTO, "announcer/robotic/1fragleft.ogg", 1, ATTN_NONE); else if (checkrules_leaderfrags == fraglimit - 2) - sound(world, CHAN_AUTO, "announcer/2fragsleft.wav", 1, ATTN_NONE); + sound(world, CHAN_AUTO, "announcer/robotic/2fragsleft.ogg", 1, ATTN_NONE); else if (checkrules_leaderfrags == fraglimit - 3) - sound(world, CHAN_AUTO, "announcer/3fragsleft.wav", 1, ATTN_NONE); + sound(world, CHAN_AUTO, "announcer/robotic/3fragsleft.ogg", 1, ATTN_NONE); } // if (checkrules_leader != checkrules_oldleader)// && checkrules_leaderfrags > checkrules_oldleaderfrags) // bprint("^1",checkrules_leader.netname, " has taken the lead with ", ftos(checkrules_leaderfrags), " frags\n"); diff --git a/data/qcsrc/gamec/t_items.c b/data/qcsrc/gamec/t_items.c index b10a4b0df..6d8520d81 100644 --- a/data/qcsrc/gamec/t_items.c +++ b/data/qcsrc/gamec/t_items.c @@ -45,9 +45,9 @@ void Item_Touch (void) // play some cool sounds ;) centerprint(other, "\n"); if(other.health <= 5) - stuffcmd(other, "play2 announce/robotic/last_second_save.ogg\n"); + stuffcmd(other, "play2 announcer/robotic/lastsecond.ogg\n"); else if(other.health < 50) - stuffcmd(other, "play2 announce/robotic/narrowly_averted.ogg\n"); + stuffcmd(other, "play2 announcer/robotic/narrowly.ogg\n"); else if(self.items == IT_CELLS) stuffcmd(other, "play2 announce/robotic/ammo.ogg\n"); -- 2.39.2