diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index e009c72f..452af877 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/docs/changelog.txt b/docs/changelog.txt index deff62ea..cd0f75a5 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -6,6 +6,7 @@ - Added Furness Railway 4-4-0 K2 'Large Seagull' - Added War Department "Austerity Tank" - Added LNER P2 +- Added Class 48 - Adjusted some purchase dates and model lifespans - HUGE template/alignment overhaul - Re-drew Class 70 diff --git a/lang/english.lng b/lang/english.lng index 7bd978a9..ce466735 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -303,6 +303,11 @@ str_BR47_usage :Mixed Traffic str_BR47_eos :--- str_BR47_liveries :BR Green, BR Blue, BR Large Logo, BR Large Logo (Alternate), Porterbrook, EWS, Anglia, InterCity, West Coast, GWR Green, Virgin, Colas Rail, ONE, Freightliner +STR_NAME_BR48 :BR Class 48 'Type 4' (Experimental) +str_BR48_usage :Mixed Traffic +str_BR48_eos :--- +str_BR48_liveries :BR Green, BR Blue + STR_NAME_Kestrel :HS4000 'Kestrel' (Type 5 Prototype) str_Kestrel_usage :Mixed Traffic str_Kestrel_eos :--- diff --git a/src/trains/_spriteset/Diesel_Sprites/48.pnml b/src/trains/_spriteset/Diesel_Sprites/48.pnml new file mode 100644 index 00000000..73430b03 --- /dev/null +++ b/src/trains/_spriteset/Diesel_Sprites/48.pnml @@ -0,0 +1,15 @@ +spriteset(spriteset_BR48_Purchase, "gfx/BR47_BR57.png") { + template_purchase(0, 0) +} + +switch(FEAT_TRAINS,SELF, sw_BR48,cargo_subtype){ + 0: spriteset_BR47_BRGreen; + 1: spriteset_BR47_BRBlue; + return CB_RESULT_NO_TEXT; +} + +switch(FEAT_TRAINS,SELF,sw_BR48_cargo_subtype_text,cargo_subtype){ + 0: return string(str_BRGreen); + 1: return string(str_BRBlue); + return CB_RESULT_NO_TEXT; +} \ No newline at end of file diff --git a/src/trains/diesel/BR048.pnml b/src/trains/diesel/BR048.pnml new file mode 100644 index 00000000..55869162 --- /dev/null +++ b/src/trains/diesel/BR048.pnml @@ -0,0 +1,48 @@ +item (FEAT_TRAINS, item_BR48, 593) { + property { + name: string(STR_NAME_BR48); + climates_available: ALL_CLIMATES; + introduction_date: date(1965,4,21); + model_life: 8; + retire_early: 1; + vehicle_life: 50; + reliability_decay: 7; + refittable_cargo_classes: 0; + cargo_allow_refit: [GOOD, FOOD]; + loading_speed: 3; + cost_factor: 45; + running_cost_factor: 41; + sprite_id: SPRITE_ID_NEW_TRAIN; + speed: 95 mph; + misc_flags: TRAIN_FLAG_FLIP; + refit_cost: 0; + track_type: RAIL; + ai_special_flag: AI_FLAG_CARGO; + power: 2650 hp; + running_cost_base: RUNNING_COST_DIESEL; + dual_headed: 0; + default_cargo_type: GOOD; + cargo_capacity: 1; + weight: 112 ton; + engine_class: ENGINE_CLASS_DIESEL; + tractive_effort_coefficient: 0.25; + air_drag_coefficient: 0.05; + length: 8; + effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_DIESEL; + extra_weight_per_wagon: 0; + bitmask_vehicle_info: 0; + } + graphics { + additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_diesel),string(str_route_7),string(str_BR48_usage),string(str_BR48_eos),string(str_BR48_liveries))); + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; + cargo_capacity: return 0; + cargo_subtype_text: sw_BR48_cargo_subtype_text; + default: sw_BR48; + purchase: spriteset_BR48_Purchase; + colour_mapping: return PALETTE_CC_FIRST; + create_effect: diesel_create_visual_effect; + sound_effect: sw_deltic_sound; + cost_factor: return(GetAdjustedCost(45)); + running_cost_factor: return(GetAdjustedCost(41)); +} +}