Merge pull request #8493 from IllianiBird/academySkillParsingFix

Fix #8448: Fixed Academy Award Incorrectly Treating XP & None as a Skill

Author: IllianiBird

MekHQ/src/mekhq/campaign/personnel/education/Academy.java

@@ -827,26 +827,19 @@ public String getTooltip(Campaign campaign, List<Person> personnel, int courseIn
 
         if (personnel.size() == 1) {
             for (String skillName : skillNames) {
-                String skillParsed;
-                if (skillName.equalsIgnoreCase("none")) {
-                    tooltip.append(skillName).append("<br>");
-                    continue;
-                } else if (skillName.equalsIgnoreCase("xp")) {
-                    tooltip.append(skillName).append(" (");
-                } else {
-                    skillParsed = skillParser(skillName);
-                    tooltip.append(skillParsed).append(" (");
-                }
-
                 if (skillName.equalsIgnoreCase("xp")) {
+                    tooltip.append(skillName.toUpperCase()).append(" (");
+
                     if (EducationLevel.parseToInt(person.getEduHighestEducation()) >= educationLevel) {
                         tooltip.append(resources.getString("nothingToLearn.text")).append(")<br>");
                     } else {
                         tooltip.append(educationLevel * campaign.getCampaignOptions().getCurriculumXpRate())
                               .append(")<br>");
                     }
-                } else {
-                    skillParsed = skillParser(skillName);
+                } else if (!skillName.equalsIgnoreCase("none")) {
+                    String skillParsed = skillParser(skillName);
+                    tooltip.append(skillParsed).append(" (");
+
                     Skill skill = person.getSkill(skillParsed);
 
                     if (skill != null) {

MekHQ/src/mekhq/campaign/personnel/education/EducationController.java

@@ -47,12 +47,7 @@
 import static mekhq.campaign.personnel.PersonnelOptions.COMPULSION_OTHER_FACTION_HATE;
 import static mekhq.campaign.personnel.PersonnelOptions.COMPULSION_PIRATE_HATE;
 import static mekhq.campaign.personnel.PersonnelOptions.FLAW_IN_FOR_LIFE;
-import static mekhq.campaign.personnel.skills.SkillType.EXP_ELITE;
-import static mekhq.campaign.personnel.skills.SkillType.EXP_GREEN;
-import static mekhq.campaign.personnel.skills.SkillType.EXP_HEROIC;
-import static mekhq.campaign.personnel.skills.SkillType.EXP_LEGENDARY;
 import static mekhq.campaign.personnel.skills.SkillType.EXP_REGULAR;
-import static mekhq.campaign.personnel.skills.SkillType.EXP_ULTRA_GREEN;
 import static mekhq.campaign.personnel.skills.SkillType.EXP_VETERAN;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
@@ -1830,8 +1825,15 @@ private static void addBonus(Campaign campaign, Person person, Academy academy,
         for (int i = 0; i < bonusCount; i++) {
             int roll = randomInt(curriculum.size());
 
-            try {
-                String skillParsed = Academy.skillParser(curriculum.get(roll));
+            String skillName = curriculum.get(roll);
+            if (skillName.equalsIgnoreCase("xp")) {
+                person.awardXP(campaign, campaign.getCampaignOptions().getCurriculumXpRate());
+
+                campaign.addReport(PERSONNEL, String.format(resources.getString("bonusXp.text"),
+                      person.getFirstName(),
+                      campaign.getCampaignOptions().getCurriculumXpRate()));
+            } else if (!skillName.equalsIgnoreCase("none")) {
+                String skillParsed = Academy.skillParser(skillName);
 
                 // if 'person' already has a +1 bonus for the skill, we give them XP, instead
                 if (person.getSkill(skillParsed).getBonus() < 1) {
@@ -1845,15 +1847,6 @@ private static void addBonus(Campaign campaign, Person person, Academy academy,
                 } else {
                     person.awardXP(campaign, campaign.getCampaignOptions().getCurriculumXpRate());
 
-                    campaign.addReport(PERSONNEL, String.format(resources.getString("bonusXp.text"),
-                          person.getFirstName(),
-                          campaign.getCampaignOptions().getCurriculumXpRate()));
-                }
-            } catch (Exception e) {
-                // if we get this, it means the 'skill' was XP or None
-                if (curriculum.get(roll).equalsIgnoreCase("xp")) {
-                    person.awardXP(campaign, campaign.getCampaignOptions().getCurriculumXpRate());
-
                     campaign.addReport(PERSONNEL, String.format(resources.getString("bonusXp.text"),
                           person.getFirstName(),
                           campaign.getCampaignOptions().getCurriculumXpRate()));