diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index 0d5f740f..70e43f1f 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/gfx/Steam/LNER_J70.png b/gfx/Steam/LNER_J70.png new file mode 100644 index 00000000..119c9a3a Binary files /dev/null and b/gfx/Steam/LNER_J70.png differ diff --git a/lang/english.lng b/lang/english.lng index d990c980..08a70a46 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -342,6 +342,12 @@ str_StephensonPlanet_usage :Mixed Traffic str_StephensonPlanet_eos :1830 str_StephensonPlanet_liveries :Teak + +STR_NAME_LNER_J70 :GER 0-6-0T "C53" (LNER "J70") Tank +str_LNER_J70_usage :Light freight and shunting +str_LNER_J70_eos :1903-1921 +str_LNER_J70_liveries :GER/LNER Teak + STR_NAME_Coppernob :Furness Railway 0-4-0 "Coppernob" str_Coppernob_usage :Mixed Traffic str_Coppernob_eos :1848 diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index ad2beb19..5137795b 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -3,6 +3,7 @@ sort(FEAT_TRAINS, [ item_Coppernob, item_CaledonianSingle, item_FurnessK2, + item_LNER_J70, item_LNWRWebb, item_LSWR_AdamsRadial, item_SRZClass, diff --git a/src/trains/_spriteset/Steam_Sprites/LNER_J70.pnml b/src/trains/_spriteset/Steam_Sprites/LNER_J70.pnml new file mode 100644 index 00000000..e300ee65 --- /dev/null +++ b/src/trains/_spriteset/Steam_Sprites/LNER_J70.pnml @@ -0,0 +1,16 @@ +spriteset(spriteset_LNER_J70_Purchase, "gfx/Steam/LNER_J70.png") { + template_purchase(0, 0) +} + +spriteset(spriteset_LNER_J70_LNERTeak, "gfx/Steam/LNER_J70.png") { + template_train16px(0, 13) +} + +switch(FEAT_TRAINS,SELF, sw_LNER_J70,cargo_subtype){ + 0: spriteset_LNER_J70_LNERTeak; +} + +switch(FEAT_TRAINS,SELF,sw_LNER_J70_cargo_subtype_text,cargo_subtype){ + 0: return string(str_LNERTeak); + return CB_RESULT_NO_TEXT; +} diff --git a/src/trains/steam/LNER/LNER_J70.pnml b/src/trains/steam/LNER/LNER_J70.pnml new file mode 100644 index 00000000..a2ae567d --- /dev/null +++ b/src/trains/steam/LNER/LNER_J70.pnml @@ -0,0 +1,48 @@ +item (FEAT_TRAINS, item_LNER_J70, 688) { + property { + name: string(STR_NAME_LNER_J70); + climates_available: ALL_CLIMATES; + introduction_date: date(1903,1,1); + model_life: 18; + retire_early: 1; + vehicle_life: 25; + reliability_decay: 7; + refittable_cargo_classes: 0; + cargo_allow_refit: [GOOD, FOOD]; + loading_speed: 3; + cost_factor: 6; + running_cost_factor: 6; + sprite_id: SPRITE_ID_NEW_TRAIN; + speed: 30 mph; + misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE; + refit_cost: 0; + track_type: RAIL; + ai_special_flag: AI_FLAG_CARGO; + power: 200 hp; + running_cost_base: RUNNING_COST_STEAM; + dual_headed: 0; + default_cargo_type: GOOD; + cargo_capacity: 1; + weight: 27 ton; + engine_class: ENGINE_CLASS_STEAM; + tractive_effort_coefficient: 0.148; + air_drag_coefficient: 0.1; + length: 4; + 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_LNER_J70_usage),string(str_LNER_J70_eos),string(str_LNER_J70_liveries))); + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; + cargo_capacity: return 0; + cargo_subtype_text: sw_LNER_J70_cargo_subtype_text; + default: sw_LNER_J70; + purchase: spriteset_LNER_J70_Purchase; + colour_mapping: return PALETTE_CC_FIRST; + create_effect: steam_create_visual_effect; + sound_effect: sw_steam_sound; + cost_factor: return(GetAdjustedCost(4)); + running_cost_factor: return(GetAdjustedCost(3)); +} +} \ No newline at end of file