mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-11 06:04:33 +00:00
Simplified
This commit is contained in:
parent
42172cdc8f
commit
af4608e743
2 changed files with 29 additions and 157 deletions
|
|
@ -36,53 +36,13 @@ function SetNextMapGetRandoms( %client )
|
|||
%RandomPick8 = getRandom(36,40);
|
||||
|
||||
//Deduction code
|
||||
//1-5
|
||||
if( %RandomPick1 $= 1) $SetNextMissionMapSlot1 = $RandomMapPick1;
|
||||
else if( %RandomPick1 $= 2) $SetNextMissionMapSlot1 = $RandomMapPick2;
|
||||
else if( %RandomPick1 $= 3) $SetNextMissionMapSlot1 = $RandomMapPick3;
|
||||
else if( %RandomPick1 $= 4) $SetNextMissionMapSlot1 = $RandomMapPick4;
|
||||
else if( %RandomPick1 $= 5) $SetNextMissionMapSlot1 = $RandomMapPick5;
|
||||
//6-10
|
||||
if( %RandomPick2 $= 6) $SetNextMissionMapSlot2 = $RandomMapPick6;
|
||||
else if( %RandomPick2 $= 7) $SetNextMissionMapSlot2 = $RandomMapPick7;
|
||||
else if( %RandomPick2 $= 8) $SetNextMissionMapSlot2 = $RandomMapPick8;
|
||||
else if( %RandomPick2 $= 9) $SetNextMissionMapSlot2 = $RandomMapPick9;
|
||||
else if( %RandomPick2 $= 10) $SetNextMissionMapSlot2 = $RandomMapPick10;
|
||||
//11-15
|
||||
if( %RandomPick3 $= 11) $SetNextMissionMapSlot3 = $RandomMapPick11;
|
||||
else if( %RandomPick3 $= 12) $SetNextMissionMapSlot3 = $RandomMapPick12;
|
||||
else if( %RandomPick3 $= 13) $SetNextMissionMapSlot3 = $RandomMapPick13;
|
||||
else if( %RandomPick3 $= 14) $SetNextMissionMapSlot3 = $RandomMapPick14;
|
||||
else if( %RandomPick3 $= 15) $SetNextMissionMapSlot3 = $RandomMapPick15;
|
||||
//16-20
|
||||
if( %RandomPick4 $= 16) $SetNextMissionMapSlot4 = $RandomMapPick16;
|
||||
else if( %RandomPick4 $= 17) $SetNextMissionMapSlot4 = $RandomMapPick17;
|
||||
else if( %RandomPick4 $= 18) $SetNextMissionMapSlot4 = $RandomMapPick18;
|
||||
else if( %RandomPick4 $= 19) $SetNextMissionMapSlot4 = $RandomMapPick19;
|
||||
else if( %RandomPick4 $= 20) $SetNextMissionMapSlot4 = $RandomMapPick20;
|
||||
//21-25
|
||||
if( %RandomPick5 $= 21) $SetNextMissionMapSlot5 = $RandomMapPick21;
|
||||
else if( %RandomPick5 $= 22) $SetNextMissionMapSlot5 = $RandomMapPick22;
|
||||
else if( %RandomPick5 $= 23) $SetNextMissionMapSlot5 = $RandomMapPick23;
|
||||
else if( %RandomPick5 $= 24) $SetNextMissionMapSlot5 = $RandomMapPick24;
|
||||
else if( %RandomPick5 $= 25) $SetNextMissionMapSlot5 = $RandomMapPick25;
|
||||
//26-30
|
||||
if( %RandomPick6 $= 26) $SetNextMissionMapSlot6 = $RandomMapPick26;
|
||||
else if( %RandomPick6 $= 27) $SetNextMissionMapSlot6 = $RandomMapPick27;
|
||||
else if( %RandomPick6 $= 28) $SetNextMissionMapSlot6 = $RandomMapPick28;
|
||||
else if( %RandomPick6 $= 29) $SetNextMissionMapSlot6 = $RandomMapPick29;
|
||||
else if( %RandomPick6 $= 30) $SetNextMissionMapSlot6 = $RandomMapPick30;
|
||||
//31-35
|
||||
if( %RandomPick7 $= 31) $SetNextMissionMapSlot7 = $RandomMapPick31;
|
||||
else if( %RandomPick7 $= 32) $SetNextMissionMapSlot7 = $RandomMapPick32;
|
||||
else if( %RandomPick7 $= 33) $SetNextMissionMapSlot7 = $RandomMapPick33;
|
||||
else if( %RandomPick7 $= 34) $SetNextMissionMapSlot7 = $RandomMapPick34;
|
||||
else if( %RandomPick7 $= 35) $SetNextMissionMapSlot7 = $RandomMapPick35;
|
||||
//36-40
|
||||
if( %RandomPick8 $= 36) $SetNextMissionMapSlot8 = $RandomMapPick36;
|
||||
else if( %RandomPick8 $= 37) $SetNextMissionMapSlot8 = $RandomMapPick37;
|
||||
else if( %RandomPick8 $= 38) $SetNextMissionMapSlot8 = $RandomMapPick38;
|
||||
else if( %RandomPick8 $= 39) $SetNextMissionMapSlot8 = $RandomMapPick39;
|
||||
else if( %RandomPick8 $= 40) $SetNextMissionMapSlot8 = $RandomMapPick40;
|
||||
$SetNextMissionMapSlot1 = $RandomMapPick[%RandomPick1];
|
||||
$SetNextMissionMapSlot2 = $RandomMapPick[%RandomPick2];
|
||||
$SetNextMissionMapSlot3 = $RandomMapPick[%RandomPick3];
|
||||
$SetNextMissionMapSlot4 = $RandomMapPick[%RandomPick4];
|
||||
$SetNextMissionMapSlot5 = $RandomMapPick[%RandomPick5];
|
||||
$SetNextMissionMapSlot6 = $RandomMapPick[%RandomPick6];
|
||||
$SetNextMissionMapSlot7 = $RandomMapPick[%RandomPick7];
|
||||
$SetNextMissionMapSlot8 = $RandomMapPick[%RandomPick8];
|
||||
|
||||
}
|
||||
|
|
@ -10,111 +10,28 @@ function MapRepetitionChecker( %game )
|
|||
|
||||
if( $CurrentMissionType $= "CTF" && !$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 )
|
||||
{
|
||||
//First map
|
||||
if($PreviousMission1back $= "")
|
||||
{
|
||||
//Set vars
|
||||
$PreviousMission1back = $CurrentMission;
|
||||
|
||||
//Debug
|
||||
if(%MapRepetitionCheckerDebug)
|
||||
echo("PM1: " @ $PreviousMission1back);
|
||||
|
||||
return;
|
||||
}
|
||||
//1 map back
|
||||
//Second map
|
||||
else if($PreviousMission2back $= "")
|
||||
{
|
||||
if( $PreviousMission1back $= $EvoCachedNextMission )
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
||||
//Set vars
|
||||
$PreviousMission2back = $PreviousMission1back;
|
||||
$PreviousMission1back = $CurrentMission;
|
||||
|
||||
//Debug
|
||||
if(%MapRepetitionCheckerDebug)
|
||||
{
|
||||
echo("PM1: " @ $PreviousMission1back);
|
||||
echo("PM2: " @ $PreviousMission2back);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
//2 maps back
|
||||
//Third map
|
||||
else if($PreviousMission3back $= "")
|
||||
{
|
||||
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission )
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
||||
//Set vars
|
||||
$PreviousMission3back = $PreviousMission2back;
|
||||
$PreviousMission2back = $PreviousMission1back;
|
||||
$PreviousMission1back = $CurrentMission;
|
||||
|
||||
//Debug
|
||||
if(%MapRepetitionCheckerDebug)
|
||||
{
|
||||
echo("PM1: " @ $PreviousMission1back);
|
||||
echo("PM2: " @ $PreviousMission2back);
|
||||
echo("PM3: " @ $PreviousMission3back);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
//3 maps back
|
||||
//Forth map
|
||||
else if($PreviousMission4back $= "")
|
||||
{
|
||||
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission )
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
||||
//Set vars
|
||||
$PreviousMission4back = $PreviousMission3back;
|
||||
$PreviousMission3back = $PreviousMission2back;
|
||||
$PreviousMission2back = $PreviousMission1back;
|
||||
$PreviousMission1back = $CurrentMission;
|
||||
|
||||
//Debug
|
||||
if(%MapRepetitionCheckerDebug)
|
||||
{
|
||||
echo("PM1: " @ $PreviousMission1back);
|
||||
echo("PM2: " @ $PreviousMission2back);
|
||||
echo("PM3: " @ $PreviousMission3back);
|
||||
echo("PM4: " @ $PreviousMission4back);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
//4 maps back
|
||||
//Fifth map
|
||||
else
|
||||
{
|
||||
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission )
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
||||
//Set vars
|
||||
$PreviousMission4back = $PreviousMission3back;
|
||||
$PreviousMission3back = $PreviousMission2back;
|
||||
$PreviousMission2back = $PreviousMission1back;
|
||||
$PreviousMission1back = $CurrentMission;
|
||||
|
||||
//Debug
|
||||
if(%MapRepetitionCheckerDebug)
|
||||
{
|
||||
echo("PM1: " @ $PreviousMission1back);
|
||||
echo("PM2: " @ $PreviousMission2back);
|
||||
echo("PM3: " @ $PreviousMission3back);
|
||||
echo("PM4: " @ $PreviousMission4back);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission )
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
||||
$MapRepetitionCheckerRunOnce = 1;
|
||||
//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);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$MapRepetitionCheckerRunOnce = 1;
|
||||
}
|
||||
|
||||
function MapRepetitionCheckerFindRandom()
|
||||
|
|
@ -122,12 +39,7 @@ function MapRepetitionCheckerFindRandom()
|
|||
SetNextMapGetRandoms( %client );
|
||||
%MapCheckerRandom = getRandom(1,6);
|
||||
|
||||
if(%MapCheckerRandom $= 1) $EvoCachedNextMission = $SetNextMissionMapSlot1;
|
||||
else if(%MapCheckerRandom $= 2) $EvoCachedNextMission = $SetNextMissionMapSlot2;
|
||||
else if(%MapCheckerRandom $= 3) $EvoCachedNextMission = $SetNextMissionMapSlot3;
|
||||
else if(%MapCheckerRandom $= 4) $EvoCachedNextMission = $SetNextMissionMapSlot4;
|
||||
else if(%MapCheckerRandom $= 5) $EvoCachedNextMission = $SetNextMissionMapSlot5;
|
||||
else if(%MapCheckerRandom $= 6) $EvoCachedNextMission = $SetNextMissionMapSlot6;
|
||||
$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
|
||||
|
||||
if($EvoCachedNextMission $= $PreviousMission1back || $EvoCachedNextMission $= $PreviousMission2back || $EvoCachedNextMission $= $PreviousMission3back || $EvoCachedNextMission $= $PreviousMission4back)
|
||||
MapRepetitionCheckerFindRandom();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue