Change: WIP on improved tank car variants

andythenorth · Oct 21, 2024 · bf392a6 · bf392a6
1 parent 3c7d35a
commit bf392a6
Show file tree

Hide file tree

Showing 69 changed files with 2,563 additions and 142 deletions.
diff --git a/src/gestalt_graphics/graphics_constants.py b/src/gestalt_graphics/graphics_constants.py
@@ -527,7 +527,7 @@
     143: 23,
 }
 
-product_tank_car_livery_recolour_map = {
+silver_grey_tank_car_livery_recolour_map = {
     136: 16,
     137: 18,
     138: 19,
@@ -537,7 +537,7 @@
     142: 23,
     143: 14,
 }
-product_tank_car_livery_recolour_map_weathered = {
+silver_grey_tank_car_livery_recolour_map_weathered = {
     136: 16,
     137: 5,
     138: 7,
@@ -667,4 +667,3 @@
     142: 12,
     143: 14,
 }
-
diff --git a/src/global_constants.py b/src/global_constants.py
@@ -110,7 +110,12 @@
     "bulk_cars_mixed_randomised",
     "tank_cars_type_1",
     "tank_cars_type_2",
-    "product_tank_cars",
+    "tank_cars_type_3",
+    "tank_cars_randomised",
+    "volatiles_tank_cars_type_1",
+    "product_tank_cars_type_1",
+    "product_tank_cars_type_2",
+    "product_tank_cars_randomised",
     "acid_tank_cars_type_1",
     "acid_tank_cars_type_2",
     "acid_tank_cars_randomised",
@@ -347,8 +352,9 @@
     "wagon_group_lime_covered_hopper_cars": "lime_covered_hopper_car_type_1",
     "wagon_group_open_cars": "open_car",
     "wagon_group_passenger_cars": "passenger_car",
-    "wagon_group_pressure_tank_cars": "pressure_tank_car",
     "wagon_group_piece_goods_cars_randomised": "piece_goods_car_mixed_randomised",
+    "wagon_group_pressure_tank_cars": "pressure_tank_car",
+    "wagon_group_product_tank_cars": "product_tank_car_type_1",
     "wagon_group_reefer_cars": "reefer_car_type_1",
     "wagon_group_roller_roof_hopper_cars": "roller_roof_hopper_car_type_1",
     "wagon_group_salt_covered_hopper_cars": "salt_covered_hopper_car",
@@ -359,6 +365,7 @@
     "wagon_group_tarpaulin_cars": "tarpaulin_car_type_1",
     "wagon_group_tippler_bulk_open_cars": "tippler_bulk_open_car_type_1",
     "wagon_group_vehicle_transporter_cars": "automobile_car",
+    "wagon_group_volatiles_tank_cars": "volatiles_tank_car_type_1",
 }
 
 # custom remappings of cc1/cc2, used in recolour_sprites, not used in graphics generation, so not in graphics_constants

diff --git a/src/graphics/pony/product_tank_car_pony_gen_2A.png b/src/graphics/pony/product_tank_car_pony_gen_2A.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_3A.png b/src/graphics/pony/product_tank_car_pony_gen_3A.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_3B.png b/src/graphics/pony/product_tank_car_pony_gen_3B.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_3C.png b/src/graphics/pony/product_tank_car_pony_gen_3C.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_4A.png b/src/graphics/pony/product_tank_car_pony_gen_4A.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_4B.png b/src/graphics/pony/product_tank_car_pony_gen_4B.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_4C.png b/src/graphics/pony/product_tank_car_pony_gen_4C.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_5A.png b/src/graphics/pony/product_tank_car_pony_gen_5A.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_5B.png b/src/graphics/pony/product_tank_car_pony_gen_5B.png
diff --git a/src/graphics/pony/product_tank_car_pony_gen_5C.png b/src/graphics/pony/product_tank_car_pony_gen_5C.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_2A.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_2A.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_3A.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_3A.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_3B.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_3B.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_3C.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_3C.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_4A.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_4A.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_4B.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_4B.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_4C.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_4C.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_5A.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_5A.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_5B.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_5B.png
diff --git a/src/graphics/pony/product_tank_car_type_1_pony_gen_5C.png b/src/graphics/pony/product_tank_car_type_1_pony_gen_5C.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_2A.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_2A.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_3A.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_3A.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_3B.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_3B.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_3C.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_3C.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_4A.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_4A.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_4B.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_4B.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_4C.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_4C.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_5A.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_5A.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_5B.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_5B.png
diff --git a/src/graphics/pony/product_tank_car_type_2_pony_gen_5C.png b/src/graphics/pony/product_tank_car_type_2_pony_gen_5C.png
diff --git a/src/graphics/pony/tank_car_type_1_pony_gen_5C.png b/src/graphics/pony/tank_car_type_1_pony_gen_5C.png
diff --git a/src/graphics/pony/tank_car_type_2_pony_gen_5C.png b/src/graphics/pony/tank_car_type_2_pony_gen_5C.png
diff --git a/src/graphics/pony/tank_car_type_3_pony_gen_5C.png b/src/graphics/pony/tank_car_type_3_pony_gen_5C.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_1A.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_1A.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_2B.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_2B.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3A.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3A.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3B.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3B.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3C.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_3C.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4A.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4A.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4B.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4B.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4C.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_4C.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5A.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5A.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5B.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5B.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5C.png b/src/graphics/pony/volatiles_tank_car_type_1_pony_gen_5C.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_2_pony_gen_5A.png b/src/graphics/pony/volatiles_tank_car_type_2_pony_gen_5A.png
diff --git a/src/graphics/pony/volatiles_tank_car_type_2_pony_gen_5B.png b/src/graphics/pony/volatiles_tank_car_type_2_pony_gen_5B.png
diff --git a/src/lang/catalan.toml b/src/lang/catalan.toml
@@ -132,7 +132,7 @@ base = "Cotxe de passatge"
 [STR_NAME_SUFFIX_DROP_SIDE_FLAT_CAR]
 base = "Cotxe plater"
 
-[STR_NAME_SUFFIX_PRODUCT_TANK_CAR]
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_1]
 base = "Cotxe tanc"
 
 [STR_NAME_SUFFIX_RAILCAR_PASSENGER_TRAILER_CAR]

