Merge pull request #7878 from IllianiBird/cadreRole

IllianiBird · web-flow · commit 7555b9a14806 · 2025-10-30T11:10:22.000-05:00
Improvement: Added 'Cadre' Combat Role to Distinguish Between Forces Assigned to Train Allied Forces &amp; Those Assigned to Train Player Forces
diff --git a/MekHQ/resources/mekhq/resources/CampaignGUI.properties b/MekHQ/resources/mekhq/resources/CampaignGUI.properties
@@ -314,4 +314,6 @@ dialogCheckDueScenarios.title=Scenarios Must Be Completed
 dialogCheckDueScenarios.text=You must complete scenarios with a date of today or earlier before advancing the day.
 dialogScenarioAcceptance.outOfCharacter=<b>Reactor online, sensors online, weapons online. All systems nominal.</b>
 dialogScenarioAcceptance.button.accept=Commence Drop
-dialogScenarioAcceptance.button.cancel=Return to the Launch Bay
+dialogScenarioAcceptance.button.accept=Commence Drop
+cadreReassignment.text=One or more forces were assigned to Cadre duties. With the contract now concluded, they have \
+  been reassigned to Frontline.
diff --git a/MekHQ/resources/mekhq/resources/GlossaryEntry.properties b/MekHQ/resources/mekhq/resources/GlossaryEntry.properties
@@ -198,6 +198,9 @@ COMBAT_ROLES.definition=Combat Roles are used in <a href='GLOSSARY:STRATCON'>Str
   \ these rules) Furthermore, when a force deploys to the AO, There''s a chance they will be immediately pulled into \
   a hidden scenario. When a Patrol deploys, any hidden scenarios will always be one hex away unless the force is \
   deploying ''blind'' (deploying to an unscouted hex).\
+ <br>- <b>Cadre:</b> Training forces represent your personnel being assigned to train local forces. Outside of Cadre \
+  Duty contracts this is a roleplay only role. Cadre Duty contracts will require some of your forces to be assigned \
+  to this role, limiting your combat options.\
  <br>- <b>Auxiliary:</b> Forces assigned to this role are those you intend to pull into scenarios piecemeal. While\
  \ Auxiliary forces may be used to reinforce, they are best used to house Conventional Infantry for tactics deployment.\
  \ Or units specialized in being brought into a scenario as <a href='GLOSSARY:LEADERSHIP_UNITS'>Leadership Units</a>.\
diff --git a/MekHQ/resources/mekhq/resources/Mission.properties b/MekHQ/resources/mekhq/resources/Mission.properties
@@ -82,11 +82,11 @@ CombatRole.TRAINING.toolTipText=The commander of this force is training their su
   \ see the supporting documentation.
 CombatRole.AUXILIARY.text=Auxiliary
 CombatRole.AUXILIARY.toolTipText=This force rolls twice when reinforcing, using the best roll. It\
-  \ cannot be directly assigned to scenarios, nor will it be automatically assigned to scenarios\
-  \ during an Integrated contract.
+  \ cannot be directly assigned to scenarios.
 CombatRole.RESERVE.text=Reserve
