From ba140c0ce137af86055cde1bec8b0f476f8a3f75 Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 6 Aug 2024 02:26:01 +0100 Subject: [PATCH] Added Electrostars to variant group --- src/sortpurchase.pnml | 48 ++++++++++--------- src/trains/electric_mu/BR357.pnml | 1 + src/trains/electric_mu/BR375_3.pnml | 1 + src/trains/electric_mu/BR375_4.pnml | 1 + src/trains/electric_mu/BR376.pnml | 1 + src/trains/electric_mu/BR377_3.pnml | 1 + src/trains/electric_mu/BR377_4.pnml | 1 + .../electric_mu/BR377_4dualvoltage.pnml | 1 + src/trains/electric_mu/BR377_5.pnml | 1 + .../electric_mu/BR377_5dualvoltage.pnml | 1 + src/trains/electric_mu/BR378.pnml | 5 ++ src/trains/electric_mu/BR379.pnml | 1 + src/trains/electric_mu/BR387.pnml | 1 + 13 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml index 33b401b4..a3bf704f 100644 --- a/src/sortpurchase.pnml +++ b/src/sortpurchase.pnml @@ -128,29 +128,33 @@ sort(FEAT_TRAINS, [ item_br_345_7car, item_br_345_9car, item_BR350, - item_BR357, - item_APTE, + + item_BR370, - item_BR373, - item_BR373_25kv, - item_BR373_2, - item_BR374, - item_TGV, - item_BR375_3, - item_BR375_4, - item_BR376, - item_BR377_3, - item_BR377_4, - item_BR377_4_dv, - item_BR377_5, - item_BR377_5dv, - item_BR378_3dv, - item_BR378_4, - item_BR378_4dv, - item_BR378_5, - item_BR378_5dv, - item_BR379, - item_BR387, + item_APTE, + header_Eurostar, + item_BR373, + item_BR373_25kv, + item_BR373_2, + item_BR374, + item_TGV, + header_Electrostar, + item_BR357, + item_BR375_3, + item_BR375_4, + item_BR376, + item_BR377_3, + item_BR377_4, + item_BR377_4_dv, + item_BR377_5, + item_BR377_5dv, + item_BR378_3dv, + item_BR378_4, + item_BR378_4dv, + item_BR378_5, + item_BR378_5dv, + item_BR379, + item_BR387, item_BR390, item_BR390_11, item_BR395, diff --git a/src/trains/electric_mu/BR357.pnml b/src/trains/electric_mu/BR357.pnml index 2f74ef21..bf154e9d 100644 --- a/src/trains/electric_mu/BR357.pnml +++ b/src/trains/electric_mu/BR357.pnml @@ -81,6 +81,7 @@ switch(FEAT_TRAINS,SELF,sw_BR357_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR357, 531) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR357); climates_available: ALL_CLIMATES; introduction_date: date(1999,1,1); diff --git a/src/trains/electric_mu/BR375_3.pnml b/src/trains/electric_mu/BR375_3.pnml index 124b2b90..cfc15201 100644 --- a/src/trains/electric_mu/BR375_3.pnml +++ b/src/trains/electric_mu/BR375_3.pnml @@ -104,6 +104,7 @@ switch(FEAT_TRAINS,SELF,sw_BR375_3_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR375_3, 197) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR375_3); climates_available: ALL_CLIMATES; introduction_date: date(2001,4,21); diff --git a/src/trains/electric_mu/BR375_4.pnml b/src/trains/electric_mu/BR375_4.pnml index 3f826da6..83061ee0 100644 --- a/src/trains/electric_mu/BR375_4.pnml +++ b/src/trains/electric_mu/BR375_4.pnml @@ -134,6 +134,7 @@ switch(FEAT_TRAINS,SELF,sw_BR375_4_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR375_4, 200) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR375_4); climates_available: ALL_CLIMATES; introduction_date: date(1999,4,21); diff --git a/src/trains/electric_mu/BR376.pnml b/src/trains/electric_mu/BR376.pnml index 92cbe11b..d53a6c32 100644 --- a/src/trains/electric_mu/BR376.pnml +++ b/src/trains/electric_mu/BR376.pnml @@ -47,6 +47,7 @@ switch(FEAT_TRAINS,SELF,sw_BR376_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR376, 204) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR376); climates_available: ALL_CLIMATES; introduction_date: date(2004,4,21); diff --git a/src/trains/electric_mu/BR377_3.pnml b/src/trains/electric_mu/BR377_3.pnml index 8e0514c2..f55947c5 100644 --- a/src/trains/electric_mu/BR377_3.pnml +++ b/src/trains/electric_mu/BR377_3.pnml @@ -41,6 +41,7 @@ switch(FEAT_TRAINS,SELF,sw_BR377_3_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR377_3, 208) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR377_3); climates_available: ALL_CLIMATES; introduction_date: date(2001,4,21); diff --git a/src/trains/electric_mu/BR377_4.pnml b/src/trains/electric_mu/BR377_4.pnml index c283e5ef..854bf97d 100644 --- a/src/trains/electric_mu/BR377_4.pnml +++ b/src/trains/electric_mu/BR377_4.pnml @@ -41,6 +41,7 @@ switch(FEAT_TRAINS,SELF,sw_BR377_4_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR377_4, 211) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR377_4); climates_available: ALL_CLIMATES; introduction_date: date(2002,4,21); diff --git a/src/trains/electric_mu/BR377_4dualvoltage.pnml b/src/trains/electric_mu/BR377_4dualvoltage.pnml index f5428dd7..01b84fb8 100644 --- a/src/trains/electric_mu/BR377_4dualvoltage.pnml +++ b/src/trains/electric_mu/BR377_4dualvoltage.pnml @@ -81,6 +81,7 @@ switch(FEAT_TRAINS,SELF,sw_BR377_4_dv_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR377_4_dv, 214) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR377_4_dv); climates_available: ALL_CLIMATES; introduction_date: date(2002,4,21); diff --git a/src/trains/electric_mu/BR377_5.pnml b/src/trains/electric_mu/BR377_5.pnml index 7e35e63d..b4f94ec0 100644 --- a/src/trains/electric_mu/BR377_5.pnml +++ b/src/trains/electric_mu/BR377_5.pnml @@ -42,6 +42,7 @@ switch(FEAT_TRAINS,SELF,sw_BR377_5_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR377_5, 218) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR377_5); climates_available: ALL_CLIMATES; introduction_date: date(2013,4,21); diff --git a/src/trains/electric_mu/BR377_5dualvoltage.pnml b/src/trains/electric_mu/BR377_5dualvoltage.pnml index 7b53a791..f3438ffe 100644 --- a/src/trains/electric_mu/BR377_5dualvoltage.pnml +++ b/src/trains/electric_mu/BR377_5dualvoltage.pnml @@ -45,6 +45,7 @@ switch(FEAT_TRAINS,SELF,sw_BR377_5dv_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR377_5dv, 221) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR377_5dv); climates_available: ALL_CLIMATES; introduction_date: date(2014,4,21); diff --git a/src/trains/electric_mu/BR378.pnml b/src/trains/electric_mu/BR378.pnml index 765e1a30..3a24f6c3 100644 --- a/src/trains/electric_mu/BR378.pnml +++ b/src/trains/electric_mu/BR378.pnml @@ -149,6 +149,7 @@ switch(FEAT_TRAINS,SELF,sw_BR378_5_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR378_3dv, 225) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR378_3); climates_available: ALL_CLIMATES; introduction_date: date(2009,4,21); @@ -200,6 +201,7 @@ item (FEAT_TRAINS, item_BR378_3dv, 225) { item (FEAT_TRAINS, item_BR378_4, 226) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR378_4); climates_available: ALL_CLIMATES; introduction_date: date(2011,4,21); @@ -248,6 +250,7 @@ item (FEAT_TRAINS, item_BR378_4, 226) { item (FEAT_TRAINS, item_BR378_4dv, 227) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR378_4); climates_available: ALL_CLIMATES; introduction_date: date(2011,4,21); @@ -298,6 +301,7 @@ item (FEAT_TRAINS, item_BR378_4dv, 227) { item (FEAT_TRAINS, item_BR378_5, 228) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR378_5); climates_available: ALL_CLIMATES; introduction_date: date(2013,4,21); @@ -346,6 +350,7 @@ item (FEAT_TRAINS, item_BR378_5, 228) { item (FEAT_TRAINS, item_BR378_5dv, 229) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR378_5); climates_available: ALL_CLIMATES; introduction_date: date(2013,4,21); diff --git a/src/trains/electric_mu/BR379.pnml b/src/trains/electric_mu/BR379.pnml index ab52f6a5..e58aa5d3 100644 --- a/src/trains/electric_mu/BR379.pnml +++ b/src/trains/electric_mu/BR379.pnml @@ -45,6 +45,7 @@ switch(FEAT_TRAINS,SELF,sw_BR379_cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR379, 236) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR379); climates_available: ALL_CLIMATES; introduction_date: date(2004,4,21); diff --git a/src/trains/electric_mu/BR387.pnml b/src/trains/electric_mu/BR387.pnml index b456996e..65810188 100644 --- a/src/trains/electric_mu/BR387.pnml +++ b/src/trains/electric_mu/BR387.pnml @@ -153,6 +153,7 @@ switch(FEAT_TRAINS,SELF,sw_BR387__cargo_subtype_text,cargo_subtype){ item (FEAT_TRAINS, item_BR387, 240) { property { + variant_group: header_Electrostar; name: string(STR_NAME_BR387_); climates_available: ALL_CLIMATES; introduction_date: date(2015,4,21);