diff --git a/MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.31.xls b/MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.32.xls similarity index 68% rename from MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.31.xls rename to MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.32.xls index 91b32c64dd..379f80a134 100644 Binary files a/MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.31.xls and b/MekHQ/docs/AtB Stuff/Official AtB TT Rules 2.32.xls differ diff --git a/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties b/MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties index ceaa4eda73..dfb06d920d 100644 --- 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 index a2a7c816d3..f7c7b5e2b4 100644 --- a/MekHQ/src/mekhq/campaign/Campaign.java +++ b/MekHQ/src/mekhq/campaign/Campaign.java @@ -3150,6 +3150,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 index 2d6b23c69d..bf8ed7e692 100644 --- 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;