MegaMek · HammerGS · May 13, 2024 · Mar 29, 2024 · Mar 29, 2024 · Apr 2, 2024
diff --git a/MekHQ/resources/mekhq/resources/CustomizeScenarioDialog.properties b/MekHQ/resources/mekhq/resources/CustomizeScenarioDialog.properties
@@ -1,7 +1,28 @@
 btnCancel.text=Cancel
 btnOkay.text=OK
 lblName.text=Scenario Name:
+lblDate.text=Scenario Date:
 lblStatus.text=Status:
 title=Customize Scenario
 title.new=New Scenario
-lblDate.text=Date:
+btnAddLoot.text=Add Loot
+btnEditLoot.text=Edit Loot
+btnDeleteLoot.text=Delete Loot
+btnPlanetaryConditions.text=Edit Planetary Conditions...
+panPlanetaryConditions.title=Planetary Conditions
+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>
+lblOtherConditions.text=<html><b>Other:</b></html>
+emi.text=Electromagnetic interference
+sand.text=Blowing sand
+panOtherForces.title=Other Forces
+btnAddForce.text=Add Force
+btnEditForce.text=Edit Force
+btnDeleteForce.text=Delete Force
diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -173,22 +173,7 @@ public void run() {
                 client.sendMapSettings(mapSettings);
                 Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());
 
-                PlanetaryConditions planetaryConditions = new PlanetaryConditions();
-                planetaryConditions.setLight(scenario.getLight());
-                planetaryConditions.setWeather(scenario.getWeather());
-                planetaryConditions.setWind(scenario.getWind());
-                planetaryConditions.setFog(scenario.getFog());
-                planetaryConditions.setAtmosphere(scenario.getAtmosphere());
-                planetaryConditions.setTemperature(scenario.getModifiedTemperature());
-                planetaryConditions.setGravity(scenario.getGravity());
-                planetaryConditions.setEMI(scenario.getEMI());
-                planetaryConditions.setBlowingSand(scenario.getBlowingSand());
-                planetaryConditions.setShiftingWindDirection(scenario.canWindShiftDirection());
-                planetaryConditions.setShiftingWindStrength(scenario.canWindShiftStrength());
-                planetaryConditions.setWindMax(scenario.getMaxWindStrength());
-                planetaryConditions.setWindMin(scenario.getMinWindStrength());
-
-                client.sendPlanetaryConditions(planetaryConditions);
+                client.sendPlanetaryConditions(scenario.createPlanetaryConditions());
                 Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());
 
                 client.getLocalPlayer().setStartingPos(scenario.getStart());

diff --git a/MekHQ/src/mekhq/campaign/mission/Scenario.java b/MekHQ/src/mekhq/campaign/mission/Scenario.java
@@ -380,6 +380,50 @@ public BlowingSand getBlowingSand() {
 
     public void setMinWindStrength(Wind strength) { this.minWindStrength = strength; }
 
+    /**
+     * Create a PlanetaryConditions object from variables
+     * @return PlanetaryConditions object
+     */
+    public PlanetaryConditions createPlanetaryConditions() {
+        PlanetaryConditions planetaryConditions = new PlanetaryConditions();
+        planetaryConditions.setLight(getLight());
+        planetaryConditions.setWeather(getWeather());
+        planetaryConditions.setWind(getWind());
+        planetaryConditions.setFog(getFog());
+        planetaryConditions.setAtmosphere(getAtmosphere());
+        planetaryConditions.setTemperature(getModifiedTemperature());
+        planetaryConditions.setGravity(getGravity());
+        planetaryConditions.setEMI(getEMI());
+        planetaryConditions.setBlowingSand(getBlowingSand());
+        planetaryConditions.setShiftingWindDirection(canWindShiftDirection());
+        planetaryConditions.setShiftingWindStrength(canWindShiftStrength());
+        planetaryConditions.setWindMax(getMaxWindStrength());
+        planetaryConditions.setWindMin(getMinWindStrength());
+
+        return planetaryConditions;
+    }
+
+    /**
+     * Read the values from a PlanetaryConditions object into the Scenario variables for planetary conditions.
+     * This is necessary because MekHQ has XML and MegaMek doesn't.
+     * @param planetaryConditions A PlanetaryConditions object
+     */
+    public void readPlanetaryConditions(PlanetaryConditions planetaryConditions) {
+        this.setLight(planetaryConditions.getLight());
+        this.setWeather(planetaryConditions.getWeather());
+        this.setWind(planetaryConditions.getWind());
+        this.setFog(planetaryConditions.getFog());
+        this.setAtmosphere(planetaryConditions.getAtmosphere());
+        this.setTemperature(planetaryConditions.getTemperature());
+        this.setGravity(planetaryConditions.getGravity());
+        this.setEMI(planetaryConditions.getEMI());
+        this.setBlowingSand(planetaryConditions.getBlowingSand());
+        this.setShiftWindDirection(planetaryConditions.shiftingWindDirection());
+        this.setShiftWindStrength(planetaryConditions.shiftingWindStrength());
+        this.setMaxWindStrength(planetaryConditions.getWindMax());
+        this.setMinWindStrength(planetaryConditions.getWindMin());
+    }
+
     public ScenarioDeploymentLimit getDeploymentLimit() {
         return deploymentLimit;
     }
@@ -1029,4 +1073,5 @@ public boolean getHasTrack() {
     public void setHasTrack(boolean b) {
         hasTrack = b;
     }
+
 }