Merge pull request #7306 from IllianiBird/techTimeMaxPatientsDisplay

Improvement: Added Daily Max Tech Minutes and Max Patient Count to Personnel Tab Tech Skills Display

Author: IllianiBird

MekHQ/resources/mekhq/resources/GUI.properties

@@ -957,9 +957,10 @@ PersonnelTableModelColumn.TECH_MECHANIC.text=Mechanic
 PersonnelTableModelColumn.TECH_BA.text=Tech/BA
 PersonnelTableModelColumn.TECH_VESSEL.text=Tech/Vessel
 PersonnelTableModelColumn.MEDICAL.text=Medical
+PersonnelTableModelColumn.TECH_MINUTES.text=Max Minutes
+PersonnelTableModelColumn.MEDICAL_CAPACITY.text=Max Patients
 PersonnelTableModelColumn.ADMINISTRATION.text=Admin
 PersonnelTableModelColumn.NEGOTIATION.text=Negotiation
-PersonnelTableModelColumn.SCROUNGE.text=Scrounge
 PersonnelTableModelColumn.INJURIES.text=Injuries
 PersonnelTableModelColumn.KILLS.text=Kills
 PersonnelTableModelColumn.SALARY.text=Salary

MekHQ/src/mekhq/gui/enums/PersonnelTableModelColumn.java

@@ -52,6 +52,7 @@
 import megamek.common.util.sorter.NaturalOrderComparator;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
+import mekhq.campaign.CampaignOptions;
 import mekhq.campaign.force.Force;
 import mekhq.campaign.market.PersonnelMarket;
 import mekhq.campaign.personnel.Person;
@@ -116,6 +117,8 @@ public enum PersonnelTableModelColumn {
     TECH_BA("PersonnelTableModelColumn.TECH_BA.text"),
     TECH_VESSEL("PersonnelTableModelColumn.TECH_VESSEL.text"),
     MEDICAL("PersonnelTableModelColumn.MEDICAL.text"),
+    TECH_MINUTES("PersonnelTableModelColumn.TECH_MINUTES.text"),
+    MEDICAL_CAPACITY("PersonnelTableModelColumn.MEDICAL_CAPACITY.text"),
     ADMINISTRATION("PersonnelTableModelColumn.ADMINISTRATION.text"),
     NEGOTIATION("PersonnelTableModelColumn.NEGOTIATION.text"),
     INJURIES("PersonnelTableModelColumn.INJURIES.text"),
@@ -333,6 +336,14 @@ public boolean isMedical() {
         return this == MEDICAL;
     }
 
+    public boolean isTechMinutes() {
+        return this == TECH_MINUTES;
+    }
+
+    public boolean isMedicalCapacity() {
+        return this == MEDICAL_CAPACITY;
+    }
+
     public boolean isAdministration() {
         return this == ADMINISTRATION;
     }
@@ -544,9 +555,13 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
 
         String sign;
 
-        boolean isUseAgeEffects = campaign.getCampaignOptions().isUseAgeEffects();
-        boolean isClanCampaign = campaign.isClanCampaign();
-        LocalDate today = campaign.getLocalDate();
+        final boolean isClanCampaign = campaign.isClanCampaign();
+        final LocalDate today = campaign.getLocalDate();
+        final CampaignOptions campaignOptions = campaign.getCampaignOptions();
+        final boolean isUseAgeEffects = campaignOptions.isUseAgeEffects();
+        final boolean isUseTechAdmin = campaignOptions.isTechsUseAdministration();
+        final int baseBedCapacity = campaignOptions.getMaximumPatients();
+        final boolean isUseMedicalAdmin = campaignOptions.isDoctorsUseAdministration();
 
         switch (this) {
             case PERSON:
@@ -828,11 +843,23 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
                              Integer.toString(person.getSkill(SkillType.S_TECH_VESSEL)
                                                     .getFinalSkillValue(options, attributes)) :
                              "-";
+            case TECH_MINUTES:
+                if (person.isTechExpanded()) {
+                    return String.valueOf(person.getDailyAvailableTechTime(isUseTechAdmin));
+                } else {
+                    return "0";
+                }
             case MEDICAL:
                 return person.hasSkill(SkillType.S_SURGERY) ?
                              Integer.toString(person.getSkill(SkillType.S_SURGERY)
                                                     .getFinalSkillValue(options, attributes)) :
                              "-";
+            case MEDICAL_CAPACITY:
+                if (person.isDoctor()) {
+                    return String.valueOf(person.getDoctorMedicalCapacity(isUseMedicalAdmin, baseBedCapacity));
+                } else {
+                    return "0";
+                }
             case ADMINISTRATION:
                 return person.hasSkill(SkillType.S_ADMIN) ?
                              Integer.toString(person.getSkill(SkillType.S_ADMIN)
@@ -1103,7 +1130,9 @@ yield switch (this) {
                      TECH_MECHANIC,
                      TECH_BA,
                      TECH_VESSEL,
-                     MEDICAL -> true;
+                     TECH_MINUTES,
+                     MEDICAL,
+                     MEDICAL_CAPACITY -> true;
                 default -> false;
             };
             case ADMINISTRATIVE_SKILLS -> switch (this) {