Created London Underground group variants and added LU trains to them

BRTrains · Aug 5, 2024 · 298f896 · 298f896
1 parent d2fd73a
commit 298f896
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 9 deletions.
diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
diff --git a/lang/english.lng b/lang/english.lng
@@ -1182,7 +1182,7 @@ str_FurnessLumberWagon_usage		:Wood
 str_FurnessLumberWagon_eos		:---
 str_FurnessLumberWagon_liveries	:Green
 
-STR_NAME_BRMk1_Header			:BR Mark 1 Coaches
+STR_NAME_BRMk1_Header			:BR Mark 1 Coaches (Click to Expand)
 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
 
@@ -1225,7 +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_Header			:BR Mark 2 Coaches (Click to Expand)
 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)
@@ -1243,7 +1243,7 @@ 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_BRMk3_Header			:BR Mark 3 Coaches (Click to Expand)
 
 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
@@ -1272,7 +1272,7 @@ 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_BRMk4_Header			:BR Mark 4 Coaches (Click to Expand)
 
 STR_NAME_BRMk4FO				:BR Mark 4 Coach (First Open)
 str_BRMk4FO_liveries			:InterCity Swallow, National Express, GNER, East Coast, Virgin East Coast
@@ -1292,7 +1292,7 @@ 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_BRMk5_Header			:BR Mark 5 Coaches (Click to Expand)
 
 STR_NAME_BRMk5DVT				:BR Mark 5 Driving Van Trailer
 str_BRMk5DVT_liveries			:Transpennine Express
@@ -1371,6 +1371,8 @@ str_LNER_Thompson_61FK_liveries		:LNER "Teak"
 STR_NAME_LNER_Thompson_63TK		    :LNER Thompson 63 ft TK
 str_LNER_Thompson_63TK_liveries		:LNER "Teak"
 
+STR_LU_Subsurface_Header        :London Underground sub-surface
+STR_LU_Deeplevel_Header        :London Underground deep level
 
 STR_NAME_LU1938					:London Underground 1938 Stock (8-car, Deep Level)
 str_LU1938_usage				:Metro
@@ -1834,4 +1836,28 @@ str_whyte_0100      :0-10-0
 str_whyte_2100      :2-10-0
 
 str_whyte_garrett260   :2-6-0+0-6-2
-str_whyte_garrett280   :2-8-0+0-8-2
+str_whyte_garrett280   :2-8-0+0-8-2
+
+# Power types
+str_steam           :Steam
+str_electric        :Electric
+str_electric_AC     :Electric (Overhead power)
+str_electric_3rd    :Electric (3rd Rail)
+str_electric_4th    :Electric (4th Rail)
+str_electric_dual   :Electric (Dual Voltage 3rd rail + overhead)
+str_diesel          :Diesel
+str_bimodeDE        :Bi-mode (Diesel + Electric)
+str_bimodeBE        :Bi-mode (Battery + Electric)
+str_trimode         :Tri-mode (Diesel + Electric + Battery
+
+# Just some numbers
+str_0       :0
+str_1       :1
+str_2       :2
+str_3       :3
+str_4       :4
+str_5       :5
+str_6       :6
+str_7       :7
+str_8       :8
+str_9       :9
diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
@@ -222,11 +222,14 @@ sort(FEAT_TRAINS, [
  item_MPV_Single,
  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,

diff --git a/src/trains/metro/LU1938.pnml → src/trains/metro/LUDeeplevel/LU1938.pnml b/src/trains/metro/LU1938.pnml → src/trains/metro/LUDeeplevel/LU1938.pnml
@@ -51,6 +51,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1938_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1938, 490) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1938);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1938,1,1);

diff --git a/src/trains/metro/LU1967.pnml → src/trains/metro/LUDeeplevel/LU1967.pnml b/src/trains/metro/LU1967.pnml → src/trains/metro/LUDeeplevel/LU1967.pnml
@@ -37,6 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1967_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1967, 493) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1967);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1967,1,1);

diff --git a/src/trains/metro/LU1986.pnml → src/trains/metro/LUDeeplevel/LU1986.pnml b/src/trains/metro/LU1986.pnml → src/trains/metro/LUDeeplevel/LU1986.pnml
@@ -49,6 +49,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1986_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1986, 510) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1986);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1986,1,1);

diff --git a/src/trains/metro/LU1992.pnml → src/trains/metro/LUDeeplevel/LU1992.pnml b/src/trains/metro/LU1992.pnml → src/trains/metro/LUDeeplevel/LU1992.pnml
@@ -57,6 +57,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1992_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1992, 528) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1992);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1992,1,1);
@@ -107,6 +108,7 @@ item (FEAT_TRAINS, item_LU1992, 528) {
 
 item (FEAT_TRAINS, item_LU1992_4, 546) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1992_4);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1992,1,1);

