From 3cef29d7b9cb4670393ac7ae8ee10955946f60d5 Mon Sep 17 00:00:00 2001
From: ChocoTaco <boldfilter@zoho.com>
Date: Sun, 5 Jan 2020 03:39:33 -0500
Subject: [PATCH] Map Rotation and Limits Update

---
 Classic/prefs/SetMapLimits.cs    |  8 ++++----
 Classic/prefs/evo_mapRotation.cs | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Classic/prefs/SetMapLimits.cs b/Classic/prefs/SetMapLimits.cs
index fbe7fcc..843a223 100644
--- a/Classic/prefs/SetMapLimits.cs
+++ b/Classic/prefs/SetMapLimits.cs
@@ -59,6 +59,7 @@ $Host::MapPlayerLimitsSmallTimeCTF_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL2_Hildebrand_CTF = %min SPC %max;
 $Host::MapPlayerLimitsArenaDome_CTF = %min SPC "10";
 $Host::MapPlayerLimitsFirestorm_CTF = %min SPC %max;
+$Host::MapPlayerLimitsBulwark_CTF = %min SPC "12";
 
 //Medium Maps
 /////////////////////////////////////////////////////////////////////
@@ -88,7 +89,6 @@ $Host::MapPlayerLimitsS5_Centaur_CTF = %min SPC %max;
 $Host::MapPlayerLimitsS8_Cardiac_CTF = %min SPC %max;
 $Host::MapPlayerLimitsCirclesEdge_CTF = %min SPC %max;
 $Host::MapPlayerLimitsS5_Icedance_CTF = %min SPC %max;
-$Host::MapPlayerLimitsBulwark_CTF = %min SPC %max;
 $Host::MapPlayerLimitsS5_Woodymyrk_CTF = %min SPC %max;
 $Host::MapPlayerLimitsDiscord_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTenebrousCTF_CTF = %min SPC %max;
@@ -142,6 +142,7 @@ $Host::MapPlayerLimitsNatureMagic_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL_Damnation_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL_DangerousCrossing_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL_DeadlyBirdsSong_CTF = %min SPC %max;
+$Host::MapPlayerLimitsVauban_CTF = %min SPC %max;
 
 //Vehicle Maps
 /////////////////////////////////////////////////////////////////////
@@ -162,7 +163,6 @@ $Host::MapPlayerLimitsTWL2_FrozenGlory_CTF = %min SPC %max;
 $Host::MapPlayerLimitsLandingParty_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTitanV_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL_Crossfire_CTF = %min SPC %max;
-$Host::MapPlayerLimitsVauban_CTF = %min SPC %max;
 $Host::MapPlayerLimitsWindyGap_CTF = %min SPC %max;
 $Host::MapPlayerLimitsSurro_CTF = %min SPC %max;
 $Host::MapPlayerLimitsHarvestDance_CTF = %min SPC %max;
@@ -201,8 +201,8 @@ $Host::MapPlayerLimitsGlade_CTF = %min SPC %max;
 %min = 14;
 %max = 32;
 
-$Host::MapPlayerLimitsFenix_CTF = %min SPC %max;
-$Host::MapPlayerLimitsHillside_CTF = %min SPC %max;
+$Host::MapPlayerLimitsFenix_CTF = "18" SPC %max;
+$Host::MapPlayerLimitsHillside_CTF = "18" SPC %max;
 $Host::MapPlayerLimitsSangre_de_Grado_CTF = %min SPC %max;
 $Host::MapPlayerLimitsSlapdash_CTF = %min SPC %max;
 $Host::MapPlayerLimitsTWL2_Bleed_CTF = %min SPC %max;
diff --git a/Classic/prefs/evo_mapRotation.cs b/Classic/prefs/evo_mapRotation.cs
index d9e6c96..52d05aa 100644
--- a/Classic/prefs/evo_mapRotation.cs
+++ b/Classic/prefs/evo_mapRotation.cs
@@ -89,7 +89,7 @@ addRotationMap(Prismatic, CTF, 1, 1);
 addRotationMap(TWL_WilderZone, CTF, 1, 1);
 addRotationMap(Mirage, CTF, 1, 1);
 addRotationMap(S5_Mimicry, CTF, 1, 1);
