Skip to content

Commit

Permalink
Added a bunch more stuff to variant groups
Browse files Browse the repository at this point in the history
  • Loading branch information
audigex committed Aug 6, 2024
1 parent ba140c0 commit b039a0f
Show file tree
Hide file tree
Showing 47 changed files with 109 additions and 23 deletions.
Binary file modified docs/SpriteIDs.xlsx
Binary file not shown.
7 changes: 6 additions & 1 deletion lang/english.lng
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,14 @@ 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 :Brirish Rail "Voyager"/"Meridian"
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_APT_Header :British Rail "Advanced Passenger Train"
STR_DTrain_Header :British Rail "D Train"
STR_Flirt_Header :British Rail "Flirt"
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"
Expand Down
46 changes: 24 additions & 22 deletions src/sortpurchase.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ sort(FEAT_TRAINS, [
item_br_345_7car,
item_br_345_9car,
item_BR350,


item_BR370,
item_APTE,
header_APT,
item_BR370,
item_APTE,
header_Eurostar,
item_BR373,
item_BR373_25kv,
Expand Down Expand Up @@ -198,25 +197,28 @@ sort(FEAT_TRAINS, [
item_BR508_1,
item_BR508_2,
item_BR555,
item_BR700,
item_BR700_2,
item_br_701_0,
item_br_701_5,
item_BR707,
item_br_710_1,
item_br_710_2_4car,
item_br_710_2_5car,
item_BR717,
item_br_720,
item_br_720_1,
item_br730_0,
item_br730_2,
item_br_745,
header_Desiro,
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_br777,
item_br_755_3,
item_br_755_4,
item_br_756_3,
item_br_756_4,
header_Flirt,
item_br_755_3,
item_br_755_4,
item_br_756_3,
item_br_756_4,
item_br_769,
item_br_769_9,
header_IEP,
Expand Down
1 change: 1 addition & 0 deletions src/trains/bimode_mu/755-3.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ switch(FEAT_TRAINS, SELF, switch_br_755_3_length, position_in_articulated_veh %
// Class 755/3 (3.5car)
item(FEAT_TRAINS, item_br_755_3, 453) {
property {
variant_group: header_Flirt;
name: string(STR_BR_755_3CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 07, 29);
Expand Down
1 change: 1 addition & 0 deletions src/trains/bimode_mu/755-4.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ switch(FEAT_TRAINS, SELF, switch_br_755_4_length, position_in_articulated_veh %
// Class 755/4 (4.5car)
item(FEAT_TRAINS, item_br_755_4, 454) {
property {
variant_group: header_Flirt;
name: string(STR_BR_755_4CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 07, 29);
Expand Down
1 change: 1 addition & 0 deletions src/trains/bimode_mu/756-3.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ switch(FEAT_TRAINS, SELF, switch_br_756_3_length, position_in_articulated_veh %
// Class 756/3 (3.5car)
item(FEAT_TRAINS, item_br_756_3, 572) {
property {
variant_group: header_Flirt;
name: string(STR_BR_756_3CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 07, 29);
Expand Down
1 change: 1 addition & 0 deletions src/trains/bimode_mu/756-4.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ switch(FEAT_TRAINS, SELF, switch_br_756_4_length, position_in_articulated_veh %
// Class 756/4 (4.5car)
item(FEAT_TRAINS, item_br_756_4, 573) {
property {
variant_group: header_Flirt;
name: string(STR_BR_756_4CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 07, 29);
Expand Down
1 change: 1 addition & 0 deletions src/trains/diesel_mu/231.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ switch(FEAT_TRAINS, SELF, switch_br_231_length, position_in_articulated_veh % 5)
// Class 755/4 (4.5car)
item(FEAT_TRAINS, item_br_231, 574) {
property {
variant_group: header_Flirt;
name: string(STR_BR_231_4CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 07, 29);
Expand Down
1 change: 1 addition & 0 deletions src/trains/diesel_mu/APTE.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ switch(FEAT_TRAINS,SELF,sw_APTE_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_APTE, 568) {
property {
variant_group: header_APT;
name: string(STR_NAME_APTE);
climates_available: ALL_CLIMATES;
introduction_date: date(1972,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/diesel_mu/BR185.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ switch(FEAT_TRAINS,SELF,sw_BR185_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR185, 70) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR185);
climates_available: ALL_CLIMATES;
introduction_date: date(2005,4,21);
Expand Down
2 changes: 2 additions & 0 deletions src/trains/diesel_mu/BR230.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ switch(FEAT_TRAINS,SELF,sw_BR230_3car_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR230_2CAR, 501) {
property {
variant_group: header_DTrain;
name: string(STR_NAME_BR230_2CAR);
climates_available: ALL_CLIMATES;
introduction_date: date(2019,1,1);
Expand Down Expand Up @@ -147,6 +148,7 @@ item (FEAT_TRAINS, item_BR230_2CAR, 501) {

item (FEAT_TRAINS, item_BR230_3CAR, 502) {
property {
variant_group: header_DTrain;
name: string(STR_NAME_BR230_3CAR);
climates_available: ALL_CLIMATES;
introduction_date: date(2021,1,1);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions src/trains/electric_mu/345_7car.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ switch(FEAT_TRAINS, SELF, switch_br_345_7car_particles, position_in_articulated_
// Class 345
item(FEAT_TRAINS, item_br_345_7car, 599) {
property {
variant_group: header_Aventra;
name: string(STR_BR_345_7CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2017, 06, 02);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/345_9car.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ switch(FEAT_TRAINS, SELF, switch_br_345_9car_particles, position_in_articulated_
// Class 345
item(FEAT_TRAINS, item_br_345_9car, 426) {
property {
variant_group: header_Aventra;
name: string(STR_BR_345_9CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2021, 06, 02);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/701-0.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ switch(FEAT_TRAINS, SELF, switch_br_701_0_can_attach_wagon, vehicle_type_id) {
// Class 701
item(FEAT_TRAINS, item_br_701_0, 428) {
property {
variant_group: header_Aventra;
name: string(STR_BR_701_0);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 11, 01);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/701-5.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ switch(FEAT_TRAINS, SELF, switch_br_701_5_can_attach_wagon, vehicle_type_id) {
// Class 701
item(FEAT_TRAINS, item_br_701_5, 429) {
property {
variant_group: header_Aventra;
name: string(STR_BR_701_5);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 11, 01);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/710-1.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ switch(FEAT_TRAINS, SELF, switch_br_710_1_can_attach_wagon, vehicle_type_id) {
// Class 720
item(FEAT_TRAINS, item_br_710_1, 444) {
property {
variant_group: header_Aventra;
name: string(STR_BR_710_1);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 03, 03);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/710-2_4car.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ switch(FEAT_TRAINS, SELF, switch_br_710_2_4car_can_attach_wagon, vehicle_type_id
// Class 720
item(FEAT_TRAINS, item_br_710_2_4car, 445) {
property {
variant_group: header_Aventra;
name: string(STR_BR_710_2_4CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 03, 03);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/710-2_5car.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ switch(FEAT_TRAINS, SELF, switch_br_710_2_5car_can_attach_wagon, vehicle_type_id
// Class 720
item(FEAT_TRAINS, item_br_710_2_5car, 446) {
property {
variant_group: header_Aventra;
name: string(STR_BR_710_2_5CAR);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 03, 03);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/720-1.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ switch(FEAT_TRAINS, SELF, switch_br_720_1_can_attach_wagon, vehicle_type_id) {

item(FEAT_TRAINS, item_br_720_1, 447) {
property {
variant_group: header_Aventra;
name: string(STR_BR_720_1);
climates_available: NO_CLIMATE; // available in all climates
introduction_date: date(2020, 03, 17);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/720.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ switch(FEAT_TRAINS, SELF, switch_br_720_can_attach_wagon, vehicle_type_id) {
// Class 720
item(FEAT_TRAINS, item_br_720, 448) {
property {
variant_group: header_Aventra;
name: string(STR_BR_720);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 03, 17);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/730-0.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ switch(FEAT_TRAINS, SELF, switch_br730_0_can_attach_wagon, vehicle_type_id) {

item(FEAT_TRAINS, item_br730_0, 575) {
property {
variant_group: header_Aventra;
name: string(STR_BR730_0);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2024, 03, 17);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/730-2.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ switch(FEAT_TRAINS, SELF, switch_br730_2_can_attach_wagon, vehicle_type_id) {

item(FEAT_TRAINS, item_br730_2, 576) {
property {
variant_group: header_Aventra;
name: string(STR_BR730_2);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2024, 03, 17);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/745-0-1.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ switch(FEAT_TRAINS, SELF, switch_br_745_subtype_text, cargo_subtype) {
// Class 331/0 (3car)
item(FEAT_TRAINS, item_br_745, 449) {
property {
variant_group: header_Flirt;
name: string(STR_BR_745);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2020, 01, 08);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR350.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ switch(FEAT_TRAINS,SELF,sw_BR350_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR350, 343) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR350);
climates_available: ALL_CLIMATES;
introduction_date: date(2004,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR370.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ switch(FEAT_TRAINS,SELF,sw_BR370_speed,param_max_speed){

item (FEAT_TRAINS, item_BR370, 125) {
property {
variant_group: header_APT;
name: string(STR_NAME_BR370);
climates_available: ALL_CLIMATES;
introduction_date: date(1979,4,21);
Expand Down
3 changes: 3 additions & 0 deletions src/trains/electric_mu/BR373.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ switch(FEAT_TRAINS,SELF,switch_BR373DV_speed, tile_powers_railtype("ELRL")){

item (FEAT_TRAINS, item_BR373, 80) {
property {
variant_group: header_Eurostar;
name: string(STR_NAME_BR373Dual);
climates_available: ALL_CLIMATES;
introduction_date: date(1993,4,21);
Expand Down Expand Up @@ -257,6 +258,7 @@ item (FEAT_TRAINS, item_BR373, 80) {

item (FEAT_TRAINS, item_BR373_25kv, 557) {
property {
variant_group: header_Eurostar;
name: string(STR_NAME_BR373);
climates_available: ALL_CLIMATES;
introduction_date: date(2007,4,21);
Expand Down Expand Up @@ -307,6 +309,7 @@ item (FEAT_TRAINS, item_BR373_25kv, 557) {

item (FEAT_TRAINS, item_BR373_2, 97) {
property {
variant_group: header_Eurostar;
name: string(STR_NAME_BR373_2);
climates_available: ALL_CLIMATES;
introduction_date: date(1993,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR374.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ switch(FEAT_TRAINS,SELF,sw_BR374_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR374, 88) {
property {
variant_group: header_Eurostar;
name: string(STR_NAME_BR374);
climates_available: ALL_CLIMATES;
introduction_date: date(2015,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR444.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ switch(FEAT_TRAINS,SELF,sw_BR444_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR444, 74) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR444);
climates_available: ALL_CLIMATES;
introduction_date: date(2004,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR450.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ switch(FEAT_TRAINS,SELF,sw_BR450_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR450, 288) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR450);
climates_available: ALL_CLIMATES;
introduction_date: date(2002,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR484.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ switch(FEAT_TRAINS,SELF,sw_BR484_speed,param_max_speed){

item (FEAT_TRAINS, item_BR484, 499) {
property {
variant_group: header_DTrain;
name: string(STR_NAME_BR484);
climates_available: ALL_CLIMATES;
introduction_date: date(2021,1,1);
Expand Down
2 changes: 2 additions & 0 deletions src/trains/electric_mu/BR700.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ switch(FEAT_TRAINS,SELF,sw_BR700_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR700, 255) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR700);
climates_available: ALL_CLIMATES;
introduction_date: date(2015,4,21);
Expand Down Expand Up @@ -120,6 +121,7 @@ item (FEAT_TRAINS, item_BR700, 255) {

item (FEAT_TRAINS, item_BR700_2, 256) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR700_2);
climates_available: ALL_CLIMATES;
introduction_date: date(2015,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR707.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ switch(FEAT_TRAINS,SELF,sw_BR707_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR707, 514) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR707);
climates_available: ALL_CLIMATES;
introduction_date: date(2015,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/BR717.pnml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ switch(FEAT_TRAINS,SELF,sw_BR717_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BR717, 518) {
property {
variant_group: header_Desiro;
name: string(STR_NAME_BR717);
climates_available: ALL_CLIMATES;
introduction_date: date(2015,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/electric_mu/TGV.pnml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
item(FEAT_TRAINS, item_TGV, 589) {
property {
variant_group: header_Eurostar;
name: string(STR_TGV);
climates_available: ALL_CLIMATES; // available in all climates
introduction_date: date(2019, 09, 16);
Expand Down
11 changes: 11 additions & 0 deletions src/trains/variantheaders/APT_Header.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
item (FEAT_TRAINS, header_APT, 10019) {
property {
name: string(STR_APT_Header);
climates_available: NO_CLIMATE;
sprite_id: SPRITE_ID_NEW_TRAIN;
power: 1;
}
graphics {
purchase: spriteset_BR370_Purchase;
}
}
11 changes: 11 additions & 0 deletions src/trains/variantheaders/DTrain_Header.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
item (FEAT_TRAINS, header_DTrain, 10021) {
property {
name: string(STR_DTrain_Header);
climates_available: NO_CLIMATE;
sprite_id: SPRITE_ID_NEW_TRAIN;
power: 1;
}
graphics {
purchase: spriteset_BR230_3car_Purchase;
}
}
11 changes: 11 additions & 0 deletions src/trains/variantheaders/Desiro_Header.pnml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
item (FEAT_TRAINS, header_Desiro, 10022) {
property {
name: string(STR_Desiro_Header);
climates_available: NO_CLIMATE;
sprite_id: SPRITE_ID_NEW_TRAIN;
power: 1;
}
graphics {
purchase: spriteset_BR700_Purchase;
}
}
Loading

0 comments on commit b039a0f

Please sign in to comment.