Re-drew 507 and 508, moved to new template

BRTrains · May 7, 2024 · 8c41870 · 8c41870
1 parent 0104ab5
commit 8c41870
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 107 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -19,6 +19,7 @@
 - Re-drew Class 195
 - Re-drew Class 331
 - Re-drew Class 397
+- Re-drew Class 507 and 508
 - Re-drew Mk5 coaches and DVT
 - Improved Class 67
 - Added GWR livery for Class 230

diff --git a/gfx/BR508.png → gfx/Archive/BR508.png b/gfx/BR508.png → gfx/Archive/BR508.png
diff --git a/gfx/EMU/507_508.png b/gfx/EMU/507_508.png
diff --git a/src/trains/_spriteset/EMU_Sprites/508_508.pnml b/src/trains/_spriteset/EMU_Sprites/508_508.pnml
@@ -0,0 +1,84 @@
+spriteset(spriteset_BR508_Purchase, "gfx/EMU/507_508.png") {
+	template_purchase(0, 0)
+}
+
+spriteset(spriteset_BR508a_BRBlue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 13)
+}
+spriteset(spriteset_BR508b_BRBlue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 39)
+}
+spriteset(spriteset_BR508c_BRBlue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 65)
+}
+
+spriteset(spriteset_BR508a_GoodComs, "gfx/EMU/507_508.png") {
+	template_train32px(0, 169)
+}
+spriteset(spriteset_BR508b_GoodComs, "gfx/EMU/507_508.png") {
+	template_train32px(0, 195)
+}
+spriteset(spriteset_BR508c_GoodComs, "gfx/EMU/507_508.png") {
+	template_train32px(0, 221)
+}
+
+spriteset(spriteset_BR508a_MerseyRail, "gfx/EMU/507_508.png") {
+	template_train32px(0, 247)
+}
+spriteset(spriteset_BR508b_MerseyRail, "gfx/EMU/507_508.png") {
+	template_train32px(0, 273)
+}
+spriteset(spriteset_BR508c_MerseyRail, "gfx/EMU/507_508.png") {
+	template_train32px(0, 299)
+}
+
+spriteset(spriteset_BR508a_MerseyRailOld, "gfx/EMU/507_508.png") {
+	template_train32px(0, 325)
+}
+spriteset(spriteset_BR508b_MerseyRailOld, "gfx/EMU/507_508.png") {
+	template_train32px(0, 351)
+}
+spriteset(spriteset_BR508c_MerseyRailOld, "gfx/EMU/507_508.png") {
+	template_train32px(0, 377)
+}
+
+// Connex
+spriteset(spriteset_BR508a_CSE, "gfx/EMU/507_508.png") {
+	template_train32px(0, 403)
+}
+spriteset(spriteset_BR508b_CSE, "gfx/EMU/507_508.png") {
+	template_train32px(0, 429)
+}
+spriteset(spriteset_BR508c_CSE, "gfx/EMU/507_508.png") {
+	template_train32px(0, 455)
+}
+
+spriteset(spriteset_BR508a_Silverlink, "gfx/EMU/507_508.png") {
+	template_train32px(0, 481)
+}
+spriteset(spriteset_BR508b_Silverlink, "gfx/EMU/507_508.png") {
+	template_train32px(0, 507)
+}
+spriteset(spriteset_BR508c_Silverlink, "gfx/EMU/507_508.png") {
+	template_train32px(0, 533)
+}
+
+spriteset(spriteset_BR508a_SE_Yellow, "gfx/EMU/507_508.png") {
+	template_train32px(0, 637)
+}
+spriteset(spriteset_BR508b_SE_Yellow, "gfx/EMU/507_508.png") {
+	template_train32px(0, 663)
+}
+spriteset(spriteset_BR508c_SE_Yellow, "gfx/EMU/507_508.png") {
+	template_train32px(0, 689)
+}
+
+spriteset(spriteset_BR508a_SE_Blue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 559)
+}
+spriteset(spriteset_BR508b_SE_Blue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 585)
+}
+spriteset(spriteset_BR508c_SE_Blue, "gfx/EMU/507_508.png") {
+	template_train32px(0, 611)
+}
diff --git a/src/trains/emu/BR507508.pnml b/src/trains/emu/BR507508.pnml
@@ -1,103 +1,3 @@
-spriteset(spriteset_BR508_Purchase, "gfx/BR508.png") {
-	template_purchase(240, 0)
-}
-
-spriteset(spriteset_BR508a_BRBlue, "gfx/BR508.png") {
-	template_450(0, 0)
-}
-
-spriteset(spriteset_BR508b_BRBlue, "gfx/BR508.png") {
-	template_450(0, 27)
-}
-
-spriteset(spriteset_BR508c_BRBlue, "gfx/BR508.png") {
-	template_450(0, 54)
-}
-
-spriteset(spriteset_BR508a_MerseyRailOld, "gfx/BR508.png") {
-	template_450(0, 81)
-}
-
-spriteset(spriteset_BR508b_MerseyRailOld, "gfx/BR508.png") {
-	template_450(0, 108)
-}
-
-spriteset(spriteset_BR508c_MerseyRailOld, "gfx/BR508.png") {
-	template_450(0, 135)
-}
-
-spriteset(spriteset_BR508a_Silverlink, "gfx/BR508.png") {
-	template_450(0, 162)
-}
-
-spriteset(spriteset_BR508b_Silverlink, "gfx/BR508.png") {
-	template_450(0, 189)
-}
-
-spriteset(spriteset_BR508c_Silverlink, "gfx/BR508.png") {
-	template_450(0, 216)
-}
-
-spriteset(spriteset_BR508a_CSE, "gfx/BR508.png") {
-	template_450(0, 243)
-}
-
-spriteset(spriteset_BR508b_CSE, "gfx/BR508.png") {
-	template_450(0, 270)
-}
-
-spriteset(spriteset_BR508c_CSE, "gfx/BR508.png") {
-	template_450(0, 297)
-}
-
-spriteset(spriteset_BR508a_SE_Yellow, "gfx/BR508.png") {
-	template_450(0, 324)
-}
-
-spriteset(spriteset_BR508b_SE_Yellow, "gfx/BR508.png") {
-	template_450(0, 351)
-}
-
-spriteset(spriteset_BR508c_SE_Yellow, "gfx/BR508.png") {
-	template_450(0, 378)
-}
-
-spriteset(spriteset_BR508a_SE_Blue, "gfx/BR508.png") {
-	template_450(0, 405)
-}
-
-spriteset(spriteset_BR508b_SE_Blue, "gfx/BR508.png") {
-	template_450(0, 432)
-}
-
-spriteset(spriteset_BR508c_SE_Blue, "gfx/BR508.png") {
-	template_450(0, 459)
-}
-
-spriteset(spriteset_BR508a_MerseyRail, "gfx/BR508.png") {
-	template_450(0, 486)
-}
-
-spriteset(spriteset_BR508b_MerseyRail, "gfx/BR508.png") {
-	template_450(0, 513)
-}
-
-spriteset(spriteset_BR508c_MerseyRail, "gfx/BR508.png") {
-	template_450(0, 540)
-}
-
-spriteset(spriteset_BR508a_GoodComs, "gfx/BR508.png") {
-	template_450(0, 567)
-}
-
-spriteset(spriteset_BR508b_GoodComs, "gfx/BR508.png") {
-	template_450(0, 594)
-}
-
-spriteset(spriteset_BR508c_GoodComs, "gfx/BR508.png") {
-	template_450(0, 621)
-}
-
 switch(FEAT_TRAINS,SELF, sw_BR508a,cargo_subtype){
     0:	spriteset_BR508a_BRBlue;
 	1:  spriteset_BR508a_MerseyRailOld;
@@ -153,21 +53,21 @@ switch(FEAT_TRAINS,SELF, sw_BR507c,cargo_subtype){
 }
 
 switch (FEAT_TRAINS, SELF, switch_articulated_BR508_1, extra_callback_info1) {
-	1: return item_BR508b;
-	2: return item_BR508b;
-	3: return item_BR508c;
+	1: return item_BR508c;
+	2: return item_BR508c;
+	3: return item_BR508b;
     return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
 }
 
 switch (FEAT_TRAINS, SELF, switch_articulated_BR508_2, extra_callback_info1) {
-	1: return item_BR508b;
-	2: return item_BR508c;
+	1: return item_BR508c;
+	2: return item_BR508b;
     return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
 }
 
 switch (FEAT_TRAINS, SELF, switch_articulated_BR507, extra_callback_info1) {
-	1: return item_BR507b;
-	2: return item_BR507c;
+	1: return item_BR507c;
+	2: return item_BR507b;
     return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
 }