From 668b0dd671a05d437e4edf836b018c40cd76acbc Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 7 Aug 2024 03:50:08 +0100 Subject: [PATCH] Added 80-87 to variant group, moved 158-159 to separate group, fixed Z-Class overwriting Class 87 --- docs/SpriteIDs.xlsx | Bin 514576 -> 514664 bytes docs/changelog.txt | 2 +- lang/english.lng | 28 ++++++++++-------- src/sortpurchase.pnml | 2 ++ src/trains/diesel_mu/Sprinter/BR158.pnml | 2 +- src/trains/diesel_mu/Sprinter/BR158_3.pnml | 2 +- src/trains/diesel_mu/Sprinter/BR159.pnml | 2 +- src/trains/electric_loco/80.pnml | 1 + src/trains/electric_loco/81.pnml | 1 + src/trains/electric_loco/82.pnml | 1 + src/trains/electric_loco/83.pnml | 1 + src/trains/electric_loco/84.pnml | 1 + src/trains/electric_loco/85.pnml | 1 + src/trains/electric_loco/86.pnml | 1 + src/trains/electric_loco/87.pnml | 1 + src/trains/steam/SR/SR_ZClass.pnml | 2 +- src/trains/variantheaders/AL1to7_Header.pnml | 11 +++++++ ...iro_Header.pnml => DesiroCity_Header.pnml} | 2 +- .../ExpressSprinter_Header.pnml | 11 +++++++ .../variantheaders/Sprinter_Header.pnml | 2 +- 20 files changed, 54 insertions(+), 20 deletions(-) create mode 100644 src/trains/variantheaders/AL1to7_Header.pnml rename src/trains/variantheaders/{Desiro_Header.pnml => DesiroCity_Header.pnml} (82%) create mode 100644 src/trains/variantheaders/ExpressSprinter_Header.pnml diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx index b867c5071ffeb3c4683793cdd6d350f12d9e7406..4a1d123da303bfa0e6cd5738d0475562205c58f6 100644 GIT binary patch delta 18691 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

