From 9e07a093684920a2bd366eb1153bd9fed4fb4a3f Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 16 Jul 2024 01:33:58 +0100 Subject: [PATCH] Added GWR 2801 Dean Goods WIP --- docs/SpriteIDs.xlsx | Bin 507485 -> 507512 bytes lang/english.lng | 12 +++-- src/sortpurchase.pnml | 1 + .../Steam_Sprites/GWR_DeanGoods.pnml | 46 ++++++++++++++++ src/trains/steam/GWR_DeanGoods.pnml | 50 ++++++++++++++++++ 5 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 src/trains/_spriteset/Steam_Sprites/GWR_DeanGoods.pnml create mode 100644 src/trains/steam/GWR_DeanGoods.pnml diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index 1fd3c85817b1b668f050e2dc8a5fd61ff08cc963..23785f090fc7fd3fae72398b14981b0f37e10010 100644 GIT binary patch delta 11089 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
    Q2sk5ACcTjeBjU3)&Z(UJK!rZq-ED=4cL!n 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 JEr5Ts{|BnaFRK6m diff --git a/lang/english.lng b/lang/english.lng index cc5e302b..16b1706a 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -269,6 +269,11 @@ str_LNWRWebb_usage :Low speed freight str_LNWRWebb_eos :1988 str_LNWRWebb_liveries :LNWR Black, BR Black +STR_NAME_GWR_DeanGoods :GWR 2301 0-6-0 "Dean Goods" +str_GWR_DeanGoods_usage :Freight and local passenger services +str_GWR_DeanGoods_eos :1883 +str_GWR_DeanGoods_liveries :GWR Green, GWR Green & Chrome + STR_NAME_GreatBear :GWR 4-6-2 "Great Bear" str_GreatBear_usage :Express Passenger str_GreatBear_eos :1908 @@ -1504,10 +1509,11 @@ str_gtrb : (Govia Thameslink "Blue") str_gtrp : (Govia Thameslink "Pink") str_GTRPride : (Govia Thameslink "Pride") str_Gulf : (Gulf) -str_GNRGreen : (GNR "Green") -str_GWRGreen : (GWR "Green") +str_GNRGreen : (GNR Green) +str_GWRGreen : (GWR Green) +str_GWRGreenChrome : (GWR Green & Chrome) str_GWRPride : (GWR "Pride") -str_GWRGreenUn : (GWR "Green" Unbranded) +str_GWRGreenUn : (GWR Green Unbranded) str_HansonHall : (Hanson & Hall) str_HarryNeedle : (Harry Needle Railroad) str_Hitachi : (Hitachi) diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 6172629c..60f6b669 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -5,6 +5,7 @@ sort(FEAT_TRAINS, [ item_LNWRWebb, item_SRZClass, item_GER_L77, + item_GWR_DeanGoods, item_GreatBear, item_GWRHall, item_LMSBlack5, diff --git a/src/trains/_spriteset/Steam_Sprites/GWR_DeanGoods.pnml b/src/trains/_spriteset/Steam_Sprites/GWR_DeanGoods.pnml new file mode 100644 index 00000000..18c4a0a6 --- /dev/null +++ b/src/trains/_spriteset/Steam_Sprites/GWR_DeanGoods.pnml @@ -0,0 +1,46 @@ +spriteset(spriteset_GWR_DeanGoods_Purchase, "gfx/Steam/GWR_DeanGoods.png") { + template_purchase_anim(0, 0) +} + +spriteset(spriteset_GWR_DeanGoods_GWRGreen, "gfx/Steam/GWR_DeanGoods.png") { + template_train20px(0, 13) +} + +spriteset(spriteset_GWR_DeanGoods_GWRGreenChrome, "gfx/Steam/GWR_DeanGoods.png") { + template_train20px(0, 39) +} + +spriteset(spriteset_GWR_DeanGoods_Tender_GWRGreen, "gfx/Steam/GWR_DeanGoods_Tender.png") { + template_train16px(0, 13) +} + +switch(FEAT_TRAINS,SELF, sw_GWR_DeanGoodsLoco,cargo_subtype){ + 0: spriteset_GWR_DeanGoods_GWRGreen; + 1: spriteset_GWR_DeanGoods_GWRGreenChrome; +} + +switch(FEAT_TRAINS,SELF, sw_GWR_DeanGoodsTender,cargo_subtype){ + spriteset_GWR_DeanGoods_Tender_GWRGreen; +} + + +switch(FEAT_TRAINS, SELF, sw_GWR_DeanGoods, position_in_articulated_veh){ + 0: sw_GWR_DeanGoodsLoco; + 1: sw_GWR_DeanGoodsTender; +} + +switch(FEAT_TRAINS, SELF, switch_GWR_DeanGoods_length, position_in_articulated_veh) { + 0: return 5; + 1: return 4; +} + +switch (FEAT_TRAINS, SELF, switch_articulated_GWR_DeanGoods, extra_callback_info1) { + 1: return item_GWR_DeanGoods; + return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts +} + +switch(FEAT_TRAINS,SELF,sw_GWR_DeanGoods_cargo_subtype_text,cargo_subtype){ + 0: return string(str_GWRGreen); + 1: return string(str_GWRGreenChrome); + return CB_RESULT_NO_TEXT; +} diff --git a/src/trains/steam/GWR_DeanGoods.pnml b/src/trains/steam/GWR_DeanGoods.pnml new file mode 100644 index 00000000..d9eda511 --- /dev/null +++ b/src/trains/steam/GWR_DeanGoods.pnml @@ -0,0 +1,50 @@ +item (FEAT_TRAINS, item_GWR_DeanGoods, 661) { + property { + name: string(STR_NAME_GWR_DeanGoods); + climates_available: ALL_CLIMATES; + introduction_date: date(1883,2,1); + model_life: 17; + retire_early: 1; + vehicle_life: 74; + 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: 40 mph; + misc_flags: TRAIN_FLAG_NO_BREAKDOWN_SMOKE; + refit_cost: 0; + track_type: RAIL; + ai_special_flag: AI_FLAG_CARGO; + power: 700 hp; + running_cost_base: RUNNING_COST_STEAM; + dual_headed: 0; + default_cargo_type: GOOD; + cargo_capacity: 1; + weight: 74 ton; + engine_class: ENGINE_CLASS_STEAM; + tractive_effort_coefficient: 0.112; + 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_GWR_DeanGoods_length; + additional_text: return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_route_9),string(str_GWR_DeanGoods_usage),string(str_GWR_DeanGoods_eos),string(str_GWR_DeanGoods_liveries))); + can_attach_wagon: CB_RESULT_ATTACH_ALLOW; + cargo_capacity: return 0; + cargo_subtype_text: sw_GWR_DeanGoods_cargo_subtype_text; + articulated_part: switch_articulated_GWR_DeanGoods; + default: sw_GWR_DeanGoods; + purchase: spriteset_GWR_DeanGoods_Purchase; + colour_mapping: return PALETTE_CC_FIRST; + create_effect: steam_create_visual_effect; + sound_effect: sw_steam_sound; + cost_factor: return(GetAdjustedCost(21)); + running_cost_factor: return(GetAdjustedCost(17)); +} +} \ No newline at end of file