Merge pull request #7978 from psikomonkie/pr/transport-hhw-in-arms

Author: psikomonkie

MekHQ/resources/mekhq/resources/AssignForceToTransport.properties

@@ -57,6 +57,9 @@ AssignForceToTransportMenu.DOCKING_COLLAR.text=Docking Collar
 AssignForceToTransportMenu.TANK_TRAILER_HITCH.text=Trailer Hitch
 AssignForceToTransportMenu.CARGO_BAY.text=Cargo Bay (Standard)
 AssignForceToTransportMenu.CARGO_CONTAINER.text=Cargo Container
+AssignForceToTransportMenu.MEK_ARMS.text=Mek Arms
+AssignForceToTransportMenu.LIFT_HOIST.text=Lift Hoist
+AssignForceToTransportMenu.ROOF_RACK.text=Roof Rack
 TOEMouseAdapter.unassign.TACTICAL_TRANSPORT.text=Unassign Force from Tactical Transport
 TOEMouseAdapter.unassign.SHIP_TRANSPORT.text=Unassign Force from Ship Transport
 TOEMouseAdapter.unassign.TOW_TRANSPORT.text=Unassign Force from Tractor

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

@@ -5639,6 +5639,10 @@ public boolean isUnmannedTrailer() {
         return false;
     }
 
+    public boolean isHandheldWeapon() {
+        return entity instanceof HandheldWeapon;
+    }
+
     public int getForceId() {
         return forceId;
     }
@@ -6676,7 +6680,8 @@ public Money getSparePartsCost() {
                 partsCost = partsCost.multipliedBy(2.0);
             }
 
-            if (!(entity instanceof Infantry)) {
+            // No engines for infantry or HHW
+            if (!(entity instanceof Infantry) && !(entity instanceof HandheldWeapon)) {
                 if ((engine.getEngineType() == Engine.XL_ENGINE) || (engine.getEngineType() == Engine.XXL_ENGINE)) {
                     partsCost = partsCost.multipliedBy(2.5);
                 } else if (engine.getEngineType() == Engine.LIGHT_ENGINE) {

MekHQ/src/mekhq/campaign/utilities/CampaignTransportUtilities.java

@@ -42,6 +42,7 @@
 
 import megamek.common.battleArmor.BattleArmor;
 import megamek.common.equipment.Cargo;
+import megamek.common.equipment.HandheldWeapon;
 import megamek.common.equipment.ICarryable;
 import megamek.common.units.*;
 import mekhq.campaign.enums.CampaignTransportType;
@@ -328,6 +329,28 @@ public EnumSet<TransporterType> getTransporterTypes(Cargo cargo,
                       transporters.add(ROOF_RACK);
                   }
 
+                  return transporters;
+              }
+          },
+          new Visitor<HandheldWeapon>() {
+              @Override
+              public boolean isInterestedIn(ICarryable entity) {
+                  return entity instanceof HandheldWeapon;
+              }
+
+              @Override
+              public EnumSet<TransporterType> getTransporterTypes(HandheldWeapon handheldWeapon,
+                    CampaignTransportType
+                          campaignTransportType) {
+                  EnumSet<TransporterType> transporters = EnumSet.noneOf(TransporterType.class);
+
+                  //Ship transports can't use some transport types
+                  if (!(campaignTransportType.isShipTransport())) {
+                      // For now just MekArms. This should be expanded to include regular cargo bays and lift hoists
+                      // once those are supported for HHW in MHQ
+                      transporters.add(MEK_ARMS);
+                  }
+
                   return transporters;
               }
           });

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

@@ -1023,6 +1023,7 @@ protected Optional<JPopupMenu> createPopupMenu() {
                 // Only add units that have commanders
                 // Or Gun Emplacements!
                 // Or don't need a crew (trailers)
+                // Or HHWs
                 // TODO: Or Robotic Systems!
                 JMenu unsorted = new JMenu("Unsorted");
 
@@ -1044,7 +1045,9 @@ protected Optional<JPopupMenu> createPopupMenu() {
                             }
                             unitTypeMenus.get(type).setEnabled(true);
                         }
-                    } else if ((u.getForceId() < 1) && (u.isPresent()) && (u.isUnmannedTrailer())) {
+                    } else if ((u.getForceId() < 1) &&
+                                     (u.isPresent()) &&
+                                     (u.isUnmannedTrailer() || u.isHandheldWeapon())) {
                         JMenuItem menuItem0 = new JMenuItem(u.getName());
                         menuItem0.setActionCommand(TOEMouseAdapter.COMMAND_ADD_UNIT + u.getId() + '|' + forceIds);
                         menuItem0.addActionListener(this);