Merge pull request #8492 from IllianiBird/passengerFix

Fix #8450: Fixed Transport Cost Calculator Incorrectly Counting WarShip, JumpShip, and DropShip Crews as Passengers; Fixed Bay Personnel Capacity of Small Craft Not Being Factored into Cost Calculator

Author: IllianiBird

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

@@ -753,14 +753,50 @@ void countUnitsByType() {
      * @since 50.10
      */
     void calculateAdditionalBayRequirementsFromPassengers(int passengerCapacity) {
-        int passengerCount = allPersonnel.size();
+        int passengerCount = getPassengerCount();
         int additionalPassengerNeeds = max(0, passengerCount - passengerCapacity);
         additionalPassengerBaysRequired = (int) ceil(additionalPassengerNeeds / PASSENGERS_PER_BAY);
         additionalPassengerBaysCost = round(additionalPassengerBaysRequired * PASSENGERS_COST);
         totalCost = totalCost.plus(additionalPassengerBaysCost);
         totalAdditionalBaysRequired += additionalPassengerBaysRequired;
     }
 
+    /**
+     * Calculates and returns the total number of passengers. A person is considered a passenger if:
+     *
+     * <ul>
+     *     <li>They are not associated with any unit.</li>
+     *     <li>Their associated unit does not have an associated entity.</li>
+     *     <li>The entity associated with their unit is not a WarShip, JumpShip, or DropShip.</li>
+     * </ul>
+     *
+     * @return The total count of passengers based on the conditions specified.
+     */
+    private int getPassengerCount() {
+        int passengerCount = 0;
+        for (Person person : allPersonnel) {
+            Unit unit = person.getUnit();
+            if (unit == null) {
+                passengerCount++;
+                continue;
+            }
+
+            Entity entity = unit.getEntity();
+            if (entity == null) {
+                passengerCount++;
+                continue;
+            }
+
+            // We exclude Space Stations here, as CamOps pg 35 states that only crew of the below unit types are
+            // excluded from passenger counts
+            if (!entity.isSmallCraft() && !entity.isWarShip() && !entity.isJumpShip() && !entity.isDropShip()) {
+                passengerCount++;
+            }
+        }
+
+        return passengerCount;
+    }
+
     /**
      * Executes a financial transaction for performing a jump between two planetary systems, debiting the specified
      * journey cost from the provided finances. Generates and includes a report of the transaction outcome.

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

@@ -266,7 +266,7 @@ public int getTotalDockingCollars() {
 
     public int getTotalLargeCraftPassengerCapacity() {
         return getHangar().getUnitsStream()
-                     .filter(u -> u.getEntity().isLargeCraft())
+                     .filter(u -> u.getEntity().isLargeCraft() || u.getEntity().isSmallCraft())
                      .mapToInt(u -> u.getEntity().getNPassenger() + u.getEntity().getBayPersonnel())
                      .sum();
     }