Reverted some over-grouped variant header stuff

BRTrains · Aug 7, 2024 · 118a3f1 · 118a3f1
1 parent 16527b5
commit 118a3f1
Show file tree

Hide file tree

Showing 60 changed files with 67 additions and 126 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);