Skip to content

Commit

Permalink
LNER Coronation set completely added. Fixed introduction date on Big …
Browse files Browse the repository at this point in the history
…Bertha
  • Loading branch information
Su1phur committed Nov 29, 2024
1 parent bec9151 commit 520f68e
Show file tree
Hide file tree
Showing 15 changed files with 364 additions and 34 deletions.
Binary file modified docs/SpriteIDs.xlsx
Binary file not shown.
4 changes: 4 additions & 0 deletions docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- Made eyecandy, debug, and departmental vehicles unattractive to AI
- GWR Dean 25ft 4 Compartment Second Class (SY), Diagram S1/LA9N, Built 1871, seats 32
- BRT Whisky CovHop (PAV) - Only variant code needed
- Metropolitan Class G

# v2.13
- Added LNER J70
Expand All @@ -32,6 +33,7 @@
- Added BR VGA and VKA goods vans
- Added BR JIA "Polybulk" Covered Hopper
- Added BRT PAA Covered Hopper
- Added LNER Coronation Train Set, and individual articulated coaches
- Adjusted EyeCandy engine to hopefully discourage AI use
- Reworked Southern Region CC Class (OG BR Class 70)
- Added a pile of liveries for Class 66
Expand All @@ -48,6 +50,8 @@
- Fixed Debug Mode and Simple Mode not removing some vehicles
- Fixed Class 88 stats and introduction date
- Fixed Class 08 having steam icon
- Fixed misaligned tender on the BR Standard Class 9F
- Fixed 32px reversing template being misaligned
- Disabled Great Bear and Hall pending rework

# v2.12 (2024-08-08)
Expand Down
Binary file modified gfx/Rolling Stock/LNER/LNERCoronationSetImp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -1406,12 +1406,12 @@ str_BRJIA_Polybulk_liveries :Traffic Service Limited Polybulk, Polybulk, Gra
# # # # # # # #

STR_NAME_LNER_CorSet :LNER Coronation Set
STR_NAME_LNER_CorSet_BT_KT :LNER Coronation Articulated Coach (Brake Third + Kitchen Third)
STR_NAME_LNER_CorSet_OF_OF :LNER Coronation Articulated Coach (Open First + Open First)
STR_NAME_LNER_CorSet_OT_KT :LNER Coronation Articulated Coach (Open Third + Kitchen Third)
STR_NAME_LNER_CorSet_OT_BT :LNER Coronation Articulated Coach (Open Third + Brake Third)
STR_NAME_LNER_CorSet_BT_KT :LNER Coronation Articulated Coach (BT + KT)
STR_NAME_LNER_CorSet_OF_OF :LNER Coronation Articulated Coach (OF + OF)
STR_NAME_LNER_CorSet_OT_KT :LNER Coronation Articulated Coach (OT + KT)
STR_NAME_LNER_CorSet_OT_BT :LNER Coronation Articulated Coach (OT + BT)
STR_NAME_LNER_CorSet_OBV :LNER Coronation Observation Coach
STR_NAME_LNER_CorSet_OT_OT :LNER Coronation Articulated Coach (Open Third + Open Third)
STR_NAME_LNER_CorSet_OT_OT :LNER Coronation Articulated Coach (OT + OT)

STR_LNER_CorSet_liveries :LNER Coronation Garter Blue, BR Carmine and Cream

Expand Down
39 changes: 23 additions & 16 deletions src/sortpurchase.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ sort(FEAT_TRAINS, [
item_LNER_J70,
item_LNWRWebb,
item_LSWR_AdamsRadial,
item_SRZClass,
item_GER_L77,
item_GWR_DeanGoods,
item_GER_L77,
item_SRZClass,
item_GreatBear,
item_GWRHall,
item_LMSBigBertha,
item_LMSBlack5,
item_LMSJubilee,
item_LMS8F,
item_LNERV2,
item_GNRA1,
header_LNERP2,
Expand Down Expand Up @@ -275,22 +276,28 @@ header_LU_Deeplevel,
item_RS_SWB_Hopper,
item_BRHHA,
item_BRTTA,
header_CoveredVan,
header_CoveredVan,
item_BRVGA,
item_BRVGA,
item_BRContainer,
item_RMTPO,
item_GCR_Robinson_50_CLSO,
item_LNERTK,
item_LNERBCK,
item_LNERPV,
item_LNERBG,
item_LMS_StanierP3_50BG,
item_LNER_Gresley_616TK,
item_LNER_Gresley_616BCK,
item_LNER_Thompson_61FK,
item_LNER_Thompson_63TK,
header_BRMk1,
item_BRContainer,
item_RMTPO,
item_GCR_Robinson_50_CLSO,
item_LNERTK,
item_LNERBCK,
item_LNERPV,
item_LNERBG,
item_LMS_StanierP3_50BG,
item_LNER_Gresley_616TK,
item_LNER_Gresley_616BCK,
item_LNER_Cornation_Set,
item_LNER_Coronation_set_BTKT,
item_LNER_Coronation_set_2OF,
item_LNER_Coronation_set_OTKT,
item_LNER_Coronation_set_OTBT,
item_LNER_Coronation_set_OBV,
item_LNER_Thompson_61FK,
item_LNER_Thompson_63TK,
header_BRMk1,
item_BRMk1FO,
item_BRMk1SO,
item_BRMk1TSO,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,26 @@ spriteset(spriteset_LNER_CorSet_OBV_New_BnC, "gfx/Rolling Stock/LNER/LNERCoronat
template_train32px(0, 303)
}

spriteset(spriteset_LNER_CorSet_BT_KT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
spriteset(spriteset_LNER_CorSet_BTKT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 333)
}

spriteset(spriteset_LNER_CorSet_2OF_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 347)
}

spriteset(spriteset_LNER_CorSet_OT_KT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
spriteset(spriteset_LNER_CorSet_OTKT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 361)
}

spriteset(spriteset_LNER_CorSet_OT_BT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 376)
spriteset(spriteset_LNER_CorSet_OTBT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 375)
}

