- Introduced a miscModifier parameter to the SkillCheckUtility methods and constructor for customizable target number adjustments.

- Updated `determineTargetNumber` logic to incorporate `miscModifier` for both "count up" and "count down" skill types.
- Changed method calls and tests to include the new parameter, ensuring compatibility and correctness.

Author: IllianiBird

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

@@ -72,8 +72,8 @@ public class SkillCheckUtility {
      */
     protected static final int UNTRAINED_TARGET_NUMBER_TWO_LINKED_ATTRIBUTES = 18; // ATOW pg 43
 
-    private Person person;
-    private String skillName;
+    private final Person person;
+    private final String skillName;
     private int marginOfSuccess;
     private String resultsText;
     private int targetNumber;
@@ -89,22 +89,26 @@ public class SkillCheckUtility {
      * <p><b>Usage:</b> This constructor gives you a lot of control over what information you need, but for most
      * use-cases you can get away with using the lazy method: {@link #performQuickSkillCheck(Person, String)}.</p>
      *
-     * @param person    the {@link Person} performing the skill check
-     * @param skillName the name of the skill being used
-     * @param useEdge   whether the person should use edge for a re-roll if the first attempt fails
+     * @param person       the {@link Person} performing the skill check
+     * @param skillName    the name of the skill being used
+     * @param miscModifier any special modifiers, as an {@link Integer}. These values are subtracted from the target
+     *                     number, if the associated skill is classified as 'count up', otherwise they are added to the
+     *                     target number. This means negative values are bonuses, positive values are penalties.
+     * @param useEdge      whether the person should use edge for a re-roll if the first attempt fails
      *
      * @author Illiani
      * @since 0.50.5
      */
-    public SkillCheckUtility(final Person person, final String skillName, final boolean useEdge) {
+    public SkillCheckUtility(final Person person, final String skillName, final int miscModifier,
+          final boolean useEdge) {
         this.person = person;
         this.skillName = skillName;
 
         if (isPersonNull()) {
             return;
         }
 
-        targetNumber = determineTargetNumber(person, skillName);
+        targetNumber = determineTargetNumber(person, skillName, miscModifier);
         performCheck(useEdge);
     }
 
@@ -117,16 +121,19 @@ public SkillCheckUtility(final Person person, final String skillName, final bool
      * <p><b>Usage:</b> This is a nice, quick lazy method for performing a skill check. For most use-cases across
      * MekHQ this is the method you want to use. If you need more control use the class constructor, instead.</p>
      *
-     * @param person    the {@link Person} performing the skill check
-     * @param skillName the name of the skill being checked
+     * @param person       the {@link Person} performing the skill check
+     * @param skillName    the name of the skill being checked
+     * @param miscModifier any special modifiers, as an {@link Integer}. These values are subtracted from the target
+     *                     number, if the associated skill is classified as 'count up', otherwise they are added to the
+     *                     target number. This means negative values are bonuses, positive values are penalties.
      *
      * @return {@code true} if the skill check is successful, {@code false} otherwise
      *
      * @author Illiani
      * @since 0.50.5
      */
-    public static boolean performQuickSkillCheck(final Person person, final String skillName) {
-        SkillCheckUtility skillCheck = new SkillCheckUtility(person, skillName, false);
+    public static boolean performQuickSkillCheck(final Person person, final String skillName, final int miscModifier) {
+        SkillCheckUtility skillCheck = new SkillCheckUtility(person, skillName, miscModifier, false);
         return skillCheck.isSuccess();
     }
 
@@ -322,15 +329,18 @@ public boolean isUsedEdge() {
      * <p>If the person is untrained, the target number is based on constants for untrained rolls and the number of
      * linked attributes. Otherwise, it is based on the final skill value and attribute modifiers.</p>
      *
-     * @param person    the {@link Person} performing the skill check
-     * @param skillName the name of the skill being used
+     * @param person       the {@link Person} performing the skill check
+     * @param skillName    the name of the skill being used
+     * @param miscModifier any special modifiers, as an {@link Integer}. These values are subtracted from the target
+     *                     number, if the associated skill is classified as 'count up', otherwise they are added to the
+     *                     target number. This means negative values are bonuses, positive values are penalties.
      *
      * @return the target number for the skill check
      *
      * @author Illiani
      * @since 0.50.5
      */
-    static int determineTargetNumber(Person person, String skillName) {
+    static int determineTargetNumber(Person person, String skillName, int miscModifier) {
         final SkillType skillType = SkillType.getType(skillName);
         final Attributes characterAttributes = person.getATOWAttributes();
 
@@ -356,8 +366,10 @@ static int determineTargetNumber(Person person, String skillName) {
 
         targetNumber -= attributeModifier;
         if (skillType.isCountUp()) {
+            targetNumber -= miscModifier;
             return min(targetNumber, COUNT_UP_MAX_VALUE);
         } else {
+            targetNumber += miscModifier;
             return max(targetNumber, COUNT_DOWN_MIN_VALUE);
         }
     }

MekHQ/unittests/mekhq/campaign/personnel/skills/SkillCheckUtilityTest.java

@@ -77,7 +77,7 @@
 class SkillCheckUtilityTest {
     @Test
     void testIsPersonNull_EdgeDisallowed() {
-        SkillCheckUtility checkUtility = new SkillCheckUtility(null, S_GUN_MEK, false);
+        SkillCheckUtility checkUtility = new SkillCheckUtility(null, S_GUN_MEK, 0, false);
 
         int expectedMarginOfSuccess = getMarginValue(DISASTROUS);
         assertEquals(expectedMarginOfSuccess, checkUtility.getMarginOfSuccess());
@@ -95,7 +95,7 @@ void testIsPersonNull_EdgeDisallowed() {
 
     @Test
     void testIsPersonNull_EdgeAllowed() {
-        SkillCheckUtility checkUtility = new SkillCheckUtility(null, S_GUN_MEK, true);
+        SkillCheckUtility checkUtility = new SkillCheckUtility(null, S_GUN_MEK, 0, true);
 
         int expectedMarginOfSuccess = getMarginValue(DISASTROUS);
         assertEquals(expectedMarginOfSuccess, checkUtility.getMarginOfSuccess());
@@ -113,7 +113,7 @@ void testIsPersonNull_EdgeAllowed() {
 
     @Test
     void testIsPersonNull_PerformQuickSkillCheck() {
-        boolean results = performQuickSkillCheck(null, S_GUN_MEK);
+        boolean results = performQuickSkillCheck(null, S_GUN_MEK, 0);
         assertFalse(results);
     }
 
@@ -305,7 +305,7 @@ void testDetermineTargetNumber_UntrainedWithOneLinkedAttribute() {
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK, 0);
 
             // Assert
             int expectedTargetNumber = UNTRAINED_TARGET_NUMBER_ONE_LINKED_ATTRIBUTE -
@@ -326,7 +326,7 @@ void testDetermineTargetNumber_UntrainedWithTwoLinkedAttributes() {
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK, 0);
 
             // Assert
             int expectedTargetNumber = UNTRAINED_TARGET_NUMBER_TWO_LINKED_ATTRIBUTES -
@@ -364,7 +364,7 @@ void testDetermineTargetNumber_TrainedWithOneLinkedAttribute() {
                 mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
                 // Act
-                int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK);
+                int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK, 0);
 
                 // Assert
                 int skillTargetNumber = skill.getFinalSkillValue(new PersonnelOptions(), 0);
@@ -403,7 +403,7 @@ void testDetermineTargetNumber_TrainedWithOneLinkedAttribute_AboveNormalAttribut
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK, 0);
 
             // Assert
             int skillTargetNumber = skill.getFinalSkillValue(new PersonnelOptions(), 0);
@@ -439,7 +439,7 @@ void testDetermineTargetNumber_TrainedWithTwoLinkedAttributes() {
                 mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
                 // Act
-                int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK);
+                int targetNumber = SkillCheckUtility.determineTargetNumber(mockPerson, S_GUN_MEK, 0);
 
                 // Assert
                 int skillTargetNumber = skill.getFinalSkillValue(new PersonnelOptions(), 0);
@@ -468,7 +468,7 @@ void testDetermineTargetNumber_InvalidAttributes() {
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK, 0);
 
             // Assert
             int expectedTargetNumber = UNTRAINED_TARGET_NUMBER_TWO_LINKED_ATTRIBUTES -
@@ -494,7 +494,7 @@ void testDetermineTargetNumber_EdgeCaseSkillType() {
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(edgeCaseSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK, 0);
 
             // Assert
             assertEquals(UNTRAINED_TARGET_NUMBER_ONE_LINKED_ATTRIBUTE, targetNumber);
@@ -523,7 +523,7 @@ void testDetermineTargetNumber_NegativeAttributeModifier() {
             mockSkillType.when(() -> SkillType.getType(S_GUN_MEK)).thenReturn(testSkillType);
 
             // Act
-            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK);
+            int targetNumber = SkillCheckUtility.determineTargetNumber(person, S_GUN_MEK, 0);
 
             // Assert
             int expectedTargetNumber = UNTRAINED_TARGET_NUMBER_TWO_LINKED_ATTRIBUTES -