diff --git a/lang/english.lng b/lang/english.lng index 89baa061..9600da8c 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -1077,7 +1077,7 @@ 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_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) 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 f01d09df..3d2af0e5 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 @@ -47,7 +47,7 @@ switch(FEAT_TRAINS,SELF, sw_BRMk2_Late_DBSO,cargo_subtype){ 4: spriteset_BRMk2_Late_RDBSODRS; } -switch(FEAT_TRAINS,SELF,sw_BRMk2_Late__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); diff --git a/src/trains/rollingstock/BRMK2Early.pnml b/src/trains/rollingstock/BRMK2Early.pnml index 0a71df37..3a95a8dd 100644 --- a/src/trains/rollingstock/BRMK2Early.pnml +++ b/src/trains/rollingstock/BRMK2Early.pnml @@ -1,6 +1,6 @@ -item (FEAT_TRAINS, item_BRMk2ATSO, 317) { +item (FEAT_TRAINS, item_BRMk2_Early_TSO, 317) { property { - name: string(STR_NAME_BRMk2ATSO); + name: string(STR_NAME_BRMk2_Early_TSO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -20,11 +20,11 @@ item (FEAT_TRAINS, item_BRMk2ATSO, 317) { cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2A_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Early_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2A_cargo_subtype_text; - default: sw_BRMk2ATSO; - purchase: spriteset_BRMk2ATSO_Purchase; + cargo_subtype_text: sw_BRMk2_Early_cargo_subtype_text; + default: sw_BRMk2_Early_TSO; + purchase: spriteset_BRMk2_Early_TSO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(64 * param_pax); cost_factor: return(GetAdjustedCost(50)); @@ -32,9 +32,9 @@ item (FEAT_TRAINS, item_BRMk2ATSO, 317) { } } -item (FEAT_TRAINS, item_BRMk2AFO, 318) { +item (FEAT_TRAINS, item_BRMk2_Early_FO, 318) { property { - name: string(STR_NAME_BRMk2AFO); + name: string(STR_NAME_BRMk2_Early_FO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -54,11 +54,11 @@ item (FEAT_TRAINS, item_BRMk2AFO, 318) { cargo_age_period: 250; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2A_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Early_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2A_cargo_subtype_text; - default: sw_BRMk2AFO; - purchase: spriteset_BRMk2AFO_Purchase; + cargo_subtype_text: sw_BRMk2_Early_cargo_subtype_text; + default: sw_BRMk2_Early_FO; + purchase: spriteset_BRMk2_Early_FO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(42 * param_pax); cost_factor: return(GetAdjustedCost(50)); @@ -66,9 +66,9 @@ item (FEAT_TRAINS, item_BRMk2AFO, 318) { } } -item (FEAT_TRAINS, item_BRMk2ABSO, 319) { +item (FEAT_TRAINS, item_BRMk2_Early_BSO, 319) { property { - name: string(STR_NAME_BRMk2ABSO); + name: string(STR_NAME_BRMk2_Early_BSO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -88,11 +88,11 @@ item (FEAT_TRAINS, item_BRMk2ABSO, 319) { cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2A_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Early_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2A_cargo_subtype_text; - default: sw_BRMk2ABSO; - purchase: spriteset_BRMk2ABSO_Purchase; + cargo_subtype_text: sw_BRMk2_Early_cargo_subtype_text; + default: sw_BRMk2_Early_BSO; + purchase: spriteset_BRMk2_Early_BSO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(31 * param_pax); cost_factor: return(GetAdjustedCost(50)); diff --git a/src/trains/rollingstock/BRMk2Late.pnml b/src/trains/rollingstock/BRMk2Late.pnml index 8a8ab500..a5e026be 100644 --- a/src/trains/rollingstock/BRMk2Late.pnml +++ b/src/trains/rollingstock/BRMk2Late.pnml @@ -1,7 +1,7 @@ -item (FEAT_TRAINS, item_BRMk2DTSO, 320) { +item (FEAT_TRAINS, item_BRMk2_Late_TSO, 320) { property { - name: string(STR_NAME_BRMk2DTSO); + name: string(STR_NAME_BRMk2_Late_TSO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -21,11 +21,11 @@ item (FEAT_TRAINS, item_BRMk2DTSO, 320) { cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2D_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Late_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2D_cargo_subtype_text; - default: sw_BRMk2DTSO; - purchase: spriteset_BRMk2DTSO_Purchase; + cargo_subtype_text: sw_BRMk2_Late_cargo_subtype_text; + default: sw_BRMk2_Late_TSO; + purchase: spriteset_BRMk2_Late_TSO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(64 * param_pax); cost_factor: return(GetAdjustedCost(50)); @@ -33,9 +33,9 @@ item (FEAT_TRAINS, item_BRMk2DTSO, 320) { } } -item (FEAT_TRAINS, item_BRMk2DFO, 321) { +item (FEAT_TRAINS, item_BRMk2_Late_FO, 321) { property { - name: string(STR_NAME_BRMk2DFO); + name: string(STR_NAME_BRMk2_Late_FO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -55,11 +55,11 @@ item (FEAT_TRAINS, item_BRMk2DFO, 321) { cargo_age_period: 250; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2D_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Late_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2D_cargo_subtype_text; - default: sw_BRMk2DFO; - purchase: spriteset_BRMk2DFO_Purchase; + cargo_subtype_text: sw_BRMk2_Late_cargo_subtype_text; + default: sw_BRMk2_Late_FO; + purchase: spriteset_BRMk2_Late_FO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(42 * param_pax); cost_factor: return(GetAdjustedCost(50)); @@ -67,9 +67,9 @@ item (FEAT_TRAINS, item_BRMk2DFO, 321) { } } -item (FEAT_TRAINS, item_BRMk2DBSO, 322) { +item (FEAT_TRAINS, item_BRMk2_Late_BSO, 322) { property { - name: string(STR_NAME_BRMk2DBSO); + name: string(STR_NAME_BRMk2_Late_BSO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -89,11 +89,11 @@ item (FEAT_TRAINS, item_BRMk2DBSO, 322) { cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2D_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Late_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2D_cargo_subtype_text; - default: sw_BRMk2DBSO; - purchase: spriteset_BRMk2DBSO_Purchase; + cargo_subtype_text: sw_BRMk2_Late_cargo_subtype_text; + default: sw_BRMk2_Late_BSO; + purchase: spriteset_BRMk2_Late_BSO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(32 * param_pax); cost_factor: return(GetAdjustedCost(50)); @@ -101,9 +101,9 @@ item (FEAT_TRAINS, item_BRMk2DBSO, 322) { } } -item (FEAT_TRAINS, item_BRMk2DDBSO, 323) { +item (FEAT_TRAINS, item_BRMk2_Late_DBSO, 323) { property { - name: string(STR_NAME_BRMk2DDBSO); + name: string(STR_NAME_BRMk2_Late_DBSO); climates_available: ALL_CLIMATES; introduction_date: date(1964,4,21); model_life: 100; @@ -123,11 +123,11 @@ item (FEAT_TRAINS, item_BRMk2DDBSO, 323) { cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2DBSO_liveries))); + additional_text: return(string(str_purchase_coach,string(str_BRMk2_Late_BSO_liveries))); can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2DDBSO_cargo_subtype_text; - default: sw_BRMk2DDBSO; - purchase: spriteset_BRMk2DBSO_Purchase; + cargo_subtype_text: sw_BRMk2_Late_DBSO_cargo_subtype_text; + default: sw_BRMk2_Late_DBSO; + purchase: spriteset_BRMk2_Late_BSO_Purchase; colour_mapping: return PALETTE_CC_FIRST; cargo_capacity: return(32 * param_pax); cost_factor: return(GetAdjustedCost(50));