ensure minimum objective count for small units

MegaMek · May 26, 2021 · e84bd9b · e84bd9b
1 parent f56d2de
commit e84bd9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MekHQ/src/mekhq/campaign/stratcon/StratconContractInitializer.java b/MekHQ/src/mekhq/campaign/stratcon/StratconContractInitializer.java
@@ -90,7 +90,7 @@ public static void initializeCampaignState(AtBContract contract, Campaign campai
         for (ObjectiveParameters objectiveParams : contractDefinition.getObjectiveParameters()) {
             int objectiveCount = objectiveParams.objectiveCount > 0 ?
                     (int) objectiveParams.objectiveCount :
-                    (int) (-objectiveParams.objectiveCount * contract.getRequiredLances());
+                    (int) Math.max(1, -objectiveParams.objectiveCount * contract.getRequiredLances());
 
             List<Integer> trackObjects = trackObjectDistribution(objectiveCount, campaignState.getTracks().size());
 

diff --git a/MekHQ/src/mekhq/gui/StratconTab.java b/MekHQ/src/mekhq/gui/StratconTab.java
@@ -267,7 +267,7 @@ private String buildShortStrategicObjectiveText(StratconCampaignState campaignSt
         }
 
         // special logic for non-independent command clauses
-        if (campaignState.getContract().getCommandRights() <= Contract.COM_LIAISON) {
+        if (!campaignState.getContract().getCommandRights().isIndependent()) {
             desiredObjectives++;
 
             if (campaignState.getVictoryPoints() > 0) {
@@ -345,7 +345,7 @@ private String buildStrategicObjectiveText(StratconCampaignState campaignState)
         }
 
         // special case text reminding player to complete required scenarios
-        if (campaignState.getContract().getCommandRights() <= Contract.COM_LIAISON) {
+        if (!campaignState.getContract().getCommandRights().isIndependent()) {
             if (campaignState.getVictoryPoints() > 0) {
                 sb.append("<span color='green'>");
             } else {