MegaMek · HammerGS · Mar 24, 2024 · Feb 9, 2024 · Feb 10, 2024 · Feb 10, 2024
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.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.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>

diff --git a/MekHQ/resources/mekhq/resources/AtBScenarioViewPanel.properties b/MekHQ/resources/mekhq/resources/AtBScenarioViewPanel.properties
@@ -8,6 +8,8 @@ lblLight.text=Light:
 lblWeather.text=Weather:
 lblWind.text=Wind:
 lblFog.text=Fog:
+lblBlowingSand.text=Blowing Sand:
+lblEMI.text=EMI:
 lblAtmosphere.text=Atmosphere:
 lblGravity.text=Gravity:
 lblPlayerStart.text=Player Start:

diff --git a/MekHQ/resources/mekhq/resources/ScenarioViewPanel.properties b/MekHQ/resources/mekhq/resources/ScenarioViewPanel.properties
@@ -15,6 +15,8 @@ lblLight.text=<html><b>Light:</b></html>
 lblWeather.text=<html><b>Weather:</b></html>
 lblWind.text=<html><b>Wind:</b></html>
 lblFog.text=<html><b>Fog:</b></html>
+lblBlowingSand.text=<html><b>Blowing Sand:</b></html>
+lblEMI.text=<html><b>EMI:</b></html>
 lblAtmosphere.text=<html><b>Atmosphere:</b></html>
 lblGravity.text=<html><b>Gravity:</b></html>
 lblTemperature.text=<html><b>Temperature:</b></html>

