MegaMek · neoancient · Oct 16, 2019 · Feb 4, 2019 · Feb 4, 2019 · Feb 14, 2019
diff --git a/megamek/data/images/units/defaults/default_maglev_tractor.png b/megamek/data/images/units/defaults/default_maglev_tractor.png
diff --git a/megamek/data/images/units/defaults/default_rail_tractor.png b/megamek/data/images/units/defaults/default_rail_tractor.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_ArrowIV.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_ArrowIV.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_Gauss.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_Gauss.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_LRM15.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_LRM15.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_SRM6.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_SRM6.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_UAC20.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_UAC20.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries LevCar_Weaponless.png b/megamek/data/images/units/vehicles/Kallon Industries LevCar_Weaponless.png
diff --git a/megamek/data/images/units/vehicles/Kallon Industries Nolan.png b/megamek/data/images/units/vehicles/Kallon Industries Nolan.png
diff --git a/megamek/data/images/units/vehicles/MUSE Ironhorse_Tractor.png b/megamek/data/images/units/vehicles/MUSE Ironhorse_Tractor.png
diff --git a/megamek/data/images/units/vehicles/MUSE Ironhorse_Trailer.png b/megamek/data/images/units/vehicles/MUSE Ironhorse_Trailer.png
diff --git a/...a/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train (Standard).blk b/...a/mechfiles/vehicles/TRO Vehicle Annex/Rail/Adelante Passenger-Cargo Train (Standard).blk
@@ -0,0 +1,103 @@
+#building block data file
+<BlockVersion>
+1
+</BlockVersion>
+
+##Write the version number just in case...
+<Version>
+MAM0
+</Version>
+
+<UnitType>
+LargeSupportTank
+</UnitType>
+
+<Name>
+Adelante Passenger-Cargo Train
+</Name>
+
+<Model>
+(Standard)
+</Model>
+
+<year>
+2919
+</year>
+
+<originalBuildYear>
+2919
+</originalBuildYear>
+
+<type>
+IS Level 4
+</type>
+
+<motion_type>
+Rail
+</motion_type>
+
+<transporters>
+crewquarters:35.0:0
+cargobay:28.0:1:2
+</transporters>
+
+<cruiseMP>
+12
+</cruiseMP>
+
+<engine_type>
+0
+</engine_type>
+
+<internal_type>
+-1
+</internal_type>
+
+<armor>
+40
+35
+35
+35
+35
+20
+</armor>
+
+<Body Equipment>
+SV Chassis Mod [Tractor]
+</Body Equipment>
+
+<Front Equipment>
+</Front Equipment>
+
+<Front Right Equipment>
+</Front Right Equipment>
+
+<Front Left Equipment>
+</Front Left Equipment>
+
+<Rear Right Equipment>
+</Rear Right Equipment>
+
+<Rear Left Equipment>
+</Rear Left Equipment>
+
+<Rear Equipment>
+Hitch
+</Rear Equipment>
+
+<barrating>
+7
+</barrating>
+
+<structural_tech_rating>
+3
+</structural_tech_rating>
+
+<source>
+TRO:Vehicle Annex
+</source>
+
+<tonnage>
+600.0
+</tonnage>
+
diff --git a/...data/mechfiles/vehicles/TRO Vehicle Annex/Rail/TGV Omni Railcar Primary Configuration.blk b/...data/mechfiles/vehicles/TRO Vehicle Annex/Rail/TGV Omni Railcar Primary Configuration.blk
@@ -0,0 +1,107 @@
+#building block data file
+<BlockVersion>
+1
+</BlockVersion>
+
+##Write the version number just in case...
+<Version>
+MAM0
+</Version>
+
+<UnitType>
+SupportTank
+</UnitType>
+
+<Name>
+TGV Omni Railcar
+</Name>
+
+<Model>
+Primary Configuration
+</Model>
+
+<year>
+3062
+</year>
+
+<originalBuildYear>
+3062
+</originalBuildYear>
+
+<type>
+IS Level 3
+</type>
+
+<motion_type>
+Rail
+</motion_type>
+
+<transporters>
+1stclassquarters:90.0:0:omni
+2ndclassquarters:7.0:0:omni
+cargobay:4.5:1:3:omni
+BattleArmorHandles - troopers:-1
+</transporters>
+
+<cruiseMP>
+0
+</cruiseMP>
+
+<engine_type>
+8
+</engine_type>
+
+<internal_type>
+-1
+</internal_type>
+
+<omni>
+1
+</omni>
+
+<armor>
+16
+16
+16
+15
+</armor>
+
+<Body Equipment>
+SV Chassis Mod [Trailer]
+SV Chassis Mod [Tractor]
+OmniChassisMod
+</Body Equipment>
+
+<Front Equipment>
+</Front Equipment>
+
+<Right Equipment>
+</Right Equipment>
+
+<Left Equipment>
+</Left Equipment>
+
+<Rear Equipment>
+Hitch
+</Rear Equipment>
+
+<barrating>
+9
+</barrating>
+
+<structural_tech_rating>
+5
+</structural_tech_rating>
+
+<source>
+TRO: Vehicle Annex
+</source>
+
+<tonnage>
+120.0
+</tonnage>
+
+<baseChassisFireConWeight>
+0.0
+</baseChassisFireConWeight>
+
diff --git a/megamek/i18n/megamek/client/messages.properties b/megamek/i18n/megamek/client/messages.properties
@@ -1870,7 +1870,10 @@ MovementType.Aerodyne=Aerodyne
 MovementType.Spheroid=Spheroid
 MovementType.AirMech=AirMech
 MovementType.Fighter=Fighter
