Merge pull request #3834 from kuronekochomusuke/pitchBlackChance

update planetary conditions chance logic
MegaMek · Mar 24, 2024 · eaa80b6 · eaa80b6
2 parents 90e2424 + f7a11a4
commit eaa80b6
Show file tree

Hide file tree

Showing 38 changed files with 1,834 additions and 436 deletions.
diff --git a/MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml b/MekHQ/data/scenariotemplates/Allied Facility - Heavy.xml
@@ -7,8 +7,9 @@
     <isAlliedFacility>true</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdFacility</allowedTerrainType>
+            <allowedTerrainType>HotFacility</allowedTerrainType>
+            <allowedTerrainType>TemperateFacility</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/Allied Facility.xml b/MekHQ/data/scenariotemplates/Allied Facility.xml
@@ -7,8 +7,9 @@
     <isAlliedFacility>true</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdFacility</allowedTerrainType>
+            <allowedTerrainType>HotFacility</allowedTerrainType>
+            <allowedTerrainType>TemperateFacility</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml b/MekHQ/data/scenariotemplates/Hostile Facility - Heavy.xml
@@ -6,8 +6,9 @@
 	<isHostileFacility>true</isHostileFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdFacility</allowedTerrainType>
+            <allowedTerrainType>HotFacility</allowedTerrainType>
+            <allowedTerrainType>TemperateFacility</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/Hostile Facility.xml b/MekHQ/data/scenariotemplates/Hostile Facility.xml
@@ -6,8 +6,9 @@
 	<isHostileFacility>true</isHostileFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdFacility</allowedTerrainType>
+            <allowedTerrainType>HotFacility</allowedTerrainType>
+            <allowedTerrainType>TemperateFacility</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml b/MekHQ/data/scenariotemplates/Irregular Forces - Heavy.xml
@@ -7,8 +7,9 @@
     <isAlliedFacility>false</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdUrban</allowedTerrainType>
+            <allowedTerrainType>HotUrban</allowedTerrainType>
+            <allowedTerrainType>Urban</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/Irregular Forces.xml b/MekHQ/data/scenariotemplates/Irregular Forces.xml
@@ -7,8 +7,9 @@
     <isAlliedFacility>false</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>3</allowedTerrainType>
-            <allowedTerrainType>6</allowedTerrainType>
+            <allowedTerrainType>ColdUrban</allowedTerrainType>
+            <allowedTerrainType>HotUrban</allowedTerrainType>
+            <allowedTerrainType>Urban</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AceDuel.xml
@@ -7,7 +7,7 @@
     <isAlliedFacility>false</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>1</allowedTerrainType>
+            <allowedTerrainType>Hills</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml b/MekHQ/data/scenariotemplates/LegacyAtB/AlliedTraitors.xml
@@ -7,7 +7,7 @@
     <isAlliedFacility>false</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>1</allowedTerrainType>
+            <allowedTerrainType>Hills</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>

diff --git a/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml b/MekHQ/data/scenariotemplates/LegacyAtB/OfficerDuel.xml
@@ -7,7 +7,7 @@
     <isAlliedFacility>false</isAlliedFacility>
     <mapParameters>
         <allowedTerrainTypes>
-            <allowedTerrainType>1</allowedTerrainType>
+            <allowedTerrainType>Hills</allowedTerrainType>
         </allowedTerrainTypes>
         <allowRotation>false</allowRotation>
         <baseHeight>0</baseHeight>