Merge pull request MegaMek#4538 from IllianiCBT/autoAwards_supportPer…

…sonOfTheYearBug Fixed Support Score Calculation
HoneySkull · Aug 2, 2024 · 696a6cd · 696a6cd
2 parents 500adcc + 6d48cba
commit 696a6cd
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/MekHQ/src/mekhq/campaign/Campaign.java b/MekHQ/src/mekhq/campaign/Campaign.java
@@ -3503,12 +3503,22 @@ public void processNewDayPersonnel() {
                 int score = 0;
 
                 if (p.getPrimaryRole().isSupport(true)) {
-                    score =  Compute.d6(p.getExperienceLevel(this, false));
+                    int dice = p.getExperienceLevel(this, false);
+
+                    if (dice > 0) {
+                        score = Compute.d6(dice);
+                    }
+
                     multiplier += 0.5;
                 }
 
                 if (p.getSecondaryRole().isSupport(true)) {
-                    score += Compute.d6(p.getExperienceLevel(this, false));
+                    int dice = p.getExperienceLevel(this, true);
+
+                    if (dice > 0) {
+                        score += Compute.d6(dice);
+                    }
+
                     multiplier += 0.5;
                 } else if (p.getSecondaryRole().isNone()) {
                     multiplier += 0.5;