Change: split Shoebox and Dynamo lines, making Shoeboxes heavy_genera…

…l; remove Super Shoebox as redundant, introduce Ultra Shoebox in 1995 or so, bump stats around for balance; also add Cyclone 2200 hp electric locomotive, introduced around 1994 or so, as continuation for Dynamo;

src/rosters/pony.py

@@ -27,14 +27,13 @@
 from vehicles import cargo_sprinter
 from vehicles import carrack
 from vehicles import centaur
-
-# from vehicles import challenger # for NA roster
 from vehicles import cheddar_valley
 from vehicles import cheese_bug
 from vehicles import chinook
 from vehicles import chuggypig
 from vehicles import clipper
 from vehicles import constance
+from vehicles import cyclone
 from vehicles import daring
 from vehicles import deasil
 from vehicles import decapod
@@ -138,7 +137,6 @@
 from vehicles import streamer
 from vehicles import strongbow
 from vehicles import sunshine_coast
-from vehicles import super_shoebox
 from vehicles import swift
 from vehicles import tenacious
 from vehicles import tencendur
@@ -743,8 +741,8 @@ def main():
             defiant,
             relentless,
             dynamo,
+            cyclone,
             shoebox,
-            super_shoebox,
             ultra_shoebox,
             hurly_burly,
             moor_gallop,

src/vehicles/cyclone.py

@@ -0,0 +1,37 @@
+from train import EngineConsist, ElectricEngineUnit
+
+
+def main(roster_id):
+    consist = EngineConsist(
+        roster_id=roster_id,
+        id="cyclone",
+        base_numeric_id=8440,
+        name="Cyclone",
+        role="express",
+        role_child_branch_num=-1,
+        power_by_power_source={
+            "AC": 2200,
+        },
+        random_reverse=True,
+        gen=5,
+        pantograph_type="diamond-double",
+        intro_year_offset=4,  # introduce later than gen epoch by design
+        extended_vehicle_life=True,
+        fixed_run_cost_points=180,  # substantial cost bonus for balance against same-era steam engines
+        additional_liveries=[],
+        default_livery_extra_docs_examples=[
+            ("COLOUR_PINK", "COLOUR_WHITE"),
+            ("COLOUR_LIGHT_BLUE", "COLOUR_WHITE"),
+            ("COLOUR_PALE_GREEN", "COLOUR_PINK"),
+        ],
+        sprites_complete=True,
+    )
+
+    consist.add_unit(
+        type=ElectricEngineUnit, weight=92, vehicle_length=8, spriterow_num=0
+    )
+
+    consist.description = """."""
+    consist.foamer_facts = """ """
+
+    return consist

src/vehicles/shoebox.py

@@ -7,22 +7,22 @@ def main(roster_id):
         id="shoebox",
         base_numeric_id=9320,
         name="Shoebox",
-        role="express",
-        role_child_branch_num=-1,
-        power_by_power_source={"DIESEL": 950, "AC": 2300},
+        role="heavy_express",
+        role_child_branch_num=-3,
+        power_by_power_source={"DIESEL": 950, "AC": 2500},
         random_reverse=True,
         pantograph_type="z-shaped-single",
         gen=4,
         intro_year_offset=3,  # introduce later than gen epoch by design
-        additional_liveries=["BANGER_BLUE"],
+        additional_liveries=["BANGER_BLUE", "INTERCITY_RASPBERRY_RIPPLE", "RES", "RAILFREIGHT_TRIPLE_GREY", "SWOOSH", "DBSCHENKER"], # "RAILFREIGHT_TRIPLE_GREY"
         default_livery_extra_docs_examples=[
             ("COLOUR_PALE_GREEN", "COLOUR_WHITE"),
             ("COLOUR_BLUE", "COLOUR_BLUE"),
             ("COLOUR_PINK", "COLOUR_WHITE"),
             ("COLOUR_LIGHT_BLUE", "COLOUR_WHITE"),
             ("COLOUR_CREAM", "COLOUR_WHITE"),
         ],
-        sprites_complete=True,
+        sprites_complete=False,
     )
 
     consist.add_unit(

src/vehicles/super_shoebox.py

@@ -7,12 +7,12 @@ def main(roster_id):
         id="super_shoebox",
         base_numeric_id=9920,
         name="Super Shoebox",
-        role="express",
-        role_child_branch_num=-1,
+        role="heavy_express",
+        role_child_branch_num=-3,
         power_by_power_source={"DIESEL": 1250, "AC": 2600},
         random_reverse=True,
         pantograph_type="z-shaped-single",
-        gen=5,
+        gen=6,
         # additional_liveries=["RAILFREIGHT_TRIPLE_GREY", "DUTCH"],
         additional_liveries=["INTERCITY_RASPBERRY_RIPPLE", "RES", "SWOOSH", "DBSCHENKER"], # "RAILFREIGHT_TRIPLE_GREY"
         default_livery_extra_docs_examples=[

src/vehicles/ultra_shoebox.py

@@ -7,12 +7,15 @@ def main(roster_id):
         id="ultra_shoebox",
         base_numeric_id=11210,
         name="Ultra Shoebox",
-        role="express",
-        role_child_branch_num=-1,
+        role="heavy_express",
+        role_child_branch_num=-3,
         power_by_power_source={"DIESEL": 1650, "AC": 2800},
+        speed=125, # for lolz and also gen 6 compatibility
         random_reverse=True,
         pantograph_type="z-shaped-single",
-        gen=6,
+        gen=5,
+        intro_year_offset=6, # earlier than anything IRL, but we want 125 mph capability so eh, there we go
+        extended_vehicle_life=True, # because long time until replaced
         additional_liveries=[],
         default_livery_extra_docs_examples=[
             ("COLOUR_RED", "COLOUR_RED"),
@@ -24,7 +27,7 @@ def main(roster_id):
             ("COLOUR_PALE_GREEN", "COLOUR_WHITE"),
         ],
         sprites_complete=True,
-        sprites_additional_liveries_potential=True,  # banger blue, yellow?
+        sprites_additional_liveries_potential=True,  # banger blue, yellow? - unused banger blue from Super Shoebox also?  Freightliner swoosh?
     )
 
     consist.add_unit(