diff --git a/docs/SpriteID table.xlsx b/docs/SpriteID table.xlsx index a39baf6..5ee2630 100644 Binary files a/docs/SpriteID table.xlsx and b/docs/SpriteID table.xlsx differ diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index cf3dd93..2b51277 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/gfx/Steam/LBSCR_E2.png b/gfx/Steam/LBSCR_E2.png new file mode 100644 index 0000000..d9b8bc2 Binary files /dev/null and b/gfx/Steam/LBSCR_E2.png differ diff --git a/lang/english.lng b/lang/english.lng index b5ca7f2..33ee742 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -52,6 +52,7 @@ str_abbr_VXC :VXC str_abbr_VTEC :VTEC str_abbr_VTWC :VTWC str_abbr_WMR :WMR +str_abbr_LBSC :LBSCR # Companies str_comp_Avanti :Avanti West Coast @@ -72,6 +73,7 @@ str_comp_VXC :Virgin CrossCountry str_comp_VTEC :Virgin East Coast str_comp_VTWC :Virgin West Coast str_comp_WMR :West Midland Railway +str_comp_LBSC :London brighton and south coast railway str_comp_gen_priv_owner :Private Owner @@ -388,6 +390,12 @@ str_StephensonPlanet_eos :1830-1841 str_StephensonPlanet_liveries :Teak +STR_NAME_LBSCR_E2 :LBSCR E2 class 0-6-0T (NWR "Thomas") +str_LBSCR_E2_usage :freight +str_LBSCR_E2_eos :1913-1963 +str_LBSCR_E2_liveries :LBSCR Umber,Black + + STR_NAME_LNER_J70 :GER Class C53 0-6-0T (LNER "J70") str_LNER_J70_usage :Light Mixed Traffic str_LNER_J70_eos :1903-1955 @@ -2138,4 +2146,4 @@ str_5 :5 str_6 :6 str_7 :7 str_8 :8 -str_9 :9 \ No newline at end of file +str_9 :9 diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 54ffe43..015e7df 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -11,6 +11,7 @@ sort(FEAT_TRAINS, [ item_GER_L77, item_SRZClass, item_GreatBear, + item_LBSCR_E2, item_GWRHall, item_GNRA1, item_LMSBlack5, @@ -360,4 +361,4 @@ header_BRMk4, item_UtilityTrain32px, item_UtilityTrain28pxOLD, item_UtilityTrain32pxOLD - ]); \ No newline at end of file + ]); diff --git a/src/trains/_spriteset/Steam_Sprites/LBSCR_E2.pnml b/src/trains/_spriteset/Steam_Sprites/LBSCR_E2.pnml new file mode 100644 index 0000000..158643d --- /dev/null +++ b/src/trains/_spriteset/Steam_Sprites/LBSCR_E2.pnml @@ -0,0 +1,16 @@ +spriteset(spriteset__Purchase, "gfx/Steam/LBSCR_E2.png") { + template_purchase(0, 0) +} + +spriteset(spriteset_LBSCR_E2_LBSCUmber, "gfx/Steam/LBSCR_E2.png") { + template_train20px(0, 13) +} + +switch(FEAT_TRAINS,SELF, sw_LBSCR_E2,cargo_subtype){ + 0: spriteset_LBSCR_E2_LBSCUmber; +} + +switch(FEAT_TRAINS,SELF,sw_LBSCR_E2_cargo_subtype_text,cargo_subtype){ + 0: return string(str_LBSCUmber); + return CB_RESULT_NO_TEXT; +} diff --git a/src/trains/steam/LBSCR/LBSCR_E2.pnml b/src/trains/steam/LBSCR/LBSCR_E2.pnml new file mode 100644 index 0000000..9dac781 --- /dev/null +++ b/src/trains/steam/LBSCR/LBSCR_E2.pnml @@ -0,0 +1,48 @@ +item (FEAT_TRAINS, item_LBSCR_E2, 705) { + property { + name: string(STR_NAME_LBSCR_E2); + climates_available: ALL_CLIMATES; + introduction_date: date(1913,1,1); + model_life: 3; + retire_early: 1; + vehicle_life: 50; + 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: 50 mph; + misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE; + refit_cost: 0; + track_type: RAIL; + ai_special_flag: AI_FLAG_CARGO; + power: 350 hp; + running_cost_base: RUNNING_COST_STEAM; + dual_headed: 0; + default_cargo_type: GOOD; + cargo_capacity: 1; + weight: 52 ton; + engine_class: ENGINE_CLASS_STEAM; + tractive_effort_coefficient: 0.182; + 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 { + additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_LBSCR_E2_usage),string(str_LBSCR_E2_eos),string(str_LBSCR_E2_liveries))); + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; + cargo_capacity: return 0; + cargo_subtype_text: sw_LBSCR_E2_cargo_subtype_text; + default: sw_LBSCR_E2; + purchase: spriteset_LBSCR_E2_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)); +} +}