add back in mission link check, add check for other linked missions b…

…efore reinforcement
MegaMek · Jan 31, 2025 · 1fef6d5 · 1fef6d5
1 parent 814b290
commit 1fef6d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -9181,4 +9181,13 @@ public ImageIcon getCampaignFactionIcon() {
         }
         return icon;
     }
+
+    public boolean checkLinkedScenario(int sID){
+        for(Scenario s : getScenarios()){
+            if(s.getId() == sID){
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/MekHQ/src/mekhq/gui/BriefingTab.java b/MekHQ/src/mekhq/gui/BriefingTab.java
@@ -1297,7 +1297,9 @@ public void refreshScenarioView() {
         // later
         SwingUtilities.invokeLater(() -> scrollScenarioView.getVerticalScrollBar().setValue(0));
 
-        final boolean canStartGame = scenario.canStartScenario(getCampaign());
+        final boolean canStartGame = (
+            (getCampaign().checkLinkedScenario(scenario.getId())) && (scenario.canStartScenario(getCampaign()))
+            );
 
         btnStartGame.setEnabled(canStartGame);
         btnJoinGame.setEnabled(canStartGame);

diff --git a/MekHQ/src/mekhq/gui/dialog/ResolveScenarioWizardDialog.java b/MekHQ/src/mekhq/gui/dialog/ResolveScenarioWizardDialog.java
@@ -1618,7 +1618,8 @@ private void finish() {
 
         StratconRulesManager.processScenarioCompletion(tracker);
 
-        if (reinforcementsSent || tracker.getScenario().getStatus().isVictory()) {
+        if (reinforcementsSent && tracker.getScenario().getStatus().isVictory()
+            && tracker.getCampaign().checkLinkedScenario(tracker.getScenario().getId())) {
             StratconRulesManager.linkedScenerioProcessing(tracker, forces);
         }