Skip to content

Commit

Permalink
Added Mk1-5 coaches to variant groups
Browse files Browse the repository at this point in the history
  • Loading branch information
@audigex
audigex committed Aug 4, 2024
1 parent ea59913 commit d694d01
Show file tree
Hide file tree
Showing 23 changed files with 308 additions and 42 deletions.
Binary file modified docs/SpriteIDs.xlsx
View file
Binary file not shown.
11 changes: 10 additions & 1 deletion lang/english.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,7 @@ str_FurnessLumberWagon_usage :Wood
str_FurnessLumberWagon_eos :---
str_FurnessLumberWagon_liveries :Green

STR_NAME_BRMk1_Header :BR Mark 1 Coaches
STR_NAME_BRMk1FO :BR Mark 1 Coach (First Open)
str_BRMk1FO_liveries :BR Carmine and Cream, BR Chocolate and Cream, BR Malachite Green, BR Maroon, BR Blue & Grey

Expand Down Expand Up @@ -1224,6 +1225,7 @@ str_BRMk1RK_liveries :BR Carmine and Cream, BR Chocolate and Cream, BR Malachi
STR_NAME_BRMk1RMB :BR Mark 1 Coach (Restaurant Buffet)
str_BRMk1RMB_liveries :BR Carmine and Cream, BR Chocolate and Cream, BR Malachite Green, BR Maroon, BR Blue & Grey

STR_NAME_BRMk2_Header :BR Mark 2 Coaches
STR_NAME_BRMk2_DBSO :BR Mark 2 Driving Coach (Driving Brake Standard Class)
STR_NAME_BRMk2_Early_SO :BR Mark 2 Coach (A-C Standard Class)
STR_NAME_BRMk2_Early_FO :BR Mark 2 Coach (A-C First Class)
Expand All @@ -1240,6 +1242,9 @@ str_BRMk2_Late_liveries :BR Blue & Grey, InterCity, ScotRail, Arriva, Arriva N
str_BRMk2_BFO_liveries :BR Blue & Grey, InterCity, ScotRail, DRS
str_BRMk2_Buffet_liveries :BR Blue & Grey, InterCity, ScotRail, Arriva, Arriva New, DRS, Virgin, First Great Western "Fag Packet", West Coast Railway Company


STR_NAME_BRMk3_Header :BR Mark 3 Coaches

STR_NAME_BRMk3TF :BR Mark 3 Coach (Trailer First)
str_BRMk3TF_liveries :BR Blue, InterCity Executive, InterCity Swallow, Midland Mainline (Teal & Tangerine), Midland Mainline (Blue), East Midlands Trains, Virgin Trains, Cross Country, Grand Central, Grand Central Lined, First Great Western, Great North Eastern Railway

Expand Down Expand Up @@ -1267,6 +1272,8 @@ str_BRMk3Sleeper_liveries :BR Blue, InterCity, First ScotRail, ScotRail, Caled
STR_NAME_BRMk3DVT :BR Mark 3 Driving Van Trailer
str_BRMk3DVT_liveries :InterCity Swallow, Virgin, ONE, Chiltern, Greater Anglia, Transport for Wales, Virgin "Pretendolino", Arriva Wales, Network Rail

STR_NAME_BRMk4_Header :BR Mark 4 Coaches

STR_NAME_BRMk4FO :BR Mark 4 Coach (First Open)
str_BRMk4FO_liveries :InterCity Swallow, National Express, GNER, East Coast, Virgin East Coast

Expand All @@ -1285,10 +1292,12 @@ str_BRMk4RFM_liveries :InterCity Swallow, National Express, GNER, East Coast,
STR_NAME_BRMk4DVT :BR Mark 4 Driving Van Trailer
str_BRMk4DVT_liveries :InterCity Swallow, National Express, GNER, East Coast, Virgin East Coast

STR_NAME_BRMk5_Header :BR Mark 5 Coaches

STR_NAME_BRMk5DVT :BR Mark 5 Driving Van Trailer
str_BRMk5DVT_liveries :Transpennine Express

STR_NAME_BRMk5a :BR Mark 5 Driving Van Trailer
STR_NAME_BRMk5a :BR Mark 5 Coach
str_BRMk5a_liveries :Transpennine Express

