Skip to content

Commit 3408a03

Browse files
authored
Merge pull request #8721 from MegaMek/fix/surgery-skill-level-display
Display surgeon skill level instead of target number in prosthetic surgery dialog
2 parents 1f1b7df + 7de6f2b commit 3408a03

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

MekHQ/resources/mekhq/resources/AdvancedReplacementLimbDialog.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ AdvancedReplacementLimbDialog.status.selected=<b>Selected:</b> {0} surgery(s)
4242
AdvancedReplacementLimbDialog.status.difficulty=<b>Surgery Skill Level Required:</b> {0}
4343
AdvancedReplacementLimbDialog.status.localSurgeon=<b>Using Local Surgeon</b> Cost increased tenfold
4444
AdvancedReplacementLimbDialog.status.localSurgeon.transit=<b>Unable to find a local surgeon in space</b>
45-
AdvancedReplacementLimbDialog.status.surgeon=<b>Surgeon:</b> {0} ({1}+)
45+
AdvancedReplacementLimbDialog.status.surgeon=<b>Surgeon:</b> {0} (Skill Level {1}, TN {2}+)
4646
AdvancedReplacementLimbDialog.status.total=<b>Total Cost:</b> {0} C-Bills
4747
AdvancedReplacementLimbDialog.exclusions.refused=<br>- {0}Patient has refused due to hatred of bionics.{1}
4848
AdvancedReplacementLimbDialog.exclusions.planet=<br>- {0}Advanced prosthetics require planetary facilities.{1}

MekHQ/src/mekhq/gui/dialog/AdvancedReplacementLimbDialog.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,12 +522,14 @@ private void updateSummary() {
522522
"AdvancedReplacementLimbDialog.status.localSurgeon.transit"));
523523
}
524524
} else {
525-
int targetNumber = surgeon.getSkill(S_SURGERY).getFinalSkillValue(surgeon.getSkillModifierData());
526-
targetNumber -= surgeon.getOptions().booleanOption(UNOFFICIAL_BIOLOGICAL_MACHINIST) ? -2 : 0;
525+
Skill surgerySkill = surgeon.getSkill(S_SURGERY);
526+
SkillModifierData modifierData = surgeon.getSkillModifierData();
527+
int surgeonSkillLevel = surgerySkill.getTotalSkillLevel(modifierData);
528+
int targetNumber = surgerySkill.getFinalSkillValue(modifierData);
527529

528530
summary.add(getFormattedTextAt(RESOURCE_BUNDLE,
529531
"AdvancedReplacementLimbDialog.status.surgeon",
530-
surgeon.getFullTitle(), targetNumber));
532+
surgeon.getFullTitle(), surgeonSkillLevel, targetNumber));
531533
}
532534

533535
if (totalCost.isPositive()) {

0 commit comments

Comments
 (0)