-
+MovementType.Rail=Rail
+MovementType.MagLev=MagLev
+MovementType.Airship=Airship
+MovementType.StationKeeping=Station Keeping
 #Map/Hex Notes
 NoteDialog.action=Create/Edit Note
 NoteDialog.Done=Done

diff --git a/megamek/i18n/megamek/common/messages.properties b/megamek/i18n/megamek/common/messages.properties
@@ -32,6 +32,7 @@ Engine.invalidSphereOnly=Light/Fission engines Inner Sphere only
 Engine.Large=\ Large
 Engine.Light=\ Light
 Engine.Vehicle=\ [Vehicle]
+Engine.Fusion=\ Fusion
 Engine.XL=\ XL
 Engine.XXL=\ XXL
 Engine.Fission=\ Fission
@@ -40,6 +41,8 @@ Engine.None=\ None
 Engine.Steam=\ Steam
 Engine.Battery=\ Battery
 Engine.Solar=\ Solar
+Engine.MagLev=\ MagLev
+Engine.External=\ External
 Entity.sensor_range_vs_ground_target=Air to Ground Range
 EntityWeightClass.0=Ultra Light/PA(L)/Exoskeleton
 EntityWeightClass.1=Light
@@ -430,4 +433,7 @@ MovementType.Aerodyne=Aerodyne
 MovementType.Spheroid=Spheroid
 MovementType.AirMech=AirMech
 MovementType.Fighter=Fighter
-
+MovementType.Rail=Rail
+MovementType.MagLev=MagLev
+MovementType.Airship=Airship
+MovementType.StationKeeping=Station Keeping
diff --git a/megamek/src/megamek/common/Aero.java b/megamek/src/megamek/common/Aero.java
@@ -809,6 +809,10 @@ public int getRightThrustHits() {
         return rightThrustHits;
     }
 
