Skip to content

Commit

Permalink
Updated steam locomotive weights, tractive efforts, and some top speeds
Browse files Browse the repository at this point in the history
  • Loading branch information
audigex committed Jul 15, 2024
1 parent 79279c2 commit f1ef6e5
Show file tree
Hide file tree
Showing 15 changed files with 243 additions and 243 deletions.
4 changes: 2 additions & 2 deletions src/trains/steam/CaledonianSingle.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ item (FEAT_TRAINS, item_CaledonianSingle, 598) {
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 60 ton;
weight: 70 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.37;
tractive_effort_coefficient: 0.086;
air_drag_coefficient: 0.1;
length: 5;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
4 changes: 2 additions & 2 deletions src/trains/steam/FurnessCoppernob.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ item (FEAT_TRAINS, item_Coppernob, 584) {
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 15 ton;
weight: 19 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.3;
tractive_effort_coefficient: 0.18;
air_drag_coefficient: 0.1;
length: 5;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
4 changes: 2 additions & 2 deletions src/trains/steam/FurnessK2.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ item (FEAT_TRAINS, item_FurnessK2, 590) {
cost_factor: 10;
running_cost_factor: 10;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 85 mph;
speed: 70 mph;
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
refit_cost: 0;
track_type: RAIL;
Expand All @@ -65,7 +65,7 @@ item (FEAT_TRAINS, item_FurnessK2, 590) {
cargo_capacity: 1;
weight: 70 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.4;
tractive_effort_coefficient: 0.088;
air_drag_coefficient: 0.1;
length: 5;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
8 changes: 4 additions & 4 deletions src/trains/steam/GNRA1.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ item (FEAT_TRAINS, item_GNRA1, 4) {
cost_factor: 26;
running_cost_factor: 30;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 108 mph;
speed: 100 mph;
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1392 hp;
power: 1600 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 93 ton;
weight: 150 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.3;
tractive_effort_coefficient: 0.0885;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
6 changes: 3 additions & 3 deletions src/trains/steam/GWRGreatBear.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ item (FEAT_TRAINS, item_GreatBear, 484) {
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1000 hp;
power: 1300 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 142 ton;
weight: 145 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.3;
tractive_effort_coefficient: 0.085;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
6 changes: 3 additions & 3 deletions src/trains/steam/GWRHall.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ item (FEAT_TRAINS, item_GWRHall, 512) {
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1000 hp;
power: 1100 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 124 ton;
weight: 123.6 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.3;
tractive_effort_coefficient: 0.098;
air_drag_coefficient: 0.1;
length: 8;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
Expand Down
162 changes: 81 additions & 81 deletions src/trains/steam/LMSBlack5.pnml
Original file line number Diff line number Diff line change
@@ -1,91 +1,91 @@

spriteset(spriteset_LMSBlack5_Purchase, "gfx/Steam/LMSJubilee.png") {
template_purchase_anim(0, 0)
}
// spriteset(spriteset_LMSBlack5_Purchase, "gfx/Steam/LMSJubilee.png") {
// template_purchase_anim(0, 0)
// }

spriteset(spriteset_LMSBlack5_FurnessRed, "gfx/Steam/LMSJubilee.png") {
template_train20px(0, 13)
}
// spriteset(spriteset_LMSBlack5_FurnessRed, "gfx/Steam/LMSJubilee.png") {
// template_train20px(0, 13)
// }

spriteset(spriteset_LMSBlack5T_FurnessRed, "gfx/Steam/LMSJubilee.png") {
template_train12px(0, 33)
}
// spriteset(spriteset_LMSBlack5T_FurnessRed, "gfx/Steam/LMSJubilee.png") {
// template_train12px(0, 33)
// }

switch(FEAT_TRAINS,SELF, sw_LMSBlack5Loco,cargo_subtype){
0: spriteset_LMSBlack5_FurnessRed;
}
// switch(FEAT_TRAINS,SELF, sw_LMSBlack5Loco,cargo_subtype){
// 0: spriteset_LMSBlack5_FurnessRed;
// }

switch(FEAT_TRAINS,SELF, sw_LMSBlack5Tender,cargo_subtype){
0: spriteset_LMSBlack5T_FurnessRed;
}
// switch(FEAT_TRAINS,SELF, sw_LMSBlack5Tender,cargo_subtype){
// 0: spriteset_LMSBlack5T_FurnessRed;
// }

switch(FEAT_TRAINS, SELF, sw_LMSBlack5, position_in_articulated_veh){
0: sw_LMSBlack5Loco;
1: sw_LMSBlack5Tender;
}
// switch(FEAT_TRAINS, SELF, sw_LMSBlack5, position_in_articulated_veh){
// 0: sw_LMSBlack5Loco;
// 1: sw_LMSBlack5Tender;
// }

switch(FEAT_TRAINS, SELF, switch_LMSBlack5_length, position_in_articulated_veh) {
0: return 5;
1: return 3;
}
// switch(FEAT_TRAINS, SELF, switch_LMSBlack5_length, position_in_articulated_veh) {
// 0: return 5;
// 1: return 3;
// }

switch (FEAT_TRAINS, SELF, switch_articulated_LMSBlack5, extra_callback_info1) {
1: return item_LMSBlack5;
return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
}
// switch (FEAT_TRAINS, SELF, switch_articulated_LMSBlack5, extra_callback_info1) {
// 1: return item_LMSBlack5;
// return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
// }

switch(FEAT_TRAINS,SELF,sw_LMSBlack5_cargo_subtype_text,cargo_subtype){
0: return string(str_FurnessRed);
return CB_RESULT_NO_TEXT;
}
// switch(FEAT_TRAINS,SELF,sw_LMSBlack5_cargo_subtype_text,cargo_subtype){
// 0: return string(str_FurnessRed);
// return CB_RESULT_NO_TEXT;
// }

item (FEAT_TRAINS, item_LMSBlack5, 590) {
property {
name: string(STR_NAME_LMSBlack5);
climates_available: ALL_CLIMATES;
introduction_date: date(1934,2,1);
model_life: 40;
retire_early: 1;
vehicle_life: 40;
reliability_decay: 7;
refittable_cargo_classes: 0;
cargo_allow_refit: [GOOD, FOOD];
loading_speed: 3;
cost_factor: 18;
running_cost_factor: 21;
sprite_id: SPRITE_ID_NEW_TRAIN;
speed: 80 mph;
misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
refit_cost: 0;
track_type: RAIL;
ai_special_flag: AI_FLAG_CARGO;
power: 1300 hp;
running_cost_base: RUNNING_COST_STEAM;
dual_headed: 0;
default_cargo_type: GOOD;
cargo_capacity: 1;
weight: 130 ton;
engine_class: ENGINE_CLASS_STEAM;
tractive_effort_coefficient: 0.4;
air_drag_coefficient: 0.1;
length: 5;
effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
extra_weight_per_wagon: 0;
bitmask_vehicle_info: 0;
}
graphics {
length: switch_LMSBlack5_length;
additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_route_9),string(str_LMSBlack5_usage),string(str_LMSBlack5_eos),string(str_LMSBlack5_liveries)));
can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
cargo_capacity: return 0;
cargo_subtype_text: sw_LMSBlack5_cargo_subtype_text;
articulated_part: switch_articulated_LMSBlack5;
default: sw_LMSBlack5;
purchase: spriteset_LMSBlack5_Purchase;
colour_mapping: return PALETTE_CC_FIRST;
create_effect: steam_create_visual_effect;
sound_effect: sw_steam_sound;
cost_factor: return(GetAdjustedCost(10));
running_cost_factor: return(GetAdjustedCost(10));
}
}
// item (FEAT_TRAINS, item_LMSBlack5, 590) {
// property {
// name: string(STR_NAME_LMSBlack5);
// climates_available: ALL_CLIMATES;
// introduction_date: date(1934,2,1);
// model_life: 40;
// retire_early: 1;
// vehicle_life: 40;
// reliability_decay: 7;
// refittable_cargo_classes: 0;
// cargo_allow_refit: [GOOD, FOOD];
// loading_speed: 3;
// cost_factor: 18;
// running_cost_factor: 21;
// sprite_id: SPRITE_ID_NEW_TRAIN;
// speed: 85 mph;
// misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
// refit_cost: 0;
// track_type: RAIL;
// ai_special_flag: AI_FLAG_CARGO;
// power: 1500 hp;
// running_cost_base: RUNNING_COST_STEAM;
// dual_headed: 0;
// default_cargo_type: GOOD;
// cargo_capacity: 1;
// weight: 130 ton;
// engine_class: ENGINE_CLASS_STEAM;
// tractive_effort_coefficient: 0.28; // RL 0.14, 24.4k lbf
// air_drag_coefficient: 0.1;
// length: 5;
// effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_STEAM;
// extra_weight_per_wagon: 0;
// bitmask_vehicle_info: 0;
// }
// graphics {
// length: switch_LMSBlack5_length;
// additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_route_9),string(str_LMSBlack5_usage),string(str_LMSBlack5_eos),string(str_LMSBlack5_liveries)));
// can_attach_wagon: CB_RESULT_ATTACH_ALLOW;
// cargo_capacity: return 0;
// cargo_subtype_text: sw_LMSBlack5_cargo_subtype_text;
// articulated_part: switch_articulated_LMSBlack5;
// default: sw_LMSBlack5;
// purchase: spriteset_LMSBlack5_Purchase;
// colour_mapping: return PALETTE_CC_FIRST;
// create_effect: steam_create_visual_effect;
// sound_effect: sw_steam_sound;
// cost_factor: return(GetAdjustedCost(10));
// running_cost_factor: return(GetAdjustedCost(10));
// }
// }
Loading

0 comments on commit f1ef6e5

Please sign in to comment.