Merge pull request #6539 from IllianiCBT/flawsGlassJaw

Added "Glass Jaw" SPA

Author: IllianiCBT

MekHQ/data/universe/defaultspa.xml

@@ -464,6 +464,14 @@
     </ability>
 
     <!-- Misc SPA -->
+    <ability>
+        <lookupName>flaw_glass_jaw</lookupName>
+        <displayName>Glass Jaw (ATOW)</displayName>
+        <desc>All injuries suffered and fatigue gained is doubled</desc>
+        <xpCost>-300</xpCost>
+        <weight>1</weight>
+        <skillPrereq/>
+    </ability>
     <ability>
         <lookupName>eagle_eyes</lookupName>
         <xpCost>100</xpCost>

MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java

@@ -33,6 +33,7 @@
 import static megamek.codeUtilities.MathUtility.clamp;
 import static megamek.common.Compute.randomInt;
 import static megamek.common.enums.SkillLevel.REGULAR;
+import static mekhq.campaign.personnel.enums.BloodGroup.getRandomBloodGroup;
 import static mekhq.campaign.personnel.skills.SkillType.S_ADMIN;
 import static mekhq.campaign.personnel.enums.BloodGroup.getRandomBloodGroup;
 import static mekhq.campaign.personnel.skills.SkillType.S_ADMIN;
@@ -337,7 +338,7 @@ public Person(final String givenName, final String surname, final Campaign campa
     }
 
     public Person(final String givenName, final String surname, final @Nullable Campaign campaign,
-                  final String factionCode) {
+          final String factionCode) {
         this("", givenName, surname, "", campaign, factionCode);
     }
 
