Skip to content

Commit

Permalink
Renamed Mk2 units for clarity, pointed spritesets at new files (not y…
Browse files Browse the repository at this point in the history 
…et using updated coordinates)
  • Loading branch information
@audigex
audigex committed May 13, 2024
1 parent 78b2cda commit ba2d5ca
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 135 deletions.
22 changes: 11 additions & 11 deletions lang/english.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions src/sortpurchase.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
30 changes: 15 additions & 15 deletions src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Spritesets.pnml
View file
Original file line number Diff line number Diff line change
@@ -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)
}
38 changes: 19 additions & 19 deletions src/trains/_spriteset/Rolling Stock_Sprites/Mk2_A-C_Switches.pnml
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
40 changes: 20 additions & 20 deletions src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Spritesets.pnml
View file
Original file line number Diff line number Diff line change
@@ -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)
}
82 changes: 41 additions & 41 deletions src/trains/_spriteset/Rolling Stock_Sprites/Mk2_D-F_Switches.pnml
View file
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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);
Expand Down
Loading

0 comments on commit ba2d5ca

Please sign in to comment.