spriteset(spriteset_LNER_CorSet_2OT_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 390)
template_purchase(0, 389)
}

spriteset(spriteset_LNER_CorSet_OBV_Purchase, "gfx/Rolling Stock/LNER/LNERCoronationSetImp.png") {
template_purchase(0, 403)
}
7 changes: 6 additions & 1 deletion src/trains/rolling_stock/LNER/LNER_Coronation_set.pnml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
switch(FEAT_TRAINS, SELF, sw_CoronationCoach_articulated, extra_callback_info1) {
// extra_callback_info1 returns the car number, so 1 is the second car, .. so on
// The callback runs this switch until it returns NO_MORE_ARTICULATED_PARTS, which ends the growth
0..8: return item_LNER_Cornation_Set;
return CB_RESULT_NO_MORE_ARTICULATED_PARTS; // Stop adding more cars
}

switch(FEAT_TRAINS, SELF, sw_Coronation_Set_CorBlue, position_in_articulated_veh ) {
Expand Down Expand Up @@ -47,6 +50,7 @@ switch(FEAT_TRAINS, SELF, sw_CoronationCoach_Capacity, position_in_articulated_v
6: 30; // OT
7: 36; // BT
8: 16; // OBV
// total 208
}

item (FEAT_TRAINS, item_LNER_Cornation_Set, 711) {
Expand All @@ -61,7 +65,7 @@ item (FEAT_TRAINS, item_LNER_Cornation_Set, 711) {
running_cost_factor: 1;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 100 mph;
speed: 110 mph;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
default_cargo_type: PASS;
Expand All @@ -82,6 +86,7 @@ item (FEAT_TRAINS, item_LNER_Cornation_Set, 711) {

default: sw_Coronation_Set_liveries;
purchase: spriteset_LNER_CorSet_Purchase;
purchase_cargo_capacity: return (208 / 9 * param_pax);
running_cost_factor: return(GetAdjustedCost(25));
}
}
6 changes: 3 additions & 3 deletions src/trains/rolling_stock/LNER/LNER_Coronation_set_2OF.pnml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
switch(FEAT_TRAINS, SELF, sw_Coronation_2OF_articulated, extra_callback_info1) {
0..1: return item_LNER_Cornation_Set;
0..1: return item_LNER_Coronation_set_2OF;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OF_CorBlue, position_in_articulated_veh ) {
Expand Down Expand Up @@ -39,12 +39,12 @@ item(FEAT_TRAINS, item_LNER_Coronation_set_2OF, 713) {
running_cost_factor: 1;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 100 mph;
speed: 110 mph;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
default_cargo_type: PASS;
cargo_capacity: 1;
weight: 33 ton;
weight: 76 ton;
length: 8;
bitmask_vehicle_info: 0;
}
Expand Down
65 changes: 65 additions & 0 deletions src/trains/rolling_stock/LNER/LNER_Coronation_set_2OT.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_articulated, extra_callback_info1) {
0..1: return item_LNER_Coronation_set_2OT;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_CorBlue, position_in_articulated_veh ) {
0: spriteset_LNER_CorSet_OT_CorBlue;
1: spriteset_LNER_CorSet_OTRev_CorBlue;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_BnC, position_in_articulated_veh ) {
0: spriteset_LNER_CorSet_OT_BnC;
1: spriteset_LNER_CorSet_OTRev_BnC;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_Capacity, position_in_articulated_veh ) {
0..1: 30; // OT
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_liveries, cargo_subtype) {
0: sw_Coronation_2OT_CorBlue;
1: sw_Coronation_2OT_BnC;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_2OT_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY, string(str_abbr_LNER), string(str_col_GarterBlue));
1: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_BloodCustard));
}

item(FEAT_TRAINS, item_LNER_Coronation_set_2OT, 717) {
property {
variant_group: item_LNER_Cornation_Set;
name: string(STR_NAME_LNER_CorSet_OT_OT);
climates_available: ALL_CLIMATES;
introduction_date: date(1937, 7, 5);
model_life: 30;
cargo_allow_refit: [PASS];
loading_speed: 10;
cost_factor: 1;
running_cost_factor: 1;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 110 mph;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
default_cargo_type: PASS;
cargo_capacity: 1;
weight: 76 ton;
length: 8;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(STR_LNER_CorSet_liveries)));
articulated_part: sw_Coronation_2OT_articulated;