D z^sR%``ZNM56IT#3GIQdqqYfq8njC=UFUC`+rT0uc>9*Y>%56H{V=3^=G^69PTgAjhX&kk6Jos?e*FA z|LnoXL~K_&#J-7}rR#Ue#qBrFvYRs2Yg;+rZagJ-q;W&%qiBzJ+Y&xI3cdYxe|G8C zbN$B)&i%bx?7!+~+}4xq7W%#G0_O=%X?W)5v3Kpo%T*K41w3ND+_crrxwq;=#=SZ7 zL+=FT$=FyWA7tgU>r{EGx!v?uYl7yndG8$z=exG|JvwG_)Tw5d?zW!&8+9KvP4Hf$ zU~sUW=`edjmb#ME#3p}_-|ucQDp<6MiM)7FIPd9?+tLR#|Gz)5V2;I9p1r;1y@mca zo8*t4-21)As4RAR=~DsaXXihj{*-7sXO>s(i!SCYzQ0?}w5P5qQg*!aq7l8q@#WVAoS akwdw2(^uYPw`HuE{v0U5)_0j5Xb%7ydoZy8 delta 18645 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 Yr!(GSw`EkBZhwnina%7n@N5AF036E}Gynhq diff --git a/docs/changelog.txt b/docs/changelog.txt index 029244fe..3e40293c 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -2,7 +2,7 @@ - Furness Railway Railmotor? - GWR 5700/6700/8750 Class (gfx done need coding) - Class 20 (graphics drawn? Need to check if they're actually right.... looksl ike the wheels etc need to be taller on some views, definitely needs more liveries) -- Stephenson's Planet +- Stephenson's Planet (Coded, tweak graphics a British) # v2.12 - Added Class 58 diff --git a/lang/english.lng b/lang/english.lng index b4d7524b..fd589146 100644 --- a/lang/english.lng +++ b/lang/english.lng @@ -71,26 +71,28 @@ str_var_Olympics :Olympics str_var_Unnamed :Unnamed # Variant group headers -STR_LU_Subsurface_Header :London Underground sub-surface -STR_LU_Deeplevel_Header :London Underground deep level +STR_LU_Subsurface_Header :London Underground sub-surface units +STR_LU_Deeplevel_Header :London Underground deep level units STR_Steam_Header :British Rail Steam Locomotives STR_Diesel_Header :British Rail Diesel Locomotives STR_Electric_Header :British Rail Electric Locomotives -STR_Pacer_Header :British Rail "Pacer" -STR_Sprinter_Header :British Rail "Sprinter" -STR_Turbo_Header :British Rail "Turbo" -STR_Turbostar_Header :British Rail "Turbostar"/"Clubman" -STR_Voyager_Header :British Rail "Voyager"/"Meridian" -STR_Desiro_Header :British Rail "Desiro" -STR_Aventra_Header :British Rail "Aventra" -STR_Electrostar_Header :British Rail "Electrostar" +STR_AL1to7_Header :British Rail Class 80-87 "AC Electric" +STR_Pacer_Header :British Rail Class 140-144 "Pacer" +STR_Sprinter_Header :British Rail Class 150-156 "Sprinter" +STR_ExpressSprinter_Header :British Rail Class 158-159 "Express Sprinter" +STR_Turbo_Header :British Rail Class 165-166 "Turbo" +STR_Turbostar_Header :British Rail Class 168-172 "Turbostar"/"Clubman" +STR_Voyager_Header :British Rail Class 220-222 "Voyager"/"Meridian" +STR_DesiroCity_Header :British Rail "Desiro City" family +STR_Aventra_Header :British Rail "Aventra" family +STR_Electrostar_Header :British Rail "Electrostar" family STR_APT_Header :British Rail "Advanced Passenger Train" -STR_DTrain_Header :British Rail "D Train" -STR_Flirt_Header :British Rail "Flirt" +STR_DTrain_Header :British Rail "D Train" family +STR_Flirt_Header :British Rail "Flirt" family STR_Eurostar_Header :British Rail "Eurostar"/TGV STR_IEP_Header :British Rail "Intercity Express Program" STR_Departmental_Header :National Rail Maintenance Vehicles -STR_Civity_Header :British Rail "Civity" +STR_Civity_Header :British Rail "Civity" family STR_Debug_Header :BRTrains DEBUG units (see description) STR_Debug_AdditionalText :Units for BRTrains debugging - Not intended for gameplay{}Disable these using the BRTrains "Developer Mode" parameter diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 6bdbe9ba..4531bfe7 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -46,6 +46,7 @@ sort(FEAT_TRAINS, [ item_BR71, item_BR73GatEx, item_18100, + header_AL1to7, item_BR80, item_BR81, item_BR82, @@ -76,6 +77,7 @@ sort(FEAT_TRAINS, [ item_BR153, item_BR155, item_BR156, + header_ExpressSprinter, item_BR158, item_BR158_3, item_BR159, diff --git a/src/trains/diesel_mu/Sprinter/BR158.pnml b/src/trains/diesel_mu/Sprinter/BR158.pnml index 6de12019..f835ce7e 100644 --- a/src/trains/diesel_mu/Sprinter/BR158.pnml +++ b/src/trains/diesel_mu/Sprinter/BR158.pnml @@ -329,7 +329,7 @@ switch(FEAT_TRAINS,SELF,sw_BR158_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR158, 36) { property { - variant_group: header_Sprinter; + variant_group: header_ExpressSprinter; name: string(STR_NAME_BR158); climates_available: ALL_CLIMATES; introduction_date: date(1989,4,21); diff --git a/src/trains/diesel_mu/Sprinter/BR158_3.pnml b/src/trains/diesel_mu/Sprinter/BR158_3.pnml index f49cfd2d..3fec45a6 100644 --- a/src/trains/diesel_mu/Sprinter/BR158_3.pnml +++ b/src/trains/diesel_mu/Sprinter/BR158_3.pnml @@ -107,7 +107,7 @@ switch(FEAT_TRAINS,SELF,sw_BR158_3_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR158_3, 39) { property { - variant_group: header_Sprinter; + variant_group: header_ExpressSprinter; name: string(STR_NAME_BR158_3); climates_available: ALL_CLIMATES; introduction_date: date(1989,4,21); diff --git a/src/trains/diesel_mu/Sprinter/BR159.pnml b/src/trains/diesel_mu/Sprinter/BR159.pnml index 0f57ffa8..de0f3ff7 100644 --- a/src/trains/diesel_mu/Sprinter/BR159.pnml +++ b/src/trains/diesel_mu/Sprinter/BR159.pnml @@ -37,7 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_BR159_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR159, 59) { property { - variant_group: header_Sprinter; + variant_group: header_ExpressSprinter; name: string(STR_NAME_BR159); climates_available: ALL_CLIMATES; introduction_date: date(1993,4,21); diff --git a/src/trains/electric_loco/80.pnml b/src/trains/electric_loco/80.pnml index 5d0a93dd..8f6e1b56 100644 --- a/src/trains/electric_loco/80.pnml +++ b/src/trains/electric_loco/80.pnml @@ -18,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR80_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR80, 560) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR80); climates_available: ALL_CLIMATES; introduction_date: date(1958,1,1); diff --git a/src/trains/electric_loco/81.pnml b/src/trains/electric_loco/81.pnml index 4360569a..c2a87c83 100644 --- a/src/trains/electric_loco/81.pnml +++ b/src/trains/electric_loco/81.pnml @@ -18,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR81_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR81, 561) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR81); climates_available: ALL_CLIMATES; introduction_date: date(1959,1,1); diff --git a/src/trains/electric_loco/82.pnml b/src/trains/electric_loco/82.pnml index 6b8d2cab..d0a8e532 100644 --- a/src/trains/electric_loco/82.pnml +++ b/src/trains/electric_loco/82.pnml @@ -25,6 +25,7 @@ switch(FEAT_TRAINS,SELF,sw_BR82_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR82, 562) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR82); climates_available: ALL_CLIMATES; introduction_date: date(1960,1,1); diff --git a/src/trains/electric_loco/83.pnml b/src/trains/electric_loco/83.pnml index 00a111af..f2d75bcf 100644 --- a/src/trains/electric_loco/83.pnml +++ b/src/trains/electric_loco/83.pnml @@ -18,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR83_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR83, 563) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR83); climates_available: ALL_CLIMATES; introduction_date: date(1960,1,1); diff --git a/src/trains/electric_loco/84.pnml b/src/trains/electric_loco/84.pnml index 4b772709..d781f7c5 100644 --- a/src/trains/electric_loco/84.pnml +++ b/src/trains/electric_loco/84.pnml @@ -18,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR84_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR84, 564) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR84); climates_available: ALL_CLIMATES; introduction_date: date(1960,1,1); diff --git a/src/trains/electric_loco/85.pnml b/src/trains/electric_loco/85.pnml index edc85ed1..69443433 100644 --- a/src/trains/electric_loco/85.pnml +++ b/src/trains/electric_loco/85.pnml @@ -25,6 +25,7 @@ switch(FEAT_TRAINS,SELF,sw_BR85_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR85, 565) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR85); climates_available: ALL_CLIMATES; introduction_date: date(1961,1,1); diff --git a/src/trains/electric_loco/86.pnml b/src/trains/electric_loco/86.pnml index b06b9fff..5b22996c 100644 --- a/src/trains/electric_loco/86.pnml +++ b/src/trains/electric_loco/86.pnml @@ -73,6 +73,7 @@ switch(FEAT_TRAINS,PARENT,sw_BR86_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR86, 566) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR86); climates_available: ALL_CLIMATES; introduction_date: date(1973,1,1); diff --git a/src/trains/electric_loco/87.pnml b/src/trains/electric_loco/87.pnml index 4862da2b..1f121c67 100644 --- a/src/trains/electric_loco/87.pnml +++ b/src/trains/electric_loco/87.pnml @@ -48,6 +48,7 @@ switch(FEAT_TRAINS,PARENT,sw_BR87_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR87, 567) { property { + variant_group: header_AL1to7; name: string(STR_NAME_BR87); climates_available: ALL_CLIMATES; introduction_date: date(1973,1,1); diff --git a/src/trains/steam/SR/SR_ZClass.pnml b/src/trains/steam/SR/SR_ZClass.pnml index 6bf1d12d..5fd37c00 100644 --- a/src/trains/steam/SR/SR_ZClass.pnml +++ b/src/trains/steam/SR/SR_ZClass.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, item_SRZClass, 567) { +item (FEAT_TRAINS, item_SRZClass, 657) { property { name: string(STR_NAME_SRZClass); climates_available: ALL_CLIMATES; diff --git a/src/trains/variantheaders/AL1to7_Header.pnml b/src/trains/variantheaders/AL1to7_Header.pnml new file mode 100644 index 00000000..36551cd4 --- /dev/null +++ b/src/trains/variantheaders/AL1to7_Header.pnml @@ -0,0 +1,11 @@ +item (FEAT_TRAINS, header_AL1to7, 10026) { + property { + name: string(STR_AL1to7_Header); + climates_available: NO_CLIMATE; + sprite_id: SPRITE_ID_NEW_TRAIN; + power: 1; + } + graphics { + purchase: spriteset_BR87_Purchase; + } +} \ No newline at end of file diff --git a/src/trains/variantheaders/Desiro_Header.pnml b/src/trains/variantheaders/DesiroCity_Header.pnml similarity index 82% rename from src/trains/variantheaders/Desiro_Header.pnml rename to src/trains/variantheaders/DesiroCity_Header.pnml index b5ba63b0..9420e397 100644 --- a/src/trains/variantheaders/Desiro_Header.pnml +++ b/src/trains/variantheaders/DesiroCity_Header.pnml @@ -1,6 +1,6 @@ item (FEAT_TRAINS, header_DesiroCity, 10022) { property { - name: string(STR_Desiro_Header); + name: string(STR_DesiroCity_Header); climates_available: NO_CLIMATE; sprite_id: SPRITE_ID_NEW_TRAIN; power: 1; diff --git a/src/trains/variantheaders/ExpressSprinter_Header.pnml b/src/trains/variantheaders/ExpressSprinter_Header.pnml new file mode 100644 index 00000000..27b58151 --- /dev/null +++ b/src/trains/variantheaders/ExpressSprinter_Header.pnml @@ -0,0 +1,11 @@ +item (FEAT_TRAINS, header_ExpressSprinter, 10027) { + property { + name: string(STR_ExpressSprinter_Header); + climates_available: NO_CLIMATE; + sprite_id: SPRITE_ID_NEW_TRAIN; + power: 1; + } + graphics { + purchase: spriteset_BR158_3_Purchase; + } +} \ No newline at end of file diff --git a/src/trains/variantheaders/Sprinter_Header.pnml b/src/trains/variantheaders/Sprinter_Header.pnml index ee027b75..971134bb 100644 --- a/src/trains/variantheaders/Sprinter_Header.pnml +++ b/src/trains/variantheaders/Sprinter_Header.pnml @@ -6,6 +6,6 @@ item (FEAT_TRAINS, header_Sprinter, 10009) { power: 1; } graphics { - purchase: spriteset_BR158_3_Purchase; + purchase: spriteset_BR153_Purchase; } } \ No newline at end of file