From ba2d5ca2c80585bf688b9a20bb1bb917b9efc6cd Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 13 May 2024 14:58:29 +0100 Subject: [PATCH] Renamed Mk2 units for clarity, pointed spritesets at new files (not yet using updated coordinates) --- lang/english.lng | 22 ++--- src/sortpurchase.pnml | 14 ++-- .../Mk2_A-C_Spritesets.pnml | 30 +++---- .../Mk2_A-C_Switches.pnml | 38 ++++----- .../Mk2_D-F_Spritesets.pnml | 40 ++++----- .../Mk2_D-F_Switches.pnml | 82 +++++++++---------- .../Mk2_DBSO_Spritesets.pnml | 30 +++---- .../Rolling Stock_Sprites/Mk2_Purchase.pnml | 14 ++-- 8 files changed, 135 insertions(+), 135 deletions(-) diff --git a/lang/english.lng b/lang/english.lng index d9cc8ad7..89baa061 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -1068,17 +1068,17 @@ str_BRMk1RK_liveries :BR Carmine and Cream, BR Chocolate and Cream, BR Malachi STR_NAME_BRMk1RMB :BR Mark 1 Coach (Restaurant Buffet) str_BRMk1RMB_liveries :BR Carmine and Cream, BR Chocolate and Cream, BR Malachite Green, BR Maroon, BR Blue & Grey -STR_NAME_BRMk2ATSO :BR Mark 2 A Coach (Tourist Standard Open) -STR_NAME_BRMk2AFO :BR Mark 2 A Coach (First Open) -STR_NAME_BRMk2ABSO :BR Mark 2 A Coach (Brake Standard Open) -str_BRMk2A_liveries :BR Blue & Grey, Network SouthEast, Regional Railways, Scotrail, West Coast Railway Company - -STR_NAME_BRMk2DTSO :BR Mark 2 D Coach (Tourist Standard Open) -STR_NAME_BRMk2DFO :BR Mark 2 D Coach (First Open) -STR_NAME_BRMk2DBSO :BR Mark 2 D Coach (Brake Standard Open) -STR_NAME_BRMk2DDBSO :BR Mark 2 D Coach (Driving Brake Standard Open) -str_BRMk2D_liveries :BR Blue & Grey, Intercity, Scotrail, Arriva, Arriva New, DRS, Virgin, First Great Western 'Fag Packet', West Coast Railway Company -str_BRMk2DBSO_liveries :BR Blue & Grey, Intercity, Scotrail, DRS +STR_NAME_BRMk2_Early_TSO :BR Mark 2 A Coach (Tourist Standard Open) +STR_NAME_BRMk2_Early_FO :BR Mark 2 A Coach (First Open) +STR_NAME_BRMk2_Early_BSO :BR Mark 2 A Coach (Brake Standard Open) +str_BRMk2_Early_liveries :BR Blue & Grey, Network SouthEast, Regional Railways, Scotrail, West Coast Railway Company + +STR_NAME_BRMk2_Late_TSO :BR Mark 2 D Coach (Tourist Standard Open) +STR_NAME_BRMk2_Late_FO :BR Mark 2 D Coach (First Open) +STR_NAME_BRMk2_Late_BSO :BR Mark 2 D Coach (Brake Standard Open) +STR_NAME_BRMk2_Late_DBSO :BR Mark 2 D Coach (Driving Brake Standard Open) +str_BRMk2_Late__liveries :BR Blue & Grey, Intercity, Scotrail, Arriva, Arriva New, DRS, Virgin, First Great Western 'Fag Packet', West Coast Railway Company +str_BRMk2_Late_BSO_liveries :BR Blue & Grey, Intercity, Scotrail, DRS STR_NAME_BRMk3TF :BR Mark 3 Coach (Trailer First) str_BRMk3TF_liveries :BR Blue, Intercity Executive, Intercity Swallow, Midland Mainline (Teal & Tangerine), Midland Mainline (Blue), East Midlands Trains, Virgin Trains, Cross Country, Grand Central, Grand Central Lined, First Great Western, Great North Eastern Railway diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 7ea16035..999f6363 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -254,13 +254,13 @@ sort(FEAT_TRAINS, [ item_BRMk1BG, item_BRMk1RK, item_BRMk1RMB, - item_BRMk2ATSO, - item_BRMk2AFO, - item_BRMk2ABSO, - item_BRMk2DTSO, - item_BRMk2DFO, - item_BRMk2DBSO, - item_BRMk2DDBSO, + item_BRMk2_Early_TSO, + item_BRMk2_Early_FO, + item_BRMk2_Early_BSO, + item_BRMk2_Late_TSO, + item_BRMk2_Late_FO, + item_BRMk2_Late_BSO, + item_BRMk2_Late_DBSO, item_BRMk3DVT, item_253_BRMk3TF, item_253_BRMk3TS, diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Spritesets.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Spritesets.pnml index 15000a79..6658ddf1 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Spritesets.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Spritesets.pnml @@ -1,59 +1,59 @@ -spriteset(spriteset_BRMk2ATSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_TSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 13) } -spriteset(spriteset_BRMk2ATSONSE, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_TSONSE, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 163) } -spriteset(spriteset_BRMk2ATSORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_TSORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 238) } -spriteset(spriteset_BRMk2ATSOScotRail, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_TSOScotRail, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 313) } -spriteset(spriteset_BRMk2ATSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_TSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 388) } -spriteset(spriteset_BRMk2AFOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_FOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 38) } -spriteset(spriteset_BRMk2AFONSE, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_FONSE, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 188) } -spriteset(spriteset_BRMk2AFORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_FORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 263) } -spriteset(spriteset_BRMk2AFOScotRail, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_FOScotRail, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 338) } -spriteset(spriteset_BRMk2AFOWCRC, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_FOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 413) } -spriteset(spriteset_BRMk2ABSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_BSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 63) } -spriteset(spriteset_BRMk2ABSONSE, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_BSONSE, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 213) } -spriteset(spriteset_BRMk2ABSORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_BSORegionalRailways, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 288) } -spriteset(spriteset_BRMk2ABSOScotRail, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_BSOScotRail, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 363) } -spriteset(spriteset_BRMk2ABSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2A-C.png") { +spriteset(spriteset_BRMk2_Early_BSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_Early.png") { template_train32px(0, 438) } diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Switches.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Switches.pnml index 6fd65220..918df482 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Switches.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Switches.pnml @@ -1,29 +1,29 @@ -switch(FEAT_TRAINS,SELF, sw_BRMk2ATSO,cargo_subtype){ - 0: spriteset_BRMk2ATSOBRBlue; - 1: spriteset_BRMk2ATSONSE; - 2: spriteset_BRMk2ATSORegionalRailways; - 3: spriteset_BRMk2ATSOScotRail; - 4: spriteset_BRMk2ATSOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Early_TSO,cargo_subtype){ + 0: spriteset_BRMk2_Early_TSOBRBlue; + 1: spriteset_BRMk2_Early_TSONSE; + 2: spriteset_BRMk2_Early_TSORegionalRailways; + 3: spriteset_BRMk2_Early_TSOScotRail; + 4: spriteset_BRMk2_Early_TSOWCRC; } -switch(FEAT_TRAINS,SELF, sw_BRMk2AFO,cargo_subtype){ - 0: spriteset_BRMk2AFOBRBlue; - 1: spriteset_BRMk2AFONSE; - 2: spriteset_BRMk2AFORegionalRailways; - 3: spriteset_BRMk2AFOScotRail; - 4: spriteset_BRMk2AFOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Early_FO,cargo_subtype){ + 0: spriteset_BRMk2_Early_FOBRBlue; + 1: spriteset_BRMk2_Early_FONSE; + 2: spriteset_BRMk2_Early_FORegionalRailways; + 3: spriteset_BRMk2_Early_FOScotRail; + 4: spriteset_BRMk2_Early_FOWCRC; } -switch(FEAT_TRAINS,SELF, sw_BRMk2ABSO,cargo_subtype){ - 0: spriteset_BRMk2ABSOBRBlue; - 1: spriteset_BRMk2ABSONSE; - 2: spriteset_BRMk2ABSORegionalRailways; - 3: spriteset_BRMk2ABSOScotRail; - 4: spriteset_BRMk2ABSOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Early_BSO,cargo_subtype){ + 0: spriteset_BRMk2_Early_BSOBRBlue; + 1: spriteset_BRMk2_Early_BSONSE; + 2: spriteset_BRMk2_Early_BSORegionalRailways; + 3: spriteset_BRMk2_Early_BSOScotRail; + 4: spriteset_BRMk2_Early_BSOWCRC; } -switch(FEAT_TRAINS,SELF,sw_BRMk2A_cargo_subtype_text,cargo_subtype){ +switch(FEAT_TRAINS,SELF,sw_BRMk2_Early_cargo_subtype_text,cargo_subtype){ 0: return string(str_BRBlue); 1: return string(str_NSE); 2: return string(str_Regional); diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Spritesets.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Spritesets.pnml index 106e8b3d..f8e656a2 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Spritesets.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Spritesets.pnml @@ -1,82 +1,82 @@ //Mk2 D-F -spriteset(spriteset_BRMk2DTSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 13) } -spriteset(spriteset_BRMk2DTSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 263) } -spriteset(spriteset_BRMk2DTSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 388) } -spriteset(spriteset_BRMk2DTSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 513) } -spriteset(spriteset_BRMk2DTSOArriva, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOArriva, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 638) } -spriteset(spriteset_BRMk2DTSOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 713) } -spriteset(spriteset_BRMk2DTSODRS, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSODRS, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 788) } -spriteset(spriteset_BRMk2DTSOVirgin, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOVirgin, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 913) } -spriteset(spriteset_BRMk2DTSOGW, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOGW, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 988) } -spriteset(spriteset_BRMk2DTSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_TSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 1063) } -spriteset(spriteset_BRMk2DFOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 38) } -spriteset(spriteset_BRMk2DFOIntercity, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOIntercity, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 288) } -spriteset(spriteset_BRMk2DFOScotrail, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOScotrail, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 413) } -spriteset(spriteset_BRMk2DFOAnglia, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOAnglia, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 538) } -spriteset(spriteset_BRMk2DFOArriva, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOArriva, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 663) } -spriteset(spriteset_BRMk2DFOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 738) } -spriteset(spriteset_BRMk2DFODRS, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FODRS, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 813) } -spriteset(spriteset_BRMk2DFOVirgin, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOVirgin, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 938) } -spriteset(spriteset_BRMk2DFOGW, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOGW, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 1013) } -spriteset(spriteset_BRMk2DFOWCRC, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_FOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_Late.png") { template_train32px(0, 1088) } diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Switches.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Switches.pnml index cda37caf..f01d09df 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Switches.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Switches.pnml @@ -1,53 +1,53 @@ -switch(FEAT_TRAINS,SELF, sw_BRMk2DTSO,cargo_subtype){ - 0: spriteset_BRMk2DTSOBRBlue; - 1: spriteset_BRMk2DTSOIntercity; - 2: spriteset_BRMk2DTSOScotrail; - 3: spriteset_BRMk2DTSOAnglia; - 4: spriteset_BRMk2DTSOArriva; - 5: spriteset_BRMk2DTSOArrivaNew; - 6: spriteset_BRMk2DTSODRS; - 7: spriteset_BRMk2DTSOVirgin; - 8: spriteset_BRMk2DTSOGW; - 9: spriteset_BRMk2DTSOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Late_TSO,cargo_subtype){ + 0: spriteset_BRMk2_Late_TSOBRBlue; + 1: spriteset_BRMk2_Late_TSOIntercity; + 2: spriteset_BRMk2_Late_TSOScotrail; + 3: spriteset_BRMk2_Late_TSOAnglia; + 4: spriteset_BRMk2_Late_TSOArriva; + 5: spriteset_BRMk2_Late_TSOArrivaNew; + 6: spriteset_BRMk2_Late_TSODRS; + 7: spriteset_BRMk2_Late_TSOVirgin; + 8: spriteset_BRMk2_Late_TSOGW; + 9: spriteset_BRMk2_Late_TSOWCRC; } -switch(FEAT_TRAINS,SELF, sw_BRMk2DFO,cargo_subtype){ - 0: spriteset_BRMk2DFOBRBlue; - 1: spriteset_BRMk2DFOIntercity; - 2: spriteset_BRMk2DFOScotrail; - 3: spriteset_BRMk2DFOAnglia; - 4: spriteset_BRMk2DFOArriva; - 5: spriteset_BRMk2DFOArrivaNew; - 6: spriteset_BRMk2DFODRS; - 7: spriteset_BRMk2DFOVirgin; - 8: spriteset_BRMk2DFOGW; - 9: spriteset_BRMk2DFOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Late_FO,cargo_subtype){ + 0: spriteset_BRMk2_Late_FOBRBlue; + 1: spriteset_BRMk2_Late_FOIntercity; + 2: spriteset_BRMk2_Late_FOScotrail; + 3: spriteset_BRMk2_Late_FOAnglia; + 4: spriteset_BRMk2_Late_FOArriva; + 5: spriteset_BRMk2_Late_FOArrivaNew; + 6: spriteset_BRMk2_Late_FODRS; + 7: spriteset_BRMk2_Late_FOVirgin; + 8: spriteset_BRMk2_Late_FOGW; + 9: spriteset_BRMk2_Late_FOWCRC; } -switch(FEAT_TRAINS,SELF, sw_BRMk2DBSO,cargo_subtype){ - 0: spriteset_BRMk2DBSOBRBlue; - 1: spriteset_BRMk2DBSOIntercity; - 2: spriteset_BRMk2DBSOScotrail; - 3: spriteset_BRMk2DBSOAnglia; - 4: spriteset_BRMk2DBSOArriva; - 5: spriteset_BRMk2DBSOArrivaNew; - 6: spriteset_BRMk2DBSODRS; - 7: spriteset_BRMk2DBSOVirgin; - 8: spriteset_BRMk2DBSOGW; - 9: spriteset_BRMk2DBSOWCRC; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Late_BSO,cargo_subtype){ + 0: spriteset_BRMk2_Late_BSOBRBlue; + 1: spriteset_BRMk2_Late_BSOIntercity; + 2: spriteset_BRMk2_Late_BSOScotrail; + 3: spriteset_BRMk2_Late_BSOAnglia; + 4: spriteset_BRMk2_Late_BSOArriva; + 5: spriteset_BRMk2_Late_BSOArrivaNew; + 6: spriteset_BRMk2_Late_BSODRS; + 7: spriteset_BRMk2_Late_BSOVirgin; + 8: spriteset_BRMk2_Late_BSOGW; + 9: spriteset_BRMk2_Late_BSOWCRC; } -switch(FEAT_TRAINS,SELF, sw_BRMk2DDBSO,cargo_subtype){ - 0: spriteset_BRMk2DRDBSOBRBlue; - 1: spriteset_BRMk2DRDBSOIntercity; - 2: spriteset_BRMk2DRDBSOScotrail; - 3: spriteset_BRMk2DRDBSOAnglia; - 4: spriteset_BRMk2DRDBSODRS; +switch(FEAT_TRAINS,SELF, sw_BRMk2_Late_DBSO,cargo_subtype){ + 0: spriteset_BRMk2_Late_RDBSOBRBlue; + 1: spriteset_BRMk2_Late_RDBSOIntercity; + 2: spriteset_BRMk2_Late_RDBSOScotrail; + 3: spriteset_BRMk2_Late_RDBSOAnglia; + 4: spriteset_BRMk2_Late_RDBSODRS; } -switch(FEAT_TRAINS,SELF,sw_BRMk2D_cargo_subtype_text,cargo_subtype){ +switch(FEAT_TRAINS,SELF,sw_BRMk2_Late__cargo_subtype_text,cargo_subtype){ 0: return string(str_BRBlue); 1: return string(str_Intercity); 2: return string(str_ScotRail); @@ -61,7 +61,7 @@ switch(FEAT_TRAINS,SELF,sw_BRMk2D_cargo_subtype_text,cargo_subtype){ return CB_RESULT_NO_TEXT; } -switch(FEAT_TRAINS,SELF,sw_BRMk2DDBSO_cargo_subtype_text,cargo_subtype){ +switch(FEAT_TRAINS,SELF,sw_BRMk2_Late_DBSO_cargo_subtype_text,cargo_subtype){ 0: return string(str_BRBlue); 1: return string(str_Intercity); 2: return string(str_ScotRail); diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_DBSO_Spritesets.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_DBSO_Spritesets.pnml index 76f84038..3f2741c2 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_DBSO_Spritesets.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_DBSO_Spritesets.pnml @@ -1,61 +1,61 @@ -spriteset(spriteset_BRMk2DBSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 63) } -spriteset(spriteset_BRMk2DBSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 313) } -spriteset(spriteset_BRMk2DBSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 438) } -spriteset(spriteset_BRMk2DBSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 563) } -spriteset(spriteset_BRMk2DBSOArriva, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOArriva, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 688) } -spriteset(spriteset_BRMk2DBSOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOArrivaNew, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 763) } -spriteset(spriteset_BRMk2DBSODRS, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSODRS, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 838) } -spriteset(spriteset_BRMk2DBSOVirgin, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOVirgin, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 963) } -spriteset(spriteset_BRMk2DBSOGW, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOGW, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 1038) } -spriteset(spriteset_BRMk2DBSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_BSOWCRC, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 1113) } -spriteset(spriteset_BRMk2DRDBSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_RDBSOBRBlue, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 113) } -spriteset(spriteset_BRMk2DRDBSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_RDBSOIntercity, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 363) } -spriteset(spriteset_BRMk2DRDBSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_RDBSOScotrail, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 488) } -spriteset(spriteset_BRMk2DRDBSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_RDBSOAnglia, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 613) } -spriteset(spriteset_BRMk2DRDBSODRS, "gfx/Rolling Stock/Mk2/BRMk2D-F.png") { +spriteset(spriteset_BRMk2_Late_RDBSODRS, "gfx/Rolling Stock/Mk2/BRMk2_DBSO.png") { template_train32px(0, 888) } \ No newline at end of file diff --git a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_Purchase.pnml b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_Purchase.pnml index b47ac433..601b8603 100644 --- a/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_Purchase.pnml +++ b/src/trains/_spriteset/Rolling Stock_Sprites/Mk2_Purchase.pnml @@ -1,27 +1,27 @@ -spriteset(spriteset_BRMk2ATSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Early_TSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 0) } -spriteset(spriteset_BRMk2AFO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Early_FO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 13) } -spriteset(spriteset_BRMk2ABSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Early_BSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 26) } -spriteset(spriteset_BRMk2DTSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Late_TSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 39) } -spriteset(spriteset_BRMk2DFO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Late_FO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 52) } -spriteset(spriteset_BRMk2DBSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Late_BSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 65) } -spriteset(spriteset_BRMk2DDBSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { +spriteset(spriteset_BRMk2_Late_DBSO_Purchase, "gfx/Rolling Stock/Mk2/BRMk2Purchase.png") { template_purchase(0, 78) } \ No newline at end of file