Merge pull request #8270 from psikomonkie/issue/8226/hhw-crews

Fix #8226: Prevent HHWs from being crewed

Author: psikomonkie

MekHQ/src/mekhq/campaign/ResolveScenarioTracker.java

@@ -557,7 +557,6 @@ private UnitStatus processAlliedUnit(Entity e) {
      * <p>
      * This method should be run the first time an entity is loaded into the tracker, either from the game or from a MUL
      * file.
-     *
      */
     private void checkForLostLimbs(Entity en, boolean controlsField) {
         for (int loc = 0; loc < en.locations(); loc++) {
@@ -666,7 +665,7 @@ public void checkStatusOfPersonnel() {
                     }
                 }
                 // No crew? All's good, no personnel, next.
-                if (u.isUnmannedTrailer()) {
+                if (u.isNotCrewedEntityType()) {
                     continue;
                 }
 

MekHQ/src/mekhq/campaign/mission/CrewSkillUpgrader.java

@@ -197,7 +197,7 @@ private int addSingleSPA(Entity entity, double xpCap) {
                         break;
                     default:
                         // If there's no crew, stop looking for SPAs
-                        if (entity.getCrew() == null) {
+                        if (entity.isUncrewed()) {
                             return 0;
                             // If we can't access the option, try a different one
                         } else if ((entity.getCrew().getOptions() == null) ||
@@ -257,7 +257,6 @@ private List<SpecialAbility> coalescedSPAList(int unitType, double xpCap) {
 
     /**
      * Contains "special" logic to ensure SPA is appropriate for the entity, beyond the simple unit type check.
-     *
      */
     private boolean extraEligibilityCheck(SpecialAbility spa, Entity entity) {
         if (spa.getName().equals(OptionsConstants.PILOT_ANIMAL_MIMIC)) {

MekHQ/src/mekhq/campaign/unit/Unit.java

@@ -94,7 +94,6 @@
 import megamek.common.options.PilotOptions;
 import megamek.common.rolls.TargetRoll;
 import megamek.common.units.*;
-import megamek.common.units.CrewType;
 import megamek.common.util.C3Util;
 import megamek.common.weapons.attacks.InfantryAttack;
 import megamek.common.weapons.bayWeapons.BayWeapon;
@@ -1223,7 +1222,7 @@ public void undeploy() {
         if (!isFunctional()) {
             return "unit is not functional";
         }
-        if (isUnmanned() && !(isUnmannedTrailer())) {
+        if (isUnmanned() && isNotCrewedEntityType()) {
             return "unit has no pilot";
         }
         if (isRefitting()) {
@@ -5675,6 +5674,9 @@ public void remove(final @Nullable Person person, final boolean log) {
         }
     }
 
+    /**
+     * @return true if the unit has no commander
+     */
     public boolean isUnmanned() {
         return (null == getCommander());
     }
@@ -5685,8 +5687,8 @@ public boolean isUnmanned() {
      * @return true if this Unit is an unmanned trailer, false if it isn't a trailer or has a crew
      */
     public boolean isUnmannedTrailer() {
-        if (getEntity() instanceof Tank tank) {
-            return tank.isTrailer() && (tank.defaultCrewType().equals(CrewType.NONE));
+        if (isNotCrewedEntityType() && getEntity() instanceof Tank tank) {
+            return tank.isTrailer();
         }
 
         return false;
@@ -5696,6 +5698,14 @@ public boolean isHandheldWeapon() {
         return entity instanceof HandheldWeapon;
     }
 
+    /**
+     * @return true if the unit is always uncrewed, like a Handheld Weapon or unarmed, unpowered trailer. Should not
+     *       return true for remote drone OS. False if the entity is null.
+     */
+    public boolean isNotCrewedEntityType() {
+        return entity != null && entity.isNotCrewedEntityType();
+    }
+
     public int getForceId() {
         return forceId;
     }

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

@@ -1047,7 +1047,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
                         }
                     } else if ((u.getForceId() < 1) &&
                                      (u.isPresent()) &&
-                                     (u.isUnmannedTrailer() || u.isHandheldWeapon())) {
+                                     (u.isNotCrewedEntityType())) {
                         JMenuItem menuItem0 = new JMenuItem(u.getName());
                         menuItem0.setActionCommand(TOEMouseAdapter.COMMAND_ADD_UNIT + u.getId() + '|' + forceIds);
                         menuItem0.addActionListener(this);