Sounds and TeamCounts update

This commit is contained in:
ChocoTaco 2018-07-29 17:37:22 -04:00
parent be90903595
commit a39d2c62bd
4 changed files with 28 additions and 24 deletions

View file

@ -87,7 +87,6 @@ function CTFGame::initGameVars(%game)
%game.stalemateTimeMS = 60000; %game.stalemateTimeMS = 60000;
%game.stalemateFreqMS = 15000; %game.stalemateFreqMS = 15000;
%game.stalemateDurationMS = 6000; %game.stalemateDurationMS = 6000;
// --------------------------------------------------- // ---------------------------------------------------
// z0dd - ZOD, 9/29/02. Removed T2 demo code from here // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
@ -554,17 +553,17 @@ function CTFGame::flagCap(%game, %player)
if ($missionRunning) if ($missionRunning)
{ {
if (%game.getTeamName(%client.team) $= 'Inferno') if (%game.getTeamName(%client.team) $= 'Inferno')
messageAll("", '~wvoice/announcer/ann.infscores.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Storm') else if (%game.getTeamName(%client.team) $= 'Storm')
messageAll("", '~wvoice/announcer/ann.stoscores.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Phoenix') else if (%game.getTeamName(%client.team) $= 'Phoenix')
messageAll("", '~wvoice/announcer/ann.pxscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Blood Eagle') else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
messageAll("", '~wvoice/announcer/ann.bescore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Diamond Sword') else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
messageAll("", '~wvoice/announcer/ann.dsscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Starwolf') else if (%game.getTeamName(%client.team) $= 'Starwolf')
messageAll("", '~wvoice/announcer/ann.swscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
} }
} }

View file

@ -691,17 +691,17 @@ function SCtFGame::flagCap(%game, %player)
if ($missionRunning) if ($missionRunning)
{ {
if (%game.getTeamName(%client.team) $= 'Inferno') if (%game.getTeamName(%client.team) $= 'Inferno')
messageAll("", '~wvoice/announcer/ann.infscores.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Storm') else if (%game.getTeamName(%client.team) $= 'Storm')
messageAll("", '~wvoice/announcer/ann.stoscores.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Phoenix') else if (%game.getTeamName(%client.team) $= 'Phoenix')
messageAll("", '~wvoice/announcer/ann.pxscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Blood Eagle') else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
messageAll("", '~wvoice/announcer/ann.bescore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Diamond Sword') else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
messageAll("", '~wvoice/announcer/ann.dsscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
else if (%game.getTeamName(%client.team) $= 'Starwolf') else if (%game.getTeamName(%client.team) $= 'Starwolf')
messageAll("", '~wvoice/announcer/ann.swscore.wav'); messageAll("", '~wfx/misc/flag_capture.wav');
} }
} }

View file

@ -56,12 +56,15 @@ function GetTeamCounts( %game, %client, %respawn )
if($CurrentMissionType $= "CTF" && $TotalTeamPlayerCount !$= 0 && $countdownStarted $= true && $MatchStarted $= true) { if($CurrentMissionType $= "CTF" && $TotalTeamPlayerCount !$= 0 && $countdownStarted $= true && $MatchStarted $= true) {
TeamBalanceNotify::AtSpawn( %game, %client, %respawn ); TeamBalanceNotify::AtSpawn( %game, %client, %respawn );
} }
//Start if($CurrentMissionType $= "sctf" && $TotalTeamPlayerCount !$= 0 && $countdownStarted $= true && $MatchStarted $= true) {
TeamBalanceNotify::AtSpawn( %game, %client, %respawn );
}
//Start Base Rape Notify
//Make sure it's CTF Mode //Make sure it's CTF Mode
if($CurrentMissionType $= "CTF" && $countdownStarted $= true && $MatchStarted $= true) { if($CurrentMissionType $= "CTF" && $countdownStarted $= true && $MatchStarted $= true) {
PlayerNotify::AtSpawn( %game, %client, %respawn ); PlayerNotify::AtSpawn( %game, %client, %respawn );
} }
//AntiCloak Start //AntiCloak Start
//if($CurrentMissionType $= "CTF") { //if($CurrentMissionType $= "CTF") {
//ActivateAntiCloak (); //ActivateAntiCloak ();
//} //}
@ -86,4 +89,4 @@ function GetTeamCounts( %game, %client, %respawn )
//if(!%client.isAIControlled()) //if(!%client.isAIControlled())
//$PlayerCount[%client.team]++; //$PlayerCount[%client.team]++;
//} //}
//} //}

