Merge pull request #6561 from IllianiCBT/dedicatedSkillCheckClass

Added Dedicated Skill Check Class Utility

Author: IllianiCBT

MekHQ/resources/mekhq/resources/MarginOfSuccess.properties

@@ -0,0 +1,10 @@
+# suppress inspection "UnusedProperty" for the whole file
+SPECTACULAR.label=<i>Spectacular!</i>
+EXTRAORDINARY.label=<i>Extraordinary!</i>
+GOOD.label=<i>Good</i>
+IT_WILL_DO.label=<i>It'll do...</i>
+BARELY_MADE_IT.label=<i>Barely made it!</i>
+ALMOST.label=<i>Almost...</i>
+BAD.label=<i>Bad</i>
+TERRIBLE.label=<i>Terrible!</i>
+DISASTROUS.label=<i>Disastrous</i>

MekHQ/resources/mekhq/resources/SkillCheckUtility.properties

@@ -0,0 +1,4 @@
+skillCheck.results={0} {1}<b>failed</b>{2} {3} {4} check with a roll of <b>{5}</b> vs. a target number of <b>{6}</b>. {7}.{8}
+skillCheck.rerolled=\ {0} used a point of <b>Edge</b> when making this check.
+skillCheck.nullSkillName=ERROR: Skill name is null. Please report this bug to the MegaMek team.
+skillCheck.nullPerson=ERROR: Person is null. Please report this bug to the MegaMek team.

MekHQ/src/mekhq/campaign/personnel/skills/Attributes.java

@@ -33,6 +33,7 @@
 
 import megamek.codeUtilities.MathUtility;
 import megamek.logging.MMLogger;
+import mekhq.campaign.personnel.skills.enums.SkillAttribute;
 import mekhq.utilities.MHQXMLUtility;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -117,8 +118,65 @@ public Attributes() {
         charisma = DEFAULT_ATTRIBUTE_SCORE;
     }
 
+    /**
+     * Constructs a new {@code Attributes} object with the specified attribute values.
+     *
+     * @param strength     the {@link SkillAttribute#STRENGTH} value of the character, representing physical power.
+     * @param body         the {@link SkillAttribute#BODY} value of the character, representing endurance and physical
+     *                     resilience.
+     * @param reflexes     the {@link SkillAttribute#REFLEXES} value of the character, representing reaction speed and
+     *                     agility.
+     * @param dexterity    the {@link SkillAttribute#DEXTERITY} value of the character, representing skillfulness and
+     *                     precision.
+     * @param intelligence the {@link SkillAttribute#INTELLIGENCE} value of the character, representing cognitive
+     *                     ability and reasoning.
+     * @param willpower    the {@link SkillAttribute#WILLPOWER} value of the character, representing mental strength and
+     *                     determination.
+     * @param charisma     the {@link SkillAttribute#CHARISMA} value of the character, representing persuasiveness and
+     *                     social skills.
+     *
+     * @author Illiani
+     * @since 0.50.5
+     */
+    public Attributes(int strength, int body, int reflexes, int dexterity, int intelligence, int willpower,
+          int charisma) {
+        this.strength = strength;
+        this.body = body;
+        this.reflexes = reflexes;
+        this.dexterity = dexterity;
+        this.intelligence = intelligence;
+        this.willpower = willpower;
+        this.charisma = charisma;
+    }
+
     // Getters and Setters
 
+    /**
+     * Retrieves the value of a specified attribute.
+     *
+     * <p>This method returns the score of the requested {@link SkillAttribute}.
+     * If the attribute does not match any of the defined attributes, the method returns {@code 0} as the default
+     * value.</p>
+     *
+     * @param attribute the {@link SkillAttribute} to retrieve the value for.
+     *
+     * @return the value of the specified attribute, or {@code 0} if the attribute is not valid or not recognized.
+     *
+     * @since 0.50.05
+     */
+    public int getAttribute(SkillAttribute attribute) {
+        return switch (attribute) {
+            case STRENGTH -> strength;
+            case BODY -> body;
+            case REFLEXES -> reflexes;
+            case DEXTERITY -> dexterity;
+            case INTELLIGENCE -> intelligence;
+            case WILLPOWER -> willpower;
+            case CHARISMA -> charisma;
+            default -> 0;
+        };
+    }
+
     /**
      * @return the current strength value.
      *

MekHQ/src/mekhq/campaign/personnel/skills/Skill.java

@@ -66,21 +66,21 @@
  * <p>
  * target - this is the baseline target number for the skill when level and bonus are zero.
  * <p>
- * countUp - this is a boolean that defines whether this skill's target is a "roll greater than or equal to" (false) or
- * an rpg-style bonus to a roll (true)
+ * isCountUp - this is a boolean that defines whether this skill's target is a "roll greater than or equal to" (false)
+ * or an rpg-style bonus to a roll (true)
  * <p>
  * The actual target number for a skill is given by
  * <p>
- * countUp: target + lvl + bonus !countUp: target - level - bonus
+ * isCountUp: target + lvl + bonus !isCountUp: target - level - bonus
  * <p>
  * by clever manipulation of these values and skill costs in campaignOptions, players should be able to recreate any of
  * the rpg versions or their own homebrew system. The default setup will follow the core rule books (not aToW).
  *
  * @author Jay Lawson (jaylawson39 at yahoo.com)
  */
 public class Skill {
-    private static int COUNT_UP_MAX_VALUE = 10;
-    private static int COUNT_DOWN_MIN_VALUE = 0;
+    public static int COUNT_UP_MAX_VALUE = 10;
+    public static int COUNT_DOWN_MIN_VALUE = 0;
 
     private static final MMLogger logger = MMLogger.create(Skill.class);
 
@@ -137,7 +137,7 @@ public static int getCountDownMaxValue() {
      * @return {@code true} if the progression type is "count up", {@code false} otherwise.
      */
     private boolean isCountUp() {
-        return type.countUp();
+        return type.isCountUp();
     }
 
     /**