Moved Class 80-87 and prototypes to new templates, fixed length

audigex · audigex · commit 876af05d0e65 · 2024-07-24T16:01:33.000+01:00
diff --git a/gfx/Electric/BR8X.png b/gfx/Electric/BR8X.png
diff --git a/src/trains/electric/18100.pnml b/src/trains/electric/18100.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_18100_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_18100_BRBlack, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 13)
+	template_train32px(0, 13)
 }
 
 switch(FEAT_TRAINS,SELF, sw_18100, cargo_subtype){
diff --git a/src/trains/electric/BR80.pnml b/src/trains/electric/BR80.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR80_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR80_BRBlack, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 38)
+	template_train32px(0, 39)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR80, cargo_subtype){
diff --git a/src/trains/electric/BR81.pnml b/src/trains/electric/BR81.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR81_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR81_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR81, cargo_subtype){
diff --git a/src/trains/electric/BR82.pnml b/src/trains/electric/BR82.pnml
@@ -1,13 +1,13 @@
 spriteset(spriteset_BR82_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 13)
+	template_purchase(264, 13)
 }
 
 spriteset(spriteset_BR82_InterCityExecutive, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 88)
+	template_train32px(0, 91)
 }
 
 spriteset(spriteset_BR82_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR82, cargo_subtype){
diff --git a/src/trains/electric/BR83.pnml b/src/trains/electric/BR83.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR83_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR83_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR83, cargo_subtype){
diff --git a/src/trains/electric/BR84.pnml b/src/trains/electric/BR84.pnml
@@ -3,7 +3,7 @@ spriteset(spriteset_BR84_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR84_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR84, cargo_subtype){
diff --git a/src/trains/electric/BR85.pnml b/src/trains/electric/BR85.pnml
@@ -1,13 +1,13 @@
 spriteset(spriteset_BR85_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 26)
+	template_purchase(264, 26)
 }
 
 spriteset(spriteset_BR85_RailfreightDistribution, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 113)
+	template_train32px(0, 117)
 }
 
 spriteset(spriteset_BR85_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_BR85, cargo_subtype){
diff --git a/src/trains/electric/BR86.pnml b/src/trains/electric/BR86.pnml
@@ -1,33 +1,33 @@
 spriteset(spriteset_BR86_Purchase, "gfx/Electric/BR8X.png") {
-	template_purchase(176, 39)
+	template_purchase(264, 39)
 }
 
 spriteset(spriteset_BR86_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 63)
+	template_train32px(0, 65)
 }
 
 spriteset(spriteset_BR86_InterCityExecutive, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 88)
+	template_train32px(0, 91)
 }
 
 spriteset(spriteset_BR86_InterCitySwallow, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 138)
+	template_train32px(0, 143)
 }
 
 spriteset(spriteset_BR86_RailfreightDistribution, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 113)
+	template_train32px(0, 117)
 }
 
 spriteset(spriteset_BR86_RailExpress, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 188)
+	template_train32px(0, 195)
 }
 
 spriteset(spriteset_BR86_EWS, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 163)
+	template_train32px(0, 169)
 }
 
 spriteset(spriteset_BR86_Anglia, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 288)
+	template_train32px(0, 299)
 }
 
 // This switch called when displaying as this locomotive
diff --git a/src/trains/electric/BR87.pnml b/src/trains/electric/BR87.pnml
@@ -3,15 +3,15 @@ spriteset(spriteset_BR87_Purchase, "gfx/Electric/BR8X.png") {
 }
 
 spriteset(spriteset_BR87_InterCitySwallow, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 213)
+	template_train32px(0, 221)
 }
 
 spriteset(spriteset_BR87_Virgin, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 238)
