Update MapRepetitionChecker.cs

This commit is contained in:
ChocoTaco 2019-03-25 16:46:32 -04:00
parent 4562639dba
commit 0cb4113224

View file

@ -16,12 +16,13 @@ function MapRepetitionChecker( %game )
//Debug //Debug
//%MapRepetitionCheckerDebug = true; //%MapRepetitionCheckerDebug = true;
if(!$GetRandomMapsLoaded) if(!$GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present
return; return;
if(!$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 ) if(!$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 )
{ {
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission ) if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission ||
$PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission )
MapRepetitionCheckerFindRandom(); MapRepetitionCheckerFindRandom();
//Set vars //Set vars
@ -39,25 +40,29 @@ function MapRepetitionChecker( %game )
if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back); if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back);
} }
} }
$MapRepetitionCheckerRunOnce = 1; $MapRepetitionCheckerRunOnce = 1;
} }
function MapRepetitionCheckerFindRandom() function MapRepetitionCheckerFindRandom()
{ {
if($GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present if($GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present
SetNextMapGetRandoms( %client ); //Get Random Set Next Mission maps SetNextMapGetRandoms( %client ); //Get Random Set Next Mission maps
else else
return; return;
%MapCheckerRandom = getRandom(1,6); if( $CurrentMissionType $= "Deathmatch" )
%MapCheckerRandom = getRandom(1,8);
else
%MapCheckerRandom = getRandom(1,6);
$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom]; $EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
if($EvoCachedNextMission $= $PreviousMission1back || $EvoCachedNextMission $= $PreviousMission2back || $EvoCachedNextMission $= $PreviousMission3back || $EvoCachedNextMission $= $PreviousMission4back) if( $EvoCachedNextMission $= $PreviousMission1back || $EvoCachedNextMission $= $PreviousMission2back ||
$EvoCachedNextMission $= $PreviousMission3back || $EvoCachedNextMission $= $PreviousMission4back )
MapRepetitionCheckerFindRandom(); MapRepetitionCheckerFindRandom();
else else
{ {
error(formatTimeString("HH:nn:ss") SPC "Map Repetition Corrected."); error(formatTimeString("HH:nn:ss") SPC "Map Repetition Corrected to" SPC $EvoCachedNextMission );
messageAll('MsgNoBaseRapeNotify', '\crMap Repetition Corrected: Next mission set to %1.', $EvoCachedNextMission); messageAll('MsgNoBaseRapeNotify', '\crMap Repetition Corrected: Next mission set to %1.', $EvoCachedNextMission);
} }
} }