Work on Black 5 and Jubilee liveries, corrected tender template error

BRTrains · Sep 12, 2024 · 01bb6a4 · 01bb6a4
1 parent a16df65
commit 01bb6a4
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/gfx/Steam/LMS_Stanier_4000_impgal.png b/gfx/Steam/LMS_Stanier_4000_impgal.png
diff --git a/gfx/Steam/LMS_Stanier_Black_5.png b/gfx/Steam/LMS_Stanier_Black_5.png
diff --git a/gfx/Steam/LMS_Stanier_Jubilee.png b/gfx/Steam/LMS_Stanier_Jubilee.png
diff --git a/src/trains/_spriteset/Steam_Sprites/LMS_Black5.pnml b/src/trains/_spriteset/Steam_Sprites/LMS_Black5.pnml
@@ -1,17 +1,26 @@
 spriteset(spriteset_LMSBlack5_Purchase, "gfx/Steam/LMS_Stanier_Black_5.png") {
-	template_purchase_anim(0, 15)
+	template_purchase_anim(0, 0)
 }
 
-spriteset(spriteset_LMSBlack5_LMSBlack, "gfx/Steam/LMS_Stanier_Black_5.png") {
-	template_train24px(0, 29)
+spriteset(spriteset_LMSBlack5_Black, "gfx/Steam/LMS_Stanier_Black_5.png") {
+	template_train24px(0, 13)
 }
 
-spriteset(spriteset_LMSBlack5_LMSBlackNamed, "gfx/Steam/LMS_Stanier_Black_5.png") {
-	template_train24px(0, 86)
+spriteset(spriteset_LMSBlack5_BlackNamed, "gfx/Steam/LMS_Stanier_Black_5.png") {
+	template_train24px(0, 39)
+}
+
+spriteset(spriteset_LMSBlack5_BlackCaprotti, "gfx/Steam/LMS_Stanier_Black_5.png") {
+	template_train24px(0, 65)
 }
 
 switch(FEAT_TRAINS,SELF, sw_LMSBlack5Loco,cargo_subtype){
-    spriteset_LMSBlack5_LMSBlack;	
+    0: spriteset_LMSBlack5_Black;
+	1: spriteset_LMSBlack5_BlackNamed;
+	2: spriteset_LMSBlack5_BlackCaprotti;
+	3: spriteset_LMSBlack5_Black;
+	4: spriteset_LMSBlack5_BlackNamed;
+	5: spriteset_LMSBlack5_BlackCaprotti;
 }
 
 switch(FEAT_TRAINS,SELF, sw_LMSBlack5Tender,cargo_subtype){

diff --git a/src/trains/_spriteset/Steam_Sprites/LMS_Jubilee.pnml b/src/trains/_spriteset/Steam_Sprites/LMS_Jubilee.pnml
@@ -2,24 +2,32 @@ spriteset(spriteset_LMSJubilee_Purchase, "gfx/Steam/LMS_Stanier_Jubilee.png") {
 	template_purchase_anim(0, 0)
 }
 
-spriteset(spriteset_LMSJubilee_LMSBlack, "gfx/Steam/LMS_Stanier_Jubilee.png") {
-	template_train24px(0, 29)
+spriteset(spriteset_LMSJubilee_Red, "gfx/Steam/LMS_Stanier_Jubilee.png") {
+	template_train24px(0, 13)
 }
-spriteset(spriteset_LMSJubilee_LMSBlackNamed, "gfx/Steam/LMS_Stanier_Jubilee.png") {
-	template_train24px(0, 86)
+
+spriteset(spriteset_LMSJubilee_Black, "gfx/Steam/LMS_Stanier_Jubilee.png") {
+	template_train24px(0, 39)
+}
+
+spriteset(spriteset_LMSJubilee_Green, "gfx/Steam/LMS_Stanier_Jubilee.png") {
+	template_train24px(0, 66)
 }
 
-spriteset(spriteset_LMSJubilee_LMSRed, "gfx/Steam/LMS_Stanier_Jubilee.png") {
-	template_train24px(0, 60)
+spriteset(spriteset_LMSJubilee_Blue, "gfx/Steam/LMS_Stanier_Jubilee.png") {
+	template_train24px(0, 92)
 }
 
 
 switch(FEAT_TRAINS,SELF, sw_LMSJubileeLoco,cargo_subtype){
-    0:	spriteset_LMSJubilee_LMSRed;
-	1:	spriteset_LMSJubilee_LMSBlack;
-	2:	spriteset_LMSJubilee_LMSRed;
-	3: 	spriteset_LMSJubilee_LMSBlack;
-	4:	spriteset_LMSJubilee_LMSBlack;
+    0:	spriteset_LMSJubilee_Red;
+	1:	spriteset_LMSJubilee_Black;
+	2:	spriteset_LMSJubilee_Red;
+	3:	spriteset_LMSJubilee_Red;
+	4: 	spriteset_LMSJubilee_Black;
+	5:	spriteset_LMSJubilee_Black;
+	6: 	spriteset_LMSJubilee_Green;
+	7: 	spriteset_LMSJubilee_Blue;
 }
 
 switch(FEAT_TRAINS,SELF, sw_LMSJubileeTender,cargo_subtype){