Change: 6/8 standard gauge livestock cars

andythenorth · Feb 11, 2024 · 842c9b8 · 842c9b8
1 parent 9421d7a
commit 842c9b8
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/src/graphics/chassis/3_axle_solid_express_24px.png b/src/graphics/chassis/3_axle_solid_express_24px.png
diff --git a/src/graphics/pony/aggregate_hopper_car_ng_pony_gen_3B.png b/src/graphics/pony/aggregate_hopper_car_ng_pony_gen_3B.png
diff --git a/src/graphics/pony/livestock_car_pony_gen_2B.png b/src/graphics/pony/livestock_car_pony_gen_2B.png
diff --git a/src/graphics/pony/livestock_car_pony_gen_3B.png b/src/graphics/pony/livestock_car_pony_gen_3B.png
diff --git a/src/graphics/pony/livestock_car_pony_gen_4B.png b/src/graphics/pony/livestock_car_pony_gen_4B.png
diff --git a/src/vehicles/aggregate_hopper_cars.py b/src/vehicles/aggregate_hopper_cars.py
@@ -26,18 +26,17 @@ def main():
 
     consist.add_unit(type=FreightCar, chassis="4_axle_ng_16px")
 
-    """ # restore in next version
     consist = HopperCarAggregateConsist(
         roster_id="pony",
         base_numeric_id=13820,
-        gen=4,
-        subtype="U",
+        gen=3,
+        subtype="B",
         base_track_type_name="NG",
         sprites_complete=True,
     )
 
-    consist.add_unit(type=FreightCar, chassis="4_axle_ng_16px")
-    """
+    consist.add_unit(type=FreightCar, chassis="4_axle_ng_24px")
+
     # --------------- pony ----------------------------------------------------------------------
 
     consist = HopperCarAggregateConsist(

diff --git a/src/vehicles/livestock_cars.py b/src/vehicles/livestock_cars.py
@@ -49,7 +49,16 @@ def main():
 
     consist.add_unit(type=FreightCar, chassis="2_axle_filled_16px")
 
-    # no gen 2 needed
+
+    consist = LivestockCarConsist(
+        roster_id="pony",
+        base_numeric_id=18140,
+        gen=2,
+        subtype="B",
+        sprites_complete=True,
+    )
+
+    consist.add_unit(type=FreightCar, chassis="3_axle_solid_express_24px")
 
     consist = LivestockCarConsist(
         roster_id="pony",
@@ -61,6 +70,16 @@ def main():
 
     consist.add_unit(type=FreightCar, chassis="2_axle_filled_16px")
 
+    consist = LivestockCarConsist(
+        roster_id="pony",
+        base_numeric_id=18670,
+        gen=3,
+        subtype="B",
+        sprites_complete=True,
+    )
+
+    consist.add_unit(type=FreightCar, chassis="3_axle_solid_express_24px")
+
     consist = LivestockCarConsist(
         roster_id="pony",
         base_numeric_id=18260,
@@ -71,6 +90,16 @@ def main():
 
     consist.add_unit(type=FreightCar, chassis="2_axle_filled_16px")
 
+    consist = LivestockCarConsist(
+        roster_id="pony",
+        base_numeric_id=10550,
+        gen=4,
+        subtype="B",
+        sprites_complete=True,
+    )
+
+    consist.add_unit(type=FreightCar, chassis="2_axle_filled_24px")
+
     consist = LivestockCarConsist(
         roster_id="pony",
         base_numeric_id=18280,