diff --git a/src/graphics/pony/merchandise_open_car_ng_pony_gen_1A.png b/src/graphics/pony/merchandise_open_car_ng_pony_gen_1A.png new file mode 100644 index 000000000..495b2ebc3 Binary files /dev/null and b/src/graphics/pony/merchandise_open_car_ng_pony_gen_1A.png differ diff --git a/src/vehicles/merchandise_open_cars.py b/src/vehicles/merchandise_open_cars.py index 0fb629188..4ba12ba97 100644 --- a/src/vehicles/merchandise_open_cars.py +++ b/src/vehicles/merchandise_open_cars.py @@ -4,6 +4,17 @@ def main(): # --------------- pony NG ---------------------------------------------------------------------- + consist = OpenCarMerchandiseConsist( + roster_id="pony", + base_numeric_id=11850, + gen=1, + subtype="A", + base_track_type_name="NG", + sprites_complete=True, + ) + + consist.add_unit(type=FreightCar, chassis="4_axle_ng_16px") + consist = OpenCarMerchandiseConsist( roster_id="pony", base_numeric_id=14950, diff --git a/src/vehicles/randomised_dump_cars.py b/src/vehicles/randomised_dump_cars.py index b727e6ac0..98b389c75 100644 --- a/src/vehicles/randomised_dump_cars.py +++ b/src/vehicles/randomised_dump_cars.py @@ -15,8 +15,6 @@ def main(): consist.add_unit(type=FreightCar, chassis="empty_16px") - # no new type A for gen 2, gen 1 type A continues - consist = DumpCarRandomisedConsist( roster_id="pony", base_numeric_id=15880, @@ -28,18 +26,17 @@ def main(): consist.add_unit(type=FreightCar, chassis="empty_16px") - """ # restore in next version consist = DumpCarRandomisedConsist( roster_id="pony", - base_numeric_id=14540, - gen=4, - subtype="U", + base_numeric_id=10900, + gen=3, + subtype="B", base_track_type_name="NG", sprites_complete=True, ) - consist.add_unit(type=FreightCar, chassis="empty_16px") - """ + consist.add_unit(type=FreightCar, chassis="empty_24px") + # --------------- pony ---------------------------------------------------------------------- consist = DumpCarRandomisedConsist( diff --git a/src/vehicles/randomised_hopper_cars.py b/src/vehicles/randomised_hopper_cars.py index d1b3e75f7..9019a11d1 100644 --- a/src/vehicles/randomised_hopper_cars.py +++ b/src/vehicles/randomised_hopper_cars.py @@ -15,8 +15,6 @@ def main(): consist.add_unit(type=FreightCar, chassis="empty_16px") - # no new type A for gen 2, gen 1 type A continues - consist = HopperCarRandomisedConsist( roster_id="pony", base_numeric_id=10690, @@ -28,18 +26,17 @@ def main(): consist.add_unit(type=FreightCar, chassis="empty_16px") - """ # restore in next version consist = HopperCarRandomisedConsist( roster_id="pony", - base_numeric_id=11850, - gen=4, - subtype="U", + base_numeric_id=9620, + gen=3, + subtype="B", base_track_type_name="NG", sprites_complete=True, ) - consist.add_unit(type=FreightCar, chassis="empty_16px") - """ + consist.add_unit(type=FreightCar, chassis="empty_24px") + # --------------- pony ---------------------------------------------------------------------- consist = HopperCarRandomisedConsist( diff --git a/src/vehicles/randomised_open_cars.py b/src/vehicles/randomised_open_cars.py index 1b38086c2..c1d6b99fb 100644 --- a/src/vehicles/randomised_open_cars.py +++ b/src/vehicles/randomised_open_cars.py @@ -2,6 +2,41 @@ def main(): + # --------------- pony ng ---------------------------------------------------------------------- + + consist = OpenCarRandomisedConsist( + roster_id="pony", + base_numeric_id=9900, + gen=1, + subtype="A", + base_track_type_name="NG", + sprites_complete=True, + ) + + consist.add_unit(type=FreightCar, chassis="empty_16px") + + consist = OpenCarRandomisedConsist( + roster_id="pony", + base_numeric_id=9950, + gen=3, + subtype="A", + base_track_type_name="NG", + sprites_complete=True, + ) + + consist.add_unit(type=FreightCar, chassis="empty_16px") + + consist = OpenCarRandomisedConsist( + roster_id="pony", + base_numeric_id=11080, + gen=3, + subtype="B", + base_track_type_name="NG", + sprites_complete=True, + ) + + consist.add_unit(type=FreightCar, chassis="empty_24px") + # --------------- pony ---------------------------------------------------------------------- consist = OpenCarRandomisedConsist(