Merge pull request #5693 from IllianiCBT/stratCon_gmReinforcement

Removed SP Cost for GM Reinforcement Attempts in StratCon
MegaMek · Jan 9, 2025 · 4495c68 · 4495c68
2 parents d187832 + e8820f4
commit 4495c68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/MekHQ/resources/mekhq/resources/AtBStratCon.properties b/MekHQ/resources/mekhq/resources/AtBStratCon.properties
@@ -79,7 +79,7 @@ reinforcementConfirmation.confirmButton=Reinforce
 reinforcementConfirmation.confirmButton.tooltip=Make reinforcement attempt.
 reinforcementConfirmation.confirmButton.gm=Reinforce (GM)
 reinforcementConfirmation.confirmButton.gm.tooltip=Make a reinforcement attempt, bypassing the\
-  \ reinforcement check.
+  \ reinforcement check and Support Point cost.
 reinforcementConfirmation.cancelButton=Cancel
 unitsSelectedLabel.bv=selected (ignores crew skill)
 unitsSelectedLabel.count=selected

diff --git a/MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java b/MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java
@@ -789,12 +789,7 @@ private void reinforcementConfirmDialog() {
         JButton reinforceButtonGM = new JButton(resources.getString("reinforcementConfirmation.confirmButton.gm"));
         reinforceButtonGM.setToolTipText(resources.getString("reinforcementConfirmation.confirmButton.gm.tooltip"));
         reinforceButtonGM.addActionListener(evt -> {
-            int spentSupportPoints = (int) spnSupportPointCost.getValue();
-            int finalTargetNumber = targetNumber - ((spentSupportPoints - 1) * 2);
-
-            currentCampaignState.setSupportPoints(currentCampaignState.getSupportPoints() - spentSupportPoints);
-
-            btnCommitClicked(evt, finalTargetNumber, true);
+            btnCommitClicked(evt, 0, true);
             dialog.dispose();
         });
         reinforceButtonGM.setVisible(campaign.isGM());