feat: removed redundant Units matter auto-resolve to focus on ACS-lik…

…e, a little bit of performance improvements
MegaMek · Dec 7, 2024 · 9ea7d34 · 9ea7d34
1 parent e67f5e1
commit 9ea7d34
Show file tree

Hide file tree

Showing 44 changed files with 899 additions and 1,146 deletions.
diff --git a/MekHQ/resources/mekhq/resources/AutoResolveMethod.properties b/MekHQ/resources/mekhq/resources/AutoResolveMethod.properties
@@ -1,6 +1,4 @@
 AutoResolveMethod.PRINCESS.text=Princess
 AutoResolveMethod.PRINCESS.toolTipText=Princess
-AutoResolveMethod.UNITS_MATTER.text=Units Matter
-AutoResolveMethod.UNITS_MATTER.toolTipText=Units Matter
 AutoResolveMethod.ABSTRACT_COMBAT.text=Abstract Combat
 AutoResolveMethod.ABSTRACT_COMBAT.toolTipText=Abstract Combat
diff --git a/MekHQ/src/mekhq/AtBGameThread.java b/MekHQ/src/mekhq/AtBGameThread.java
@@ -29,6 +29,7 @@
 import megamek.client.ui.swing.ClientGUI;
 import megamek.common.*;
 import megamek.common.annotations.Nullable;
+import megamek.common.options.GameOptions;
 import megamek.common.planetaryconditions.PlanetaryConditions;
 import megamek.logging.MMLogger;
 import mekhq.campaign.force.Force;
@@ -140,7 +141,7 @@ public void run() {
                 client.getLocalPlayer().setConstantInitBonus(campaign.getInitiativeBonus());
 
                 if (started) {
-                    client.getGame().getOptions().loadOptions();
+                    ((GameOptions) client.getGame().getOptions()).loadOptions();
                     client.sendGameOptions(password, app.getCampaign().getGameOptionsVector());
                     Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());
                 }

diff --git a/MekHQ/src/mekhq/GameThread.java b/MekHQ/src/mekhq/GameThread.java
@@ -39,6 +39,7 @@
 import megamek.common.Entity;
 import megamek.common.MapSettings;
 import megamek.common.WeaponOrderHandler;
+import megamek.common.options.GameOptions;
 import megamek.common.preference.PreferenceManager;
 import megamek.logging.MMLogger;
 import mekhq.campaign.Campaign;
@@ -178,7 +179,7 @@ public void run() {
                 client.getLocalPlayer().setCamouflage(app.getCampaign().getCamouflage().clone());
 
                 if (started) {
-                    client.getGame().getOptions().loadOptions();
+                    ((GameOptions) client.getGame().getOptions()).loadOptions();
                     client.sendGameOptions(password, app.getCampaign().getGameOptionsVector());
                     Thread.sleep(MekHQ.getMHQOptions().getStartGameDelay());
                 }