Skip to content

Commit

Permalink
Improved MPV livery names, added concatenation strings
Browse files Browse the repository at this point in the history
  • Loading branch information
@audigex
audigex committed Jul 19, 2024
1 parent 924b85c commit 7d5c51b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 14 deletions.
28 changes: 22 additions & 6 deletions lang/english.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@
STR_GRF_NAME :British Rail UK Set (BRTrains v2)
STR_GRF_DESC :A development of the BRTrains set (based on BROS) and Modern UK Train Set (MUTS).{}{}{WHITE}The British Rail Set (BRTrains v2){COPYRIGHT}2020 {LTBLUE}Audigex{WHITE}{}MUTS {COPYRIGHT}2020 {LTBLUE}KubaP {WHITE}& {GREEN}AlmostCthulhu{WHITE}{}UKTrains (v1) {COPYRIGHT}2015 {LTBLUE}Leander {WHITE}& {GREEN}BROS Artists{}{}{WHITE}License: {LTBLUE}GPL v2

# Concat without spaces etc
STR_CONCAT_2 :{STRING}{STRING}
STR_CONCAT_3 :{STRING}{STRING}{STRING}
STR_CONCAT_4 :{STRING}{STRING}{STRING}{STRING}
STR_CONCAT_5 :{STRING}{STRING}{STRING}{STRING}{STRING}
# Concat with dash
STR_CONCAT_2d : {STRING} - {STRING}
STR_CONCAT_3d : {STRING} - {STRING} - {STRING}
STR_CONCAT_4d : {STRING} - {STRING} - {STRING} - {STRING}
STR_CONCAT_5d : {STRING} - {STRING} - {STRING} - {STRING} - {STRING}
# Concat with spaces
STR_CONCAT_2s : {STRING} {STRING}
STR_CONCAT_3s : {STRING} {STRING} {STRING}
STR_CONCAT_4s : {STRING} {STRING} {STRING} {STRING}
STR_CONCAT_5s : {STRING} {STRING} {STRING} {STRING} {STRING}


STR_Electrostar :Bombardier Electrostar

Expand Down Expand Up @@ -214,8 +230,8 @@ STR_DSC_BR805_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {
STR_DSC_BR807_7CAR :Type: {BLUE}Electric Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}Avanti West Coast, Hitachi
STR_DSC_BR810_5CAR :Type: {RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit{}{BLACK}Usage: {GOLD}Express Passenger{}{BLACK}Withdrawal: {GOLD}--{}{BLACK}Liveries: {GOLD}East Midland Railway, Hitachi

str_purchase_loco_with_liveries :{BLACK}Type: {STRING}{}{BLACK}Route Availability: {GOLD}{STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}Liveries: {GOLD}{STRING}{BLACK}
str_purchase_loco :{BLACK}Type: {STRING}{}{BLACK}Route Availability: {GOLD}{STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}
str_purchase_loco_with_liveries :{BLACK}Type: {STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}Liveries: {GOLD}{STRING}{BLACK}
str_purchase_loco :{BLACK}Type: {STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}
str_purchase_steam_liveries :{BLACK}Type: {STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}Liveries: {GOLD}{STRING}{BLACK}
str_purchase_coach :{BLACK}Liveries: {GOLD}{STRING}{BLACK}

Expand All @@ -228,7 +244,7 @@ str_purchase_type_dmu :{RED}Diesel Multiple Unit
str_purchase_type_demu :{RED}Diesel{BLACK}-{BLUE}Electric {PURPLE}Multiple Unit
str_purchase_type_emu :{BLUE}Electric Multiple Unit
str_purchase_type_electric :{BLUE}Electric Locomotive
str_purchase_type_gtu :{ORANGE}Gas Turbine Experimental Unit
str_purchase_type_gtu :{ORANGE}Gas Turbine Experimental Unit

STR_NAME_MPV_Single :Departmental Class 98/9 "MPV" Track Maintenance Unit (1-car)
STR_NAME_MPV_DualTrack :Departmental Class 98/9 "MPV" Track Maintenance Unit (2-car)
Expand All @@ -237,9 +253,9 @@ str_MPV_usage :Departmental Railway
str_MPV_eos :---
str_MPV_liveries :Network Rail, Railtrack, South West Trains

str_MPV_Geometry : - Track Geometry (Covered)
str_MPV_GeometryOpen : - Track Geometry (Open)
str_MPV_Leaf : - Leaf Removal
str_MPV_Geometry :Track Geometry (Covered)
str_MPV_GeometryOpen :Track Geometry (Open)
str_MPV_Leaf :Leaf Removal


STR_NAME_Coppernob :Furness Railway 0-4-0 "Coppernob"
Expand Down
4 changes: 2 additions & 2 deletions src/trains/_spriteset/Departmental_Sprites/MPV/MPV_Switches_DualTrack.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ switch(FEAT_TRAINS,SELF,sw_MPV_DualTrack_Leaf_NRBlue,position_in_articulated_veh

switch(FEAT_TRAINS,SELF,sw_MPV_DualTrack_cargo_subtype_text,cargo_subtype){
0: return string(str_NRYellow);
1: return(string(str_NRYellow,string(str_MPV_Leaf)));
1: return string(STR_CONCAT_2d, string(str_NRYellow), string(str_MPV_Leaf) );
2: return string(str_NRBlue);
3: return(string(str_NRBlue,string(str_MPV_Leaf)));
3: return string(STR_CONCAT_2d, string(str_NRBlue), string(str_MPV_Leaf) );
//4: return string(str_NRWhite);
//5: return string(str_NRWhite);
//6: return string(str_NROrange);
Expand Down
13 changes: 7 additions & 6 deletions src/trains/_spriteset/Departmental_Sprites/MPV/MPV_Switches_Single.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ switch(FEAT_TRAINS,SELF,sw_MPV_Single_effect,var[0xc8]){


switch(FEAT_TRAINS,SELF,sw_MPV_cargo_subtype_text,cargo_subtype){
0: return(string(str_NRYellow,string(str_MPV_GeometryOpen)));
1: return(string(str_NRYellow,string(str_MPV_Geometry)));
2: return(string(str_NRBlue,string(str_MPV_GeometryOpen)));
3: return(string(str_NRBlue,string(str_MPV_Geometry)));
0: return string(STR_CONCAT_2d, string(str_NRYellow), string(str_MPV_GeometryOpen) );
1: return string(STR_CONCAT_2d, string(str_NRYellow), string(str_MPV_Geometry) );
2: return string(STR_CONCAT_2d, string(str_NRBlue), string(str_MPV_GeometryOpen) );
3: return string(STR_CONCAT_2d, string(str_NRBlue), string(str_MPV_Geometry) );
return CB_RESULT_NO_TEXT;
}

//4: return(string(str_NROrange,string(str_MPV_Geometry)));
//5: return(string(str_NROrange,string(str_MPV_GeometryOpen)));
//6: return(string(str_NRWhite,string(str_MPV_Geometry)));
Expand All @@ -20,8 +23,6 @@ switch(FEAT_TRAINS,SELF,sw_MPV_cargo_subtype_text,cargo_subtype){
//11: return(string(str_SWTPink,string(str_MPV_GeometryOpen)));
//12: return(string(str_SWTOrange,string(str_MPV_Geometry)));
//13: return(string(str_SWTOrange,string(str_MPV_GeometryOpen)));
return CB_RESULT_NO_TEXT;
}

switch(FEAT_TRAINS,SELF, sw_MPV_Single,cargo_subtype){
0: spriteset_MPV_Single_Open_NRYellow;
Expand Down

0 comments on commit 7d5c51b

Please sign in to comment.