Added lak support

This commit is contained in:
ChocoTaco 2019-02-23 22:20:35 -05:00
parent 5f91f9fb37
commit b3f3e96ade
2 changed files with 59 additions and 24 deletions

View file

@ -11,6 +11,8 @@ $GetRandomMapsLoaded = true;
//Map pool
//
//CTF
//
//1-5
$RandomMapPick1 = "SmallCrossing"; $RandomMapPick2 = "OasisIntensity"; $RandomMapPick3 = "Blink"; $RandomMapPick4 = "SmallTimeCTF"; $RandomMapPick5 = "ArenaDome";
//6-10
@ -27,29 +29,54 @@ $RandomMapPick26 = "S8_Cardiac"; $RandomMapPick27 = "CirclesEdge"; $RandomM
$RandomMapPick31 = "MoonDance"; $RandomMapPick32 = "Rollercoaster_nef"; $RandomMapPick33 = "Logans_Run"; $RandomMapPick34 = "TWL_BeachBlitz"; $RandomMapPick35 = "TWL2_FrozenGlory";
//36-40
$RandomMapPick36 = "CircleofStones"; $RandomMapPick37 = "TitanV"; $RandomMapPick38 = "TWL_Katabatic"; $RandomMapPick39 = "TWL2_Magnum"; $RandomMapPick40 = "Fenix";
//
//LakRabbit
//
//1-5
$LakRandomMapPick1 = "VaubanLak"; $LakRandomMapPick2 = "MiniSunDried"; $LakRandomMapPick3 = "TitaniaLak"; $LakRandomMapPick4 = "DesertofDeathLak"; $LakRandomMapPick5 = "Sundance";
//6-8
$LakRandomMapPick6 = "SunDriedLak"; $LakRandomMapPick7 = "SkinnyDipLak"; $LakRandomMapPick8 = "LushLak"; $LakRandomMapPick9 = "InfernusLak"; $LakRandomMapPick10 = "Arrakis";
//11-15
$LakRandomMapPick11 = "BoxLak"; $LakRandomMapPick12 = "TreasureIslandLak"; $LakRandomMapPick13 = "Raindance_nefLak"; $LakRandomMapPick14 = "SaddiesHill"; $LakRandomMapPick15 = "TWL_BeachBlitzLak";
function SetNextMapGetRandoms( %client )
{
//Get random numbers
%RandomPick1 = getRandom(1,5);
%RandomPick2 = getRandom(6,10);
%RandomPick3 = getRandom(11,15);
%RandomPick4 = getRandom(16,20);
%RandomPick5 = getRandom(21,25);
%RandomPick6 = getRandom(26,30);
%RandomPick7 = getRandom(31,35);
%RandomPick8 = getRandom(36,40);
if( $CurrentMissionType $= "CTF" )
{
//Get random numbers
%RandomPick1 = getRandom(1,5);
%RandomPick2 = getRandom(6,10);
%RandomPick3 = getRandom(11,15);
%RandomPick4 = getRandom(16,20);
%RandomPick5 = getRandom(21,25);
%RandomPick6 = getRandom(26,30);
%RandomPick7 = getRandom(31,35);
%RandomPick8 = getRandom(36,40);
//Deduction code
$SetNextMissionMapSlot1 = $RandomMapPick[%RandomPick1];
$SetNextMissionMapSlot2 = $RandomMapPick[%RandomPick2];
$SetNextMissionMapSlot3 = $RandomMapPick[%RandomPick3];
$SetNextMissionMapSlot4 = $RandomMapPick[%RandomPick4];
$SetNextMissionMapSlot5 = $RandomMapPick[%RandomPick5];
$SetNextMissionMapSlot6 = $RandomMapPick[%RandomPick6];
$SetNextMissionMapSlot7 = $RandomMapPick[%RandomPick7];
$SetNextMissionMapSlot8 = $RandomMapPick[%RandomPick8];
//Deduction code
$SetNextMissionMapSlot1 = $RandomMapPick[%RandomPick1];
$SetNextMissionMapSlot2 = $RandomMapPick[%RandomPick2];
$SetNextMissionMapSlot3 = $RandomMapPick[%RandomPick3];
$SetNextMissionMapSlot4 = $RandomMapPick[%RandomPick4];
$SetNextMissionMapSlot5 = $RandomMapPick[%RandomPick5];
$SetNextMissionMapSlot6 = $RandomMapPick[%RandomPick6];
$SetNextMissionMapSlot7 = $RandomMapPick[%RandomPick7];
$SetNextMissionMapSlot8 = $RandomMapPick[%RandomPick8];
}
else if( $CurrentMissionType $= "LakRabbit" )
{
//Get random numbers
%LakRandomPick1 = getRandom(1,5);
%LakRandomPick2 = getRandom(6,10);
%LakRandomPick3 = getRandom(11,15);
//Deduction code
$SetNextMissionMapSlot1 = $LakRandomMapPick[%LakRandomPick1];
$SetNextMissionMapSlot2 = $LakRandomMapPick[%LakRandomPick2];
$SetNextMissionMapSlot3 = $LakRandomMapPick[%LakRandomPick3];
}
}

View file

@ -1,5 +1,6 @@
//To help decrease the chances of a repeated map in the map rotation by correcting repeated maps thru script
//$EvoCachedNextMission = "RoundTheMountain";
//$EvoCachedNextMission = "Arrakis";
//
//$GetRandomMapsLoaded makes sure GetRandomMaps.cs is present
//$SNMPresetsLoaded makes sure if GetRandomMaps.cs isnt present presets are loaded.
@ -15,7 +16,7 @@ function MapRepetitionChecker( %game )
//Debug
//%MapRepetitionCheckerDebug = true;
if( $CurrentMissionType $= "CTF" && !$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 && ($GetRandomMapsLoaded || $SNMPresetsLoaded))
if( ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "LakRabbit" ) && !$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 && ($GetRandomMapsLoaded || $SNMPresetsLoaded))
{
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission )
MapRepetitionCheckerFindRandom();
@ -34,8 +35,6 @@ function MapRepetitionChecker( %game )
if($PreviousMission3back !$= "") echo("PM3: " @ $PreviousMission3back);
if($PreviousMission4back !$= "") echo("PM4: " @ $PreviousMission4back);
}
return;
}
$MapRepetitionCheckerRunOnce = 1;
@ -46,9 +45,18 @@ function MapRepetitionCheckerFindRandom()
if($GetRandomMapsLoaded) //Make sure GetRandomMaps.cs is present
SetNextMapGetRandoms( %client ); //Get Random Set Next Mission maps
%MapCheckerRandom = getRandom(1,6);
$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
if( $CurrentMissionType $= "CTF" )
{
%MapCheckerRandom = getRandom(1,6);
$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
}
else if( $CurrentMissionType $= "LakRabbit" && $GetRandomMapsLoaded )
{
%MapCheckerRandom = getRandom(1,3);
$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
}
else
return;
if($EvoCachedNextMission $= $PreviousMission1back || $EvoCachedNextMission $= $PreviousMission2back || $EvoCachedNextMission $= $PreviousMission3back || $EvoCachedNextMission $= $PreviousMission4back)
MapRepetitionCheckerFindRandom();