Moved LU 1938 and S-Stock to new template, enabled TRAM versions

BRTrains · Jul 31, 2024 · 3d5f487 · 3d5f487
1 parent 5fcb6e3
commit 3d5f487
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 25 deletions.
diff --git a/gfx/Metro/LU_1938.png b/gfx/Metro/LU_1938.png
diff --git a/gfx/Metro/LU_S7S8.png b/gfx/Metro/LU_S7S8.png
diff --git a/src/debugmode_switch.pnml b/src/debugmode_switch.pnml
@@ -1,8 +1,5 @@
  if (param[1] == 0) {
 // Disable some trams that aren't finished
-	disable_item(FEAT_ROADVEHS, 490); // 1938 Tube Stock
-	disable_item(FEAT_ROADVEHS, 292); // S7 Tube Stock
-	disable_item(FEAT_ROADVEHS, 293); // S8 Tube Stock
 
 // Disable some trains that aren't finished
 

diff --git a/src/trains/emu/BR483.pnml b/src/trains/emu/BR483.pnml
@@ -3,23 +3,23 @@ spriteset(spriteset_BR483_Purchase, "gfx/Metro/LU_1938.png") {
 }
 
 spriteset(spriteset_BR483a_Island, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 238)
+	template_train32px(0, 247)
 }
 spriteset(spriteset_BR483b_Island, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 263)
+	template_train32px(0, 273)
 }
 spriteset(spriteset_BR483c_Island, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 288)
+	template_train32px(0, 299)
 }
 
 spriteset(spriteset_BR483a_NSE, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 163)
+	template_train32px(0, 169)
 }
 spriteset(spriteset_BR483b_NSE, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 188)
+	template_train32px(0, 195)
 }
 spriteset(spriteset_BR483c_NSE, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 213)
+	template_train32px(0, 221)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR483a,cargo_subtype){

diff --git a/src/trains/metro/LU1938.pnml b/src/trains/metro/LU1938.pnml
@@ -3,23 +3,23 @@ spriteset(spriteset_LU1938_Purchase, "gfx/Metro/LU_1938.png") {
 }
 
 spriteset(spriteset_LU1938a_LURedRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 13)
+	template_train32px(0, 13)
 }
 spriteset(spriteset_LU1938b_LURedRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 38)
+	template_train32px(0, 39)
 }
 spriteset(spriteset_LU1938c_LURedRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 spriteset(spriteset_LU1938a_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 88)
+	template_train32px(0, 91)
 }
 spriteset(spriteset_LU1938b_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 113)
+	template_train32px(0, 117)
 }
 spriteset(spriteset_LU1938c_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_train32px_old(0, 138)
+	template_train32px(0, 143)
 }
 
 switch(FEAT_TRAINS,SELF, sw_LU1938a,cargo_subtype){

diff --git a/src/trains/metro/LUS7S8.pnml b/src/trains/metro/LUS7S8.pnml
@@ -3,13 +3,13 @@ spriteset(spriteset_LUS7S8_Purchase, "gfx/Metro/LU_S7S8.png") {
 }
 
 spriteset(spriteset_LUS7S8a_TfL, "gfx/Metro/LU_S7S8.png") {
-	template_train32px_old(0, 0)
+	template_train32px(0, 0)
 }
 spriteset(spriteset_LUS7S8b_TfL, "gfx/Metro/LU_S7S8.png") {
-	template_train32px_old(0, 25)
+	template_train32px(0, 26)
 }
 spriteset(spriteset_LUS7S8c_TfL, "gfx/Metro/LU_S7S8.png") {
-	template_train32px_old(0, 50)
+	template_train32px(0, 52)
 }
 
 

diff --git a/src/trams/Metro/LUS7S8_Tram.pnml b/src/trams/Metro/LUS7S8_Tram.pnml
@@ -6,10 +6,10 @@ spriteset(spriteset_TRAM_LULS7S8_front_TfL, "gfx/Metro/LU_S7S8.png") {
 	template_tram32px(0, 0)
 }
 spriteset(spriteset_TRAM_LULS7S8_middle_TfL, "gfx/Metro/LU_S7S8.png") {
-	template_tram32px(0, 25)
+	template_tram32px(0, 26)
 }
 spriteset(spriteset_TRAM_LULS7S8_rear_TfL, "gfx/Metro/LU_S7S8.png") {
-	template_tram32px(0, 50)
+	template_tram32px(0, 52)
 }
 
 

diff --git a/src/trams/_spriteset/LU1938_Tram_sprites.pnml b/src/trams/_spriteset/LU1938_Tram_sprites.pnml
@@ -6,20 +6,20 @@ spriteset(spriteset_TRAM_LU1938a_LURedRoof, "gfx/Metro/LU_1938.png") {
 	template_tram32px(0, 13)
 }
 spriteset(spriteset_TRAM_LU1938b_LURedRoof, "gfx/Metro/LU_1938.png") {
-	template_tram32px(0, 38)
+	template_tram32px(0, 39)
 }
 spriteset(spriteset_TRAM_LU1938c_LURedRoof, "gfx/Metro/LU_1938.png") {
-	template_tram32px(0, 63)
+	template_tram32px(0, 65)
 }
 
 spriteset(spriteset_TRAM_LU1938a_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_tram32px(0, 88)
+	template_tram32px(0, 91)
 }
 spriteset(spriteset_TRAM_LU1938b_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_tram32px(0, 113)
+	template_tram32px(0, 117)
 }
 spriteset(spriteset_TRAM_LU1938c_LUGreyRoof, "gfx/Metro/LU_1938.png") {
-	template_tram32px(0, 138)
+	template_tram32px(0, 143)
 }
 
 switch(FEAT_ROADVEHS,SELF, sw_TRAM_LU1938a,cargo_subtype){