diff --git a/MekHQ/src/mekhq/AtBGameThread.java b/MekHQ/src/mekhq/AtBGameThread.java
@@ -121,13 +121,15 @@ public void run() {
                 mapSettings.getBoardsSelectedVector().clear();
 
                 // if the scenario is taking place in space, do space settings instead
-                if (scenario.getTerrainType() == Scenario.TER_SPACE) {
+                if (scenario.getBoardType() == Scenario.T_SPACE) {
                     mapSettings.setMedium(MapSettings.MEDIUM_SPACE);
                     mapSettings.getBoardsSelectedVector().add(MapSettings.BOARD_GENERATED);
                 } else if (scenario.isUsingFixedMap()) {
-                    mapSettings.getBoardsSelectedVector().add(scenario.getMap().replace(".board", "")); // TODO : remove inline file type
+                    String board = scenario.getMap().replace(".board", ""); // TODO : remove inline file type
+                    board = board.replace("\\", "/");
+                    mapSettings.getBoardsSelectedVector().add(board);
 
-                    if (scenario.getTerrainType() == Scenario.TER_LOW_ATMO) {
+                    if (scenario.getBoardType() == Scenario.T_ATMOSPHERE) {
                         mapSettings.setMedium(MapSettings.MEDIUM_ATMOSPHERE);
                     }
                 } else {
@@ -138,7 +140,7 @@ public void run() {
                         LogManager.getLogger().error("Could not load map file data/mapgen/" + scenario.getMap() + ".xml", ex);  // TODO : Remove inline file path
                     }
 
-                    if (scenario.getTerrainType() == Scenario.TER_LOW_ATMO) {
+                    if (scenario.getBoardType() == Scenario.T_ATMOSPHERE) {
                         mapSettings.setMedium(MapSettings.MEDIUM_ATMOSPHERE);
                     }
 
@@ -158,6 +160,8 @@ public void run() {
                 planetaryConditions.setFog(scenario.getFog());
                 planetaryConditions.setAtmosphere(scenario.getAtmosphere());
                 planetaryConditions.setGravity(scenario.getGravity());
+                planetaryConditions.setEMI(scenario.usesEMI());
+                planetaryConditions.setBlowingSand(scenario.usesBlowingSand());
                 planetaryConditions.setTemperature(scenario.getTemperature());
                 client.sendPlanetaryConditions(planetaryConditions);
                 Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());

diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -137,13 +137,15 @@ public void run() {
                     mapSettings.getBoardsSelectedVector().clear();
 
                     // if the scenario is taking place in space, do space settings instead
-                    if (scenario.getTerrainType() == Scenario.TER_SPACE) {
+                    if (scenario.getBoardType() == Scenario.T_SPACE) {
                         mapSettings.setMedium(MapSettings.MEDIUM_SPACE);
                         mapSettings.getBoardsSelectedVector().add(MapSettings.BOARD_GENERATED);
                     } else if (scenario.isUsingFixedMap()) {
-                        mapSettings.getBoardsSelectedVector().add(scenario.getMap().replace(".board", ""));
+                        String board = scenario.getMap().replace(".board", ""); // TODO : remove inline file type
+                        board = board.replace("\\", "/");
+                        mapSettings.getBoardsSelectedVector().add(board);
 
-                        if (scenario.getTerrainType() == Scenario.TER_LOW_ATMO) {
+                        if (scenario.getBoardType() == Scenario.T_ATMOSPHERE) {
                             mapSettings.setMedium(MapSettings.MEDIUM_ATMOSPHERE);
                         }
                     } else {
@@ -154,7 +156,7 @@ public void run() {
                             LogManager.getLogger().error("Could not load map file data/mapgen/" + scenario.getMap() + ".xml", ex);  // TODO : remove inline file path
                         }
 
-                        if (scenario.getTerrainType() == Scenario.TER_LOW_ATMO) {
+                        if (scenario.getBoardType() == Scenario.T_ATMOSPHERE) {
                             mapSettings.setMedium(MapSettings.MEDIUM_ATMOSPHERE);
                         }
 

diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenario.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenario.java
@@ -564,11 +564,6 @@ protected void loadFieldsFromXmlNode(final Node wn, final Version version, final
         super.loadFieldsFromXmlNode(wn, version, campaign);
     }
 
-    @Override
-    public void setTerrain() {
-        AtBDynamicScenarioFactory.setTerrain(this);
-    }
-
     @Override
     public void refresh(Campaign campaign) {
 

diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
@@ -52,6 +52,8 @@
 import mekhq.campaign.personnel.Bloodname;
 import mekhq.campaign.personnel.SkillType;
 import mekhq.campaign.personnel.enums.Phenotype;
+import mekhq.campaign.stratcon.StratconBiomeManifest;
+import mekhq.campaign.stratcon.StratconContractInitializer;
 import mekhq.campaign.unit.Unit;
 import mekhq.campaign.universe.*;
 import mekhq.campaign.universe.Faction.Tag;
@@ -465,7 +467,7 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
             }
 
             setStartingAltitude(generatedLance, forceTemplate.getStartingAltitude());
-            correctNonAeroFlyerBehavior(generatedLance, scenario.getTerrainType());
+            correctNonAeroFlyerBehavior(generatedLance, scenario.getBoardType());
 
             // if force contributes to map size, increment the generated "lance" count
             if (forceTemplate.getContributesToMapSize()) {
@@ -708,22 +710,7 @@ private static void scaleObjectiveTimeLimits(AtBDynamicScenario scenario, Campai
      * @param scenario The scenario for which to set lighting conditions.
      */
     private static void setLightConditions(AtBDynamicScenario scenario) {
-        int roll = Compute.randomInt(10) + 1;
-        int light;
-
-        if (roll < 6) {
-            light = PlanetaryConditions.L_DAY;
-        } else if (roll < 8) {
-            light = PlanetaryConditions.L_DUSK;
-        } else if (roll == 8) {
-            light = PlanetaryConditions.L_FULL_MOON;
-        } else if (roll == 9) {
-            light = PlanetaryConditions.L_MOONLESS;
-        } else {
-            light = PlanetaryConditions.L_PITCH_BLACK;
-        }
-
-        scenario.setLight(light);
+        scenario.setLightConditions();
     }
 
     /**
@@ -732,78 +719,7 @@ private static void setLightConditions(AtBDynamicScenario scenario) {
      * @param scenario The scenario for which to set weather conditions.
      */
     private static void setWeather(AtBDynamicScenario scenario) {
-        int weather = PlanetaryConditions.WE_NONE;
-        int wind = PlanetaryConditions.WI_NONE;
-        int fog = PlanetaryConditions.FOG_NONE;
-
-        // weather is irrelevant in these situations.
-        if (scenario.getTerrainType() == AtBScenario.TER_SPACE ||
-                scenario.getTerrainType() == AtBScenario.TER_LOW_ATMO) {
-            return;
-        }
-
-        int roll = Compute.randomInt(10) + 1;
-        int r2 = Compute.d6();
-        if (roll < 6) {
-            return;
-        } else if (roll == 6) {
-            if (r2 < 4) {
-                weather = PlanetaryConditions.WE_LIGHT_RAIN;
-            } else if (r2 < 6) {
-                weather = PlanetaryConditions.WE_MOD_RAIN;
-            } else {
-                weather = PlanetaryConditions.WE_HEAVY_RAIN;
-            }
-        } else if (roll == 7) {
-            if (r2 < 4) {
-                weather = PlanetaryConditions.WE_LIGHT_SNOW;
-            } else if (r2 < 6) {
-                weather = PlanetaryConditions.WE_MOD_SNOW;
-            } else {
-                weather = PlanetaryConditions.WE_HEAVY_SNOW;
-            }
-        } else if (roll == 8) {
-            if (r2 < 4) {
-                wind = PlanetaryConditions.WI_LIGHT_GALE;
-            } else if (r2 < 6) {
-                wind = PlanetaryConditions.WI_MOD_GALE;
-            } else {
-                wind = PlanetaryConditions.WI_STRONG_GALE;
-            }
-        } else if (roll == 9) {
-            if (r2 == 1) {
-                wind = PlanetaryConditions.WI_STORM;
-            } else if (r2 == 2) {
-                weather = PlanetaryConditions.WE_DOWNPOUR;
-            } else if (r2 == 3) {
-                weather = PlanetaryConditions.WE_SLEET;
-            } else if (r2 == 4) {
-                weather = PlanetaryConditions.WE_ICE_STORM;
-            } else if (r2 == 5) {
-                // tornadoes are classified as wind rather than weather.
-                wind = PlanetaryConditions.WI_TORNADO_F13;
-            } else if (r2 == 6) {
-                wind = PlanetaryConditions.WI_TORNADO_F4;
-            }
-        } else {
-            if (r2 < 5) {
-                fog = PlanetaryConditions.FOG_LIGHT;
-            } else {
-                fog = PlanetaryConditions.FOG_HEAVY;
-            }
-        }
-
-        if (!WeatherRestriction.IsWeatherRestricted(weather, scenario.getAtmosphere(), scenario.getTemperature())) {
-            scenario.setWeather(weather);
-        }
-
-        if (!WeatherRestriction.IsWindRestricted(wind, scenario.getAtmosphere(), scenario.getTemperature())) {
-            scenario.setWind(wind);
-        }
-
-        if (!WeatherRestriction.IsFogRestricted(fog, scenario.getAtmosphere(), scenario.getTemperature())) {
-            scenario.setFog(fog);
-        }
+        scenario.setWeather();
     }
 
     /**
@@ -812,26 +728,40 @@ private static void setWeather(AtBDynamicScenario scenario) {
      * @param scenario The scenario to work on.
      */
     public static void setTerrain(AtBDynamicScenario scenario) {
-        int terrainIndex;
-
         // if we are allowing all terrain types, then pick one from the list
         // otherwise, pick one from the allowed ones
         if (scenario.getTemplate().mapParameters.getMapLocation() == ScenarioMapParameters.MapLocation.AllGroundTerrain) {
-            terrainIndex = Compute.randomInt(AtBScenario.terrainTypes.length);
-            scenario.setTerrainType(terrainIndex);
+            scenario.setBoardType(AtBScenario.T_GROUND);
+            StratconBiomeManifest biomeManifest = StratconBiomeManifest.getInstance();
+            int kelvinTemp = scenario.getTemperature() + StratconContractInitializer.ZERO_CELSIUS_IN_KELVIN;
+            List<String> allowedTerrain = biomeManifest.getTempMap(StratconBiomeManifest.TERRAN_BIOME)
+                    .floorEntry(kelvinTemp).getValue().allowedTerrainTypes;
+
+            int terrainIndex = Compute.randomInt(allowedTerrain.size());
+            scenario.setTerrainType(allowedTerrain.get(terrainIndex));
             scenario.setMapFile();
         } else if (scenario.getTemplate().mapParameters.getMapLocation() == ScenarioMapParameters.MapLocation.Space) {
-            scenario.setTerrainType(AtBScenario.TER_SPACE);
+            scenario.setBoardType(AtBScenario.T_SPACE);
+            scenario.setTerrainType("Space");
         } else if (scenario.getTemplate().mapParameters.getMapLocation() == ScenarioMapParameters.MapLocation.LowAtmosphere) {
+            scenario.setBoardType(AtBScenario.T_ATMOSPHERE);
             // low atmosphere actually makes use of the terrain, so we generate some here as well
-            terrainIndex = Compute.randomInt(AtBScenario.terrainTypes.length);
-            scenario.setTerrainType(terrainIndex);
+            scenario.setTerrain();
             scenario.setMapFile();
-
-            // but then we set the terrain to low atmosphere
-            scenario.setTerrainType(AtBScenario.TER_LOW_ATMO);
         } else {
-            terrainIndex = Compute.randomInt(scenario.getTemplate().mapParameters.allowedTerrainTypes.size());
+            StratconBiomeManifest biomeManifest =  StratconBiomeManifest.getInstance();
+            int kelvinTemp = scenario.getTemperature() + StratconContractInitializer.ZERO_CELSIUS_IN_KELVIN;
+            List<String> allowedFacility = biomeManifest.getTempMap(StratconBiomeManifest.TERRAN_FACILITY_BIOME)
+                    .floorEntry(kelvinTemp).getValue().allowedTerrainTypes;
+            List<String> allowedTerrain = biomeManifest.getTempMap(StratconBiomeManifest.TERRAN_BIOME)
+                    .floorEntry(kelvinTemp).getValue().allowedTerrainTypes;
+            List<String> allowedTemplate = scenario.getTemplate().mapParameters.allowedTerrainTypes;
+            // try to filter on temp
+            allowedTerrain.addAll(allowedFacility);
+            allowedTemplate.retainAll(allowedTerrain);
+            allowedTemplate = allowedTemplate.size() > 0 ? allowedTemplate : scenario.getTemplate().mapParameters.allowedTerrainTypes;
+
+            int terrainIndex = Compute.randomInt(allowedTemplate.size());
             scenario.setTerrainType(scenario.getTemplate().mapParameters.allowedTerrainTypes.get(terrainIndex));
             scenario.setMapFile();
         }
@@ -846,7 +776,7 @@ public static void setTerrain(AtBDynamicScenario scenario) {
      * @param campaign The current campaign
      */
     private static void setPlanetaryConditions(AtBDynamicScenario scenario, AtBContract mission, Campaign campaign) {
-        if (scenario.getTerrainType() == AtBScenario.TER_SPACE) {
+        if (scenario.getBoardType() == AtBScenario.T_SPACE) {
             return;
         }
 
@@ -2445,10 +2375,10 @@ private static void setStartingAltitude(List<Entity> entityList, int startingAlt
      * This method contains various hacks intended to put "special units"
      * such as LAMs, VTOLs and WIGEs into a reasonable state that the bot can use
      */
-    private static void correctNonAeroFlyerBehavior(List<Entity> entityList, int terrainType) {
+    private static void correctNonAeroFlyerBehavior(List<Entity> entityList, int boardType) {
         for (Entity entity : entityList) {
-            boolean inSpace = terrainType == AtBScenario.TER_SPACE;
-            boolean inAtmo = terrainType == AtBScenario.TER_LOW_ATMO;
+            boolean inSpace = boardType == AtBScenario.T_SPACE;
+            boolean inAtmo = boardType == AtBScenario.T_ATMOSPHERE;
 
             // hack for land-air mechs
             if (entity instanceof LandAirMech) {