-CombatRole.RESERVE.toolTipText=This force cannot be directly assigned to scenarios, nor will it be\
-  \ automatically assigned to scenarios during an Integrated contract.
+CombatRole.RESERVE.toolTipText=This force cannot be directly assigned to scenarios.
+CombatRole.CADRE.text=Cadre
+CombatRole.CADRE.toolTipText=This force is being used to train local forces. This has no mechanical effects.
 # AtBMoraleLevel Enum
 AtBMoraleLevel.ROUTED.text=Routed
 AtBMoraleLevel.ROUTED.toolTipText=The enemy is in full retreat, suffering devastating losses and scattered. They pose no\
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -4803,8 +4803,10 @@ public int getDeploymentDeficit(AtBContract contract) {
 
             if (!combatRole.isReserve() && !combatRole.isAuxiliary()) {
                 if ((combatTeam.getMissionId() == contract.getId())) {
-                    if (!combatRole.isTraining() || contract.getContractType().isCadreDuty()) {
-                        total += combatTeam.getSize(this);
+                    if (!combatRole.isTraining()) {
+                        if (!combatRole.isCadre() || contract.getContractType().isCadreDuty()) {
+                            total += combatTeam.getSize(this);
+                        }
                     }
                 }
 
diff --git a/MekHQ/src/mekhq/campaign/campaignOptions/CampaignOptions.java b/MekHQ/src/mekhq/campaign/campaignOptions/CampaignOptions.java
@@ -1302,6 +1302,7 @@ public CampaignOptions() {
         atbBattleChance[CombatRole.FRONTLINE.ordinal()] = 20;
         atbBattleChance[CombatRole.PATROL.ordinal()] = 60;
         atbBattleChance[CombatRole.TRAINING.ordinal()] = 10;
+        atbBattleChance[CombatRole.CADRE.ordinal()] = 10;
         generateChases = true;
 
         // Scenarios
diff --git a/MekHQ/src/mekhq/campaign/force/CombatTeam.java b/MekHQ/src/mekhq/campaign/force/CombatTeam.java
@@ -647,7 +647,7 @@ public AtBScenario checkForBattle(Campaign campaign) {
                           getBattleDate(campaign.getLocalDate()));
                 }
             }
-            case TRAINING: {
+            case TRAINING, CADRE: {
                 roll = Compute.randomInt(10) + battleTypeMod;
                 if (roll < 1) {
                     return AtBScenarioFactory.createScenario(campaign,
diff --git a/MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java b/MekHQ/src/mekhq/campaign/market/contractMarket/AtbMonthlyContractMarket.java
@@ -477,7 +477,8 @@ private static void checkForEmployerOverride(LocalDate today, AtBContract contra
         contract.calculateLength(campaign.getCampaignOptions().isVariableContractLength());
         setContractClauses(contract, unitRatingMod, campaign);
 
-        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contract.getContractType().isCadreDuty()));
         contract.setRequiredCombatElements(calculateRequiredCombatElements(campaign, contract, false));
         contract.setMultiplier(calculatePaymentMultiplier(campaign, contract));
 
@@ -576,7 +577,8 @@ protected AtBContract generateAtBSubcontract(Campaign campaign, AtBContract pare
         }
         contract.setTransportComp(100);
 
-        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contract.getContractType().isCadreDuty()));
         contract.setRequiredCombatElements(calculateRequiredCombatElements(campaign, contract, false));
         contract.setMultiplier(calculatePaymentMultiplier(campaign, contract));
         contract.setPartsAvailabilityLevel(contract.getContractType().calculatePartsAvailabilityLevel());
@@ -649,7 +651,8 @@ private void addFollowup(Campaign campaign, AtBContract contract) {
         followup.setAllyQuality(contract.getAllyQuality());
         followup.calculateLength(campaign.getCampaignOptions().isVariableContractLength());
         setContractClauses(followup, campaign.getAtBUnitRatingMod(), campaign);
-        followup.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        followup.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contract.getContractType().isCadreDuty()));
         contract.setRequiredCombatElements(calculateRequiredCombatElements(campaign, contract, false));
         followup.setMultiplier(calculatePaymentMultiplier(campaign, followup));
         followup.setPartsAvailabilityLevel(followup.getContractType().calculatePartsAvailabilityLevel());
diff --git a/MekHQ/src/mekhq/campaign/market/contractMarket/CamOpsContractMarket.java b/MekHQ/src/mekhq/campaign/market/contractMarket/CamOpsContractMarket.java
@@ -281,7 +281,8 @@ private Optional<AtBContract> generateContract(Campaign campaign, ReputationCont
         // Step 6: Determine the initial contract clauses
         setContractClauses(contract, contractTerms);
         // Step 7: Determine the number of required lances (Not CamOps RAW)
-        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contract.getContractType().isCadreDuty()));
         contract.setRequiredCombatElements(calculateRequiredCombatElements(campaign, contract, false));
         // Step 8: Calculate the payment
         contract.setMultiplier(calculatePaymentMultiplier(campaign, contract));
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java
@@ -365,13 +365,13 @@ public void calculateLength(final boolean variable) {
      *
      * @return The number of lances required.
      *
-     * @deprecated use {@link ContractUtilities#calculateBaseNumberOfRequiredLances(Campaign)}
+     * @deprecated use {@link ContractUtilities#calculateBaseNumberOfRequiredLances(Campaign, boolean)}
      *       <p>
      *       Calculates the number of lances required for this contract, based on [campaign].
      */
     @Deprecated(since = "0.50.07", forRemoval = true)
     public static int calculateBaseNumberOfRequiredLances(Campaign campaign) {
-        return ContractUtilities.calculateBaseNumberOfRequiredLances(campaign);
+        return ContractUtilities.calculateBaseNumberOfRequiredLances(campaign, false);
     }
 
     /**
@@ -1566,7 +1566,8 @@ public AtBContract(Contract contract, Campaign campaign) {
             enemyCode = "REB";
         }
 
-        setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contractType.isCadreDuty()));
         setRequiredCombatElements(ContractUtilities.calculateBaseNumberOfUnitsRequiredInCombatTeams(campaign));
 
         setPartsAvailabilityLevel(getContractType().calculatePartsAvailabilityLevel());
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBScenario.java b/MekHQ/src/mekhq/campaign/mission/AtBScenario.java
@@ -734,7 +734,7 @@ public void setForces(Campaign campaign) {
     private void setStandardScenarioForces(Campaign campaign) {
         /* Find the number of attached units required by the command rights clause */
         int attachedUnitWeight = EntityWeightClass.WEIGHT_MEDIUM;
-        if (combatRole.isPatrol() || combatRole.isTraining()) {
+        if (combatRole.isPatrol() || combatRole.isTraining() || combatRole.isCadre()) {
             attachedUnitWeight = EntityWeightClass.WEIGHT_LIGHT;
         }
         int numAttachedPlayer = 0;
diff --git a/MekHQ/src/mekhq/campaign/mission/enums/AtBContractType.java b/MekHQ/src/mekhq/campaign/mission/enums/AtBContractType.java
@@ -202,7 +202,7 @@ public int calculatePartsAvailabilityLevel() {
      */
     public CombatRole getRequiredCombatRole() {
         return switch (this) {
-            case CADRE_DUTY -> CombatRole.TRAINING;
+            case CADRE_DUTY -> CombatRole.CADRE;
             case GARRISON_DUTY, SECURITY_DUTY, RIOT_DUTY -> CombatRole.MANEUVER;
             case GUERRILLA_WARFARE, PIRATE_HUNTING, PLANETARY_ASSAULT, RELIEF_DUTY -> CombatRole.FRONTLINE;
             case DIVERSIONARY_RAID, EXTRACTION_RAID, OBJECTIVE_RAID, RECON_RAID -> CombatRole.PATROL;
diff --git a/MekHQ/src/mekhq/campaign/mission/enums/CombatRole.java b/MekHQ/src/mekhq/campaign/mission/enums/CombatRole.java
@@ -44,6 +44,7 @@ public enum CombatRole {
     PATROL("CombatRole.PATROL.text", "CombatRole.PATROL.toolTipText"),
     TRAINING("CombatRole.TRAINING.text", "CombatRole.TRAINING.toolTipText"),
     AUXILIARY("CombatRole.AUXILIARY.text", "CombatRole.AUXILIARY.toolTipText"),
+    CADRE("CombatRole.CADRE.text", "CombatRole.CADRE.toolTipText"),
     RESERVE("CombatRole.RESERVE.text", "CombatRole.RESERVE.toolTipText");
     // endregion Enum Declarations
 
@@ -84,6 +85,10 @@ public boolean isTraining() {
         return this == TRAINING;
     }
 
+    public boolean isCadre() {
+        return this == CADRE;
+    }
+
     public boolean isAuxiliary() {
         return this == AUXILIARY;
     }
diff --git a/MekHQ/src/mekhq/campaign/mission/utilities/ContractUtilities.java b/MekHQ/src/mekhq/campaign/mission/utilities/ContractUtilities.java
@@ -40,16 +40,18 @@
 import mekhq.campaign.Campaign;
 import mekhq.campaign.force.CombatTeam;
 import mekhq.campaign.force.Force;
+import mekhq.campaign.mission.enums.CombatRole;
 
 public class ContractUtilities {
     /**
      * Calculates the number of lances used for this contract, based on [campaign].
      *
-     * @param campaign The campaign to reference.
+     * @param campaign    The campaign to reference.
+     * @param isCadreDuty {@code true} if {@link CombatRole#CADRE} should be considered a combat role
      *
      * @return The number of lances required.
      */
-    public static int calculateBaseNumberOfRequiredLances(Campaign campaign) {
+    public static int calculateBaseNumberOfRequiredLances(Campaign campaign, boolean isCadreDuty) {
 
         int combatForceCount = 0;
         for (CombatTeam combatTeam : campaign.getCombatTeamsAsList()) {
@@ -62,7 +64,9 @@ public static int calculateBaseNumberOfRequiredLances(Campaign campaign) {
                 continue;
             }
 
-            if (force.isForceType(STANDARD)) {
+            CombatRole roleInMemory = force.getCombatRoleInMemory();
+            boolean hasCombatRole = roleInMemory.isCombatRole() || (isCadreDuty && roleInMemory.isCadre());
+            if (force.isForceType(STANDARD) && hasCombatRole) {
                 combatForceCount++;
             }
         }
diff --git a/MekHQ/src/mekhq/campaign/personnel/autoAwards/MiscAwards.java b/MekHQ/src/mekhq/campaign/personnel/autoAwards/MiscAwards.java
@@ -289,7 +289,8 @@ private static boolean prisonerOfWar(Campaign campaign, Award award, UUID person
     private static boolean drillInstructor(Campaign campaign, Award award, UUID person) {
         if (award.canBeAwarded(campaign.getPerson(person)) && campaign.hasActiveAtBContract()) {
             return campaign.getCombatTeamsAsList().stream()
-                         .anyMatch(lance -> (lance.getRole().isTraining()) && (lance.getCommanderId().equals(person)));
+                         .anyMatch(lance -> (lance.getRole().isTraining() || lance.getRole().isCadre()) &&
+                                                  (lance.getCommanderId().equals(person)));
         }
 
         return false;
diff --git a/MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java b/MekHQ/src/mekhq/campaign/stratCon/StratConRulesManager.java
@@ -2552,8 +2552,10 @@ public static List<Integer> getAvailableForceIDs(Campaign campaign, AtBContract
             if (bypassRoleRestrictions) {
                 suitableForces.add(combatTeam.getForceId());
             } else if (!combatRole.isReserve() && !combatRole.isAuxiliary()) {
-                if (!combatRole.isTraining() || contract.getContractType().isCadreDuty()) {
-                    suitableForces.add(combatTeam.getForceId());
+                if (!combatRole.isTraining()) {
+                    if (!combatRole.isCadre() || contract.getContractType().isCadreDuty()) {
+                        suitableForces.add(combatTeam.getForceId());
+                    }
                 }
             }
         }
diff --git a/MekHQ/src/mekhq/campaign/utilities/glossary/GlossaryEntry.java b/MekHQ/src/mekhq/campaign/utilities/glossary/GlossaryEntry.java
@@ -65,7 +65,7 @@ public enum GlossaryEntry {
     CHANGING_FILTERS_HANGAR("CHANGING_FILTERS_HANGAR", new Version("0.50.06")),
     CHANGING_FILTERS_PERSONNEL("CHANGING_FILTERS_PERSONNEL", new Version("0.50.06")),
     CHANGING_FILTERS_WAREHOUSE("CHANGING_FILTERS_WAREHOUSE", new Version("0.50.06")),
-    COMBAT_ROLES("COMBAT_ROLES", new Version("0.50.06")),
+    COMBAT_ROLES("COMBAT_ROLES", new Version("0.50.10")),
     COMBAT_TEAMS("COMBAT_TEAMS", new Version("0.50.06")),
     COMPLETE_MISSION_GUIDANCE("COMPLETE_MISSION_GUIDANCE", new Version("0.50.06")),
     CONNECTIONS("CONNECTIONS", new Version("0.50.07")),
diff --git a/MekHQ/src/mekhq/gui/BriefingTab.java b/MekHQ/src/mekhq/gui/BriefingTab.java
@@ -106,6 +106,7 @@
 import mekhq.campaign.mission.Mission;
 import mekhq.campaign.mission.Scenario;
 import mekhq.campaign.mission.atb.AtBScenarioFactory;
+import mekhq.campaign.mission.enums.CombatRole;
 import mekhq.campaign.mission.enums.MissionStatus;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.personnel.autoAwards.AutoAwardsController;
@@ -119,6 +120,7 @@
 import mekhq.campaign.universe.Factions;
 import mekhq.campaign.universe.factionStanding.FactionStandings;
 import mekhq.gui.adapter.ScenarioTableMouseAdapter;
+import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogNotification;
 import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;
 import mekhq.gui.baseComponents.roundedComponents.RoundedJButton;
 import mekhq.gui.baseComponents.roundedComponents.RoundedLineBorder;
@@ -573,7 +575,14 @@ private void completeMission() {
         }
 
         // Undeploy forces
+        boolean isCadreDuty = mission instanceof AtBContract && ((AtBContract) mission).getContractType().isCadreDuty();
+        boolean hadCadreForces = false;
         for (Force force : getCampaign().getAllForces()) {
+            if (isCadreDuty && force.getCombatRoleInMemory().isCadre()) {
+                force.setCombatRoleInMemory(CombatRole.FRONTLINE);
+                hadCadreForces = true;
+            }
+
             int scenarioAssignment = force.getScenarioId();
             if (scenarioAssignment != NO_ASSIGNED_SCENARIO) {
                 Scenario scenario = getCampaign().getScenario(force.getScenarioId());
@@ -585,6 +594,11 @@ private void completeMission() {
             }
         }
 
+        if (hadCadreForces) {
+            new ImmersiveDialogNotification(getCampaign(), resourceMap.getString("cadreReassignment.text"),
+                  true);
+        }
+
         // Resolve any outstanding scenarios
         for (Scenario scenario : mission.getCurrentScenarios()) {
             scenario.setStatus(REFUSED_ENGAGEMENT);
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/contents/RulesetsTab.java b/MekHQ/src/mekhq/gui/campaignOptions/contents/RulesetsTab.java
@@ -176,6 +176,7 @@ public class RulesetsTab {
     private JLabel lblDefendChance;
     private JLabel lblScoutChance;
     private JLabel lblTrainingChance;
+    private JLabel lblCadreChance;
     private JSpinner[] spnAtBBattleChance;
     private JButton btnIntensityUpdate;
     private JCheckBox chkGenerateChases;
@@ -901,6 +902,7 @@ private void initializeLegacyTab() {
         lblDefendChance = new JLabel();
         lblScoutChance = new JLabel();
         lblTrainingChance = new JLabel();
+        lblCadreChance = new JLabel();
         spnAtBBattleChance = new JSpinner[CombatRole.values().length - 1];
         btnIntensityUpdate = new JButton();
     }
@@ -1031,6 +1033,7 @@ private JPanel createLegacyScenarioGenerationPanel() {
         lblDefendChance = new JLabel(CombatRole.FRONTLINE.toString());
         lblScoutChance = new JLabel(CombatRole.PATROL.toString());
         lblTrainingChance = new JLabel(CombatRole.TRAINING.toString());
+        lblCadreChance = new JLabel(CombatRole.CADRE.toString());
         spnAtBBattleChance = new JSpinner[CombatRole.values().length - 1];
 
         for (int i = 0; i < spnAtBBattleChance.length; i++) {
@@ -1073,8 +1076,10 @@ private JPanel createLegacyScenarioGenerationPanel() {
         layoutBattleChance.gridx = 0;
         layoutBattleChance.gridy++;
         panelBattleChance.add(lblTrainingChance, layoutBattleChance);
+        layoutBattleChance.gridy++;
+        panelBattleChance.add(lblCadreChance, layoutBattleChance);
         layoutBattleChance.gridx++;
-        panelBattleChance.add(spnAtBBattleChance[CombatRole.TRAINING.ordinal()], layoutBattleChance);
+        panelBattleChance.add(spnAtBBattleChance[CombatRole.CADRE.ordinal()], layoutBattleChance);
 
         final JPanel panel = new CampaignOptionsStandardPanel("LegacyScenarioGenerationPanel", true,
               "LegacyScenarioGenerationPanel");
@@ -1128,6 +1133,9 @@ private double determineAtBBattleIntensity() {
         x = (int) spnAtBBattleChance[CombatRole.TRAINING.ordinal()].getValue();
         intensity += ((-9.0) * (2.0 * x - 1.0)) / (2.0 * x - 201.0);
 
+        x = (int) spnAtBBattleChance[CombatRole.CADRE.ordinal()].getValue();
+        intensity += ((-9.0) * (2.0 * x - 1.0)) / (2.0 * x - 201.0);
+
         intensity = intensity / 4.0;
 
         if (intensity > 100.0) {
@@ -1172,11 +1180,13 @@ public void stateChanged(ChangeEvent e) {
                 spnAtBBattleChance[CombatRole.PATROL.ordinal()].setValue(value);
                 value = (int) Math.min(Math.round(100.0 * intensity / (intensity + 9.0) + 0.05), 100);
                 spnAtBBattleChance[CombatRole.TRAINING.ordinal()].setValue(value);
+                spnAtBBattleChance[CombatRole.CADRE.ordinal()].setValue(value);
             } else {
                 spnAtBBattleChance[CombatRole.MANEUVER.ordinal()].setValue(0);
                 spnAtBBattleChance[CombatRole.FRONTLINE.ordinal()].setValue(0);
                 spnAtBBattleChance[CombatRole.PATROL.ordinal()].setValue(0);
                 spnAtBBattleChance[CombatRole.TRAINING.ordinal()].setValue(0);
+                spnAtBBattleChance[CombatRole.CADRE.ordinal()].setValue(0);
             }
         }
     }
@@ -1325,7 +1335,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
         chkAdjustPlayerVehicles.setSelected(options.isAdjustPlayerVehicles());
         chkGenerateChases.setSelected(options.isGenerateChases());
         for (CombatRole role : CombatRole.values()) {
-            if (role.ordinal() <= CombatRole.TRAINING.ordinal()) {
+            if (role.ordinal() <= CombatRole.CADRE.ordinal()) {
                 spnAtBBattleChance[role.ordinal()].setValue(options.getAtBBattleChance(role));
             }
         }
diff --git a/MekHQ/src/mekhq/gui/dialog/NewAtBContractDialog.java b/MekHQ/src/mekhq/gui/dialog/NewAtBContractDialog.java
@@ -568,7 +568,8 @@ protected void btnOKActionPerformed(ActionEvent evt) {
         contract.setDesc(txtDesc.getText());
         contract.setCommandRights(choiceCommand.getSelectedItem());
 
-        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));
+        contract.setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,
+              contract.getContractType().isCadreDuty()));
 
         AbstractContractMarket contractMarket = campaign.getContractMarket();
         if (contractMarket != null) {
diff --git a/MekHQ/src/mekhq/gui/view/RequiredLancesTableModel.java b/MekHQ/src/mekhq/gui/view/RequiredLancesTableModel.java
diff --git a/MekHQ/unittests/mekhq/campaign/market/enums/ContractMarketMethodTest.java b/MekHQ/unittests/mekhq/campaign/market/enums/ContractMarketMethodTest.java
diff --git a/MekHQ/unittests/mekhq/campaign/mission/AtBContractTest.java b/MekHQ/unittests/mekhq/campaign/mission/AtBContractTest.java

Original file line number	Diff line number	Diff line change
`@@ -4803,8 +4803,10 @@ public int getDeploymentDeficit(AtBContract contract) {`
`4803`	`4803`
`4804`	`4804`	`if (!combatRole.isReserve() && !combatRole.isAuxiliary()) {`
`4805`	`4805`	`if ((combatTeam.getMissionId() == contract.getId())) {`
`4806`		`- if (!combatRole.isTraining() \|\| contract.getContractType().isCadreDuty()) {`
`4807`		`- total += combatTeam.getSize(this);`
	`4806`	`+ if (!combatRole.isTraining()) {`
	`4807`	`+ if (!combatRole.isCadre() \|\| contract.getContractType().isCadreDuty()) {`
	`4808`	`+ total += combatTeam.getSize(this);`
	`4809`	`+ }`
`4808`	`4810`	`}`
`4809`	`4811`	`}`
`4810`	`4812`
Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ public AtBScenario checkForBattle(Campaign campaign) {`
`647`	`647`	`getBattleDate(campaign.getLocalDate()));`
`648`	`648`	`}`
`649`	`649`	`}`
`650`		`- case TRAINING: {`
	`650`	`+ case TRAINING, CADRE: {`
`651`	`651`	`roll = Compute.randomInt(10) + battleTypeMod;`
`652`	`652`	`if (roll < 1) {`
`653`	`653`	`return AtBScenarioFactory.createScenario(campaign,`
Original file line number	Diff line number	Diff line change
`@@ -365,13 +365,13 @@ public void calculateLength(final boolean variable) {`
`365`	`365`	`*`
`366`	`366`	`* @return The number of lances required.`
`367`	`367`	`*`
`368`		`- * @deprecated use {@link ContractUtilities#calculateBaseNumberOfRequiredLances(Campaign)}`
	`368`	`+ * @deprecated use {@link ContractUtilities#calculateBaseNumberOfRequiredLances(Campaign, boolean)}`
`369`	`369`	`* <p>`
`370`	`370`	`* Calculates the number of lances required for this contract, based on [campaign].`
`371`	`371`	`*/`
`372`	`372`	`@Deprecated(since = "0.50.07", forRemoval = true)`
`373`	`373`	`public static int calculateBaseNumberOfRequiredLances(Campaign campaign) {`
`374`		`- return ContractUtilities.calculateBaseNumberOfRequiredLances(campaign);`
	`374`	`+ return ContractUtilities.calculateBaseNumberOfRequiredLances(campaign, false);`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`/**`
`@@ -1566,7 +1566,8 @@ public AtBContract(Contract contract, Campaign campaign) {`
`1566`	`1566`	`enemyCode = "REB";`
`1567`	`1567`	`}`
`1568`	`1568`
`1569`		`- setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign));`
	`1569`	`+ setRequiredCombatTeams(ContractUtilities.calculateBaseNumberOfRequiredLances(campaign,`
	`1570`	`+ contractType.isCadreDuty()));`
`1570`	`1571`	`setRequiredCombatElements(ContractUtilities.calculateBaseNumberOfUnitsRequiredInCombatTeams(campaign));`
`1571`	`1572`
`1572`	`1573`	`setPartsAvailabilityLevel(getContractType().calculatePartsAvailabilityLevel());`
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ public void setForces(Campaign campaign) {`
`734`	`734`	`private void setStandardScenarioForces(Campaign campaign) {`
`735`	`735`	`/* Find the number of attached units required by the command rights clause */`
`736`	`736`	`int attachedUnitWeight = EntityWeightClass.WEIGHT_MEDIUM;`
`737`		`- if (combatRole.isPatrol() \|\| combatRole.isTraining()) {`
	`737`	`+ if (combatRole.isPatrol() \|\| combatRole.isTraining() \|\| combatRole.isCadre()) {`
`738`	`738`	`attachedUnitWeight = EntityWeightClass.WEIGHT_LIGHT;`
`739`	`739`	`}`
`740`	`740`	`int numAttachedPlayer = 0;`