Mk4 DVT minor fixes (purchase sprite, reversing sprite)

BRTrains · Mar 29, 2024 · 8e68b75 · 8e68b75
1 parent 1ff3f6e
commit 8e68b75
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/gfx/BR91.png b/gfx/BR91.png
diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
@@ -249,7 +249,9 @@ sort(FEAT_TRAINS, [
  item_253_BRMK3TRSB,
  item_253_BRMK3TRUB,
  item_253_BRMK3TRUK,
+ item_BRMk3DVT,
  item_BRMk3Sleeper,
+ item_BRMk4DVT,
  item_BRMk5Sleeper,
  item_IE2800
  ]);
diff --git a/src/trains/_spriteset/PushPull.pnml b/src/trains/_spriteset/PushPull.pnml
@@ -21,13 +21,13 @@ switch(FEAT_TRAINS, PARENT, sw_PUSHPULL_LocomotiveAsMk3DVT, [STORE_TEMP(num_vehs
 
 // Mirror of Mk4DVT
 switch(FEAT_TRAINS, PARENT, sw_PUSHPULL_LocomotiveAsMk4DVT, [STORE_TEMP(num_vehs_in_consist - 1, 0x10F), var[0x61, 0, 0x0000FFFF, 0xF2]]){
-    0:	spriteset_BR91_IntercitySwallow;
-	1:	spriteset_BR91_NatEx;
-	2:	spriteset_BR91_GNER;
-	3:	spriteset_BR91_EastCoast;
-	4:	spriteset_BR91_VirginEC;
-    5:	spriteset_BR91_LNER;
-    spriteset_BR91_IntercitySwallow;
+    0:	spriteset_BRMk4DVT_IntercitySwallowr;
+	1:	spriteset_BRMk4DVT_NatExr;
+	2:	spriteset_BRMk4DVT_GNERr;
+	3:	spriteset_BRMk4DVT_EastCoastr;
+	4:	spriteset_BRMk4DVT_VirginECr;
+    5:	spriteset_BRMk4DVT_LNERr;
+    spriteset_BR91_IntercitySwallowr;
 }
 
 // Mirror of BR89

diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk4DVT.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk4DVT.pnml
@@ -62,12 +62,12 @@ switch(FEAT_TRAINS, PARENT, sw_BRMk4DVT_PushPUll, [STORE_TEMP(0 - position_in_ar
 	sw_BRMk4DVT; // No compatible locomotive found, show normal sprites
 }
 
-switch(FEAT_TRAINS,PARENT,sw_Mk4DVT_CheckPosition, position_in_articulated_veh_from_end){
+switch(FEAT_TRAINS,PARENT,sw_BRMk4DVT_CheckPosition, position_in_articulated_veh_from_end){
     0: sw_BRMk4DVT_PushPUll; // Attempt push pull
 	sw_BRMk4DVT; // We aren't at the back of theconsist, show normal sprites
 }
 
 switch(FEAT_TRAINS,PARENT,sw_BRMk4DVT_Sprites ,vehicle_is_reversed){
     0:	sw_BRMk4DVT; // We're heading foward, show normal sprites
-	1:	sw_Mk4DVT_CheckPosition; // Attempt push pull (skipping check position for now for testing)
+	1:	sw_BRMk4DVT_CheckPosition; // Attempt push pull (skipping check position for now for testing)
 }