Merge pull request #8253 from IllianiBird/toughnessAAM

Improvement: Toughness Now Reduces Injury Modifier to Healing in Alt Advanced Medical; Updated Glossary

Author: HammerGS

MekHQ/resources/mekhq/resources/GlossaryEntry.properties

@@ -124,10 +124,20 @@ ALT_ADVANCED_MEDICAL.definition=In 2009 Advanced Medical was introduced to add e
   roll is made. If this final roll is also a 6, then the injury is as severe as possible: if the primary location is a\
   \ limb, the limb is completely severed (fatal, if the 'limb' was the head). Otherwise, recovery time is increased \
   further (to the maximum of +300%).</p>\
+  <h2>Hits</h2>In the original Advanced Medical an injury was worth a number of Hits (TW-scale damage) equal to its \
+  severity (a semi-random value). This made it difficult to know how badly injured your character was. In AAM all \
+  injuries are worth one Hit each.\
+  <p>Prosthetics and implants apply an 'injury' to the character. These are not true injuries and are included only \
+  as a record (and a way for us to apply the modifiers from those surgeries). These injuries are not factored into \
+  the character's Hits (or injury penalty, see below).\
+  <p>Similarly, the various injuries added by Flaws (such as addictions) are not factored into the character's Hits. \
+  This is to prevent characters from being killed by crippling flashbacks.</p>\
   <h2>Injury Penalty</h2>\
   All healing attempts suffer a penalty equal to the number of non-prosthetic injuries the patient currently has. \
   For example, a character with a prosthetic leg, a fractured skull, and heart trauma would apply a -2 penalty to all \
   healing checks made to tend to any of their injuries.\
+  <p>A character's injury penalty is reduced by their Toughness score (if any). A character with negative Toughness \
+  will increase the injury penalty, so beware!</p>\
   <h2>Prosthetic Penalty</h2>\
   Interstellar Operations, page 70, states that a -4 penalty is applied to any attempt made to heal a character with \
   cybernetics or prosthetics. While this penalty does exist in AAM, it only applies to injuries (technically damage) \

MekHQ/src/mekhq/campaign/personnel/medical/advancedMedicalAlternate/AdvancedMedicalAlternateHealing.java

@@ -32,6 +32,7 @@
  */
 package mekhq.campaign.personnel.medical.advancedMedicalAlternate;
 
+import static java.lang.Math.max;
 import static mekhq.campaign.personnel.PersonnelOptions.ATOW_FIT;
 import static mekhq.campaign.personnel.PersonnelOptions.ATOW_TOUGHNESS;
 import static mekhq.campaign.personnel.PersonnelOptions.EDGE_MEDICAL;
@@ -188,7 +189,7 @@ public static void performUnassistedHealingCheck(LocalDate today, boolean isUseF
         for (Injury injury : new ArrayList<>(patient.getInjuries())) {
             if (!injury.isPermanent()) {
                 // This needs to be refetched each cycle as the number of concurrent injuries might have changed
-                int injuryPenalty = patient.getTotalInjurySeverity();
+                int injuryPenalty = max(0, patient.getTotalInjurySeverity() - patient.getAdjustedToughness());
 
                 injury.changeTime(-1);
                 int miscPenalty = getMiscPenalty(injuryPenalty, prostheticPenalties, injury.getLocation());
@@ -299,7 +300,7 @@ public static void performAssistedHealingCheck(LocalDate today, boolean isUseFat
         for (Injury injury : new ArrayList<>(patient.getInjuries())) {
             if (!injury.isPermanent()) {
                 // This needs to be refetched each cycle as the number of concurrent injuries might have changed
-                int injuryPenalty = patient.getTotalInjurySeverity();
+                int injuryPenalty = max(0, patient.getTotalInjurySeverity() - patient.getAdjustedToughness());
 
                 injury.changeTime(-1);