STR_NAME_BRMk5Sleeper :BR Mark 5 Sleeper Coach
Expand Down
87 changes: 47 additions & 40 deletions src/sortpurchase.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ sort(FEAT_TRAINS, [
item_LMSBlack5,
item_LMSJubilee,
item_GNRA1,
header_LNERP2, // item_LNERP2,
header_LNERP2,
// item_LNERP2,
// item_LNERP2_Streamlined,
item_LNERA3,
item_WDTank,
item_Standard9F,
Expand Down Expand Up @@ -251,45 +253,50 @@ sort(FEAT_TRAINS, [
item_LMS_StanierP3_50BG,
item_LNER_Thompson_61FK,
item_LNER_Thompson_63TK,
item_BRMk1FO,
item_BRMk1SO,
item_BRMk1TSO,
item_BRMk1FK,
item_BRMk1CK,
item_BRMk1SK,
item_BRMk1BSO,
item_BRMk1BSOT,
item_BRMk1BFK,
item_BRMk1BCK,
item_BRMk1BSK,
item_BRMk1BG,
item_BRMk1RK,
item_BRMk1RMB,
item_BRMk2_DBSO,
item_BRMk2_Early_SO,
item_BRMk2_Early_FO,
item_BRMk2_Late_SO,
item_BRMk2_Late_FO,
item_BRMk2_BSO,
item_BRMk2_BFO,
item_BRMk2_Buffet,
item_BRMk3DVT,
item_253_BRMk3TF,
item_253_BRMk3TS,
item_253_BRMk3TGS,
item_253_BRMk3TRSB,
item_253_BRMk3TRUB,
item_253_BRMk3TRUK,
item_BRMk3Sleeper,
item_BRMk4DVT,
item_91_BRMk4FO,
item_91_BRMk4TSOE,
item_91_BRMk4TSO,
item_91_BRMk4RFM,
item_91_BRMk4TSOD,
item_BRMk5a,
item_BRMk5DVT,
item_BRMk5Sleeper,
header_BRMk1,
// item_BRMk1FO,
// item_BRMk1SO,
// item_BRMk1TSO,
// item_BRMk1FK,
// item_BRMk1CK,
// item_BRMk1SK,
// item_BRMk1BSO,
// item_BRMk1BSOT,
// item_BRMk1BFK,
// item_BRMk1BCK,
// item_BRMk1BSK,
// item_BRMk1BG,
// item_BRMk1RK,
// item_BRMk1RMB,
header_BRMk2,
// item_BRMk2_DBSO,
// item_BRMk2_Early_SO,
// item_BRMk2_Early_FO,
// item_BRMk2_Late_SO,
// item_BRMk2_Late_FO,
// item_BRMk2_BSO,
// item_BRMk2_BFO,
// item_BRMk2_Buffet,
header_BRMk3,
// item_BRMk3DVT,
// item_253_BRMk3TF,
// item_253_BRMk3TS,
// item_253_BRMk3TGS,
// item_253_BRMk3TRSB,
// item_253_BRMk3TRUB,
// item_253_BRMk3TRUK,
// item_BRMk3Sleeper,
header_BRMk4,
// item_BRMk4DVT,
// item_91_BRMk4FO,
// item_91_BRMk4TSOE,
// item_91_BRMk4TSO,
// item_91_BRMk4RFM,
// item_91_BRMk4TSOD,
header_BRMk5,
// item_BRMk5a,
// item_BRMk5DVT,
// item_BRMk5Sleeper,
item_BR438_3,
item_BR438_4,
item_EyeCandy,
Expand Down
6 changes: 6 additions & 0 deletions src/trains/diesel_mu/BR_A_MK3T_253.pnml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
item (FEAT_TRAINS, item_253_BRMk3TF, 13) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TF);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down Expand Up @@ -38,6 +39,7 @@ item (FEAT_TRAINS, item_253_BRMk3TF, 13) {

item (FEAT_TRAINS, item_253_BRMk3TS, 14) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TS);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down Expand Up @@ -76,6 +78,7 @@ item (FEAT_TRAINS, item_253_BRMk3TS, 14) {

item (FEAT_TRAINS, item_253_BRMk3TGS, 15) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TGS);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down Expand Up @@ -114,6 +117,7 @@ item (FEAT_TRAINS, item_253_BRMk3TGS, 15) {

item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TRSB);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down Expand Up @@ -152,6 +156,7 @@ item (FEAT_TRAINS, item_253_BRMk3TRSB, 16) {

item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TRUB);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down Expand Up @@ -190,6 +195,7 @@ item (FEAT_TRAINS, item_253_BRMk3TRUB, 17) {

item (FEAT_TRAINS, item_253_BRMk3TRUK, 18) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3TRUK);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down
5 changes: 5 additions & 0 deletions src/trains/electric_loco/BR91_IC225.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ item (FEAT_TRAINS, item_91_BRMk4DVT, 113) {

item (FEAT_TRAINS, item_91_BRMk4FO, 112) {
property {
variant_group: header_BRMk4;
name: string(STR_NAME_BRMk4FO);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: 0;
Expand Down Expand Up @@ -126,6 +127,7 @@ item (FEAT_TRAINS, item_91_BRMk4FO, 112) {

item (FEAT_TRAINS, item_91_BRMk4TSOE, 109) {
property {
variant_group: header_BRMk4;
name: string(STR_NAME_BRMk4TSOE);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: 0;
Expand Down Expand Up @@ -161,6 +163,7 @@ item (FEAT_TRAINS, item_91_BRMk4TSOE, 109) {

item (FEAT_TRAINS, item_91_BRMk4TSO, 110) {
property {
variant_group: header_BRMk4;
name: string(STR_NAME_BRMk4TSO);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: 0;
Expand Down Expand Up @@ -196,6 +199,7 @@ item (FEAT_TRAINS, item_91_BRMk4TSO, 110) {

item (FEAT_TRAINS, item_91_BRMk4RFM, 111) {
property {
variant_group: header_BRMk4;
name: string(STR_NAME_BRMk4RFM);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: 0;
Expand Down Expand Up @@ -231,6 +235,7 @@ item (FEAT_TRAINS, item_91_BRMk4RFM, 111) {

item (FEAT_TRAINS, item_91_BRMk4TSOD, 114) {
property {
variant_group: header_BRMk4;
name: string(STR_NAME_BRMk4TSOD);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: 0;
Expand Down
14 changes: 14 additions & 0 deletions src/trains/rolling_stock/BR/BRMk1.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ switch(FEAT_TRAINS,SELF,sw_BRMk1_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BRMk1SO, 137) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1SO);
climates_available: ALL_CLIMATES;
introduction_date: date(1963,4,21);
Expand Down Expand Up @@ -492,6 +493,7 @@ item (FEAT_TRAINS, item_BRMk1SO, 137) {

item (FEAT_TRAINS, item_BRMk1FO, 138) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1FO);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -527,6 +529,7 @@ item (FEAT_TRAINS, item_BRMk1FO, 138) {

item (FEAT_TRAINS, item_BRMk1FK, 139) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1FK);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -562,6 +565,7 @@ item (FEAT_TRAINS, item_BRMk1FK, 139) {

item (FEAT_TRAINS, item_BRMk1CK, 140) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1CK);
climates_available: ALL_CLIMATES;
introduction_date: date(1952,4,21);
Expand Down Expand Up @@ -597,6 +601,7 @@ item (FEAT_TRAINS, item_BRMk1CK, 140) {

item (FEAT_TRAINS, item_BRMk1BSK, 141) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BSK);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -632,6 +637,7 @@ item (FEAT_TRAINS, item_BRMk1BSK, 141) {

item (FEAT_TRAINS, item_BRMk1BCK, 142) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BCK);
climates_available: ALL_CLIMATES;
introduction_date: date(1952,4,21);
Expand Down Expand Up @@ -667,6 +673,7 @@ item (FEAT_TRAINS, item_BRMk1BCK, 142) {

item (FEAT_TRAINS, item_BRMk1BFK, 143) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BFK);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -702,6 +709,7 @@ item (FEAT_TRAINS, item_BRMk1BFK, 143) {

item (FEAT_TRAINS, item_BRMk1BG, 144) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BG);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -737,6 +745,7 @@ item (FEAT_TRAINS, item_BRMk1BG, 144) {

item (FEAT_TRAINS, item_BRMk1RK, 145) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1RK);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -772,6 +781,7 @@ item (FEAT_TRAINS, item_BRMk1RK, 145) {

item (FEAT_TRAINS, item_BRMk1RMB, 146) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1RMB);
climates_available: ALL_CLIMATES;
introduction_date: date(1957,4,21);
Expand Down Expand Up @@ -807,6 +817,7 @@ item (FEAT_TRAINS, item_BRMk1RMB, 146) {

item (FEAT_TRAINS, item_BRMk1SK, 147) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1SK);
climates_available: ALL_CLIMATES;
introduction_date: date(1951,4,21);
Expand Down Expand Up @@ -841,6 +852,7 @@ item (FEAT_TRAINS, item_BRMk1SK, 147) {

item (FEAT_TRAINS, item_BRMk1BSO, 148) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BSO);
climates_available: ALL_CLIMATES;
introduction_date: date(1955,4,21);
Expand Down Expand Up @@ -875,6 +887,7 @@ item (FEAT_TRAINS, item_BRMk1BSO, 148) {

item (FEAT_TRAINS, item_BRMk1BSOT, 149) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1BSOT);
climates_available: ALL_CLIMATES;
introduction_date: date(1952,4,21);
Expand Down Expand Up @@ -909,6 +922,7 @@ item (FEAT_TRAINS, item_BRMk1BSOT, 149) {

item (FEAT_TRAINS, item_BRMk1TSO, 150) {
property {
variant_group: header_BRMk1;
name: string(STR_NAME_BRMk1TSO);
climates_available: ALL_CLIMATES;
introduction_date: date(1952,4,21);
Expand Down
1 change: 1 addition & 0 deletions src/trains/rolling_stock/BR/BRMk3Sleeper.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ switch(FEAT_TRAINS,SELF,sw_BRMk3Sleeper_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BRMk3Sleeper, 544) {
property {
variant_group: header_BRMk3;
name: string(STR_NAME_BRMk3Sleeper);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down
1 change: 1 addition & 0 deletions src/trains/rolling_stock/BR/BRMk5Sleeper.pnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ switch(FEAT_TRAINS,SELF,sw_BRMk5Sleeper_cargo_subtype_text,cargo_subtype){

item (FEAT_TRAINS, item_BRMk5Sleeper, 545) {
property {
variant_group: header_BRMk5;
name: string(STR_NAME_BRMk5Sleeper);
climates_available: ALL_CLIMATES;
refittable_cargo_classes: CC_PASSENGERS;
Expand Down
2 changes: 2 additions & 0 deletions src/trains/rolling_stock/BR/Mk2/BRMK2_Early.pnml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
item (FEAT_TRAINS, item_BRMk2_Early_SO, 624) {
property {
variant_group: header_BRMk2;
name: string(STR_NAME_BRMk2_Early_SO);
climates_available: ALL_CLIMATES;
introduction_date: date(1964,4,21);
Expand Down Expand Up @@ -34,6 +35,7 @@ item (FEAT_TRAINS, item_BRMk2_Early_SO, 624) {

item (FEAT_TRAINS, item_BRMk2_Early_FO, 625) {
property {
variant_group: header_BRMk2;
name: string(STR_NAME_BRMk2_Early_FO);
climates_available: ALL_CLIMATES;
introduction_date: date(1964,4,21);
Expand Down
2 changes: 2 additions & 0 deletions src/trains/rolling_stock/BR/Mk2/BRMk2_Brake.pnml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
item (FEAT_TRAINS, item_BRMk2_BSO, 622) {
property {
variant_group: header_BRMk2;
name: string(STR_NAME_BRMk2_BSO);
climates_available: ALL_CLIMATES;
introduction_date: date(1964,4,21);
Expand Down Expand Up @@ -34,6 +35,7 @@ item (FEAT_TRAINS, item_BRMk2_BSO, 622) {

item (FEAT_TRAINS, item_BRMk2_BFO, 623) {
property {
variant_group: header_BRMk2;
name: string(STR_NAME_BRMk2_BFO);
climates_available: ALL_CLIMATES;
introduction_date: date(1964,4,21);
Expand Down
Loading

0 comments on commit d694d01

Please sign in to comment.