From 2d3a41e19de150f313164bf164523efcfe80f4d4 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sun, 31 Mar 2019 17:17:09 -0400 Subject: [PATCH] Added condition --- .../scripts/autoexec/MapRepetitionChecker.cs | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/Classic/scripts/autoexec/MapRepetitionChecker.cs b/Classic/scripts/autoexec/MapRepetitionChecker.cs index eb17d2e..add4fc0 100644 --- a/Classic/scripts/autoexec/MapRepetitionChecker.cs +++ b/Classic/scripts/autoexec/MapRepetitionChecker.cs @@ -13,42 +13,45 @@ $PreviousMission1back = ""; //Run in GetTeamCounts.cs function MapRepetitionChecker( %game ) { - //Debug - //%MapRepetitionCheckerDebug = true; - - if(!$GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present - return; - - if($EvoCachedNextMission $= "") - return; - - if(!$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 ) - { - //Backup - $SetNextMissionRestore = $EvoCachedNextMission; - - //Do work - if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || - $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission || - $CurrentMission $= $EvoCachedNextMission ) - MapRepetitionCheckerFindRandom(); - - //Set vars - if($PreviousMission3back !$= "") $PreviousMission4back = $PreviousMission3back; - if($PreviousMission2back !$= "") $PreviousMission3back = $PreviousMission2back; - if($PreviousMission1back !$= "") $PreviousMission2back = $PreviousMission1back; - $PreviousMission1back = $CurrentMission; - + if($countdownStarted && $MatchStarted) + { //Debug - if(%MapRepetitionCheckerDebug) - { - if($PreviousMission1back !$= "") echo("PM1: " @ $PreviousMission1back); - if($PreviousMission2back !$= "") echo("PM2: " @ $PreviousMission2back); - if($PreviousMission3back !$= "") echo("PM3: " @ $PreviousMission3back); - if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back); + //%MapRepetitionCheckerDebug = true; + + if(!$GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present + return; + + if($EvoCachedNextMission $= "") + return; + + if(!$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 ) + { + //Backup + $SetNextMissionRestore = $EvoCachedNextMission; + + //Do work + if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || + $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission || + $CurrentMission $= $EvoCachedNextMission ) + MapRepetitionCheckerFindRandom(); + + //Set vars + if($PreviousMission3back !$= "") $PreviousMission4back = $PreviousMission3back; + if($PreviousMission2back !$= "") $PreviousMission3back = $PreviousMission2back; + if($PreviousMission1back !$= "") $PreviousMission2back = $PreviousMission1back; + $PreviousMission1back = $CurrentMission; + + //Debug + if(%MapRepetitionCheckerDebug) + { + if($PreviousMission1back !$= "") echo("PM1: " @ $PreviousMission1back); + if($PreviousMission2back !$= "") echo("PM2: " @ $PreviousMission2back); + if($PreviousMission3back !$= "") echo("PM3: " @ $PreviousMission3back); + if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back); + } } + $MapRepetitionCheckerRunOnce = 1; } - $MapRepetitionCheckerRunOnce = 1; } function MapRepetitionCheckerFindRandom()