move modifiedTemperature to AtBScenario

Sleet01 · May 4, 2024 · e783140 · e783140
1 parent 33523d9
commit e783140
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -180,7 +180,7 @@ public void run() {
                 planetaryConditions.setWind(scenario.getWind());
                 planetaryConditions.setFog(scenario.getFog());
                 planetaryConditions.setAtmosphere(scenario.getAtmosphere());
-                planetaryConditions.setTemperature(scenario.getModifiedTemperature());
+                planetaryConditions.setTemperature(scenario.getTemperature());
                 planetaryConditions.setGravity(scenario.getGravity());
                 planetaryConditions.setEMI(scenario.getEMI());
                 planetaryConditions.setBlowingSand(scenario.getBlowingSand());

diff --git a/MekHQ/src/mekhq/campaign/mission/AtBScenario.java b/MekHQ/src/mekhq/campaign/mission/AtBScenario.java
@@ -183,6 +183,7 @@ public abstract class AtBScenario extends Scenario implements IAtBScenario {
 
     private static TerrainConditionsOddsManifest TCO;
     private static StratconBiomeManifest SB;
+    private int modifiedTemperature;
     //endregion Variable Declarations
 
     public AtBScenario () {
@@ -305,6 +306,14 @@ private void initBattle(Campaign campaign) {
         }
     }
 
+    public int getModifiedTemperature() {
+        return modifiedTemperature;
+    }
+
+    public void setModifiedTemperature(int modifiedTemperature) {
+        this.modifiedTemperature = modifiedTemperature;
+    }
+
     public void setTerrain() {
         Map<String, StratconBiomeManifest.MapTypeList> mapTypes = SB.getBiomeMapTypes();
         List<String> keys = mapTypes.keySet().stream().sorted().collect(Collectors.toList());
@@ -1505,6 +1514,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, "modifiedTemperature", modifiedTemperature);
 
         if (null != bigBattleAllies && !bigBattleAllies.isEmpty()) {
             MHQXMLUtility.writeSimpleXMLOpenTag(pw, indent++, "bigBattleAllies");
@@ -1603,6 +1613,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("modifiedTemperature")) {
+                    modifiedTemperature = Integer.parseInt(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
@@ -104,7 +104,6 @@ public class Scenario {
     protected Fog fog;
     protected Atmosphere atmosphere;
     private int temperature;
-    private int modifiedTemperature;
     protected float gravity;
     private EMI emi;
     private BlowingSand blowingSand;
@@ -396,14 +395,6 @@ public void setTemperature(int temperature) {
         this.temperature = temperature;
     }
 
-    public int getModifiedTemperature() {
-        return modifiedTemperature;
-    }
-
-    public void setModifiedTemperature(int modifiedTemperature) {
-        this.modifiedTemperature = modifiedTemperature;
-    }
-
     public float getGravity() {
         return gravity;
     }

diff --git a/MekHQ/src/mekhq/gui/view/ScenarioViewPanel.java b/MekHQ/src/mekhq/gui/view/ScenarioViewPanel.java
@@ -475,7 +475,7 @@ private void fillMapData() {
         leftGbc.gridy++;
         pnlMap.add(lblTemperature, leftGbc);
 
-        JLabel lblTemperatureDesc = new JLabel(PlanetaryConditions.getTemperatureDisplayableName(scenario.getModifiedTemperature()));
+        JLabel lblTemperatureDesc = new JLabel(PlanetaryConditions.getTemperatureDisplayableName(scenario.getTemperature()));
         rightGbc.gridy++;
         pnlMap.add(lblTemperatureDesc, rightGbc);