Skip to content

Commit

Permalink
Added SR Bulleid Q1.
Browse files Browse the repository at this point in the history
  • Loading branch information
Su1phur committed Nov 29, 2024
1 parent 520f68e commit 036c4b6
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 7 deletions.
Binary file modified docs/SpriteIDs.xlsx
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
- Conflat A (needs coding)
- Conflat B (needs coding)
- Class 59 (code liveries and add to lang file)
- Coronation Coaches
- GWR Great Bear and Hall class rework
- Class 56
- Class 69
Expand Down Expand Up @@ -34,6 +33,7 @@
- Added BR JIA "Polybulk" Covered Hopper
- Added BRT PAA Covered Hopper
- Added LNER Coronation Train Set, and individual articulated coaches
- Added SR Bulleid Q1
- 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 Down
Binary file added gfx/Steam/SR_Bulleid_Q1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gfx/Steam/SR_Bulleid_Q1_Tender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -482,12 +482,17 @@ str_LMSBlack5_usage :Mixed Traffic
str_LMSBlack5_eos :1934-1968
str_LMSBlack5_liveries :LMS Black, BR Transitional Black, BR Black

STR_NAME_LMS8F :LMS Stanier Class 8F
STR_NAME_LMS8F :LMS Stanier Class 8F 2-8-0
str_LMS8F_usage :Heavy Freight
str_LMS8F_eos :1935-1968
str_LMS8F_liveries :LMS BLack, BR Transitional Black, BR Black, WD Grey

STR_NAME_WDTank :WD Austerity 0-6-0ST "Austerity Tank"
STR_NAME_SRQ1 :SR Bulleid Q1 Class 0-6-0
str_SRQ1_usage :Freight
str_SRQ1_eos :1942-1966
str_SRQ1_liveries :SR Black, BR Black

STR_NAME_WDTank :WD Austerity "Austerity Tank" 0-6-0ST
str_WDTank_usage :Low speed freight/shunting
str_WDTank_eos :1960
str_WDTank_liveries :Wartime Black
Expand Down
3 changes: 2 additions & 1 deletion src/sortpurchase.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ sort(FEAT_TRAINS, [
item_LNWRWebb,
item_LSWR_AdamsRadial,
item_GWR_DeanGoods,
item_LMSBigBertha,
item_GER_L77,
item_SRZClass,
item_GreatBear,
item_GWRHall,
item_LMSBigBertha,
item_LMSBlack5,
item_LMSJubilee,
item_LMS8F,
Expand All @@ -21,6 +21,7 @@ sort(FEAT_TRAINS, [
item_LNERP2,
item_LNERP2_Streamlined,
item_LNERA3,
item_SR_Q1,
item_WDTank,
item_Standard9F,
item_BR08,
Expand Down
45 changes: 45 additions & 0 deletions src/trains/_spriteset/Steam_Sprites/SR_Q1.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
spriteset(spriteset_SR_Q1_Purchase, "gfx/Steam/SR_Bulleid_Q1.png") {
template_purchase(0, 0)
}

spriteset(spriteset_SR_Q1_engine, "gfx/Steam/SR_Bulleid_Q1.png") {
template_train20px(0, 13)
}

spriteset(spriteset_SR_Q1_tender_SR, "gfx/Steam/SR_Bulleid_Q1_Tender.png") {
template_train16px(0, 13)
}

spriteset(spriteset_SR_Q1_tender_BR, "gfx/Steam/SR_Bulleid_Q1_Tender.png") {
template_train16px(0, 39)
}

switch(FEAT_TRAINS, SELF, sw_SR_Q1_Loco, cargo_subtype) {
0: spriteset_SR_Q1_engine;
1: spriteset_SR_Q1_engine;
}

switch(FEAT_TRAINS, SELF, sw_SR_Q1_tender, cargo_subtype) {
0: spriteset_SR_Q1_tender_SR;
1: spriteset_SR_Q1_tender_BR;
}

switch(FEAT_TRAINS, SELF, sw_SR_Q1_cargo_subtype_text, cargo_subtype) {
0: return string(str_SRBlack);
1: return string(str_BRLion);
}

switch(FEAT_TRAINS, SELF, sw_SR_Q1, position_in_articulated_veh) {
0: sw_SR_Q1_Loco;
1: sw_SR_Q1_tender;
}

switch(FEAT_TRAINS, SELF, sw_SR_Q1_length, position_in_articulated_veh) {
0: return 5;
1: return 4;
}

switch (FEAT_TRAINS, SELF, sw_SR_Q1_articulated, extra_callback_info1) {
1: return item_SR_Q1;
return CB_RESULT_NO_MORE_ARTICULATED_PARTS; // stop adding vehicle parts
}
2 changes: 1 addition & 1 deletion src/trains/steam/LMS/LMSJubilee.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ item (FEAT_TRAINS, item_LMSJubilee, 658) {
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1550 hp;
power: 1700 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
Expand Down
4 changes: 2 additions & 2 deletions src/trains/steam/LNER/LNERV2.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ item (FEAT_TRAINS, item_LNERV2, 696) {
name: string(STR_NAME_LNERV2);
climates_available: ALL_CLIMATES;
introduction_date: date(1936,1,1);
model_life: 15;
model_life: 30;
retire_early: 1;
vehicle_life: 20;
reliability_decay: 7;
Expand All @@ -18,7 +18,7 @@ item (FEAT_TRAINS, item_LNERV2, 696) {
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 2150 hp;
power: 1800 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
Expand Down
52 changes: 52 additions & 0 deletions src/trains/steam/SR/SR_Q1Class.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
item(FEAT_TRAINS, item_SR_Q1, 718) {
property {
name: string(STR_NAME_SRQ1);
climates_available: ALL_CLIMATES;
introduction_date: date(1942,1,1);
model_life: 25;
retire_early: 1;
vehicle_life: 30;
reliability_decay: 7;
refittable_cargo_classes: 0;
cargo_allow_refit: [GOOD, FOOD];
loading_speed: 3;
cost_factor: 20;
running_cost_factor: 24;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 65 mph;
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1550 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 90.7 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.187561;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
extra_weight_per_wagon: 0;
bitmask_vehicle_info: 0;
}
graphics {
additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_SRQ1_usage),string(str_SRQ1_eos),string(str_SRQ1_liveries)));
articulated_part: sw_SR_Q1_articulated;

can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
cargo_capacity: return 0;
cargo_subtype_text: sw_SR_Q1_cargo_subtype_text;
colour_mapping: return PALETTE_CC_FIRST;
cost_factor: return(GetAdjustedCost(23));
create_effect: steam_create_visual_effect;

default: sw_SR_Q1;
purchase: spriteset_SR_Q1_Purchase;
running_cost_factor: return(GetAdjustedCost(28));
sound_effect: sw_steam_sound;
length: sw_SR_Q1_length;
}
}

0 comments on commit 036c4b6

Please sign in to comment.