Merge pull request #3924 from IllianiCBT/Fatigue_GUISupport

Fatigue GUI Support and Rebalance
MegaMek · Apr 30, 2024 · c609e9c · c609e9c
2 parents 707a231 + ef87c05
commit c609e9c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.../AtB Stuff/Official AtB TT Rules 2.31.xls → .../AtB Stuff/Official AtB TT Rules 2.32.xls b/.../AtB Stuff/Official AtB TT Rules 2.31.xls → .../AtB Stuff/Official AtB TT Rules 2.32.xls
diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
@@ -219,8 +219,8 @@ chkUseCustomRetirementModifiers.text=Customize Retirement Rolls
 chkUseCustomRetirementModifiers.toolTipText=Allows you to manually provide additional modifiers to the retirement/defection roll.
 chkUseRandomFounderRetirement.text=Use Random Founder Retirement
 chkUseRandomFounderRetirement.toolTipText=Allow Founders to randomly retire.
-chkTrackUnitFatigue.text=Track Unit Fatigue (No GUI Visibility)
-chkTrackUnitFatigue.toolTipText=Continuous deployments without a break increase the rate of retirements and defections. This has no GUI implementation.
+chkTrackUnitFatigue.text=Track Unit Fatigue
+chkTrackUnitFatigue.toolTipText=Continuous deployments without a break increase the rate of retirements and defections.
 
 # Family
 familyPanel.title=Family (Unofficial)

diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -3158,6 +3158,7 @@ private void processNewDayATBFatigue() {
             fatigueLevel -= 2;
         }
         fatigueLevel = Math.max(fatigueLevel, 0);
+        addReport("Your fatigue level is: " + fatigueLevel);
     }
 
     private void processNewDayATB() {

diff --git a/MekHQ/src/mekhq/campaign/mission/enums/AtBContractType.java b/MekHQ/src/mekhq/campaign/mission/enums/AtBContractType.java
@@ -218,16 +218,16 @@ public int getFatigue() {
             case CADRE_DUTY:
                 return -1;
             case RIOT_DUTY:
-            case GUERRILLA_WARFARE:
             case PIRATE_HUNTING:
                 return 1;
-            case RELIEF_DUTY:
-            case PLANETARY_ASSAULT:
-                return 2;
             case DIVERSIONARY_RAID:
             case EXTRACTION_RAID:
             case RECON_RAID:
+            case RELIEF_DUTY:
             case OBJECTIVE_RAID:
+                return 2;
+            case GUERRILLA_WARFARE:
+            case PLANETARY_ASSAULT:
                 return 3;
             default:
                 return 0;