diff --git a/src/gestalt_graphics/graphics_constants.py b/src/gestalt_graphics/graphics_constants.py index 656fce6bd..572a6434a 100644 --- a/src/gestalt_graphics/graphics_constants.py +++ b/src/gestalt_graphics/graphics_constants.py @@ -261,6 +261,26 @@ 142: 30, 143: 168, } +covered_coil_car_asymmetric_body_recolour_map = { + 136: 5, + 137: 6, + 138: 7, + 139: 20, + 140: 21, + 141: 22, + 142: 23, + 143: 14, +} +covered_coil_car_asymmetric_body_recolour_map_weathered = { + 136: 33, + 137: 34, + 138: 7, + 139: 36, + 140: 21, + 141: 22, + 142: 23, + 143: 39, +} v_barrel_silo_car_livery_recolour_maps = { 136: CC1, 137: CC1 + 1, diff --git a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4B.png b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4B.png index 3612d4909..21e046f11 100644 Binary files a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4B.png and b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4B.png differ diff --git a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4C.png b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4C.png index 4a1435e5c..049e19ba3 100644 Binary files a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4C.png and b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_4C.png differ diff --git a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5B.png b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5B.png new file mode 100644 index 000000000..dcad0b9ca Binary files /dev/null and b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5B.png differ diff --git a/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5C.png b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5C.png new file mode 100644 index 000000000..13a227dd7 Binary files /dev/null and b/src/graphics/pony/coil_car_covered_asymmetric_pony_gen_5C.png differ diff --git a/src/train.py b/src/train.py index 520850bf9..7bb66adfa 100755 --- a/src/train.py +++ b/src/train.py @@ -3166,7 +3166,8 @@ def __init__(self, **kwargs): self.use_named_buyable_variant_group = "wagon_group_coil_cars" self._joker = True # Graphics configuration - weathered_variants = {"unweathered": graphics_constants.body_recolour_CC1} + weathered_variants = {"unweathered": graphics_constants.covered_coil_car_asymmetric_body_recolour_map, + "weathered": graphics_constants.covered_coil_car_asymmetric_body_recolour_map_weathered} self.gestalt_graphics = GestaltGraphicsVisibleCargo( weathered_variants=weathered_variants, liveries=[ @@ -3177,7 +3178,7 @@ def __init__(self, **kwargs): "RANDOM_FROM_CONSIST_LIVERIES_2" ], global_constants.freight_wagon_liveries[ - "RANDOM_FROM_CONSIST_LIVERIES_3" + "RANDOM_FROM_CONSIST_LIVERIES_7" ], global_constants.freight_wagon_liveries[ "COMPANY_COLOUR_USE_WEATHERING" @@ -3185,8 +3186,8 @@ def __init__(self, **kwargs): global_constants.freight_wagon_liveries[ "COMPLEMENT_COMPANY_COLOUR_USE_WEATHERING" ], + global_constants.freight_wagon_liveries["FREIGHT_RUBY"], global_constants.freight_wagon_liveries["FREIGHT_BAUXITE"], - global_constants.freight_wagon_liveries["FREIGHT_GREY"], ], piece="coil", has_cover=True, diff --git a/src/vehicles/coil_cars_covered_asymmetric.py b/src/vehicles/coil_cars_covered_asymmetric.py index 839b87b1f..cb0901677 100644 --- a/src/vehicles/coil_cars_covered_asymmetric.py +++ b/src/vehicles/coil_cars_covered_asymmetric.py @@ -25,24 +25,23 @@ def main(): ) consist.add_unit(type=CoilCarAsymmetric, chassis="4_axle_filled_32px") - """ + consist = CoilCarCoveredAsymmetricConsist( roster_id="pony", - base_numeric_id=12570, + base_numeric_id=13430, gen=5, subtype="B", - sprites_complete=True, + sprites_complete=False, ) consist.add_unit(type=CoilCarAsymmetric, chassis="4_axle_1cc_filled_24px") consist = CoilCarCoveredAsymmetricConsist( roster_id="pony", - base_numeric_id=12580, + base_numeric_id=15730, gen=5, subtype="C", - sprites_complete=True, + sprites_complete=False, ) consist.add_unit(type=CoilCarAsymmetric, chassis="4_axle_1cc_filled_32px") - """