Added LNER Thompson 61ft FK and 63ft TK coaches

BRTrains · Jul 25, 2024 · dd843d1 · dd843d1
1 parent 77e976c
commit dd843d1
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 2 deletions.
diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
diff --git a/gfx/Rolling Stock/LNER/LNER_Thompson_61ft_FK.png b/gfx/Rolling Stock/LNER/LNER_Thompson_61ft_FK.png
diff --git a/gfx/Rolling Stock/LNER/LNER_Thompson_63ft_TK.png b/gfx/Rolling Stock/LNER/LNER_Thompson_63ft_TK.png
diff --git a/lang/english.lng b/lang/english.lng
@@ -1301,6 +1301,12 @@ str_LNERPV_liveries				:GNR/LNER Teak, BR Maroon, BR Carmine and Cream
 STR_NAME_LNERBG					:LNER Gresley Full Brake Van
 str_LNERBG_liveries				:GNR/LNER Teak, BR Maroon, BR Carmine and Cream
 
+STR_NAME_LNER_Thompson_61FK		    :LNER Thompson 61 ft TK
+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_NAME_LU1938					:London Underground 1938 Stock (8-car, Deep Level)
 str_LU1938_usage				:Metro
@@ -1553,6 +1559,8 @@ str_LNERCorridorTender			: (LNER - Green Corridor Tender)
 str_LNERGreen					: (LNER - Green)
 str_LNERAppleGreen		        : (LNER - Apple Green)
 str_LNERBlack					: (LNER - Black)
+str_LNERTeak					: (GNR/LNER - Teak)
+str_LNERFauxTeak                : (LNER - "Teak")
 str_LNWR					    : (London Northwestern Railway)
 str_LNWRBlack					: (LNWR - Black)
 str_LNWRSimple				    : (London Northwestern Railway - Transitional)
@@ -1675,7 +1683,6 @@ str_SWT_refurb					: (South West Trains - Refurbished)
 str_SWT_stagecoach				: (South West Trains - Stagecoach)
 str_SWR				            : (South Western Railway)
 str_SWRPride		            : (South Western Railway - Pride)
-str_Teak						: (GNR/LNER - Teak)
 str_Tesco                       : (Tesco)
 str_TescoEyeCandy               : (Tesco - Always show container)
 str_TfL							: (TfL Rail)

diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
@@ -243,11 +243,13 @@ sort(FEAT_TRAINS, [
  item_BRTTA,
  item_BRContainer,
  item_RMTPO,
- item_LMS_StanierP3_50BG,
  item_LNERTK,
  item_LNERBCK,
  item_LNERPV,
  item_LNERBG,
+ item_LMS_StanierP3_50BG,
+ item_LNER_Thompson_61FK,
+ item_LNER_Thompson_63TK,
  item_BRMk1FO,
  item_BRMk1SO,
  item_BRMk1TSO,
@@ -287,6 +289,8 @@ sort(FEAT_TRAINS, [
  item_BRMk5a,
  item_BRMk5DVT,
  item_BRMk5Sleeper,
+ item_BR438_3,
+ item_BR438_4,
  item_EyeCandy,
  item_UtilityTrain4px,
  item_UtilityTrain8px,

diff --git a/src/trains/rollingstock/LNER_Thompson_61FK.pnml b/src/trains/rollingstock/LNER_Thompson_61FK.pnml
@@ -0,0 +1,50 @@
+spriteset(spriteset_LNER_Thompson_61FK_Purchase, "gfx/Rolling Stock/LNER/LNER_Thompson_61ft_FK.png") {
+	template_purchase(0, 0)
+}
+
+spriteset(spriteset_LNER_Thompson_61FK_Teak, "gfx/Rolling Stock/LNER/LNER_Thompson_61ft_FK.png") {
+	template_train32px(0, 13)
+}
+
+switch(FEAT_TRAINS,SELF, sw_LNER_Thompson_61FK,cargo_subtype){
+    0:	spriteset_LNER_Thompson_61FK_Teak;
+}
+
+switch(FEAT_TRAINS,SELF,sw_LNER_Thompson_61FK_cargo_subtype_text,cargo_subtype){
+    0: return string(str_LNERFauxTeak);
+       return CB_RESULT_NO_TEXT;
+}
+
+item (FEAT_TRAINS, item_LNER_Thompson_61FK, 669) {
+	property {
+		name: 							string(STR_NAME_LNER_Thompson_61FK);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1945,1,1);
+		model_life:						30;
+		cargo_allow_refit:				[PASS];
+		loading_speed:					10;
+		cost_factor:					1;
+		running_cost_factor:			1;
+		power:							0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							100 mph;
+		refit_cost:						0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		default_cargo_type:				PASS;
+		cargo_capacity:					40;
+		weight:							32 ton;
+		length:							8;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	additional_text:					return(string(str_purchase_coach,string(str_LNER_Thompson_61FK_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	cargo_subtype_text:					sw_LNER_Thompson_61FK_cargo_subtype_text;
+	default: 							sw_LNER_Thompson_61FK;
+	purchase:							spriteset_LNER_Thompson_61FK_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_capacity: return(36 * param_pax);
+		cost_factor:	return(GetAdjustedCost(25));
+	running_cost_factor: return(GetAdjustedCost(25));
+}
+}
diff --git a/src/trains/rollingstock/LNER_Thompson_63TK.pnml b/src/trains/rollingstock/LNER_Thompson_63TK.pnml
@@ -0,0 +1,50 @@
+spriteset(spriteset_LNER_Thompson_63TK_Purchase, "gfx/Rolling Stock/LNER/LNER_Thompson_63ft_TK.png") {
+	template_purchase(0, 0)
+}
+
+spriteset(spriteset_LNER_Thompson_63TK_Teak, "gfx/Rolling Stock/LNER/LNER_Thompson_63ft_TK.png") {
+	template_train32px(0, 13)
+}
+
+switch(FEAT_TRAINS,SELF, sw_LNER_Thompson_63TK,cargo_subtype){
+    0:	spriteset_LNER_Thompson_63TK_Teak;
+}
+
+switch(FEAT_TRAINS,SELF,sw_LNER_Thompson_63TK_cargo_subtype_text,cargo_subtype){
+    0: return string(str_LNERFauxTeak);
+       return CB_RESULT_NO_TEXT;
+}
+
+item (FEAT_TRAINS, item_LNER_Thompson_63TK, 670) {
+	property {
+		name: 							string(STR_NAME_LNER_Thompson_63TK);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1946,1,1);
+		model_life:						30;
+		cargo_allow_refit:				[PASS];
+		loading_speed:					10;
+		cost_factor:					1;
+		running_cost_factor:			1;
+		power:							0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							100 mph;
+		refit_cost:						0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		default_cargo_type:				PASS;
+		cargo_capacity:					40;
+		weight:							33 ton;
+		length:							8;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	additional_text:					return(string(str_purchase_coach,string(str_LNER_Thompson_63TK_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	cargo_subtype_text:					sw_LNER_Thompson_63TK_cargo_subtype_text;
+	default: 							sw_LNER_Thompson_63TK;
+	purchase:							spriteset_LNER_Thompson_63TK_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_capacity: return(42 * param_pax);
+		cost_factor:	return(GetAdjustedCost(25));
+	running_cost_factor: return(GetAdjustedCost(25));
+}
+}