diff --git a/src/trains/metro/LU1995.pnml → src/trains/metro/LUDeeplevel/LU1995.pnml b/src/trains/metro/LU1995.pnml → src/trains/metro/LUDeeplevel/LU1995.pnml
@@ -37,6 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1995_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1995, 522) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1995);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1995,1,1);

diff --git a/src/trains/metro/LU1996.pnml → src/trains/metro/LUDeeplevel/LU1996.pnml b/src/trains/metro/LU1996.pnml → src/trains/metro/LUDeeplevel/LU1996.pnml
@@ -37,6 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_LU1996_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU1996, 525) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU1996);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1996,1,1);

diff --git a/src/trains/metro/LU2009.pnml → src/trains/metro/LUDeeplevel/LU2009.pnml b/src/trains/metro/LU2009.pnml → src/trains/metro/LUDeeplevel/LU2009.pnml
@@ -37,6 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_LU2009_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LU2009, 485) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU2009);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(2009,1,1);

diff --git a/src/trains/metro/LU2024.pnml → src/trains/metro/LUDeeplevel/LU2024.pnml b/src/trains/metro/LU2024.pnml → src/trains/metro/LUDeeplevel/LU2024.pnml
@@ -38,11 +38,9 @@ switch(FEAT_TRAINS,SELF,sw_LU2024_cargo_subtype_text,cargo_subtype){
        return CB_RESULT_NO_TEXT;
 }
 
-
-
-
 item (FEAT_TRAINS, item_LU2024, 595) {
 	property {
+		variant_group:					header_LU_Deeplevel;
 		name: 							string(STR_NAME_LU2024);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(2024,1,1);

diff --git a/src/trains/metro/LUA60A62.pnml → src/trains/metro/LUSubsurface/LUA60A62.pnml b/src/trains/metro/LUA60A62.pnml → src/trains/metro/LUSubsurface/LUA60A62.pnml
@@ -52,6 +52,7 @@ switch(FEAT_TRAINS,SELF,sw_LUAStock_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LUAStock, 507) {
 	property {
+		variant_group:					header_LU_Subsurface;
 		name: 							string(STR_NAME_LUAStock);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1961,1,1);

diff --git a/src/trains/metro/LUC69C77.pnml → src/trains/metro/LUSubsurface/LUC69C77.pnml b/src/trains/metro/LUC69C77.pnml → src/trains/metro/LUSubsurface/LUC69C77.pnml
@@ -38,6 +38,7 @@ switch(FEAT_TRAINS,SELF,sw_LUCStock_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LUCStock, 540) {
 	property {
+		variant_group:					header_LU_Subsurface;
 		name: 							string(STR_NAME_LUCStock);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1970,4,21);

diff --git a/src/trains/metro/LUD78.pnml → src/trains/metro/LUSubsurface/LUD78.pnml b/src/trains/metro/LUD78.pnml → src/trains/metro/LUSubsurface/LUD78.pnml
@@ -52,6 +52,7 @@ switch(FEAT_TRAINS,SELF,sw_LUDStock_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LUDStock, 496) {
 	property {
+		variant_group:					header_LU_Subsurface;
 		name: 							string(STR_NAME_LUDStock);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1978,4,21);

diff --git a/src/trains/metro/LUS7S8.pnml → src/trains/metro/LUSubsurface/LUS7S8.pnml b/src/trains/metro/LUS7S8.pnml → src/trains/metro/LUSubsurface/LUS7S8.pnml
@@ -44,6 +44,7 @@ switch(FEAT_TRAINS,SELF,sw_LULS_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_LULS7, 292) {
 	property {
+		variant_group:					header_LU_Subsurface;
 		name: 							string(STR_NAME_LULS7);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(2012,4,21);
@@ -92,6 +93,7 @@ item (FEAT_TRAINS, item_LULS7, 292) {
 
 item (FEAT_TRAINS, item_LULS8, 293) {
 	property {
+		variant_group:					header_LU_Subsurface;
 		name: 							string(STR_NAME_LULS8);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(2010,4,21);

diff --git a/src/trains/variantheaders/LUDeepLevel_Header.pnml b/src/trains/variantheaders/LUDeepLevel_Header.pnml
@@ -0,0 +1,11 @@
+item (FEAT_TRAINS, header_LU_Deeplevel, 10007) {
+	property {
+		name: 							string(STR_LU_Deeplevel_Header);
+		climates_available: 			NO_CLIMATE;					
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		power:							1;
+	}
+	graphics {	
+		purchase:							spriteset_LU1967_Purchase;	
+	}
+}
diff --git a/src/trains/variantheaders/LUSubsurface_Header.pnml b/src/trains/variantheaders/LUSubsurface_Header.pnml
@@ -0,0 +1,11 @@
+item (FEAT_TRAINS, header_LU_Subsurface, 10006) {
+	property {
+		name: 							string(STR_LU_Subsurface_Header);
+		climates_available: 			NO_CLIMATE;					
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		power:							1;
+	}
+	graphics {	
+		purchase:							spriteset_LUS7S8_Purchase;	
+	}
+}