Codechange: WIP on refactoring MineralCoveredHopperCar subclass names

andythenorth · Oct 5, 2024 · d762837 · d762837
1 parent 9936197
commit d762837
Show file tree

Hide file tree

Showing 8 changed files with 246 additions and 246 deletions.
diff --git a/src/train.py b/src/train.py
diff --git a/src/vehicles/pony/lime_covered_hopper_cars_randomised_pony.py b/src/vehicles/pony/lime_covered_hopper_cars_randomised_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarLimeRandomisedConsist, FreightCar
+from train import MineralCoveredHopperCarLimeRandomisedConsist, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge ---------------------------------------------------------------
 
-    consist = MineralChemicalCoveredHopperCarLimeRandomisedConsist(
+    consist = MineralCoveredHopperCarLimeRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24750,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeRandomisedConsist(
+    consist = MineralCoveredHopperCarLimeRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26610,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeRandomisedConsist(
+    consist = MineralCoveredHopperCarLimeRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26620,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeRandomisedConsist(
+    consist = MineralCoveredHopperCarLimeRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26630,
@@ -48,7 +48,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeRandomisedConsist(
+    consist = MineralCoveredHopperCarLimeRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26640,

diff --git a/src/vehicles/pony/lime_covered_hopper_cars_type_1_pony.py b/src/vehicles/pony/lime_covered_hopper_cars_type_1_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarLimeConsistType1, FreightCar
+from train import MineralCoveredHopperCarLimeConsistType1, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge ---------------------------------------------------------------
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=25990,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26000,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26010,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26020,
@@ -48,7 +48,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26070,
@@ -59,7 +59,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26030,
@@ -70,7 +70,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType1(
+    consist = MineralCoveredHopperCarLimeConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26040,

diff --git a/src/vehicles/pony/lime_covered_hopper_cars_type_2_pony.py b/src/vehicles/pony/lime_covered_hopper_cars_type_2_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarLimeConsistType2, FreightCar
+from train import MineralCoveredHopperCarLimeConsistType2, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge ---------------------------------------------------------------
     """
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=25990,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26000,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
     """
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24900,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24910,
@@ -48,7 +48,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24920,
@@ -59,7 +59,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24930,
@@ -70,7 +70,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_filled_greebled_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType2(
+    consist = MineralCoveredHopperCarLimeConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=22250,

diff --git a/src/vehicles/pony/lime_covered_hopper_cars_type_3_pony.py b/src/vehicles/pony/lime_covered_hopper_cars_type_3_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarLimeConsistType3, FreightCar
+from train import MineralCoveredHopperCarLimeConsistType3, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge ---------------------------------------------------------------
     """
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=25990,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=26000,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
     """
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=34840,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=33820,
@@ -48,7 +48,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=33030,
@@ -59,7 +59,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_16px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=34850,
@@ -70,7 +70,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_filled_greebled_24px")
 
-    consist = MineralChemicalCoveredHopperCarLimeConsistType3(
+    consist = MineralCoveredHopperCarLimeConsistType3(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=36340,

diff --git a/src/vehicles/pony/roller_roof_hopper_cars_randomised_pony.py b/src/vehicles/pony/roller_roof_hopper_cars_randomised_pony.py
@@ -1,9 +1,9 @@
-from train import CoveredHopperCarRollerRoofRandomisedConsist, FreightCar
+from train import MineralCoveredHopperCarRollerRoofRandomisedConsist, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge ---------------------------------------------------------------
-    consist = CoveredHopperCarRollerRoofRandomisedConsist(
+    consist = MineralCoveredHopperCarRollerRoofRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24650,
@@ -14,7 +14,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_16px")
 
-    consist = CoveredHopperCarRollerRoofRandomisedConsist(
+    consist = MineralCoveredHopperCarRollerRoofRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24670,
@@ -25,7 +25,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_24px")
 
-    consist = CoveredHopperCarRollerRoofRandomisedConsist(
+    consist = MineralCoveredHopperCarRollerRoofRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24690,
@@ -36,7 +36,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="empty_16px")
 
-    consist = CoveredHopperCarRollerRoofRandomisedConsist(
+    consist = MineralCoveredHopperCarRollerRoofRandomisedConsist(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24710,

diff --git a/src/vehicles/pony/roller_roof_hopper_cars_type_1_pony.py b/src/vehicles/pony/roller_roof_hopper_cars_type_1_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarRollerRoofConsistType1, FreightCar
+from train import MineralCoveredHopperCarRollerRoofConsistType1, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge -----------------------------------------------------------------
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType1(
+    consist = MineralCoveredHopperCarRollerRoofConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=23670,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType1(
+    consist = MineralCoveredHopperCarRollerRoofConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=16840,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_24px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType1(
+    consist = MineralCoveredHopperCarRollerRoofConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=23730,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_16px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType1(
+    consist = MineralCoveredHopperCarRollerRoofConsistType1(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=17160,

diff --git a/src/vehicles/pony/roller_roof_hopper_cars_type_2_pony.py b/src/vehicles/pony/roller_roof_hopper_cars_type_2_pony.py
@@ -1,10 +1,10 @@
-from train import MineralChemicalCoveredHopperCarRollerRoofConsistType2, FreightCar
+from train import MineralCoveredHopperCarRollerRoofConsistType2, FreightCar
 
 
 def main(roster_id, **kwargs):
     # --------------- standard gauge -----------------------------------------------------------------
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType2(
+    consist = MineralCoveredHopperCarRollerRoofConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24610,
@@ -15,7 +15,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_16px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType2(
+    consist = MineralCoveredHopperCarRollerRoofConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=24630,
@@ -26,7 +26,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_24px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType2(
+    consist = MineralCoveredHopperCarRollerRoofConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=34730,
@@ -37,7 +37,7 @@ def main(roster_id, **kwargs):
 
     consist.add_unit(type=FreightCar, chassis="2_axle_gapped_greebled_16px")
 
-    consist = MineralChemicalCoveredHopperCarRollerRoofConsistType2(
+    consist = MineralCoveredHopperCarRollerRoofConsistType2(
         roster_id=roster_id,
         roster_id_providing_module=kwargs["roster_id_providing_module"],
         base_numeric_id=33010,