From 118a3f1f3a9bd42589b2bb2e17f6fc8403ee8df3 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 7 Aug 2024 01:52:19 +0100 Subject: [PATCH] Reverted some over-grouped variant header stuff --- src/sortpurchase.pnml | 119 +++++++++--------- src/trains/diesel_loco/20.pnml | 1 - src/trains/diesel_loco/52.pnml | 1 - src/trains/diesel_loco/58.pnml | 1 - src/trains/diesel_loco/66.pnml | 1 - src/trains/diesel_loco/BR008.pnml | 1 - src/trains/diesel_loco/BR013.pnml | 1 - src/trains/diesel_loco/BR033.pnml | 2 - src/trains/diesel_loco/BR037.pnml | 1 - src/trains/diesel_loco/BR047.pnml | 1 - src/trains/diesel_loco/BR048.pnml | 1 - src/trains/diesel_loco/BR055.pnml | 1 - src/trains/diesel_loco/BR057.pnml | 1 - src/trains/diesel_loco/BR060.pnml | 1 - src/trains/diesel_loco/BR067.pnml | 1 - src/trains/diesel_loco/BR068.pnml | 1 - src/trains/diesel_loco/BR070.pnml | 1 - src/trains/diesel_loco/BR31.pnml | 1 - src/trains/diesel_loco/BR50.pnml | 1 - src/trains/diesel_loco/Kestrel.pnml | 1 - src/trains/diesel_mu/BR185.pnml | 3 +- src/trains/electric_loco/18100.pnml | 1 - 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/electric_loco/90.pnml | 1 - .../electric_loco/BR70_OGSouthernRegion.pnml | 1 - src/trains/electric_loco/BR71.pnml | 1 - src/trains/electric_loco/BR89.pnml | 1 - src/trains/electric_loco/BR91_Standalone.pnml | 1 - src/trains/electric_mu/BR350.pnml | 3 +- src/trains/electric_mu/BR444.pnml | 3 +- src/trains/electric_mu/BR450.pnml | 3 +- src/trains/electric_mu/BR700.pnml | 4 +- src/trains/electric_mu/BR707.pnml | 2 +- src/trains/electric_mu/BR717.pnml | 2 +- src/trains/steam/BR/Standard9F.pnml | 1 - .../steam/Caledonian/CaledonianSingle.pnml | 1 - .../steam/Furness/FurnessCoppernob.pnml | 1 - src/trains/steam/Furness/FurnessK2.pnml | 1 - src/trains/steam/GER/GER_L77.pnml | 1 - src/trains/steam/GNR/GNRA1.pnml | 1 - src/trains/steam/GWR/GWRGreatBear.pnml | 1 - src/trains/steam/GWR/GWRHall.pnml | 1 - src/trains/steam/GWR/GWR_DeanGoods.pnml | 1 - src/trains/steam/LMS/LMSBlack5.pnml | 1 - src/trains/steam/LMS/LMSJubilee.pnml | 1 - src/trains/steam/LNER/LNERA3.pnml | 1 - src/trains/steam/LNWR/LNWRWebb.pnml | 1 - src/trains/steam/LSWR/LSWR_AdamsRadial.pnml | 1 - .../steam/LivMan/StephensonsPlanet.pnml | 1 - src/trains/steam/SR/SR_ZClass.pnml | 1 - .../steam/War_Department/WDAusterityTank.pnml | 1 - src/trains/variantheaders/Desiro_Header.pnml | 2 +- src/trains/variantheaders/LNERP2_Header.pnml | 1 - 60 files changed, 67 insertions(+), 126 deletions(-) diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index b8db0fda..6bdbe9ba 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -1,23 +1,21 @@ sort(FEAT_TRAINS, [ -header_Steam, -header_Diesel, -header_Electric, - item_Coppernob, - item_CaledonianSingle, - item_FurnessK2, - item_LNWRWebb, - item_LSWR_AdamsRadial, - item_SRZClass, - item_GER_L77, - item_GWR_DeanGoods, - item_GreatBear, - item_GWRHall, - item_LMSBlack5, - item_LMSJubilee, - item_GNRA1, - header_LNERP2, -// item_LNERP2, -// item_LNERP2_Streamlined, + item_StephensonPlanet, + item_Coppernob, + item_CaledonianSingle, + item_FurnessK2, + item_LNWRWebb, + item_LSWR_AdamsRadial, + item_SRZClass, + item_GER_L77, + item_GWR_DeanGoods, + item_GreatBear, + item_GWRHall, + item_LMSBlack5, + item_LMSJubilee, + item_GNRA1, + header_LNERP2, + item_LNERP2, + item_LNERP2_Streamlined, item_LNERA3, item_WDTank, item_Standard9F, @@ -129,18 +127,16 @@ header_Electric, item_br_331_1, item_BR333, item_BR334, - item_br_345_7car, - item_br_345_9car, item_BR350, header_APT, item_BR370, item_APTE, - header_Eurostar, - item_BR373, - item_BR373_25kv, - item_BR373_2, - item_BR374, - item_TGV, +header_Eurostar, + item_BR373, + item_BR373_25kv, + item_BR373_2, + item_BR374, + item_TGV, header_Electrostar, item_BR357, item_BR375_3, @@ -201,22 +197,24 @@ header_APT, item_BR508_1, item_BR508_2, item_BR555, -header_Desiro, +header_DesiroCity, item_BR700, item_BR700_2, item_BR717, item_BR707, header_Aventra, - item_br_701_0, - item_br_701_5, - item_br_710_1, - item_br_710_2_4car, - item_br_710_2_5car, - item_br_720, - item_br_720_1, - item_br730_0, - item_br730_2, - item_br_745, + item_br_345_7car, + item_br_345_9car, + item_br_701_0, + item_br_701_5, + item_br_710_1, + item_br_710_2_4car, + item_br_710_2_5car, + item_br_720, + item_br_720_1, + item_br730_0, + item_br730_2, + item_br_745, item_br777, header_Flirt, item_br_755_3, @@ -240,23 +238,22 @@ header_Flirt, header_Departmental, item_MPV_DualTrack, item_MPV_DualFreight, - header_LU_Subsurface, - item_LUAStock, - item_LUCStock, - item_LUDStock, - item_LULS7, - item_LULS8, - header_LU_Subsurface, - header_LU_Deeplevel, - item_LU1938, - item_LU1967, - item_LU1986, - item_LU1992_4, - item_LU1992, - item_LU1995, - item_LU1996, - item_LU2009, - item_LU2024, +header_LU_Subsurface, + item_LUAStock, + item_LUCStock, + item_LUDStock, + item_LULS7, + item_LULS8, +header_LU_Deeplevel, + item_LU1938, + item_LU1967, + item_LU1986, + item_LU1992_4, + item_LU1992, + item_LU1995, + item_LU1996, + item_LU2009, + item_LU2024, item_BR325, item_FurnessGoodsVan, item_FurnessTankWagon, @@ -267,14 +264,14 @@ header_Flirt, item_BRTTA, item_BRContainer, item_RMTPO, - item_LNERTK, - item_LNERBCK, - item_LNERPV, - item_LNERBG, +item_LNERTK, +item_LNERBCK, +item_LNERPV, +item_LNERBG, item_LMS_StanierP3_50BG, item_LNER_Thompson_61FK, item_LNER_Thompson_63TK, - header_BRMk1, +header_BRMk1, item_BRMk1FO, item_BRMk1SO, item_BRMk1TSO, @@ -289,7 +286,7 @@ header_Flirt, item_BRMk1BG, item_BRMk1RK, item_BRMk1RMB, - header_BRMk2, +header_BRMk2, item_BRMk2_DBSO, item_BRMk2_Early_SO, item_BRMk2_Early_FO, diff --git a/src/trains/diesel_loco/20.pnml b/src/trains/diesel_loco/20.pnml index cbe3c444..fa0acb1a 100644 --- a/src/trains/diesel_loco/20.pnml +++ b/src/trains/diesel_loco/20.pnml @@ -17,7 +17,6 @@ switch(FEAT_TRAINS,SELF,sw_BR20_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR20, 671) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR20); climates_available: ALL_CLIMATES; introduction_date: date(1957,1,1); diff --git a/src/trains/diesel_loco/52.pnml b/src/trains/diesel_loco/52.pnml index db4ad66a..273d0c68 100644 --- a/src/trains/diesel_loco/52.pnml +++ b/src/trains/diesel_loco/52.pnml @@ -42,7 +42,6 @@ switch(FEAT_TRAINS,SELF,sw_BR52_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR52, 548) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR52); climates_available: ALL_CLIMATES; introduction_date: date(1961,1,1); diff --git a/src/trains/diesel_loco/58.pnml b/src/trains/diesel_loco/58.pnml index 2bf1474a..ef7d431d 100644 --- a/src/trains/diesel_loco/58.pnml +++ b/src/trains/diesel_loco/58.pnml @@ -41,7 +41,6 @@ switch(FEAT_TRAINS,SELF,sw_BR58_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR58, 673) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR58); climates_available: ALL_CLIMATES; introduction_date: date(1983,4,21); diff --git a/src/trains/diesel_loco/66.pnml b/src/trains/diesel_loco/66.pnml index 3398cf37..551a65f6 100644 --- a/src/trains/diesel_loco/66.pnml +++ b/src/trains/diesel_loco/66.pnml @@ -66,7 +66,6 @@ switch(FEAT_TRAINS,SELF,sw_BR66_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR66, 266) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR66); climates_available: ALL_CLIMATES; introduction_date: date(1998,4,21); diff --git a/src/trains/diesel_loco/BR008.pnml b/src/trains/diesel_loco/BR008.pnml index acd5743f..ec0dea8a 100644 --- a/src/trains/diesel_loco/BR008.pnml +++ b/src/trains/diesel_loco/BR008.pnml @@ -59,7 +59,6 @@ switch(FEAT_TRAINS,SELF,sw_BR08_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR08, 1) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR08); climates_available: ALL_CLIMATES; introduction_date: date(1952,4,21); diff --git a/src/trains/diesel_loco/BR013.pnml b/src/trains/diesel_loco/BR013.pnml index 8a10a36c..df0d08e4 100644 --- a/src/trains/diesel_loco/BR013.pnml +++ b/src/trains/diesel_loco/BR013.pnml @@ -17,7 +17,6 @@ switch (FEAT_TRAINS, SELF, switch_articulated_BR13, extra_callback_info1) { item (FEAT_TRAINS, item_BR13, 2) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR13); climates_available: ALL_CLIMATES; introduction_date: date(1965,4,21); diff --git a/src/trains/diesel_loco/BR033.pnml b/src/trains/diesel_loco/BR033.pnml index 16fe0be1..9f755717 100644 --- a/src/trains/diesel_loco/BR033.pnml +++ b/src/trains/diesel_loco/BR033.pnml @@ -130,7 +130,6 @@ switch(FEAT_TRAINS,SELF,sw_BR33_1_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR33_0, 252) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR33_0); climates_available: ALL_CLIMATES; introduction_date: date(1960,4,21); @@ -180,7 +179,6 @@ item (FEAT_TRAINS, item_BR33_0, 252) { item (FEAT_TRAINS, item_BR33_1, 253) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR33_1); climates_available: ALL_CLIMATES; introduction_date: date(1965,4,21); diff --git a/src/trains/diesel_loco/BR037.pnml b/src/trains/diesel_loco/BR037.pnml index 840a8587..2735b191 100644 --- a/src/trains/diesel_loco/BR037.pnml +++ b/src/trains/diesel_loco/BR037.pnml @@ -203,7 +203,6 @@ switch(FEAT_TRAINS,SELF,sw_BR37_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR37, 73) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR37); climates_available: ALL_CLIMATES; introduction_date: date(1960,4,21); diff --git a/src/trains/diesel_loco/BR047.pnml b/src/trains/diesel_loco/BR047.pnml index 9a4e71ab..af159cc1 100644 --- a/src/trains/diesel_loco/BR047.pnml +++ b/src/trains/diesel_loco/BR047.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR47_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR47, 440) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR47); climates_available: ALL_CLIMATES; introduction_date: date(1962,4,21); diff --git a/src/trains/diesel_loco/BR048.pnml b/src/trains/diesel_loco/BR048.pnml index 32a4bc7b..7a264734 100644 --- a/src/trains/diesel_loco/BR048.pnml +++ b/src/trains/diesel_loco/BR048.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_BR48, 593) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR48); climates_available: ALL_CLIMATES; introduction_date: date(1965,4,21); diff --git a/src/trains/diesel_loco/BR055.pnml b/src/trains/diesel_loco/BR055.pnml index 0b5898d3..3c4856e7 100644 --- a/src/trains/diesel_loco/BR055.pnml +++ b/src/trains/diesel_loco/BR055.pnml @@ -29,7 +29,6 @@ switch(FEAT_TRAINS,SELF,sw_BR55_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR55, 247) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR55); climates_available: ALL_CLIMATES; introduction_date: date(1961,4,21); diff --git a/src/trains/diesel_loco/BR057.pnml b/src/trains/diesel_loco/BR057.pnml index b704400c..db9953f9 100644 --- a/src/trains/diesel_loco/BR057.pnml +++ b/src/trains/diesel_loco/BR057.pnml @@ -60,7 +60,6 @@ switch(FEAT_TRAINS,SELF,sw_BR57_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR57, 441) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR57); climates_available: ALL_CLIMATES; introduction_date: date(1998,4,21); diff --git a/src/trains/diesel_loco/BR060.pnml b/src/trains/diesel_loco/BR060.pnml index 46e78cf3..6308dba9 100644 --- a/src/trains/diesel_loco/BR060.pnml +++ b/src/trains/diesel_loco/BR060.pnml @@ -65,7 +65,6 @@ switch(FEAT_TRAINS,SELF,sw_BR60_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR60, 267) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR60); climates_available: ALL_CLIMATES; introduction_date: date(1989,4,21); diff --git a/src/trains/diesel_loco/BR067.pnml b/src/trains/diesel_loco/BR067.pnml index 6e18958a..849c5b7c 100644 --- a/src/trains/diesel_loco/BR067.pnml +++ b/src/trains/diesel_loco/BR067.pnml @@ -84,7 +84,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR67_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR67, 151) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR67); climates_available: ALL_CLIMATES; introduction_date: date(1999,4,21); diff --git a/src/trains/diesel_loco/BR068.pnml b/src/trains/diesel_loco/BR068.pnml index c6275748..5ef34240 100644 --- a/src/trains/diesel_loco/BR068.pnml +++ b/src/trains/diesel_loco/BR068.pnml @@ -55,7 +55,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR68_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR68, 196) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR68); climates_available: ALL_CLIMATES; introduction_date: date(2013,4,21); diff --git a/src/trains/diesel_loco/BR070.pnml b/src/trains/diesel_loco/BR070.pnml index d09b8c55..d754bba1 100644 --- a/src/trains/diesel_loco/BR070.pnml +++ b/src/trains/diesel_loco/BR070.pnml @@ -23,7 +23,6 @@ switch(FEAT_TRAINS,SELF,sw_BR70_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR70, 165) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR70); climates_available: ALL_CLIMATES; introduction_date: date(2008,4,21); diff --git a/src/trains/diesel_loco/BR31.pnml b/src/trains/diesel_loco/BR31.pnml index de8274c7..5bf1c517 100644 --- a/src/trains/diesel_loco/BR31.pnml +++ b/src/trains/diesel_loco/BR31.pnml @@ -79,7 +79,6 @@ switch(FEAT_TRAINS,SELF,sw_BR31_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR31, 470) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR31); climates_available: ALL_CLIMATES; introduction_date: date(1957,4,21); diff --git a/src/trains/diesel_loco/BR50.pnml b/src/trains/diesel_loco/BR50.pnml index 793448ab..68fbf568 100644 --- a/src/trains/diesel_loco/BR50.pnml +++ b/src/trains/diesel_loco/BR50.pnml @@ -55,7 +55,6 @@ switch(FEAT_TRAINS,SELF,sw_BR50_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR50, 583) { property { - variant_group: header_Diesel; name: string(STR_NAME_BR50); climates_available: ALL_CLIMATES; introduction_date: date(1967,4,21); diff --git a/src/trains/diesel_loco/Kestrel.pnml b/src/trains/diesel_loco/Kestrel.pnml index e3bbc37f..e0c20e2a 100644 --- a/src/trains/diesel_loco/Kestrel.pnml +++ b/src/trains/diesel_loco/Kestrel.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_Kestrel_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_Kestrel, 556) { property { - variant_group: header_Diesel; name: string(STR_NAME_Kestrel); climates_available: ALL_CLIMATES; introduction_date: date(1967,1,1); diff --git a/src/trains/diesel_mu/BR185.pnml b/src/trains/diesel_mu/BR185.pnml index 518ebb67..f0bdd150 100644 --- a/src/trains/diesel_mu/BR185.pnml +++ b/src/trains/diesel_mu/BR185.pnml @@ -74,8 +74,7 @@ switch(FEAT_TRAINS,SELF,sw_BR185_cargo_subtype_text,cargo_subtype){ } item (FEAT_TRAINS, item_BR185, 70) { - property { - variant_group: header_Desiro; + property { name: string(STR_NAME_BR185); climates_available: ALL_CLIMATES; introduction_date: date(2005,4,21); diff --git a/src/trains/electric_loco/18100.pnml b/src/trains/electric_loco/18100.pnml index de963726..cb567c89 100644 --- a/src/trains/electric_loco/18100.pnml +++ b/src/trains/electric_loco/18100.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_18100_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_18100, 559) { property { - variant_group: header_Electric; name: string(STR_NAME_18100); climates_available: ALL_CLIMATES; introduction_date: date(1951,1,1); diff --git a/src/trains/electric_loco/80.pnml b/src/trains/electric_loco/80.pnml index 31a5d4e1..5d0a93dd 100644 --- a/src/trains/electric_loco/80.pnml +++ b/src/trains/electric_loco/80.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_BR80_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR80, 560) { property { - variant_group: header_Electric; 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 3dbcf21c..4360569a 100644 --- a/src/trains/electric_loco/81.pnml +++ b/src/trains/electric_loco/81.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_BR81_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR81, 561) { property { - variant_group: header_Electric; 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 abb5a132..6b8d2cab 100644 --- a/src/trains/electric_loco/82.pnml +++ b/src/trains/electric_loco/82.pnml @@ -25,7 +25,6 @@ switch(FEAT_TRAINS,SELF,sw_BR82_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR82, 562) { property { - variant_group: header_Electric; 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 bba94c2a..00a111af 100644 --- a/src/trains/electric_loco/83.pnml +++ b/src/trains/electric_loco/83.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_BR83_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR83, 563) { property { - variant_group: header_Electric; 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 132fff88..4b772709 100644 --- a/src/trains/electric_loco/84.pnml +++ b/src/trains/electric_loco/84.pnml @@ -18,7 +18,6 @@ switch(FEAT_TRAINS,SELF,sw_BR84_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR84, 564) { property { - variant_group: header_Electric; 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 838a1cc5..edc85ed1 100644 --- a/src/trains/electric_loco/85.pnml +++ b/src/trains/electric_loco/85.pnml @@ -25,7 +25,6 @@ switch(FEAT_TRAINS,SELF,sw_BR85_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR85, 565) { property { - variant_group: header_Electric; 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 6cef2d69..b06b9fff 100644 --- a/src/trains/electric_loco/86.pnml +++ b/src/trains/electric_loco/86.pnml @@ -73,7 +73,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR86_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR86, 566) { property { - variant_group: header_Electric; 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 a1cdad4d..4862da2b 100644 --- a/src/trains/electric_loco/87.pnml +++ b/src/trains/electric_loco/87.pnml @@ -48,7 +48,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR87_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR87, 567) { property { - variant_group: header_Electric; name: string(STR_NAME_BR87); climates_available: ALL_CLIMATES; introduction_date: date(1973,1,1); diff --git a/src/trains/electric_loco/90.pnml b/src/trains/electric_loco/90.pnml index c9b0d6d4..6bc7d116 100644 --- a/src/trains/electric_loco/90.pnml +++ b/src/trains/electric_loco/90.pnml @@ -115,7 +115,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR90_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR90, 543) { property { - variant_group: header_Electric; name: string(STR_NAME_BR90); climates_available: ALL_CLIMATES; introduction_date: date(1987,10,2); diff --git a/src/trains/electric_loco/BR70_OGSouthernRegion.pnml b/src/trains/electric_loco/BR70_OGSouthernRegion.pnml index 875e99a9..e08f4990 100644 --- a/src/trains/electric_loco/BR70_OGSouthernRegion.pnml +++ b/src/trains/electric_loco/BR70_OGSouthernRegion.pnml @@ -23,7 +23,6 @@ switch(FEAT_TRAINS,SELF,sw_BR70OG_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR70OG, 476) { property { - variant_group: header_Electric; name: string(STR_NAME_BR70OG); climates_available: ALL_CLIMATES; introduction_date: date(1940,1,1); diff --git a/src/trains/electric_loco/BR71.pnml b/src/trains/electric_loco/BR71.pnml index 28805466..acfbe43e 100644 --- a/src/trains/electric_loco/BR71.pnml +++ b/src/trains/electric_loco/BR71.pnml @@ -17,7 +17,6 @@ switch(FEAT_TRAINS,SELF,sw_BR71_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR71, 477) { property { - variant_group: header_Electric; name: string(STR_NAME_BR71); climates_available: ALL_CLIMATES; introduction_date: date(1940,1,1); diff --git a/src/trains/electric_loco/BR89.pnml b/src/trains/electric_loco/BR89.pnml index beac2c16..4b9efedb 100644 --- a/src/trains/electric_loco/BR89.pnml +++ b/src/trains/electric_loco/BR89.pnml @@ -48,7 +48,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR89_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR89, 418) { property { - variant_group: header_Electric; name: string(STR_NAME_BR89); climates_available: ALL_CLIMATES; introduction_date: date(1986,10,2); diff --git a/src/trains/electric_loco/BR91_Standalone.pnml b/src/trains/electric_loco/BR91_Standalone.pnml index 6c545601..b7b109f0 100644 --- a/src/trains/electric_loco/BR91_Standalone.pnml +++ b/src/trains/electric_loco/BR91_Standalone.pnml @@ -17,7 +17,6 @@ switch(FEAT_TRAINS,PARENT,sw_BR91_Sprites ,vehicle_is_reversed){ item (FEAT_TRAINS, item_BR91Standalone, 588) { property { - variant_group: header_Electric; name: string(STR_NAME_BR91_Standalone); climates_available: ALL_CLIMATES; introduction_date: date(1989,4,21); diff --git a/src/trains/electric_mu/BR350.pnml b/src/trains/electric_mu/BR350.pnml index d55a1bcd..d4ec4a65 100644 --- a/src/trains/electric_mu/BR350.pnml +++ b/src/trains/electric_mu/BR350.pnml @@ -135,8 +135,7 @@ switch(FEAT_TRAINS,SELF,sw_BR350_cargo_subtype_text,cargo_subtype){ } item (FEAT_TRAINS, item_BR350, 343) { - property { - variant_group: header_Desiro; + property { name: string(STR_NAME_BR350); climates_available: ALL_CLIMATES; introduction_date: date(2004,4,21); diff --git a/src/trains/electric_mu/BR444.pnml b/src/trains/electric_mu/BR444.pnml index 4c0cd670..5a42eed7 100644 --- a/src/trains/electric_mu/BR444.pnml +++ b/src/trains/electric_mu/BR444.pnml @@ -72,8 +72,7 @@ switch(FEAT_TRAINS,SELF,sw_BR444_cargo_subtype_text,cargo_subtype){ } item (FEAT_TRAINS, item_BR444, 74) { - property { - variant_group: header_Desiro; + property { name: string(STR_NAME_BR444); climates_available: ALL_CLIMATES; introduction_date: date(2004,4,21); diff --git a/src/trains/electric_mu/BR450.pnml b/src/trains/electric_mu/BR450.pnml index f0a895ce..3013e8cb 100644 --- a/src/trains/electric_mu/BR450.pnml +++ b/src/trains/electric_mu/BR450.pnml @@ -68,8 +68,7 @@ switch(FEAT_TRAINS,SELF,sw_BR450_cargo_subtype_text,cargo_subtype){ } item (FEAT_TRAINS, item_BR450, 288) { - property { - variant_group: header_Desiro; + property { name: string(STR_NAME_BR450); climates_available: ALL_CLIMATES; introduction_date: date(2002,4,21); diff --git a/src/trains/electric_mu/BR700.pnml b/src/trains/electric_mu/BR700.pnml index 365eacb1..b3bf14c0 100644 --- a/src/trains/electric_mu/BR700.pnml +++ b/src/trains/electric_mu/BR700.pnml @@ -70,7 +70,7 @@ switch(FEAT_TRAINS,SELF,sw_BR700_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR700, 255) { property { - variant_group: header_Desiro; + variant_group: header_DesiroCity; name: string(STR_NAME_BR700); climates_available: ALL_CLIMATES; introduction_date: date(2015,4,21); @@ -121,7 +121,7 @@ item (FEAT_TRAINS, item_BR700, 255) { item (FEAT_TRAINS, item_BR700_2, 256) { property { - variant_group: header_Desiro; + variant_group: header_DesiroCity; name: string(STR_NAME_BR700_2); climates_available: ALL_CLIMATES; introduction_date: date(2015,4,21); diff --git a/src/trains/electric_mu/BR707.pnml b/src/trains/electric_mu/BR707.pnml index 9c8ae2b8..256d8b10 100644 --- a/src/trains/electric_mu/BR707.pnml +++ b/src/trains/electric_mu/BR707.pnml @@ -63,7 +63,7 @@ switch(FEAT_TRAINS,SELF,sw_BR707_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR707, 514) { property { - variant_group: header_Desiro; + variant_group: header_DesiroCity; name: string(STR_NAME_BR707); climates_available: ALL_CLIMATES; introduction_date: date(2015,4,21); diff --git a/src/trains/electric_mu/BR717.pnml b/src/trains/electric_mu/BR717.pnml index 5188517e..e176aa42 100644 --- a/src/trains/electric_mu/BR717.pnml +++ b/src/trains/electric_mu/BR717.pnml @@ -45,7 +45,7 @@ switch(FEAT_TRAINS,SELF,sw_BR717_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR717, 518) { property { - variant_group: header_Desiro; + variant_group: header_DesiroCity; name: string(STR_NAME_BR717); climates_available: ALL_CLIMATES; introduction_date: date(2015,4,21); diff --git a/src/trains/steam/BR/Standard9F.pnml b/src/trains/steam/BR/Standard9F.pnml index fb39d0a8..d01b3df3 100644 --- a/src/trains/steam/BR/Standard9F.pnml +++ b/src/trains/steam/BR/Standard9F.pnml @@ -63,7 +63,6 @@ switch (FEAT_TRAINS, SELF, sw_articulated_Standard9F, extra_callback_info1) { item (FEAT_TRAINS, item_Standard9F, 587) { property { - variant_group: header_Steam; name: string(STR_NAME_Standard9F); climates_available: ALL_CLIMATES; introduction_date: date(1954,2,4); diff --git a/src/trains/steam/Caledonian/CaledonianSingle.pnml b/src/trains/steam/Caledonian/CaledonianSingle.pnml index 178af026..c6ea888a 100644 --- a/src/trains/steam/Caledonian/CaledonianSingle.pnml +++ b/src/trains/steam/Caledonian/CaledonianSingle.pnml @@ -40,7 +40,6 @@ switch(FEAT_TRAINS,SELF,sw_CaledonianSingle_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_CaledonianSingle, 598) { property { - variant_group: header_Steam; name: string(STR_NAME_CaledonianSingle); climates_available: ALL_CLIMATES; introduction_date: date(1886,2,1); diff --git a/src/trains/steam/Furness/FurnessCoppernob.pnml b/src/trains/steam/Furness/FurnessCoppernob.pnml index 0db8b8d8..78f34167 100644 --- a/src/trains/steam/Furness/FurnessCoppernob.pnml +++ b/src/trains/steam/Furness/FurnessCoppernob.pnml @@ -40,7 +40,6 @@ switch(FEAT_TRAINS,SELF,sw_Coppernob_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_Coppernob, 584) { property { - variant_group: header_Steam; name: string(STR_NAME_Coppernob); climates_available: ALL_CLIMATES; introduction_date: date(1848,4,21); diff --git a/src/trains/steam/Furness/FurnessK2.pnml b/src/trains/steam/Furness/FurnessK2.pnml index f7e13874..4687e53c 100644 --- a/src/trains/steam/Furness/FurnessK2.pnml +++ b/src/trains/steam/Furness/FurnessK2.pnml @@ -40,7 +40,6 @@ switch(FEAT_TRAINS,SELF,sw_FurnessK2_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_FurnessK2, 590) { property { - variant_group: header_Steam; name: string(STR_NAME_FurnessK2); climates_available: ALL_CLIMATES; introduction_date: date(1896,2,1); diff --git a/src/trains/steam/GER/GER_L77.pnml b/src/trains/steam/GER/GER_L77.pnml index a1115955..d3738265 100644 --- a/src/trains/steam/GER/GER_L77.pnml +++ b/src/trains/steam/GER/GER_L77.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_GER_L77, 660) { property { - variant_group: header_Steam; name: string(STR_NAME_GER_L77); climates_available: ALL_CLIMATES; introduction_date: date(1915,1,1); diff --git a/src/trains/steam/GNR/GNRA1.pnml b/src/trains/steam/GNR/GNRA1.pnml index c1633af2..470c36ee 100644 --- a/src/trains/steam/GNR/GNRA1.pnml +++ b/src/trains/steam/GNR/GNRA1.pnml @@ -32,7 +32,6 @@ switch(FEAT_TRAINS,SELF,sw_GNRA1_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_GNRA1, 4) { property { - variant_group: header_Steam; name: string(STR_NAME_GNRA1); climates_available: ALL_CLIMATES; introduction_date: date(1922,4,21); diff --git a/src/trains/steam/GWR/GWRGreatBear.pnml b/src/trains/steam/GWR/GWRGreatBear.pnml index 19d97ce7..46a28b90 100644 --- a/src/trains/steam/GWR/GWRGreatBear.pnml +++ b/src/trains/steam/GWR/GWRGreatBear.pnml @@ -26,7 +26,6 @@ switch(FEAT_TRAINS,SELF,sw_GreatBear_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_GreatBear, 484) { property { - variant_group: header_Steam; name: string(STR_NAME_GreatBear); climates_available: ALL_CLIMATES; introduction_date: date(1908,2,10); diff --git a/src/trains/steam/GWR/GWRHall.pnml b/src/trains/steam/GWR/GWRHall.pnml index ee8852eb..8aa0aad4 100644 --- a/src/trains/steam/GWR/GWRHall.pnml +++ b/src/trains/steam/GWR/GWRHall.pnml @@ -34,7 +34,6 @@ switch(FEAT_TRAINS,SELF,sw_GWRHall_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_GWRHall, 512) { property { - variant_group: header_Steam; name: string(STR_NAME_GWRHall); climates_available: ALL_CLIMATES; introduction_date: date(1946,2,10); diff --git a/src/trains/steam/GWR/GWR_DeanGoods.pnml b/src/trains/steam/GWR/GWR_DeanGoods.pnml index 9b320507..bfdeef93 100644 --- a/src/trains/steam/GWR/GWR_DeanGoods.pnml +++ b/src/trains/steam/GWR/GWR_DeanGoods.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_GWR_DeanGoods, 661) { property { - variant_group: header_Steam; name: string(STR_NAME_GWR_DeanGoods); climates_available: ALL_CLIMATES; introduction_date: date(1883,2,1); diff --git a/src/trains/steam/LMS/LMSBlack5.pnml b/src/trains/steam/LMS/LMSBlack5.pnml index fbcc3a64..43f3227e 100644 --- a/src/trains/steam/LMS/LMSBlack5.pnml +++ b/src/trains/steam/LMS/LMSBlack5.pnml @@ -1,7 +1,6 @@ item (FEAT_TRAINS, item_LMSBlack5, 659) { property { - variant_group: header_Steam; name: string(STR_NAME_LMSBlack5); climates_available: ALL_CLIMATES; introduction_date: date(1934,2,1); diff --git a/src/trains/steam/LMS/LMSJubilee.pnml b/src/trains/steam/LMS/LMSJubilee.pnml index e18a45ca..4a2c623a 100644 --- a/src/trains/steam/LMS/LMSJubilee.pnml +++ b/src/trains/steam/LMS/LMSJubilee.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_LMSJubilee, 658) { property { - variant_group: header_Steam; name: string(STR_NAME_LMSJubilee); climates_available: ALL_CLIMATES; introduction_date: date(1934,2,1); diff --git a/src/trains/steam/LNER/LNERA3.pnml b/src/trains/steam/LNER/LNERA3.pnml index 105c68ae..b5dbabdf 100644 --- a/src/trains/steam/LNER/LNERA3.pnml +++ b/src/trains/steam/LNER/LNERA3.pnml @@ -85,7 +85,6 @@ switch(FEAT_TRAINS,SELF,sw_LNERA3_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_LNERA3, 6) { property { - variant_group: header_Steam; name: string(STR_NAME_LNERA3); climates_available: ALL_CLIMATES; introduction_date: date(1928,4,21); diff --git a/src/trains/steam/LNWR/LNWRWebb.pnml b/src/trains/steam/LNWR/LNWRWebb.pnml index 5ada9c84..9b1da046 100644 --- a/src/trains/steam/LNWR/LNWRWebb.pnml +++ b/src/trains/steam/LNWR/LNWRWebb.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_LNWRWebb, 554) { property { - variant_group: header_Steam; name: string(STR_NAME_LNWRWebb); climates_available: ALL_CLIMATES; introduction_date: date(1881,1,1); diff --git a/src/trains/steam/LSWR/LSWR_AdamsRadial.pnml b/src/trains/steam/LSWR/LSWR_AdamsRadial.pnml index a42402d9..1893aeae 100644 --- a/src/trains/steam/LSWR/LSWR_AdamsRadial.pnml +++ b/src/trains/steam/LSWR/LSWR_AdamsRadial.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_LSWR_AdamsRadial, 667) { property { - variant_group: header_Steam; name: string(STR_NAME_LSWR_AdamsRadial); climates_available: ALL_CLIMATES; introduction_date: date(1882,1,1); diff --git a/src/trains/steam/LivMan/StephensonsPlanet.pnml b/src/trains/steam/LivMan/StephensonsPlanet.pnml index 25438cd3..01e84753 100644 --- a/src/trains/steam/LivMan/StephensonsPlanet.pnml +++ b/src/trains/steam/LivMan/StephensonsPlanet.pnml @@ -40,7 +40,6 @@ switch(FEAT_TRAINS,SELF,sw_StephensonPlanet_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_StephensonPlanet, 674) { property { - variant_group: header_Steam; name: string(STR_NAME_StephensonPlanet); climates_available: ALL_CLIMATES; introduction_date: date(1830,9,1); diff --git a/src/trains/steam/SR/SR_ZClass.pnml b/src/trains/steam/SR/SR_ZClass.pnml index a4714f2f..6bf1d12d 100644 --- a/src/trains/steam/SR/SR_ZClass.pnml +++ b/src/trains/steam/SR/SR_ZClass.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_SRZClass, 567) { property { - variant_group: header_Steam; name: string(STR_NAME_SRZClass); climates_available: ALL_CLIMATES; introduction_date: date(1929,1,1); diff --git a/src/trains/steam/War_Department/WDAusterityTank.pnml b/src/trains/steam/War_Department/WDAusterityTank.pnml index ccc7a69f..bb7427e2 100644 --- a/src/trains/steam/War_Department/WDAusterityTank.pnml +++ b/src/trains/steam/War_Department/WDAusterityTank.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, item_WDTank, 592) { property { - variant_group: header_Steam; name: string(STR_NAME_WDTank); climates_available: ALL_CLIMATES; introduction_date: date(1943,1,1); diff --git a/src/trains/variantheaders/Desiro_Header.pnml b/src/trains/variantheaders/Desiro_Header.pnml index 45380da0..b5ba63b0 100644 --- a/src/trains/variantheaders/Desiro_Header.pnml +++ b/src/trains/variantheaders/Desiro_Header.pnml @@ -1,4 +1,4 @@ -item (FEAT_TRAINS, header_Desiro, 10022) { +item (FEAT_TRAINS, header_DesiroCity, 10022) { property { name: string(STR_Desiro_Header); climates_available: NO_CLIMATE; diff --git a/src/trains/variantheaders/LNERP2_Header.pnml b/src/trains/variantheaders/LNERP2_Header.pnml index 403a8041..3a8101cc 100644 --- a/src/trains/variantheaders/LNERP2_Header.pnml +++ b/src/trains/variantheaders/LNERP2_Header.pnml @@ -1,6 +1,5 @@ item (FEAT_TRAINS, header_LNERP2, 10000) { property { - variant_group: header_Steam; name: string(STR_NAME_LNERP2); climates_available: NO_CLIMATE; sprite_id: SPRITE_ID_NEW_TRAIN;