View file

@ -53,6 +53,7 @@ addRotationMap("Minotaur", CTF, 1, 1);
addRotationMap("S8_Opus", CTF, 1, 1); addRotationMap("S8_Opus", CTF, 1, 1);
addRotationMap("BeggarsRun", CTF, 1, 1); addRotationMap("BeggarsRun", CTF, 1, 1);
addRotationMap("TitForTat", CTF, 1, 1); addRotationMap("TitForTat", CTF, 1, 1);
addRotationMap("Surreal", CTF, 1, 1);
addRotationMap("Signal", CTF, 1, 1); addRotationMap("Signal", CTF, 1, 1);
addRotationMap("Headstone", CTF, 1, 1); addRotationMap("Headstone", CTF, 1, 1);
addRotationMap("Fenix", CTF, 1, 1); addRotationMap("Fenix", CTF, 1, 1);
@ -100,7 +101,6 @@ addRotationMap("Sandstorm", CTF, 1, 0);
addRotationMap("Scarabrae_nef", CTF, 0, 0); addRotationMap("Scarabrae_nef", CTF, 0, 0);
addRotationMap("Starfallen", CTF, 1, 0); addRotationMap("Starfallen", CTF, 1, 0);
addRotationMap("Stonehenge_nef", CTF, 1, 0); addRotationMap("Stonehenge_nef", CTF, 1, 0);
addRotationMap("Surreal", CTF, 1, 0);
addRotationMap("Titan", CTF, 0, 0); addRotationMap("Titan", CTF, 0, 0);
addRotationMap("Extractor", CTF, 0, 0); addRotationMap("Extractor", CTF, 0, 0);
addRotationMap("AstersDescent", CTF, 1, 0); addRotationMap("AstersDescent", CTF, 1, 0);
@ -296,12 +296,15 @@ addRotationMap("BastardForgeLT", sctf, 1, 1);
addRotationMap("FirestormLT", sctf, 1, 1); addRotationMap("FirestormLT", sctf, 1, 1);
addRotationMap("DangerousCrossing_nef", sctf, 1, 1); addRotationMap("DangerousCrossing_nef", sctf, 1, 1);
addRotationMap("SmallCrossingLT", sctf, 1, 1); addRotationMap("SmallCrossingLT", sctf, 1, 1);
addRotationMap("RoundTheMountain", sctf, 1, 1); addRotationMap("DireLT", sctf, 1, 1);
addRotationMap("CirclesEdge", sctf, 1, 1); addRotationMap("RoundTheMountainLT", sctf, 1, 1);
addRotationMap("CirclesEdgeLT", sctf, 1, 1);
addRotationMap("HighOctane", sctf, 1, 1); addRotationMap("HighOctane", sctf, 1, 1);
addRotationMap("JadeValley", sctf, 1, 1); addRotationMap("JadeValley", sctf, 1, 1);
addRotationMap("TenebrousCTF", sctf, 1, 1); addRotationMap("TenebrousCTF", sctf, 1, 1);
addRotationMap("TheFray", sctf, 1, 1); addRotationMap("TheFray", sctf, 1, 1);
addRotationMap("SignalLT", sctf, 1, 1);
addRotationMap("StarFallLT", sctf, 1, 1);
addRotationMap("S5_DamnationLT", sctf, 1, 1); addRotationMap("S5_DamnationLT", sctf, 1, 1);
addRotationMap("S5_Icedance", sctf, 1, 1); addRotationMap("S5_Icedance", sctf, 1, 1);
addRotationMap("S5_Mordacity", sctf, 1, 1); addRotationMap("S5_Mordacity", sctf, 1, 1);
@ -310,14 +313,16 @@ addRotationMap("TWL2_CanyonCrusadeDeluxeLT", sctf, 1, 1);
addRotationMap("TWL2_FrozenHopeLT", sctf, 1, 1); addRotationMap("TWL2_FrozenHopeLT", sctf, 1, 1);
addRotationMap("TWL2_HildebrandLT", sctf, 1, 1); addRotationMap("TWL2_HildebrandLT", sctf, 1, 1);
addRotationMap("TWL2_SkylightLT", sctf, 1, 1); addRotationMap("TWL2_SkylightLT", sctf, 1, 1);
addRotationMap("TWL_BeachBlitz", sctf, 1, 1); addRotationMap("TWL_BeachBlitzLT", sctf, 1, 1);
addRotationMap("TWL_DangerousCrossing", sctf, 1, 1); addRotationMap("TWL_DangerousCrossing", sctf, 1, 1);
addRotationMap("TWL_Feign", sctf, 1, 1); addRotationMap("TWL_FeignLT", sctf, 1, 1);
addRotationMap("TWL_RollercoasterLT", sctf, 1, 1); addRotationMap("TWL_RollercoasterLT", sctf, 1, 1);
addRotationMap("TWL_StonehengeLT", sctf, 1, 1); addRotationMap("TWL_StonehengeLT", sctf, 1, 1);
addRotationMap("TWL_WilderZoneLT", sctf, 1, 1); addRotationMap("TWL_WilderZoneLT", sctf, 1, 1);
addRotationMap("oasisintensity", sctf, 1, 1); addRotationMap("oasisintensity", sctf, 1, 1);
addRotationMap("berlard", sctf, 1, 1); addRotationMap("berlard", sctf, 1, 1);
addRotationMap("SurrealLT", sctf, 1, 1);
addRotationMap("Coppersky", sctf, 1, 1);
addRotationMap("DuelersDelight", sctf, 1, 1); addRotationMap("DuelersDelight", sctf, 1, 1);
addRotationMap("SuperHappyBouncyFunTime", sctf, 1, 0); addRotationMap("SuperHappyBouncyFunTime", sctf, 1, 0);
addRotationMap("SmallTimeCTF", sctf, 1, 1); addRotationMap("SmallTimeCTF", sctf, 1, 1);
@ -335,13 +340,11 @@ addRotationMap("Minotaur", sctf, 0, 0);
addRotationMap("DesertofDeath_nef", sctf, 0, 0); addRotationMap("DesertofDeath_nef", sctf, 0, 0);
addRotationMap("Gorgon", sctf, 0, 0); addRotationMap("Gorgon", sctf, 0, 0);
addRotationMap("Titan", sctf, 0, 0); addRotationMap("Titan", sctf, 0, 0);
addRotationMap("Signal", sctf, 0, 0);
addRotationMap("Mac_FlagArena", sctf, 0, 0); addRotationMap("Mac_FlagArena", sctf, 0, 0);
addRotationMap("Extractor", sctf, 0, 0); addRotationMap("Extractor", sctf, 0, 0);
addRotationMap("AstersDescent", sctf, 0, 0); addRotationMap("AstersDescent", sctf, 0, 0);
addRotationMap("Azoth", sctf, 0, 0); addRotationMap("Azoth", sctf, 0, 0);
addRotationMap("DustLust", sctf, 0, 0); addRotationMap("DustLust", sctf, 0, 0);
addRotationMap("Dire", sctf, 0, 0);
addRotationMap("Disjointed", sctf, 0, 0); addRotationMap("Disjointed", sctf, 0, 0);
addRotationMap("Headstone", sctf, 0, 0); addRotationMap("Headstone", sctf, 0, 0);
addRotationMap("Mirage", sctf, 0, 0); addRotationMap("Mirage", sctf, 0, 0);
@ -402,7 +405,6 @@ addRotationMap("Island", sctf, 0, 0);
// ************************ // ************************
// * Siege Maps * // * Siege Maps *
// ************************ // ************************