diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index 7197a77e..da6b4bf5 100644 Binary files a/docs/SpriteIDs.xlsx and b/docs/SpriteIDs.xlsx differ diff --git a/lang/english.lng b/lang/english.lng index 7934f51a..438cfab7 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -96,11 +96,13 @@ STR_DESC_EyeCandy :An invisible locomotive intended for us STR_EyeCandy_NoAttachedUnit :Cannot start Eye Candy locomotive without an attached unit # TRAM NAMES -STR_NAME_GlasgowWooden :Glasgow Trams Wooden Double Decker -STR_NAME_BlackpoolStandard147 :Blackpool Trams 1920s "Standard" Double Decker +STR_NAME_GlasgowWooden :Glasgow Trams Wooden Classic (Double Decker) STR_NAME_CR4000 :London Trams CR4000 (2-car Single Unit) STR_NAME_LondonVariobahn :London Trams Variobahn (5-car Single Unit) STR_NAME_BirminghamUrbos :West Midlands Metro Urbos 3 (5-car Single Unit) +STR_NAME_BlackpoolStandard147 :Blackpool Trams 1920s "Standard" (Double Decker) +STR_NAME_BlackpoolBrush_Mail :Blackpool Trams Royal Mail (Single Decker) +STR_NAME_BlackpoolBrush :Blackpool Trams Brush Traincar (Single Decker) STR_NAME_BlackpoolFlexity :Blackpool Transport Flexity 2 (5-car Single Unit) STR_NAME_T68 :Manchester Metrolink T-68 (2-car Single Unit) STR_NAME_T68_DOUBLE :Manchester Metrolink T-68 (4-car Double Unit) @@ -1631,6 +1633,7 @@ str_RFPetrol : (Railfreight Petroleum) str_Royal : (Royal Scotsman) str_RoyalClaret : (British Royal Train) str_RoyalMail : (Royal Mail) +str_RoyalMailBoards : (Royal Mail - Advertising boards) str_RoyalMailFictional : (Royal Mail - Fictional Livery) str_ScotRail : (ScotRail) str_ScotRailPride : (ScotRail "Pride") diff --git a/src/trams/Blackpool_Brush.pnml b/src/trams/Blackpool_Brush.pnml new file mode 100644 index 00000000..f005175e --- /dev/null +++ b/src/trams/Blackpool_Brush.pnml @@ -0,0 +1,45 @@ +switch (FEAT_ROADVEHS, SELF, switch_articulated_TRAM_BlackpoolBrush, extra_callback_info1) { + return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts +} + + +item (FEAT_ROADVEHS, item_TRAM_BlackpoolBrush, 664) { + property { + misc_flags: bitmask(ROADVEH_FLAG_TRAM); + name: string(STR_NAME_BlackpoolBrush); + climates_available: ALL_CLIMATES; + introduction_date: date(1937,4,1); + model_life: VEHICLE_NEVER_EXPIRES; + retire_early: 1; + vehicle_life: 50; + reliability_decay: 7; + refittable_cargo_classes: CC_PASSENGERS; + cargo_allow_refit: [PASS, TOUR]; + loading_speed: 35; + cost_factor: 3; + running_cost_factor: 3; + sprite_id: SPRITE_ID_NEW_TRAIN; + speed: 35 mph; + refit_cost: 0; + power: 114 hp; + running_cost_base: RUNNING_COST_ROADVEH; + default_cargo_type: PASS; + cargo_capacity: 1; + weight: 1 ton; + tractive_effort_coefficient: 0.08; + air_drag_coefficient: 0.05; + length: 5; + cargo_age_period: 185; + } + graphics { + cargo_subtype_text: sw_TRAM_BlackpoolBrush_cargo_subtype_text; + articulated_part: switch_articulated_TRAM_BlackpoolBrush; + default: sw_TRAM_BlackpoolBrush; + purchase: spriteset_BlackpoolBrush_purchase; + colour_mapping: return PALETTE_CC_FIRST; + cargo_capacity: return(48 * param_pax); + cost_factor: return(GetAdjustedCostTRAM(3)); + running_cost_factor: return(GetAdjustedCostTRAM(3)); + weight: 9; +} +} \ No newline at end of file diff --git a/src/trams/Blackpool_Brush_Mail.pnml b/src/trams/Blackpool_Brush_Mail.pnml new file mode 100644 index 00000000..a863e9fc --- /dev/null +++ b/src/trams/Blackpool_Brush_Mail.pnml @@ -0,0 +1,44 @@ +switch (FEAT_ROADVEHS, SELF, switch_articulated_TRAM_BlackpoolBrush_Mail, extra_callback_info1) { + return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts +} + + +item (FEAT_ROADVEHS, item_TRAM_BlackpoolBrush_Mail, 665) { + property { + misc_flags: bitmask(ROADVEH_FLAG_TRAM); + name: string(STR_NAME_BlackpoolBrush_Mail); + climates_available: ALL_CLIMATES; + introduction_date: date(1937,4,1); + model_life: VEHICLE_NEVER_EXPIRES; + retire_early: 1; + vehicle_life: 50; + reliability_decay: 7; + refittable_cargo_classes: bitmask(CC_MAIL, CC_EXPRESS, CC_ARMOURED); + cargo_allow_refit: [MAIL]; + loading_speed: 35; + cost_factor: 3; + running_cost_factor: 3; + sprite_id: SPRITE_ID_NEW_TRAIN; + speed: 35 mph; + refit_cost: 0; + power: 114 hp; + running_cost_base: RUNNING_COST_ROADVEH; + default_cargo_type: MAIL; + cargo_capacity: 30; + weight: 1 ton; + tractive_effort_coefficient: 0.08; + air_drag_coefficient: 0.05; + length: 5; + cargo_age_period: 185; + } + graphics { + cargo_subtype_text: sw_TRAM_BlackpoolBrush_Mail_cargo_subtype_text; + articulated_part: switch_articulated_TRAM_BlackpoolBrush_Mail; + default: sw_TRAM_BlackpoolBrush_Mail; + purchase: spriteset_BlackpoolBrush_Mail_purchase; + colour_mapping: return PALETTE_CC_FIRST; + cost_factor: return(GetAdjustedCostTRAM(3)); + running_cost_factor: return(GetAdjustedCostTRAM(3)); + weight: 9; +} +} \ No newline at end of file diff --git a/src/trams/_spriteset/Brush_Traincar.pnml b/src/trams/_spriteset/Brush_Traincar.pnml new file mode 100644 index 00000000..4bebc33a --- /dev/null +++ b/src/trams/_spriteset/Brush_Traincar.pnml @@ -0,0 +1,38 @@ +spriteset (spriteset_BlackpoolBrush_purchase, "gfx/Tram/Blackpool_Brush.png") { + template_purchase(0,0) +} +spriteset (spriteset_BlackpoolBrush_Mail_purchase, "gfx/Tram/Blackpool_Brush.png") { + template_purchase(88,0) +} + +spriteset (spriteset_BlackpoolBrush, "gfx/Tram/Blackpool_Brush.png") { + template_tram20px_tall(0, 13) +} + +spriteset (spriteset_RoyalMailBrush_Standard, "gfx/Tram/Blackpool_Brush.png") { + template_tram20px_tall(0, 39) +} + +spriteset (spriteset_RoyalMailBrush_Boards, "gfx/Tram/Blackpool_Brush.png") { + template_tram20px_tall(0, 65) +} + +switch(FEAT_ROADVEHS,SELF,sw_TRAM_BlackpoolBrush_cargo_subtype_text,cargo_subtype){ + 0: return string(str_BlackpoolTransport); + return CB_RESULT_NO_TEXT; +} + +switch(FEAT_ROADVEHS,SELF, sw_TRAM_BlackpoolBrush,cargo_subtype){ + 0: spriteset_BlackpoolBrush; +} + +switch(FEAT_ROADVEHS,SELF,sw_TRAM_BlackpoolBrush_Mail_cargo_subtype_text,cargo_subtype){ + 0: return string(str_RoyalMailBoards); + 1: return string(str_RoyalMail); + return CB_RESULT_NO_TEXT; +} + +switch(FEAT_ROADVEHS,SELF, sw_TRAM_BlackpoolBrush_Mail,cargo_subtype){ + 0: spriteset_RoyalMailBrush_Boards; + 1: spriteset_RoyalMailBrush_Standard; +} \ No newline at end of file