diff --git a/src/lang/english.toml b/src/lang/english.toml
@@ -493,6 +493,9 @@ base = "Torpedo Wagons"
 [STR_WAGON_GROUP_VEHICLE_TRANSPORTER_CARS]
 base = "Vehicle Transporters"
 
+[STR_WAGON_GROUP_VOLATILES_TANK_CARS]
+base = "Volatiles Tankers"
+
 # wagon class suffixes, as of Jan 2019 these are switched from en-us to en-gb; !! consider splitting strings per roster?? A US caboose is still a 'caboose' in en-gb, not a brake van
 [STR_NAME_SUFFIX_ACID_TANK_CAR_RANDOMISED]
 base = "Acid Tanker"
@@ -836,7 +839,13 @@ base = "Pipe Wagon"
 [STR_NAME_SUFFIX_PRESSURE_TANK_CAR]
 base = "Pressure Tanker"
 
-[STR_NAME_SUFFIX_PRODUCT_TANK_CAR]
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_RANDOMISED]
+base = "Product Tanker"
+
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_1]
+base = "Product Tanker"
+
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_2]
 base = "Product Tanker"
 
 [STR_NAME_SUFFIX_RAILBUS_PASSENGER_TRAILER_CAR]
@@ -926,12 +935,18 @@ base = "Suburban Coach"
 [STR_NAME_SUFFIX_SWING_ROOF_HOPPER_CAR]
 base = "Swing Roof Hopper"
 
+[STR_NAME_SUFFIX_TANK_CAR_RANDOMISED]
+base = "Tanker"
+
 [STR_NAME_SUFFIX_TANK_CAR_TYPE_1]
 base = "Tanker"
 
 [STR_NAME_SUFFIX_TANK_CAR_TYPE_2]
 base = "Tanker"
 
+[STR_NAME_SUFFIX_TANK_CAR_TYPE_3]
+base = "Tanker"
+
 [STR_NAME_SUFFIX_TARPAULIN_CAR_RANDOMISED]
 base = "Tarpaulin Wagon"
 
@@ -962,6 +977,9 @@ base = "Torpedo Wagon"
 [STR_NAME_SUFFIX_VEHICLE_PARTS_BOX_CAR]
 base = "Sliding Wall Van"
 
+[STR_NAME_SUFFIX_VOLATILES_TANK_CAR_TYPE_1]
+base = "Volatiles Tanker"
+
 # cargo subtypes - only used for automobile cars (specifically vehicles cargo) as of May 2021
 [STR_CARGO_SUBTYPE_VEHI_0]
 base = "(Cars)"

diff --git a/src/lang/french.toml b/src/lang/french.toml
@@ -564,7 +564,7 @@ base = "Wagon porte-tôles"
 [STR_NAME_SUFFIX_PRESSURE_TANK_CAR]
 base = "Wagon-citerne pressurisé"
 
-[STR_NAME_SUFFIX_PRODUCT_TANK_CAR]
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_1]
 base = "Wagon-citerne à produits"
 
 [STR_NAME_SUFFIX_RAILBUS_PASSENGER_TRAILER_CAR]

diff --git a/src/lang/indonesian.toml b/src/lang/indonesian.toml
@@ -131,7 +131,7 @@ base = "Gerbong Penumpang"
 [STR_NAME_SUFFIX_DROP_SIDE_FLAT_CAR]
 base = "Gerbong Piring"
 
-[STR_NAME_SUFFIX_PRODUCT_TANK_CAR]
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_1]
 base = "Tanker Produk"
 
 [STR_NAME_SUFFIX_RAILBUS_PASSENGER_TRAILER_CAR]

diff --git a/src/lang/spanish.toml b/src/lang/spanish.toml
@@ -132,7 +132,7 @@ base = "Vagón de pasaje"
 [STR_NAME_SUFFIX_DROP_SIDE_FLAT_CAR]
 base = "Vagón platero"
 
-[STR_NAME_SUFFIX_PRODUCT_TANK_CAR]
+[STR_NAME_SUFFIX_PRODUCT_TANK_CAR_TYPE_1]
 base = "Vagón tanque"
 
 [STR_NAME_SUFFIX_RAILCAR_PASSENGER_TRAILER_CAR]

diff --git a/src/polar_fox/cargo_classes/__init__.py b/src/polar_fox/cargo_classes/__init__.py
@@ -0,0 +1 @@
+
diff --git a/src/polar_fox/cargo_classes/_files_here_are_generated.txt b/src/polar_fox/cargo_classes/_files_here_are_generated.txt
@@ -0,0 +1,6 @@
+"""
+These files are generated from the Polar Fox project.
+Don't make changes here, make them in the Polar Fox project and redistribute.
+Any changes made here are liable to be over-written.
+"""
+