196 added Chiltern livery and tidied up sprite switches

Author: audigex

build.py

@@ -75,13 +75,10 @@ def handle_folder(directory: Path, auto=False):
     if (directory / "sprites").exists():
         file_list.update(handle_folder(directory / "sprites", auto))
         file_list.update(find_files_in_directory(directory / "sprites"))
-
-    # Grab the vehicles
+    
     file_list.update(find_files_in_directory(directory))
 
-    # Automatically look at subdirectories
     if auto:
-        # Don't automatically walk subdirectories, only when auto is set
         exclude_dirs = {"append", "prepend", "sprites"}
         subdirectories = [p for p in directory.iterdir() if p.is_dir() and p.name not in exclude_dirs]
         for subdir in subdirectories:        

gfx/DMU/196.png

@@ -1,9 +1,15 @@
 // Choose sprites depending on car position
-switch(FEAT_TRAINS, SELF, switch_br_196_0_spriteset, position_in_articulated_veh % 2) {
-	0: spriteset_BR196_front_WestMidlands;
-	spriteset_BR196_middle_WestMidlands;
+switch(FEAT_TRAINS, SELF, switch_br_196_0_spriteset, cargo_subtype) {
+	0: sw_BR196_WMR;
+	1: sw_BR196_Chiltern;
 }
 
+switch(FEAT_TRAINS, SELF, switch_br_196_0_liveries, cargo_subtype) {
+	0: return string(str_WMR);
+	1: return string(str_Chiltern);
+}
+
+
 // Define articulations
 switch(FEAT_TRAINS, SELF, switch_br_196_0_articulated, extra_callback_info1) {
 	// extra_callback_info1 returns the car number, so 1 is the second car, .. so on
@@ -66,6 +72,7 @@ item(FEAT_TRAINS, item_br_196_0, 432) {
 	graphics {
 		default: switch_br_196_0_spriteset;
 		purchase: spriteset_BR196_Purchase;
+		cargo_subtype_text: switch_br_196_0_liveries;
 
 		articulated_part: switch_br_196_0_articulated;
 		start_stop: switch_br_196_0_start_stop;	

src/trains/diesel_mu/Civity/196-0.pnml

@@ -1,8 +1,6 @@
 // Choose sprites depending on car position
-switch(FEAT_TRAINS, SELF, switch_br_196_1_spriteset, position_in_articulated_veh % 4) {
-	0: spriteset_BR196_front_WestMidlands;
-	3: spriteset_BR196_middle_WestMidlands;
-	spriteset_BR196_rear_WestMidlands;
+switch(FEAT_TRAINS, SELF, switch_br_196_1_spriteset, cargo_subtype) {
+	sw_BR196_WMR;
 }
 
 // Define articulations

src/trains/diesel_mu/Civity/196-1.pnml

@@ -2,14 +2,42 @@ spriteset(spriteset_BR196_Purchase, "gfx/DMU/196.png") {
 	template_purchase(0, 0)
 }
 
-spriteset(spriteset_BR196_front_WestMidlands, "gfx/DMU/196.png") {
+spriteset(spriteset_BR196_front_WMR, "gfx/DMU/196.png") {
 	template_train32px(0, 13)
 }
-
-spriteset(spriteset_BR196_middle_WestMidlands, "gfx/DMU/196.png") {
+spriteset(spriteset_BR196_rear_WMR, "gfx/DMU/196.png") {
 	template_train32px(0, 39)
 }
-
-spriteset(spriteset_BR196_rear_WestMidlands, "gfx/DMU/196.png") {
+spriteset(spriteset_BR196_middle_WMR, "gfx/DMU/196.png") {
 	template_train32px(0, 65)
+}
+switch(FEAT_TRAINS, SELF, sw_BR196_WMR_sw2, position_in_articulated_veh)
+{
+	0: spriteset_BR196_front_WMR;
+	spriteset_BR196_middle_WMR;
+}
+switch(FEAT_TRAINS, SELF, sw_BR196_WMR, position_in_articulated_veh_from_end)
+{
+	0: spriteset_BR196_rear_WMR;
+	sw_BR196_WMR_sw2;
+}
+
+spriteset(spriteset_BR196_front_Chiltern, "gfx/DMU/196.png") {
+	template_train32px(0, 91)
+}
+spriteset(spriteset_BR196_rear_Chiltern, "gfx/DMU/196.png") {
+	template_train32px(0, 117)
+}
+spriteset(spriteset_BR196_middle_Chiltern, "gfx/DMU/196.png") {
+	template_train32px(0, 113)
+}
+switch(FEAT_TRAINS, SELF, sw_BR196_Chiltern_sw2, position_in_articulated_veh)
+{
+	0: spriteset_BR196_front_Chiltern;
+	spriteset_BR196_middle_Chiltern;
+}
+switch(FEAT_TRAINS, SELF, sw_BR196_Chiltern, position_in_articulated_veh_from_end)
+{
+	0: spriteset_BR196_rear_Chiltern;
+	sw_BR196_Chiltern_sw2;
 }