Merge pull request #6209 from IllianiCBT/updatedReinforcementTargetNumbers

Updated Reinforcement Target Calculation Logic

Author: IllianiBird

MekHQ/src/mekhq/campaign/stratcon/StratconRulesManager.java

@@ -45,7 +45,6 @@
 import mekhq.campaign.force.CombatTeam;
 import mekhq.campaign.force.Force;
 import mekhq.campaign.mission.*;
-import mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment;
 import mekhq.campaign.mission.ScenarioForceTemplate.ForceGenerationMethod;
 import mekhq.campaign.mission.ScenarioMapParameters.MapLocation;
 import mekhq.campaign.mission.atb.AtBScenarioModifier;
@@ -1657,18 +1656,12 @@ private static ScenarioTemplate getInterceptionScenarioTemplate(Force force, Cam
      *             <li>-- If command rights indicate that a liaison is required, the modifier is adjusted.</li>
      * </ol>
      *
-     * @param campaign         the {@link Campaign} instance representing the current operational campaign.
-     * @param scenario         the {@link StratconScenario} for which reinforcement details are being determined.
      * @param commandLiaison   the {@link Person} acting as the command liaison, or {@code null} if no liaison exists.
-     * @param campaignState    the {@link StratconCampaignState} representing the state of the overarching campaign.
      * @param contract         the {@link AtBContract} defining the terms of the contract for this scenario.
      * @return                 a {@link TargetRoll} object representing the calculated reinforcement target number,
      *                         with appropriate modifiers applied.
      */
-    public static TargetRoll calculateReinforcementTargetNumber(Campaign campaign,
-                                                                StratconScenario scenario,
-                                                                @Nullable Person commandLiaison,
-                                                                StratconCampaignState campaignState,
+    public static TargetRoll calculateReinforcementTargetNumber(@Nullable Person commandLiaison,
                                                                 AtBContract contract) {
         // Create Target Roll
         TargetRoll reinforcementTargetNumber = new TargetRoll();
@@ -1694,21 +1687,8 @@ public static TargetRoll calculateReinforcementTargetNumber(Campaign campaign,
                 "Administration (Unskilled)");
         }
 
-        // Facilities Modifier
-        StratconTrackState track = scenario.getTrackForScenario(campaign, campaignState);
-
-        int facilityModifier = 0;
-        if (track != null) {
-            for (StratconFacility facility : track.getFacilities().values()) {
-                if (facility.getOwner().equals(ForceAlignment.Player) || facility.getOwner().equals(Allied)) {
-                    facilityModifier--;
-                } else {
-                    facilityModifier++;
-                }
-            }
-        }
-
-        reinforcementTargetNumber.addModifier(facilityModifier, "Facilities");
+        // Enemy Morale Modifier
+        reinforcementTargetNumber.addModifier(contract.getMoraleLevel().ordinal(), "Enemy Morale");
 
         // Skill Modifier
         int skillModifier = contract.getEnemySkill().getAdjustedValue() - SkillLevel.REGULAR.getAdjustedValue();

MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java

@@ -794,8 +794,8 @@ private void reinforcementConfirmDialog() {
         JPanel rightBox = new JPanel(new BorderLayout());
         rightBox.setBorder(BorderFactory.createEtchedBorder());
 
-        TargetRoll reinforcementTargetNumber = calculateReinforcementTargetNumber(
-            campaign, currentScenario, commandLiaison, currentCampaignState, currentCampaignState.getContract());
+        TargetRoll reinforcementTargetNumber = calculateReinforcementTargetNumber(commandLiaison,
+              currentCampaignState.getContract());
         int targetNumber = reinforcementTargetNumber.getValue();
 
         StringBuilder rightDescriptionMessage = new StringBuilder();