Merge pull request #4050 from AaronGullickson/map-game-thread

Move terrainType to AtBScenario
MegaMek · May 4, 2024 · 9e921d1 · 9e921d1
2 parents 33523d9 + 45cb145
commit 9e921d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBScenario.java b/MekHQ/src/mekhq/campaign/mission/AtBScenario.java
@@ -178,6 +178,8 @@ public abstract class AtBScenario extends Scenario implements IAtBScenario {
 
     private Map<Integer, Integer> numPlayerMinefields;
 
+    private String terrainType;
+
     protected final transient ResourceBundle defaultResourceBundle = ResourceBundle.getBundle("mekhq.resources.AtBScenarioBuiltIn",
             MekHQ.getMHQOptions().getLocale());
 
@@ -252,6 +254,14 @@ public String getDesc() {
         return getScenarioTypeDescription() + (isStandardScenario() ? (isAttacker() ? " (Attacker)" : " (Defender)") : "");
     }
 
+    public String getTerrainType() {
+        return terrainType;
+    }
+
+    public void setTerrainType(String terrainType) {
+        this.terrainType = terrainType;
+    }
+
     @Override
     public boolean isStandardScenario() {
         return !isSpecialScenario() && !isBigBattle();
@@ -1505,6 +1515,7 @@ protected void writeToXMLEnd(final PrintWriter pw, int indent) {
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "deploymentDelay", deploymentDelay);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "lanceCount", lanceCount);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "rerollsRemaining", rerollsRemaining);
+        MHQXMLUtility.writeSimpleXMLTag(pw, indent, "terrainType", terrainType);
 
         if (null != bigBattleAllies && !bigBattleAllies.isEmpty()) {
             MHQXMLUtility.writeSimpleXMLOpenTag(pw, indent++, "bigBattleAllies");
@@ -1603,6 +1614,8 @@ protected void loadFieldsFromXmlNode(final Node wn, final Version version, final
                     lanceCount = Integer.parseInt(wn2.getTextContent());
                 } else if (wn2.getNodeName().equalsIgnoreCase("rerollsRemaining")) {
                     rerollsRemaining = Integer.parseInt(wn2.getTextContent());
+                } else if (wn2.getNodeName().equalsIgnoreCase("terrainType")) {
+                    terrainType = wn2.getTextContent();
                 } else if (wn2.getNodeName().equalsIgnoreCase("alliesPlayer")) {
                     NodeList nl2 = wn2.getChildNodes();
                     for (int i = 0; i < nl2.getLength(); i++) {

diff --git a/MekHQ/src/mekhq/campaign/mission/Scenario.java b/MekHQ/src/mekhq/campaign/mission/Scenario.java
@@ -91,9 +91,9 @@ public class Scenario {
     private Map<String, Entity> externalIDLookup;
 
     /** map generation variables **/
-    private String terrainType;
     private int mapSizeX;
     private int mapSizeY;
+    // map can be used to represent both fixed and random maps
     private String map;
     private boolean usingFixedMap;
 
@@ -235,10 +235,6 @@ public void setCloaked(boolean cloaked) {
         this.cloaked = cloaked;
     }
 
-    public String getTerrainType() {
-        return terrainType;
-    }
-
     public int getStartingPos() {
         return startingPos;
     }
@@ -295,10 +291,6 @@ public void setStartingAnySEy(int startingAnySEy) {
         this.startingAnySEy = startingAnySEy;
     }
 
-    public void setTerrainType(String terrainType) {
-        this.terrainType = terrainType;
-    }
-
     public void setBoardType(int boardType) {
         this.boardType = boardType;
     }
@@ -876,7 +868,6 @@ protected int writeToXMLBegin(final PrintWriter pw, int indent) {
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "date", date);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "cloaked", isCloaked());
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "boardType", boardType);
-        MHQXMLUtility.writeSimpleXMLTag(pw, indent, "terrainType", terrainType);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "hasTrack", hasTrack);
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "usingFixedMap", isUsingFixedMap());
         MHQXMLUtility.writeSimpleXMLTag(pw, indent, "mapSize", mapSizeX, mapSizeY);
@@ -1014,8 +1005,6 @@ public static Scenario generateInstanceFromXML(Node wn, Campaign c, Version vers
                     retVal.setUsingFixedMap(Boolean.parseBoolean(wn2.getTextContent().trim()));
                 } else if (wn2.getNodeName().equalsIgnoreCase("boardType")) {
                     retVal.boardType = Integer.parseInt(wn2.getTextContent());
-                } else if (wn2.getNodeName().equalsIgnoreCase("terrainType")) {
-                    retVal.terrainType = wn2.getTextContent();
                 } else if (wn2.getNodeName().equalsIgnoreCase("hasTrack")) {
                     retVal.hasTrack = Boolean.parseBoolean(wn2.getTextContent());
                 } else if (wn2.getNodeName().equalsIgnoreCase("mapSize")) {