Merge pull request #3916 from IllianiCBT/Personnel_AddVesselTech

Add Tech/Vessel Column to Tech Skills View
MegaMek · Apr 3, 2024 · 81505d0 · 81505d0
2 parents 1051ee7 + 1d910d1
commit 81505d0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/MekHQ/resources/mekhq/resources/GUI.properties b/MekHQ/resources/mekhq/resources/GUI.properties
@@ -839,6 +839,7 @@ PersonnelTableModelColumn.TECH_MEK.text=Tech/Mek
 PersonnelTableModelColumn.TECH_AERO.text=Tech/Aero
 PersonnelTableModelColumn.TECH_MECHANIC.text=Mechanic
 PersonnelTableModelColumn.TECH_BA.text=Tech/BA
+PersonnelTableModelColumn.TECH_VESSEL.text=Tech/Vessel
 PersonnelTableModelColumn.MEDICAL.text=Medical
 PersonnelTableModelColumn.ADMINISTRATION.text=Admin
 PersonnelTableModelColumn.NEGOTIATION.text=Negotiation

diff --git a/MekHQ/src/mekhq/gui/enums/PersonnelTableModelColumn.java b/MekHQ/src/mekhq/gui/enums/PersonnelTableModelColumn.java
@@ -80,6 +80,7 @@ public enum PersonnelTableModelColumn {
     TECH_AERO("PersonnelTableModelColumn.TECH_AERO.text"),
     TECH_MECHANIC("PersonnelTableModelColumn.TECH_MECHANIC.text"),
     TECH_BA("PersonnelTableModelColumn.TECH_BA.text"),
+    TECH_VESSEL("PersonnelTableModelColumn.TECH_VESSEL.text"),
     MEDICAL("PersonnelTableModelColumn.MEDICAL.text"),
     ADMINISTRATION("PersonnelTableModelColumn.ADMINISTRATION.text"),
     NEGOTIATION("PersonnelTableModelColumn.NEGOTIATION.text"),
@@ -267,6 +268,9 @@ public boolean isTechMechanic() {
     public boolean isTechBA() {
         return this == TECH_BA;
     }
+    public boolean isTechVessel() {
+        return this == TECH_VESSEL;
+    }
 
     public boolean isMedical() {
         return this == MEDICAL;
@@ -595,6 +599,10 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
                 return person.hasSkill(SkillType.S_TECH_BA)
                         ? Integer.toString(person.getSkill(SkillType.S_TECH_BA).getFinalSkillValue())
                         : "-";
+            case TECH_VESSEL:
+                return person.hasSkill(SkillType.S_TECH_VESSEL)
+                        ? Integer.toString(person.getSkill(SkillType.S_TECH_VESSEL).getFinalSkillValue())
+                        : "-";
             case MEDICAL:
                 return person.hasSkill(SkillType.S_DOCTOR)
                         ? Integer.toString(person.getSkill(SkillType.S_DOCTOR).getFinalSkillValue())
@@ -836,6 +844,7 @@ public boolean isVisible(final Campaign campaign, final PersonnelTabView view,
                     case TECH_AERO:
                     case TECH_MECHANIC:
                     case TECH_BA:
+                    case TECH_VESSEL:
                     case MEDICAL:
                         return true;
                     default:
@@ -981,6 +990,7 @@ public Comparator<?> getComparator(final Campaign campaign) {
             case TECH_AERO:
             case TECH_MECHANIC:
             case TECH_BA:
+            case TECH_VESSEL:
             case MEDICAL:
             case ADMINISTRATION:
             case NEGOTIATION:

diff --git a/MekHQ/unittests/mekhq/gui/enums/PersonnelTableModelColumnTest.java b/MekHQ/unittests/mekhq/gui/enums/PersonnelTableModelColumnTest.java
@@ -425,6 +425,17 @@ public void testIsTechBA() {
         }
     }
 
+    @Test
+    public void testIsTechVessel() {
+        for (final PersonnelTableModelColumn personnelTableModelColumn : columns) {
+            if (personnelTableModelColumn == PersonnelTableModelColumn.TECH_VESSEL) {
+                assertTrue(personnelTableModelColumn.isTechVessel());
+            } else {
+                assertFalse(personnelTableModelColumn.isTechVessel());
+            }
+        }
+    }
+
     @Test
     public void testIsMedical() {
         for (final PersonnelTableModelColumn personnelTableModelColumn : columns) {
@@ -864,6 +875,7 @@ public void testGetComparator() {
                 case TECH_AERO:
                 case TECH_MECHANIC:
                 case TECH_BA:
+                case TECH_VESSEL:
                 case MEDICAL:
                 case ADMINISTRATION:
                 case NEGOTIATION: