Merge pull request #8468 from IllianiBird/infantrySurvivalFix

Fix: Fixed Non-Player Infantry Not Swapping to Weather Appropriate Gear

Author: IllianiBird

MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java

@@ -662,8 +662,8 @@ public static void finalizeBackingScenario(Campaign campaign, AtBContract contra
         }
 
         // Finally, finish scenario set up
-        finalizeScenario(backingScenario, contract, campaign);
         setScenarioParametersFromBiome(track, scenario, campaign.getCampaignOptions().isUseNoTornadoes());
+        finalizeScenario(backingScenario, contract, campaign);
         swapInPlayerUnits(scenario, campaign, FORCE_NONE);
 
         if (!autoAssignLances && !scenario.ignoreForceAutoAssignment()) {
@@ -1158,10 +1158,10 @@ public static void deployForceToCoords(StratConCoords coords, int forceID, Campa
             revealedScenario.addPrimaryForce(forceID);
             commitPrimaryForces(campaign, revealedScenario, track);
             if (!revealedScenario.getBackingScenario().isFinalized()) {
-                finalizeScenario(revealedScenario.getBackingScenario(), contract, campaign);
                 setScenarioParametersFromBiome(track,
                       revealedScenario,
                       campaign.getCampaignOptions().isUseNoTornadoes());
+                finalizeScenario(revealedScenario.getBackingScenario(), contract, campaign);
             }
             return;
         }