Redrew Royal Mail TPO as 8/8 length, added push-pull with Class 47

BRTrains · May 15, 2024 · bc031ba · bc031ba
1 parent 4bf6ab9
commit bc031ba
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/gfx/Freight/RM_TPO.png → gfx/Archive/RM_TPO.png b/gfx/Freight/RM_TPO.png → gfx/Archive/RM_TPO.png
diff --git a/gfx/Rolling Stock/RoyalMail_TPO.png b/gfx/Rolling Stock/RoyalMail_TPO.png
diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/RM_TPO.pnml
@@ -1,23 +1,23 @@
-spriteset(spriteset_RMTPO_Purchase, "gfx/Freight/RM_TPO.png") {
+spriteset(spriteset_RMTPO_Purchase, "gfx/Rolling Stock/RoyalMail_TPO.png") {
 	template_purchase(0, 0)
 }
 
-spriteset(spriteset_RMTPO_NoDoors, "gfx/Freight/RM_TPO.png") {
-	template_train28px_old(0, 13)
+spriteset(spriteset_RMTPO_NoDoors, "gfx/Rolling Stock/RoyalMail_TPO.png") {
+	template_train32px(0, 13)
 }
-spriteset(spriteset_RMTPO_2Door, "gfx/Freight/RM_TPO.png") {
-	template_train28px_old(0, 36)
+spriteset(spriteset_RMTPO_2Door, "gfx/Rolling Stock/RoyalMail_TPO.png") {
+	template_train32px(0, 39)
 }
-spriteset(spriteset_RMTPO_3Door, "gfx/Freight/RM_TPO.png") {
-	template_train28px_old(0, 59)
+spriteset(spriteset_RMTPO_3Door, "gfx/Rolling Stock/RoyalMail_TPO.png") {
+	template_train32px(0, 65)
 }
 
-spriteset(spriteset_RMTPO_PCV, "gfx/Freight/RM_TPO.png") {
-	template_train28px_old(0, 82)
+spriteset(spriteset_RMTPO_PCV, "gfx/Rolling Stock/RoyalMail_TPO.png") {
+	template_train32px(0, 91)
 }
 
-spriteset(spriteset_RMTPO_PCVr, "gfx/Freight/RM_TPO.png") {
-	template_train28px_old(0, 105)
+spriteset(spriteset_RMTPO_PCVr, "gfx/Rolling Stock/RoyalMail_TPO.png") {
+	template_train32px(0, 117)
 }
 
 random_switch(FEAT_TRAINS, SELF, sw_RMTPO_Random)

diff --git a/src/trains/diesel/BR047.pnml b/src/trains/diesel/BR047.pnml
@@ -1,6 +1,6 @@
 // If the rear of this consist is a compatible Driving Trailer, call that vehicles's remote sprite call switch
 switch(FEAT_TRAINS, PARENT, sw_BR47_PushPUll, [STORE_TEMP(num_vehs_in_consist - 1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xC6]]) {	
-	//483: sw_PUSHPULL_LocomotiveAsRMTPO; // Royal Mail TPO, uncommen this line when RMTPO has been changed to length 8
+	483: sw_PUSHPULL_LocomotiveAsRMTPO; // Royal Mail TPO PCV
 	630: sw_PUSHPULL_LocomotiveAsMk2DBSO; // Mk2 DBSO
 	586: sw_PUSHPULL_LocomotiveAsMk3DVT; // Mk3 DVT
 	sw_BR47; // No compatible locomotive found, show normal sprites

diff --git a/src/trains/rollingstock/RM_TPO.pnml b/src/trains/rollingstock/RM_TPO.pnml
@@ -31,7 +31,7 @@ item (FEAT_TRAINS, item_RMTPO, 483) {
 		default_cargo_type:				MAIL;
 		cargo_capacity:					50;
 		weight:							30 ton;
-		length:							7;
+		length:							8;
 		bitmask_vehicle_info:			0;
 		cargo_age_period:				185;
 	}