diff --git a/CTFGame.cs b/CTFGame.cs index 629cbbc..4b0b84b 100644 --- a/CTFGame.cs +++ b/CTFGame.cs @@ -583,21 +583,21 @@ function CTFGame::flagCap(%game, %player) %game.AIflagCap(%player, %flag); //if this cap didn't end the game, play the announcer... - //if ($missionRunning) - //{ - //if (%game.getTeamName(%client.team) $= 'Inferno') - //messageAll("", '~wvoice/announcer/ann.infscores.wav'); - //else if (%game.getTeamName(%client.team) $= 'Storm') - //messageAll("", '~wvoice/announcer/ann.stoscores.wav'); - //else if (%game.getTeamName(%client.team) $= 'Phoenix') - //messageAll("", '~wvoice/announcer/ann.pxscore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Blood Eagle') - //messageAll("", '~wvoice/announcer/ann.bescore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Diamond Sword') - //messageAll("", '~wvoice/announcer/ann.dsscore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Starwolf') - //messageAll("", '~wvoice/announcer/ann.swscore.wav'); - //} + if ($missionRunning) + { + if (%game.getTeamName(%client.team) $= 'Inferno') + messageAll("", '~wvoice/announcer/ann.infscores.wav'); + else if (%game.getTeamName(%client.team) $= 'Storm') + messageAll("", '~wvoice/announcer/ann.stoscores.wav'); + else if (%game.getTeamName(%client.team) $= 'Phoenix') + messageAll("", '~wvoice/announcer/ann.pxscore.wav'); + else if (%game.getTeamName(%client.team) $= 'Blood Eagle') + messageAll("", '~wvoice/announcer/ann.bescore.wav'); + else if (%game.getTeamName(%client.team) $= 'Diamond Sword') + messageAll("", '~wvoice/announcer/ann.dsscore.wav'); + else if (%game.getTeamName(%client.team) $= 'Starwolf') + messageAll("", '~wvoice/announcer/ann.swscore.wav'); + } } function CTFGame::flagReturnFade(%game, %flag) diff --git a/SCtFGame.cs b/SCtFGame.cs index 3babefa..386babf 100644 --- a/SCtFGame.cs +++ b/SCtFGame.cs @@ -733,21 +733,21 @@ function SCtFGame::flagCap(%game, %player) %game.AIflagCap(%player, %flag); //if this cap didn't end the game, play the announcer... - //if ($missionRunning) - //{ - //if (%game.getTeamName(%client.team) $= 'Inferno') - //messageAll("", '~wvoice/announcer/ann.infscores.wav'); - //else if (%game.getTeamName(%client.team) $= 'Storm') - //messageAll("", '~wvoice/announcer/ann.stoscores.wav'); - //else if (%game.getTeamName(%client.team) $= 'Phoenix') - //messageAll("", '~wvoice/announcer/ann.pxscore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Blood Eagle') - //messageAll("", '~wvoice/announcer/ann.bescore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Diamond Sword') - //messageAll("", '~wvoice/announcer/ann.dsscore.wav'); - //else if (%game.getTeamName(%client.team) $= 'Starwolf') - //messageAll("", '~wvoice/announcer/ann.swscore.wav'); - //} + if ($missionRunning) + { + if (%game.getTeamName(%client.team) $= 'Inferno') + messageAll("", '~wvoice/announcer/ann.infscores.wav'); + else if (%game.getTeamName(%client.team) $= 'Storm') + messageAll("", '~wvoice/announcer/ann.stoscores.wav'); + else if (%game.getTeamName(%client.team) $= 'Phoenix') + messageAll("", '~wvoice/announcer/ann.pxscore.wav'); + else if (%game.getTeamName(%client.team) $= 'Blood Eagle') + messageAll("", '~wvoice/announcer/ann.bescore.wav'); + else if (%game.getTeamName(%client.team) $= 'Diamond Sword') + messageAll("", '~wvoice/announcer/ann.dsscore.wav'); + else if (%game.getTeamName(%client.team) $= 'Starwolf') + messageAll("", '~wvoice/announcer/ann.swscore.wav'); + } } function SCtFGame::flagReturnFade(%game, %flag) diff --git a/autoexec/GetTeamCounts.cs b/autoexec/GetTeamCounts.cs index 9e57e71..bddab57 100644 --- a/autoexec/GetTeamCounts.cs +++ b/autoexec/GetTeamCounts.cs @@ -76,7 +76,8 @@ function GetTeamCounts( %game, %client, %respawn ) } - + //Check pug pass + CheckPUGpassword(); //Call itself again. Every 5 seconds. schedule(5000, 0, "GetTeamCounts"); diff --git a/autoexec/PUGpasscheck.cs b/autoexec/PUGpasscheck.cs new file mode 100644 index 0000000..fca410a --- /dev/null +++ b/autoexec/PUGpasscheck.cs @@ -0,0 +1,19 @@ +//To activate a password in certain gamemodes +function CheckPUGpassword() +{ + if( $CurrentMissionType !$= "LakRabbit" ) { + + if( $Host::TournamentMode ) + $Host::Password = "pickup"; + else if( ($AllPlayerCount < 10) && !$Host::TournamentMode ) + $Host::Password = ""; + + if($AllPlayerCount >= 10) { + $Host::Password = "pickup"; + } + } + else if( $CurrentMissionType $= "LakRabbit" ) { + $Host::Password = ""; + $Host::TournamentMode = 0; + } +} \ No newline at end of file