can_attach_wagon: CB_RESULT_ATTACH_DISALLOW;
cargo_capacity: sw_Coronation_2OT_Capacity;
cargo_subtype_text: sw_Coronation_2OT_cargo_subtype_text;
colour_mapping: return PALETTE_CC_FIRST;
cost_factor: return(GetAdjustedCost(25));

default: sw_Coronation_2OT_liveries;
purchase: spriteset_LNER_CorSet_2OT_Purchase;
running_cost_factor: return(GetAdjustedCost(25));
}
}
66 changes: 66 additions & 0 deletions src/trains/rolling_stock/LNER/LNER_Coronation_set_BTKT.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_articulated, extra_callback_info1) {
0..1: return item_LNER_Coronation_set_BTKT;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_CorBlue, position_in_articulated_veh ) {
0: spriteset_LNER_CorSet_BT_CorBlue;
1: spriteset_LNER_CorSet_KTRev_CorBlue;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_BnC, position_in_articulated_veh ) {
0: spriteset_LNER_CorSet_BT_BnC;
1: spriteset_LNER_CorSet_KTRev_BnC;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_Capacity, position_in_articulated_veh ) {
0: 36; // BT
1: 6; // KT
}

switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_liveries, cargo_subtype) {
0: sw_Coronation_BTKT_CorBlue;
1: sw_Coronation_BTKT_BnC;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_BTKT_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY, string(str_abbr_LNER), string(str_col_GarterBlue));
1: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_BloodCustard));
}

item(FEAT_TRAINS, item_LNER_Coronation_set_BTKT, 712) {
property {
variant_group: item_LNER_Cornation_Set;
name: string(STR_NAME_LNER_CorSet_BT_KT);
climates_available: ALL_CLIMATES;
introduction_date: date(1937, 7, 5);
model_life: 30;
cargo_allow_refit: [PASS];
loading_speed: 10;
cost_factor: 1;
running_cost_factor: 1;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 110 mph;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
default_cargo_type: PASS;
cargo_capacity: 1;
weight: 76 ton;
length: 8;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(STR_LNER_CorSet_liveries)));
articulated_part: sw_Coronation_BTKT_articulated;

can_attach_wagon: CB_RESULT_ATTACH_DISALLOW;
cargo_capacity: sw_Coronation_BTKT_Capacity;
cargo_subtype_text: sw_Coronation_BTKT_cargo_subtype_text;
colour_mapping: return PALETTE_CC_FIRST;
cost_factor: return(GetAdjustedCost(25));

default: sw_Coronation_BTKT_liveries;
purchase: spriteset_LNER_CorSet_BTKT_Purchase;
running_cost_factor: return(GetAdjustedCost(25));
}
}
47 changes: 47 additions & 0 deletions src/trains/rolling_stock/LNER/LNER_Coronation_set_OBV.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
switch(FEAT_TRAINS, SELF, sw_LNER_Coronation_set_OBV_liveries, cargo_subtype) {
0: spriteset_LNER_CorSet_OBV_CorBlue;
1: spriteset_LNER_CorSet_OBV_BnC;
}

switch(FEAT_TRAINS, SELF, sw_Coronation_Set_OBV_cargo_subtype_text, cargo_subtype) {
0: return string(STR_LIVERY, string(str_abbr_LNER), string(str_col_GarterBlue));
1: return string(STR_LIVERY, string(str_abbr_BR), string(str_col_BloodCustard));
return CB_RESULT_NO_TEXT;
}

item(FEAT_TRAINS, item_LNER_Coronation_set_OBV, 716) {
property {
variant_group: item_LNER_Cornation_Set;
name: string(STR_NAME_LNER_CorSet_OBV);
climates_available: ALL_CLIMATES;
introduction_date: date(1937, 7, 5);
model_life: 30;
cargo_allow_refit: [PASS];
loading_speed: 10;
cost_factor: 1;
running_cost_factor: 1;
power: 0;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 110 mph;
refit_cost: 0;
running_cost_base: RUNNING_COST_STEAM;
default_cargo_type: PASS;
cargo_capacity: 1;
weight: 38 ton;
length: 8;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_coach, string(STR_LNER_CorSet_liveries)));

can_attach_wagon: CB_RESULT_ATTACH_DISALLOW;
cargo_capacity: return(16 * param_pax); // add a capacity switch for livery later
cargo_subtype_text: sw_Coronation_Set_OBV_cargo_subtype_text;
colour_mapping: return PALETTE_CC_FIRST;
cost_factor: return(GetAdjustedCost(25));

default: sw_LNER_Coronation_set_OBV_liveries;
purchase: spriteset_LNER_CorSet_OBV_Purchase;
running_cost_factor: return(GetAdjustedCost(25));
}
}
Loading

0 comments on commit 520f68e

Please sign in to comment.