Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fatigue GUI Support and Rebalance #3924

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Fatigue GUI Support and Rebalance #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file renamed .../AtB Stuff/Official AtB TT Rules 2.31.xls → .../AtB Stuff/Official AtB TT Rules 2.32.xls
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions MekHQ/src/mekhq/campaign/Campaign.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3150,6 +3150,7 @@ private void processNewDayATBFatigue() {
fatigueLevel -= 2;
}
fatigueLevel = Math.max(fatigueLevel, 0);
addReport("Your fatigue level is: " + fatigueLevel);
}

private void processNewDayATB() {
Expand Down
8 changes: 4 additions & 4 deletions MekHQ/src/mekhq/campaign/mission/enums/AtBContractType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading