Added 80-87 to variant group, moved 158-159 to separate group, fixed …

…Z-Class overwriting Class 87
BRTrains · Aug 7, 2024 · 668b0dd · 668b0dd
1 parent 118a3f1
commit 668b0dd
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 20 deletions.
diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -2,7 +2,7 @@
 - Furness Railway Railmotor?
 - GWR 5700/6700/8750 Class (gfx done need coding)
 - Class 20 (graphics drawn? Need to check if they're actually right.... looksl ike the wheels etc need to be taller on some views, definitely needs more liveries)
-- Stephenson's Planet
+- Stephenson's Planet (Coded, tweak graphics a British)
 
 # v2.12
 - Added Class 58

diff --git a/lang/english.lng b/lang/english.lng
@@ -71,26 +71,28 @@ str_var_Olympics              :Olympics
 str_var_Unnamed               :Unnamed
 
 # Variant group headers
-STR_LU_Subsurface_Header        :London Underground sub-surface
-STR_LU_Deeplevel_Header         :London Underground deep level
+STR_LU_Subsurface_Header        :London Underground sub-surface units
+STR_LU_Deeplevel_Header         :London Underground deep level units
 STR_Steam_Header                :British Rail Steam Locomotives
 STR_Diesel_Header               :British Rail Diesel Locomotives
 STR_Electric_Header             :British Rail Electric Locomotives
-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              :British Rail "Voyager"/"Meridian"
-STR_Desiro_Header               :British Rail "Desiro"
-STR_Aventra_Header              :British Rail "Aventra"
-STR_Electrostar_Header          :British Rail "Electrostar"
+STR_AL1to7_Header               :British Rail Class 80-87 "AC Electric"
+STR_Pacer_Header                :British Rail Class 140-144 "Pacer"
+STR_Sprinter_Header             :British Rail Class 150-156 "Sprinter"
+STR_ExpressSprinter_Header      :British Rail Class 158-159 "Express Sprinter"
+STR_Turbo_Header                :British Rail Class 165-166 "Turbo"
+STR_Turbostar_Header            :British Rail Class 168-172 "Turbostar"/"Clubman"
+STR_Voyager_Header              :British Rail Class 220-222 "Voyager"/"Meridian"
+STR_DesiroCity_Header           :British Rail "Desiro City" family
+STR_Aventra_Header              :British Rail "Aventra" family
+STR_Electrostar_Header          :British Rail "Electrostar" family
 STR_APT_Header                  :British Rail "Advanced Passenger Train"
-STR_DTrain_Header               :British Rail "D Train"
-STR_Flirt_Header                :British Rail "Flirt"
+STR_DTrain_Header               :British Rail "D Train" family
+STR_Flirt_Header                :British Rail "Flirt" family
 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"
+STR_Civity_Header               :British Rail "Civity" family
 STR_Debug_Header                :BRTrains DEBUG units (see description)
 STR_Debug_AdditionalText        :Units for BRTrains debugging - Not intended for gameplay{}Disable these using the BRTrains "Developer Mode" parameter
 

diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
@@ -46,6 +46,7 @@ sort(FEAT_TRAINS, [
  item_BR71,
  item_BR73GatEx,
  item_18100,
+ header_AL1to7,
  item_BR80,
  item_BR81,
  item_BR82,
@@ -76,6 +77,7 @@ sort(FEAT_TRAINS, [
    item_BR153,
    item_BR155,
    item_BR156,
+ header_ExpressSprinter,
    item_BR158,
    item_BR158_3,
    item_BR159,

diff --git a/src/trains/diesel_mu/Sprinter/BR158.pnml b/src/trains/diesel_mu/Sprinter/BR158.pnml
@@ -329,7 +329,7 @@ switch(FEAT_TRAINS,SELF,sw_BR158_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR158, 36) {
 	property {
-		variant_group:					header_Sprinter;
+		variant_group:					header_ExpressSprinter;
 		name: 							string(STR_NAME_BR158);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1989,4,21);

diff --git a/src/trains/diesel_mu/Sprinter/BR158_3.pnml b/src/trains/diesel_mu/Sprinter/BR158_3.pnml
@@ -107,7 +107,7 @@ switch(FEAT_TRAINS,SELF,sw_BR158_3_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR158_3, 39) {
 	property {
-		variant_group:					header_Sprinter;
+		variant_group:					header_ExpressSprinter;
 		name: 							string(STR_NAME_BR158_3);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1989,4,21);

diff --git a/src/trains/diesel_mu/Sprinter/BR159.pnml b/src/trains/diesel_mu/Sprinter/BR159.pnml
@@ -37,7 +37,7 @@ switch(FEAT_TRAINS,SELF,sw_BR159_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR159, 59) {
 	property {
-		variant_group:					header_Sprinter;
+		variant_group:					header_ExpressSprinter;
 		name: 							string(STR_NAME_BR159);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1993,4,21);

diff --git a/src/trains/electric_loco/80.pnml b/src/trains/electric_loco/80.pnml
@@ -18,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR80_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR80, 560) {
 	property {
+		variant_group:					header_AL1to7;
 		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,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR81_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR81, 561) {
 	property {
+		variant_group:					header_AL1to7;
 		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,6 +25,7 @@ switch(FEAT_TRAINS,SELF,sw_BR82_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR82, 562) {
 	property {
+		variant_group:					header_AL1to7;
 		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,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR83_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR83, 563) {
 	property {
+		variant_group:					header_AL1to7;
 		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,6 +18,7 @@ switch(FEAT_TRAINS,SELF,sw_BR84_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR84, 564) {
 	property {
+		variant_group:					header_AL1to7;
 		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,6 +25,7 @@ switch(FEAT_TRAINS,SELF,sw_BR85_cargo_subtype_text,cargo_subtype){
 
 item (FEAT_TRAINS, item_BR85, 565) {
 	property {
+		variant_group:					header_AL1to7;
 		name: 							string(STR_NAME_BR85);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1961,1,1);

diff --git a/src/trains/electric_loco/86.pnml b/src/trains/electric_loco/86.pnml
@@ -73,6 +73,7 @@ switch(FEAT_TRAINS,PARENT,sw_BR86_Sprites ,vehicle_is_reversed){
 
 item (FEAT_TRAINS, item_BR86, 566) {
 	property {
+		variant_group:					header_AL1to7;
 		name: 							string(STR_NAME_BR86);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1973,1,1);

diff --git a/src/trains/electric_loco/87.pnml b/src/trains/electric_loco/87.pnml
@@ -48,6 +48,7 @@ switch(FEAT_TRAINS,PARENT,sw_BR87_Sprites ,vehicle_is_reversed){
 
 item (FEAT_TRAINS, item_BR87, 567) {
 	property {
+		variant_group:					header_AL1to7;
 		name: 							string(STR_NAME_BR87);
 		climates_available: 			ALL_CLIMATES;
 		introduction_date:				date(1973,1,1);

diff --git a/src/trains/steam/SR/SR_ZClass.pnml b/src/trains/steam/SR/SR_ZClass.pnml
@@ -1,4 +1,4 @@
-item (FEAT_TRAINS, item_SRZClass, 567) {
+item (FEAT_TRAINS, item_SRZClass, 657) {
 	property {
 		name: 							string(STR_NAME_SRZClass);
 		climates_available: 			ALL_CLIMATES;

diff --git a/src/trains/variantheaders/AL1to7_Header.pnml b/src/trains/variantheaders/AL1to7_Header.pnml
@@ -0,0 +1,11 @@
+item (FEAT_TRAINS, header_AL1to7, 10026) {
+	property {
+		name: 							string(STR_AL1to7_Header);
+		climates_available: 			NO_CLIMATE;					
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		power:							1;
+	}
+	graphics {	
+		purchase:							spriteset_BR87_Purchase;	
+	}
+}
diff --git a/src/trains/variantheaders/Desiro_Header.pnml → ...ins/variantheaders/DesiroCity_Header.pnml b/src/trains/variantheaders/Desiro_Header.pnml → ...ins/variantheaders/DesiroCity_Header.pnml
@@ -1,6 +1,6 @@
 item (FEAT_TRAINS, header_DesiroCity, 10022) {
 	property {
-		name: 							string(STR_Desiro_Header);
+		name: 							string(STR_DesiroCity_Header);
 		climates_available: 			NO_CLIMATE;					
 		sprite_id:						SPRITE_ID_NEW_TRAIN;
 		power:							1;

diff --git a/src/trains/variantheaders/ExpressSprinter_Header.pnml b/src/trains/variantheaders/ExpressSprinter_Header.pnml
@@ -0,0 +1,11 @@
+item (FEAT_TRAINS, header_ExpressSprinter, 10027) {
+	property {
+		name: 							string(STR_ExpressSprinter_Header);
+		climates_available: 			NO_CLIMATE;					
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		power:							1;
+	}
+	graphics {	
+		purchase:							spriteset_BR158_3_Purchase;	
+	}
+}
diff --git a/src/trains/variantheaders/Sprinter_Header.pnml b/src/trains/variantheaders/Sprinter_Header.pnml
@@ -6,6 +6,6 @@ item (FEAT_TRAINS, header_Sprinter, 10009) {
 		power:							1;
 	}
 	graphics {	
-		purchase:							spriteset_BR158_3_Purchase;	
+		purchase:							spriteset_BR153_Purchase;	
 	}
 }