Merge pull request #4115 from IllianiCBT/autoAwards_FixAwardImageDisplayAgain

Fixed Award Image Display in Person View

Author: Sleet01

Diff for: MekHQ/src/mekhq/gui/view/PersonViewPanel.java

@@ -18,6 +18,7 @@
  */
 package mekhq.gui.view;
 
+import megamek.codeUtilities.MathUtility;
 import megamek.common.options.IOption;
 import mekhq.MHQStaticDirectoryManager;
 import mekhq.MekHQ;
@@ -341,8 +342,11 @@ private Box drawRibbons() {
                 rowRibbonsBox.setBackground(Color.RED);
             }
             try {
-                int awardTierCount = Math.min(award.getNumberOfMedalFiles(),
-                        Math.max(1, person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()));
+                int awardTierCount = MathUtility.clamp(
+                        (person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()) + 1,
+                        1,
+                        award.getNumberOfRibbonFiles()
+                );
 
                 String ribbonFileName = award.getRibbonFileName(awardTierCount);
 
@@ -393,8 +397,11 @@ private JPanel drawMedals() {
 
             Image medal;
             try {
-                int awardTierCount = Math.min(award.getNumberOfMedalFiles(),
-                        Math.max(1, person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()));
+                int awardTierCount = MathUtility.clamp(
+                        (person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()) + 1,
+                        1,
+                        award.getNumberOfMedalFiles()
+                );
 
                 String medalFileName = award.getMedalFileName(awardTierCount);
 
@@ -442,8 +449,11 @@ private JPanel drawMiscAwards() {
 
             Image miscAward;
             try {
-                int awardTierCount = Math.min(award.getNumberOfMedalFiles(),
-                        Math.max(1, person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()));
+                int awardTierCount = MathUtility.clamp(
+                        (person.getAwardController().getNumberOfAwards(award) / campaign.getCampaignOptions().getAwardTierSize()) + 1,
+                        1,
+                        award.getNumberOfMiscFiles()
+                );
 
                 String miscFileName = award.getMiscFileName(awardTierCount);