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/mechset.txt b/megamek/data/images/units/mechset.txt
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/client/ui/swing/MechTileset.java b/megamek/src/megamek/client/ui/swing/MechTileset.java
@@ -85,6 +85,11 @@ public class MechTileset {
     private String SUBMARINE_STRING = "default_submarine"; //$NON-NLS-1$
     private String HYDROFOIL_STRING = "default_hydrofoil"; //$NON-NLS-1$
     private String VTOL_STRING = "default_vtol"; //$NON-NLS-1$
+    private String RAIL_TRACTOR_STRING = "default_rail_tractor"; //$NON-NLS-1$
+    private String RAIL_MAGLEV_STRING = "default_maglev_tractor"; //$NON-NLS-1$
+    private String TRAILER_STRING = "default_trailer"; //$NON-NLS-1$
+    private String SMALL_TRAILER_STRING = "default_small_trailer"; //$NON-NLS-1$
+    private String LARGE_TRAILER_STRING = "default_large_trailer"; //$NON-NLS-1$
     private String INF_STRING = "default_infantry"; //$NON-NLS-1$
     private String BA_STRING = "default_ba"; //$NON-NLS-1$
     private String PROTO_STRING = "default_proto"; //$NON-NLS-1$
@@ -138,6 +143,11 @@ public class MechTileset {
     private MechEntry default_submarine;
     private MechEntry default_hydrofoil;
     private MechEntry default_vtol;
+    private MechEntry default_rail_tractor;
+    private MechEntry default_maglev_tractor;
+    private MechEntry default_trailer;
+    private MechEntry default_large_trailer;
+    private MechEntry default_small_trailer;
     private MechEntry default_inf;
     private MechEntry default_ba;
     private MechEntry default_proto;
@@ -306,6 +316,17 @@ public MechEntry genericFor(Entity entity, int secondaryPos) {
             return default_hydrofoil;
         }
         if (entity instanceof Tank) {
+            if (entity.isTrailer()) {
+                if (entity.isSuperHeavy()) {
+                    return default_large_trailer;
+                } else if ((entity.getWeightClass() == EntityWeightClass.WEIGHT_LIGHT)
+                        || (entity.getWeightClass() == EntityWeightClass.WEIGHT_MEDIUM)
+                        || (entity.getWeightClass() == EntityWeightClass.WEIGHT_SMALL_SUPPORT)) {
+                    return default_small_trailer;
+                } else {
+                    return default_trailer;
+                }
+            }
             if (entity.getMovementMode() == EntityMovementMode.TRACKED) {
                 if (entity.getWeightClass() == EntityWeightClass.WEIGHT_HEAVY) {
                     return default_tracked_heavy;
@@ -330,6 +351,12 @@ public MechEntry genericFor(Entity entity, int secondaryPos) {
             if (entity.getMovementMode() == EntityMovementMode.WIGE) {
                 return default_wige;
             }
+            if (entity.getMovementMode() == EntityMovementMode.RAIL) {
+                return default_rail_tractor;
+            }
+            if (entity.getMovementMode() == EntityMovementMode.MAGLEV) {
+                return default_maglev_tractor;
+            }
         }
         if (entity instanceof GunEmplacement) {
             return default_gun_emplacement;
@@ -487,6 +514,11 @@ public void loadFromFile(String filename) throws IOException {
         default_submarine = exact.get(SUBMARINE_STRING.toUpperCase());
         default_hydrofoil = exact.get(HYDROFOIL_STRING.toUpperCase());
         default_vtol = exact.get(VTOL_STRING.toUpperCase());
+        default_rail_tractor = exact.get(RAIL_TRACTOR_STRING.toUpperCase());
+        default_maglev_tractor = exact.get(RAIL_MAGLEV_STRING.toUpperCase());
+        default_trailer = exact.get(TRAILER_STRING.toUpperCase());
+        default_small_trailer = exact.get(SMALL_TRAILER_STRING.toUpperCase());
+        default_large_trailer = exact.get(LARGE_TRAILER_STRING.toUpperCase());
         default_inf = exact.get(INF_STRING.toUpperCase());
         default_ba = exact.get(BA_STRING.toUpperCase());
         default_proto = exact.get(PROTO_STRING.toUpperCase());

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"))) {