Skip to content

Commit 6c5a0ca

Browse files
authored
Merge pull request #4122 from IllianiCBT/dirtyEditFix
Removed crew fatigue setting from Unit
2 parents c71a6e2 + 97742af commit 6c5a0ca

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

MekHQ/src/mekhq/campaign/personnel/education/EducationController.java

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import mekhq.campaign.log.ServiceLogger;
1010
import mekhq.campaign.personnel.Person;
1111
import mekhq.campaign.personnel.enums.PersonnelStatus;
12+
import mekhq.campaign.universe.PlanetarySystem;
1213
import org.apache.logging.log4j.LogManager;
1314

1415
import java.time.DayOfWeek;

MekHQ/src/mekhq/campaign/unit/Unit.java

-7
Original file line numberDiff line numberDiff line change
@@ -3573,7 +3573,6 @@ public void resetPilotAndEntity() {
35733573
entity.getCrew().setPortrait(commander.getPortrait().clone(), 0);
35743574
entity.getCrew().setExternalIdAsString(commander.getId().toString(), 0);
35753575
entity.getCrew().setToughness(commander.getToughness(), 0);
3576-
entity.getCrew().setCrewFatigue(commander.getFatigue(), 0);
35773576

35783577
if (entity instanceof Tank) {
35793578
((Tank) entity).setCommanderHit(commander.getHits() > 0);
@@ -4006,12 +4005,6 @@ private void assignToCrewSlot(Person p, int slot, String gunType, String driveTy
40064005
entity.getCrew().setArtillery(Math.min(Math.max(artillery, 0), 7), slot);
40074006
entity.getCrew().setToughness(p.getToughness(), slot);
40084007

4009-
if (campaign.getCampaignOptions().isUseFatigue()) {
4010-
entity.getCrew().setCrewFatigue(p.getFatigue(), slot);
4011-
} else {
4012-
entity.getCrew().setCrewFatigue(0, slot);
4013-
}
4014-
40154008
entity.getCrew().setExternalIdAsString(p.getId().toString(), slot);
40164009
entity.getCrew().setMissing(false, slot);
40174010
}

0 commit comments

Comments
 (0)