+	template_train32px(0, 247)
 }
 
 spriteset(spriteset_BR87_BRBlue, "gfx/Electric/BR8X.png") {
-	template_train32px_old(0, 263)
+	template_train32px(0, 273)
 }
 
 // This switch called when displaying as this locomotive

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ spriteset(spriteset_18100_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_18100_BRBlack, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 13)`
	`6`	`+ template_train32px(0, 13)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`switch(FEAT_TRAINS,SELF, sw_18100, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ spriteset(spriteset_BR80_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR80_BRBlack, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 38)`
	`6`	`+ template_train32px(0, 39)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`switch(FEAT_TRAINS,SELF, sw_BR80, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ spriteset(spriteset_BR81_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR81_BRBlue, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 63)`
	`6`	`+ template_train32px(0, 65)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`switch(FEAT_TRAINS,SELF, sw_BR81, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`spriteset(spriteset_BR82_Purchase, "gfx/Electric/BR8X.png") {`
`2`		`- template_purchase(176, 13)`
	`2`	`+ template_purchase(264, 13)`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR82_InterCityExecutive, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 88)`
	`6`	`+ template_train32px(0, 91)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`spriteset(spriteset_BR82_BRBlue, "gfx/Electric/BR8X.png") {`
`10`		`- template_train32px_old(0, 63)`
	`10`	`+ template_train32px(0, 65)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`switch(FEAT_TRAINS,SELF, sw_BR82, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ spriteset(spriteset_BR83_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR83_BRBlue, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 63)`
	`6`	`+ template_train32px(0, 65)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`switch(FEAT_TRAINS,SELF, sw_BR83, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ spriteset(spriteset_BR84_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR84_BRBlue, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 63)`
	`6`	`+ template_train32px(0, 65)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`switch(FEAT_TRAINS,SELF, sw_BR84, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`spriteset(spriteset_BR85_Purchase, "gfx/Electric/BR8X.png") {`
`2`		`- template_purchase(176, 26)`
	`2`	`+ template_purchase(264, 26)`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR85_RailfreightDistribution, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 113)`
	`6`	`+ template_train32px(0, 117)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`spriteset(spriteset_BR85_BRBlue, "gfx/Electric/BR8X.png") {`
`10`		`- template_train32px_old(0, 63)`
	`10`	`+ template_train32px(0, 65)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`switch(FEAT_TRAINS,SELF, sw_BR85, cargo_subtype){`
Original file line number	Diff line number	Diff line change
`@@ -1,33 +1,33 @@`
`1`	`1`	`spriteset(spriteset_BR86_Purchase, "gfx/Electric/BR8X.png") {`
`2`		`- template_purchase(176, 39)`
	`2`	`+ template_purchase(264, 39)`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR86_BRBlue, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 63)`
	`6`	`+ template_train32px(0, 65)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`spriteset(spriteset_BR86_InterCityExecutive, "gfx/Electric/BR8X.png") {`
`10`		`- template_train32px_old(0, 88)`
	`10`	`+ template_train32px(0, 91)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`spriteset(spriteset_BR86_InterCitySwallow, "gfx/Electric/BR8X.png") {`
`14`		`- template_train32px_old(0, 138)`
	`14`	`+ template_train32px(0, 143)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`spriteset(spriteset_BR86_RailfreightDistribution, "gfx/Electric/BR8X.png") {`
`18`		`- template_train32px_old(0, 113)`
	`18`	`+ template_train32px(0, 117)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`spriteset(spriteset_BR86_RailExpress, "gfx/Electric/BR8X.png") {`
`22`		`- template_train32px_old(0, 188)`
	`22`	`+ template_train32px(0, 195)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`spriteset(spriteset_BR86_EWS, "gfx/Electric/BR8X.png") {`
`26`		`- template_train32px_old(0, 163)`
	`26`	`+ template_train32px(0, 169)`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`spriteset(spriteset_BR86_Anglia, "gfx/Electric/BR8X.png") {`
`30`		`- template_train32px_old(0, 288)`
	`30`	`+ template_train32px(0, 299)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`// This switch called when displaying as this locomotive`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@ spriteset(spriteset_BR87_Purchase, "gfx/Electric/BR8X.png") {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`spriteset(spriteset_BR87_InterCitySwallow, "gfx/Electric/BR8X.png") {`
`6`		`- template_train32px_old(0, 213)`
	`6`	`+ template_train32px(0, 221)`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`spriteset(spriteset_BR87_Virgin, "gfx/Electric/BR8X.png") {`
`10`		`- template_train32px_old(0, 238)`
	`10`	`+ template_train32px(0, 247)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`spriteset(spriteset_BR87_BRBlue, "gfx/Electric/BR8X.png") {`
`14`		`- template_train32px_old(0, 263)`
	`14`	`+ template_train32px(0, 273)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`// This switch called when displaying as this locomotive`