Merge pull request #7325 from IllianiBird/refundSkills

Improvement: #7248 Added The GM Ability to Refund Skills

Author: HammerGS

MekHQ/resources/mekhq/resources/GUI.properties

@@ -302,7 +302,7 @@ removeOriginalUnit.text=Wipe Original Unit Record
 changePrisonerStatus.text=Change Prisoner Status
 removePerson.text=Remove Person
 editHits.text=Edit Hits
-add1XP.text=Add 1 XP
+refundSkill.text=Refund Skill
 addXP.text=Add XP
 setXP.text=Set XP
 setEdge.text=Set Edge

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

@@ -147,7 +147,7 @@ private void checkForDeprecatedSkills(Person person) {
      *
      * @return the total XP refund value for the deprecated skill
      */
-    public int getRefundValue(Skills skills, SkillType skillType, String skillName) {
+    public static int getRefundValue(Skills skills, SkillType skillType, String skillName) {
         Skill skill = skills.getSkill(skillName);
         int level = skill.getLevel();
 

MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java

@@ -142,7 +142,9 @@
 import mekhq.campaign.personnel.skills.Aging;
 import mekhq.campaign.personnel.skills.RandomSkillPreferences;
 import mekhq.campaign.personnel.skills.Skill;
+import mekhq.campaign.personnel.skills.SkillDeprecationTool;
 import mekhq.campaign.personnel.skills.SkillType;
+import mekhq.campaign.personnel.skills.Skills;
 import mekhq.campaign.personnel.skills.enums.SkillAttribute;
 import mekhq.campaign.personnel.skills.enums.SkillSubType;
 import mekhq.campaign.randomEvents.personalities.PersonalityController;
@@ -230,6 +232,7 @@ public class PersonnelTableMouseAdapter extends JPopupMenuAdapter {
     private static final String CMD_ACQUIRE_HUMANTRO = "HUMANTRO";
     private static final String CMD_ACQUIRE_ABILITY = "ABILITY";
     private static final String CMD_ACQUIRE_CUSTOM_CHOICE = "CUSTOM_CHOICE";
+    private static final String CMD_REFUND_SKILL = "REFUND_SKILL";
     private static final String CMD_IMPROVE = "IMPROVE";
     private static final String CMD_BUY_TRAIT = "BUY_TRAIT";
     private static final String CMD_CHANGE_ATTRIBUTE = "CHANGE_ATTRIBUTE";
@@ -658,6 +661,18 @@ public void actionPerformed(ActionEvent action) {
                 getCampaign().personUpdated(selectedPerson);
                 break;
             }
+            case CMD_REFUND_SKILL: {
+                String typeLabel = data[1];
+                SkillType skillType = SkillType.getType(typeLabel);
+                Skills skills = selectedPerson.getSkills();
+                int refundValue = SkillDeprecationTool.getRefundValue(skills, skillType, skillType.getName());
+
+                selectedPerson.removeSkill(skillType.getName());
+                selectedPerson.awardXP(getCampaign(), refundValue);
+
+                getCampaign().personUpdated(selectedPerson);
+                break;
+            }
             case CMD_BUY_TRAIT: {
                 String type = data[1];
                 int cost = MathUtility.parseInt(data[2]);
@@ -4142,6 +4157,18 @@ protected Optional<JPopupMenu> createPopupMenu() {
             menuItem.addActionListener(this);
             menu.add(menuItem);
 
+            if (oneSelected) {
+                JMenu subMenu = new JMenu(resources.getString("refundSkill.text"));
+                for (Skill skill : person.getSkills().getSkills()) {
+                    String label = skill.getType().getName();
+                    JMenuItem menuSkill = new JMenuItem(label);
+                    menuSkill.setActionCommand(makeCommand(CMD_REFUND_SKILL, label));
+                    menuSkill.addActionListener(this);
+                    subMenu.add(menuSkill);
+                }
+                menu.add(subMenu);
+            }
+
             if (!getCampaignOptions().isUseAdvancedMedical()) {
                 menuItem = new JMenuItem(resources.getString("editHits.text"));
                 menuItem.setActionCommand(CMD_EDIT_HITS);