+    public int getOriginalFuel() {
+        return fuel;
+    }
+
     public int getFuel() {
         if ((getPartialRepairs().booleanOption("aero_asf_fueltank_crit"))
         		|| (getPartialRepairs().booleanOption("aero_fueltank_crit"))) {

diff --git a/megamek/src/megamek/common/Compute.java b/megamek/src/megamek/common/Compute.java
@@ -6808,6 +6808,8 @@ public static int getTotalGunnerNeeds(Entity entity) {
                 }
             }
             return nCapitalW + (int) Math.ceil(nStandardW / 6.0);
+        } else if (entity.isSupportVehicle()) {
+            return getSupportVehicleGunnerNeeds(entity);
         } else if (entity instanceof Tank) {
             return (getFullCrewSize(entity) - 1);
         } else if (entity instanceof Infantry) {
@@ -6837,9 +6839,119 @@ public static int getAeroCrewNeeds(Entity entity) {
         return 0;
     }
 
+    /**
+     * Calculates the base crew requirements for support vehicles.
+     *
+     * @param entity The support vehicle
+     * @return       The minimum base crew
+     */
+    public static int getSVBaseCrewNeeds(Entity entity) {
+        if (entity.isTrailer() && (entity.getEngine().getEngineType() == Engine.NONE)) {
+            return 0;
+        }
+        final boolean naval = entity.getMovementMode().equals(EntityMovementMode.NAVAL)
+                || entity.getMovementMode().equals(EntityMovementMode.HYDROFOIL)
+                || entity.getMovementMode().equals(EntityMovementMode.SUBMARINE);
+        int crew;
+        if (entity.getWeightClass() == EntityWeightClass.WEIGHT_SMALL_SUPPORT) {
+            crew = 1;
+        } else if (entity.getWeightClass() == EntityWeightClass.WEIGHT_MEDIUM_SUPPORT) {
+            if (naval || entity.getMovementMode().equals(EntityMovementMode.AIRSHIP)) {
+                crew = 4;
+            } else {
+                crew = 2;
+            }
+        } else {
+            crew = 3;
+            if (naval) {
+                crew += (int) Math.ceil(entity.getWeight() / 5000);
+            } else if (entity.getMovementMode().equals(EntityMovementMode.AIRSHIP)) {
+                crew += (int) Math.ceil(entity.getWeight() / 500);
+            }
+        }
+        return crew;
+    }
+
+    /**
+     * Calculates number of gunners required for a support vehicle. See TM, 131.
+     *
+     * @param entity The support vehicle
+     * @return       The number of gunners required.
+     */
+    public static int getSupportVehicleGunnerNeeds(Entity entity) {
+        final boolean advFireCon = entity.hasMisc(MiscType.F_ADVANCED_FIRECONTROL);
+        final boolean basicFireCon = !advFireCon && entity.hasMisc(MiscType.F_BASIC_FIRECONTROL);
+        if (entity.getWeightClass() == EntityWeightClass.WEIGHT_SMALL_SUPPORT) {
+            if (!advFireCon && !basicFireCon) {
+                // No fire control requires one gunner per weapon.
+                return entity.getWeaponList().size();
+            } else {
+                // Otherwise we require one gunner per facing, with turrets and pintle mounts counting
+                // as separate facings
+                Set<Integer> facings = new HashSet<>();
+                int pintles = 0;
+                for (Mounted m : entity.getWeaponList()) {
+                    if (m.isPintleTurretMounted()) {
+                        pintles++;
+                    } else {
+                        facings.add(m.getLocation());
+                    }
+                }
+                if (advFireCon) {
+                    // Advanced fire control lets the driver count as a gunner, so one fewer dedicated gunners is needed.
+                    return Math.max(0, pintles + facings.size() - 1);
+                } else {
+                    return pintles + facings.size();
+                }
+            }
+        } else {
+            // Medium and large support vehicle gunner requirements are based on weapon tonnage
+            double tonnage = entity.getWeaponList().stream().filter(m -> !m.getType().hasFlag(WeaponType.F_AMS))
+                    .mapToDouble(m -> m.getType().getTonnage(entity)).sum();
+            if (advFireCon) {
+                return (int) Math.ceil(tonnage / 4.0);
+            } else if (basicFireCon) {
+                return (int) Math.ceil(tonnage / 3.0);
+            } else {
+                return (int) Math.ceil(tonnage / 2.0);
+            }
+        }
+    }
+
+    /**
+     * Calculates addiontal crew required by support vehicles and advanced aerospace vessels
+     * for certain misc equipment.
+     *
+     * @param entity The unit
+     * @return       The number of additional crew required
+     */
+    public static int getAdditionalNonGunner(Entity entity) {
+        int crew = 0;
+        for (Mounted m : entity.getMisc()) {
+            if (m.getType().hasFlag(MiscType.F_COMMUNICATIONS)) {
+                crew += (int) m.getType().getTonnage(entity);
+            } else if (m.getType().hasFlag(MiscType.F_FIELD_KITCHEN)) {
+                crew += 3;
+            } else if (m.getType().hasFlag(MiscType.F_MASH)
+                    || m.getType().hasFlag(MiscType.F_MASH_EXTRA)
+                    || m.getType().hasFlag(MiscType.F_MOBILE_FIELD_BASE)) {
+                crew += 5;
+            }
+        }
+        return crew;
+    }
+
     // Taken from MekHQ, assumptions are whatever Taharqa made for there - Dylan
     public static int getFullCrewSize(Entity entity) {
-        if (entity instanceof Tank) {
+        if (entity.isSupportVehicle()) {
+            int crew = getSVBaseCrewNeeds(entity) + getSupportVehicleGunnerNeeds(entity)
+                    + getAdditionalNonGunner(entity);
+            // Add officers. Older editions of the rules give the officer ratio as 1:6 and 4 as the threshold to require officers
+            if (crew < 5) {
+                return crew;
+            }
+            return (int) Math.ceil(crew * 1.2);
+        } else if (entity instanceof Tank) {
             return (int) Math.ceil(entity.getWeight() / 15.0);
         } else if (entity instanceof BattleArmor) {
             int ntroopers = 0;