-addRotationMap(TWL_Snowblind, CTF, 1, 1);
+addRotationMap(TWL_Snowblind, CTF, 1, 0);
 addRotationMap(ShortFall, CTF, 1, 1);
 addRotationMap(IceRidge_nef, CTF, 1, 1);
 addRotationMap(Disjointed, CTF, 1, 1);
@@ -97,7 +97,7 @@ addRotationMap(TWL2_MuddySwamp, CTF, 1, 1);
 addRotationMap(Blink, CTF, 1, 1);
 addRotationMap(HighAnxiety, CTF, 1, 1);
 addRotationMap(Headstone, CTF, 1, 1);
-addRotationMap(S5_Centaur, CTF, 1, 1);
+addRotationMap(S5_Centaur, CTF, 1, 0);
 addRotationMap(S8_Cardiac, CTF, 1, 1);
 addRotationMap(CirclesEdge, CTF, 1, 1);
 addRotationMap(S5_Icedance, CTF, 1, 1);
@@ -112,7 +112,7 @@ addRotationMap(S5_HawkingHeat, CTF, 1, 0);
 addRotationMap(JadeValley, CTF, 1, 0);
 addRotationMap(S5_Sherman, CTF, 1, 0);
 addRotationMap(S5_Silenus, CTF, 1, 0);
-addRotationMap(TWL2_FrozenHope, CTF, 1, 0);
+addRotationMap(TWL2_FrozenHope, CTF, 1, 1);
 addRotationMap(TWL2_IceDagger, CTF, 1, 0);
 addRotationMap(S5_Reynard, CTF, 1, 0);
 addRotationMap(TWL_Cinereous, CTF, 1, 0);
@@ -135,6 +135,7 @@ addRotationMap(NatureMagic, CTF, 1, 0);
 addRotationMap(TWL_Damnation, CTF, 1, 0);
 addRotationMap(TWL_DangerousCrossing, CTF, 1, 0);
 addRotationMap(TWL_DeadlyBirdsSong, CTF, 1, 0);
+addRotationMap(Vauban, CTF, 1, 0);
 
 //Vehicle Maps
 /////////////////////////////////////////////////////////////////////
@@ -151,19 +152,18 @@ addRotationMap(TWL2_FrozenGlory, CTF, 1, 1);
 addRotationMap(LandingParty, CTF, 1, 1);
 addRotationMap(TitanV, CTF, 1, 1);
 addRotationMap(TWL_Crossfire, CTF, 1, 1);
-addRotationMap(Vauban, CTF, 1, 1);
-addRotationMap(WindyGap, CTF, 1, 1);
+addRotationMap(WindyGap, CTF, 1, 0);
 addRotationMap(Surro, CTF, 1, 1);
 addRotationMap(HarvestDance, CTF, 1, 1);
 
 //Vehicle Maps: Voteable, But Not in Rotation
 /////////////////////////////////////////////////////////////////////
 
-addRotationMap(SubZeroV, CTF, 1, 0);
-addRotationMap(TWL2_RoughLand, CTF, 1, 1);
+addRotationMap(SubZeroV, CTF, 1, 1);
+addRotationMap(TWL2_RoughLand, CTF, 1, 0);
 addRotationMap(S8_Geothermal, CTF, 1, 0);
 addRotationMap(Lakefront, CTF, 1, 0);
-addRotationMap(ShockRidge, CTF, 1, 0);
+addRotationMap(ShockRidge, CTF, 1, 1);
 addRotationMap(TWL2_BlueMoon, CTF, 1, 0);
 addRotationMap(FullCircle, CTF, 1, 0);
 addRotationMap(TWL_Katabatic, CTF, 1, 0);
@@ -182,8 +182,8 @@ addRotationMap(Glade, CTF, 1, 0);
 //BIG Vehicle Maps
 /////////////////////////////////////////////////////////////////////
 
-addRotationMap(Fenix, CTF, 1, 0);
-addRotationMap(Hillside, CTF, 1, 0);
+addRotationMap(Fenix, CTF, 1, 1);
+addRotationMap(Hillside, CTF, 1, 1);
 addRotationMap(Sangre_de_Grado, CTF, 1, 0);
 addRotationMap(Slapdash, CTF, 1, 0);
 addRotationMap(BerylBasin, CTF, 1, 1);