Skip to content

Commit 52aefdc

Browse files
authored
Merge pull request #8784 from TenkawaBC/PilotHitsDoublingWhenResolvingScenarios
Fixing an issue with resolving a scenario, new pilot hits were doubled
2 parents f13168d + b9b51f3 commit 52aefdc

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1743,11 +1743,12 @@ public void resolveScenario(ScenarioStatus resolution, String report) {
17431743
int statusHits = status.getHits();
17441744
int priorHits = person.getHits();
17451745
int newHits = statusHits - priorHits;
1746+
// Note: adjustedHits modifies the newHits. It can increase or decrease the value.
17461747
int adjustedHits = InjurySPAUtility.adjustInjuriesAndFatigueForSPAs(person, isUseInjuryFatigue,
17471748
fatigueRate, newHits);
17481749

17491750
person.setHitsPrior(priorHits);
1750-
person.setHits(statusHits + adjustedHits);
1751+
person.setHits(priorHits + adjustedHits);
17511752
}
17521753

17531754
if (status.wasDeployed()) {

0 commit comments

Comments
 (0)