@@ -352,7 +353,7 @@ public Person(final String givenName, final String surname, final @Nullable Camp
      * @param factionCode the faction this person was borne into
      */
     public Person(final String preNominal, final String givenName, final String surname, final String postNominal,
-                  final @Nullable Campaign campaign, final String factionCode) {
+          final @Nullable Campaign campaign, final String factionCode) {
         // We assign the variables in XML file order
         id = UUID.randomUUID();
 
@@ -1294,7 +1295,7 @@ public void performRandomizedLoyaltyChange(Campaign campaign, boolean isMajor, b
      * @param isVerbose  a boolean indicating whether the method should generate a report if the loyalty has changed
      */
     public void performForcedDirectionLoyaltyChange(Campaign campaign, boolean isPositive, boolean isMajor,
-                                                    boolean isVerbose) {
+          boolean isVerbose) {
         int originalLoyalty = loyalty;
 
         Consumer<Integer> applyLoyaltyChange = (roll) -> {

MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -27,21 +27,24 @@
  */
 package mekhq.campaign.personnel;
 
-import megamek.common.annotations.Nullable;
-import megamek.common.options.*;
-import megamek.logging.MMLogger;
-
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Vector;
 
+import megamek.common.annotations.Nullable;
+import megamek.common.options.AbstractOptionsInfo;
+import megamek.common.options.IBasicOptionGroup;
+import megamek.common.options.IOption;
+import megamek.common.options.IOptionGroup;
+import megamek.common.options.IOptionInfo;
+import megamek.common.options.OptionsConstants;
+import megamek.common.options.PilotOptions;
+import megamek.logging.MMLogger;
+
 /**
- * An extension of PilotOptions that adds MekHQ-specific SPAs and edge triggers
- * for support and command
- * actions. Display names and descriptions are taken from SpecialAbility when
- * present, otherwise
- * from the MM option.
+ * An extension of PilotOptions that adds MekHQ-specific SPAs and edge triggers for support and command actions. Display
+ * names and descriptions are taken from SpecialAbility when present, otherwise from the MM option.
  *
  * @author Neoancient
  */
@@ -59,6 +62,7 @@ public class PersonnelOptions extends PilotOptions {
     public static final String TECH_ENGINEER = "tech_engineer";
     public static final String TECH_FIXER = "tech_fixer";
     public static final String TECH_MAINTAINER = "tech_maintainer";
+    public static final String FLAW_GLASS_JAW = "flaw_glass_jaw";
 
     @Override
     public void initialize() {
@@ -67,7 +71,7 @@ public void initialize() {
         IBasicOptionGroup l3a = null;
         IBasicOptionGroup edge = null;
         IBasicOptionGroup md = null;
-        for (Enumeration<IBasicOptionGroup> e = getOptionsInfoImp().getGroups(); e.hasMoreElements();) {
+        for (Enumeration<IBasicOptionGroup> e = getOptionsInfoImp().getGroups(); e.hasMoreElements(); ) {
             final IBasicOptionGroup group = e.nextElement();
             if ((null == l3a) && group.getKey().equals(PilotOptions.LVL3_ADVANTAGES)) {
                 l3a = group;
@@ -102,6 +106,7 @@ public void initialize() {
         addOption(l3a, TECH_ENGINEER, false);
         addOption(l3a, TECH_FIXER, false);
         addOption(l3a, TECH_MAINTAINER, false);
+        addOption(l3a, FLAW_GLASS_JAW, false);
 
         addOption(edge, EDGE_MEDICAL, true);
         addOption(edge, EDGE_REPAIR_BREAK_PART, true);
@@ -122,8 +127,8 @@ public void initialize() {
                     break;
                 default:
                     throw new IllegalStateException(
-                            "Unexpected value in mekhq/campaign/personnel/PersonnelOptions.java/initialize: "
-                                    + option.getGroup());
+                          "Unexpected value in mekhq/campaign/personnel/PersonnelOptions.java/initialize: " +
+                                option.getGroup());
             }
         }
     }
@@ -143,7 +148,7 @@ protected void addOption(IBasicOptionGroup group, String name, int type, Object
      * Returns the options of the given category that this pilot has
      */
     public Enumeration<IOption> getOptions(String grpKey) {
-        for (Enumeration<IOptionGroup> i = getGroups(); i.hasMoreElements();) {
+        for (Enumeration<IOptionGroup> i = getGroups(); i.hasMoreElements(); ) {
             IOptionGroup group = i.nextElement();
 
             if (group.getKey().equalsIgnoreCase(grpKey)) {
@@ -165,7 +170,7 @@ public void acquireAbility(final String type, final String name, final @Nullable
         if (null != spa) {
             toRemove = spa.getRemovedAbilities();
         }
-        for (Enumeration<IOption> i = getOptions(type); i.hasMoreElements();) {
+        for (Enumeration<IOption> i = getOptions(type); i.hasMoreElements(); ) {
             IOption ability = i.nextElement();
             if (ability.getName().equals(name)) {
                 ability.setValue(value);
@@ -185,11 +190,9 @@ protected AbstractOptionsInfo getOptionsInfoImp() {
     }
 
     /**
-     * Custom IOptionsInfo class that allows adding additional options to the base
-     * MegaMek
-     * options before finalizing and also holds a hash of IOptionInfo objects for
-     * the abilities
-     * so we can provide names and descriptions for the MekHQ-specific options.
+     * Custom IOptionsInfo class that allows adding additional options to the base MegaMek options before finalizing and
+     * also holds a hash of IOptionInfo objects for the abilities so we can provide names and descriptions for the
+     * MekHQ-specific options.
      *
      * @author Neoancient
      */
@@ -224,11 +227,8 @@ private void setOptionInfo(String name) {
     }
 
     /**
-     * Access to ability names and descriptions from <code>SpecialAbility</code> if
-     * the ability
-     * has an entry, otherwise checks for the ability the MM PilotOptions class. If
-     * not found
-     * in either place, returns the lookup key instead.
+     * Access to ability names and descriptions from <code>SpecialAbility</code> if the ability has an entry, otherwise
+     * checks for the ability the MM PilotOptions class. If not found in either place, returns the lookup key instead.
      *
      * @author Neoancient
      */

MekHQ/src/mekhq/campaign/personnel/PersonnelOptions.java

@@ -28,6 +28,7 @@
 package mekhq.campaign.personnel.education;
 
 import static java.lang.Math.round;
+import static mekhq.campaign.personnel.PersonnelOptions.FLAW_GLASS_JAW;
 import static mekhq.campaign.personnel.skills.SkillType.EXP_GREEN;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
 import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
@@ -76,14 +77,6 @@ public class TrainingCombatTeams {
     private static final String BUNDLE_NAME = "mekhq.resources.Education";
     private static ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME, MekHQ.getMHQOptions().getLocale());
 
-    /**
-     * Represents the fatigue gained by combat team members during training.
-     *
-     * <p>This is currently set to 3 which, when factoring in fatigue recovery, will result in a
-     * gain of 2 Fatigue per week.</p>
-     */
-    private final static int FATIGUE_GAIN = 2;
-
     /**
      * Processes all training combat teams in the campaign.
      *
@@ -167,7 +160,7 @@ private static void processTraining(final Campaign campaign, final CombatTeam co
      * @param educatorSkills a map of skills and their experience levels available for teaching
      */
     private static void performTraining(Campaign campaign, Force force, Person commander,
-                                        Map<String, Integer> educatorSkills) {
+          Map<String, Integer> educatorSkills) {
         for (UUID unitId : force.getAllUnits(true)) {
             Unit unit = campaign.getUnit(unitId);
 
@@ -177,8 +170,10 @@ private static void performTraining(Campaign campaign, Force force, Person comma
 
             for (Person trainee : unit.getActiveCrew()) {
                 if (campaign.getCampaignOptions().isUseFatigue()) {
+                    int fatigueChangeRate = campaign.getCampaignOptions().getFatigueRate();
+                    boolean hasGlassJaw = trainee.getOptions().booleanOption(FLAW_GLASS_JAW);
 
-                    trainee.changeFatigue(FATIGUE_GAIN);
+                    trainee.changeFatigue(fatigueChangeRate * (hasGlassJaw ? 4 : 2));
                 }
 
                 if (commander.getUnit().getActiveCrew().contains(trainee)) {
@@ -235,7 +230,7 @@ private static void performTraining(Campaign campaign, Force force, Person comma
      * @param skillsBeingTrained a list of eligible {@link Skill} objects for training
      */
     private static void processEducationTime(Campaign campaign, Person commander, Person trainee,
-                                             List<Skill> skillsBeingTrained) {
+          List<Skill> skillsBeingTrained) {
         final CampaignOptions campaignOptions = campaign.getCampaignOptions();
         final String EDUCATION_STRING = "TRAINING_COMBAT_TEAM"; // Never change this
         final int WEEK_DURATION = 7; // days