Finished BLMS lack 5 and LMS Jubilee

BRTrains · Jul 15, 2024 · 05edd05 · 05edd05
1 parent c88b0f3
commit 05edd05
Show file tree

Hide file tree

Showing 8 changed files with 227 additions and 183 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,13 +1,13 @@
 # In progress/nightly releases, not yet on BaNaNaS (may require debug mode parameter to be enabled, graphics may not yet be coded etc)
 - Furness Railway Railmotor?
-- LMS Black 5 (gfx done need coding)
-- LMS Jubilee (gfx done need coding) 
 - LNER P2 Streamlined version (gfx done need coding)
 - GWR Dean Goods (gfx done need coding) 
 
 # v2.12
 - Added Southern Railway Z-Class
-- GER L77 (LNER N7)
+- Added GER L77 (LNER N7)
+- Added LMS Black 5
+- Added LMS Jubilee
 - Added Furness Railway Rectangular Tanker Wagon
 - Added Furness Railway 20-ton Hopper Wagon
 - Fixed some horizontal view lengths

diff --git a/lang/english.lng b/lang/english.lng
@@ -1406,6 +1406,7 @@ str_BRMaroon					: (BR Maroon)
 str_BRPrototype					: (BR Prototype)
 str_BRProvincial                : (BR Provincial)
 str_BRRefurb                    : (BR Refurbished)
+str_BRTransitionalRed           : (BR TransitionalRed)
 str_BRTest						: (BR Track Test Train)
 str_BristolElectricProto        : (Bristol Electric - Prototype)
 str_Brown                       : (Brown)
@@ -1520,6 +1521,8 @@ str_InterCityExecutive			: (InterCity Executive)
 str_InterCitySwallow			: (InterCity Swallow)
 str_Kestrel                     : (Kestrel Prototype - Yellow and Black)
 str_LaPoste					    : (La Poste)
+str_LMSBlack                    : (LMS Black)
+str_LMSRed                      : (LMS Red)
 str_LNER                        : (LNER Red/White)
 str_LNERCorridorTender			: (LNER Green Corridor Tender)
 str_LNERGreen					: (LNER Green)

diff --git a/src/sortpurchase.pnml b/src/sortpurchase.pnml
@@ -4,8 +4,11 @@ sort(FEAT_TRAINS, [
  item_FurnessK2,
  item_LNWRWebb,
  item_SRZClass,
+ item_GER_L77,
  item_GreatBear,
  item_GWRHall,
+ item_LMSBlack5,
+ item_LMSJubilee,
  item_GNRA1,
  item_LNERP2,
  item_LNERA3,

diff --git a/src/trains/_spriteset/Steam_Sprites/LMS_B5Jub_Tender.pnml b/src/trains/_spriteset/Steam_Sprites/LMS_B5Jub_Tender.pnml
@@ -0,0 +1,19 @@
+spriteset(spriteset_LMS_B5JubTender_LMSRed, "gfx/Steam/LMS_Jubilee_Black5_Tender.png") {
+	template_train16px(0, 13)
+}
+
+spriteset(spriteset_LMS_B5JubTender_LMSBlack, "gfx/Steam/LMS_Jubilee_Black5_Tender.png") {
+	template_train16px(0, 47)
+}
+
+spriteset(spriteset_LMS_B5JubTender_BRBlackLion, "gfx/Steam/LMS_Jubilee_Black5_Tender.png") {
+	template_train16px(0, 71)
+}
+
+spriteset(spriteset_LMS_B5JubTender_BRBlackText, "gfx/Steam/LMS_Jubilee_Black5_Tender.png") {
+	template_train16px(0, 96)
+}
+
+spriteset(spriteset_LMS_B5JubTender_BRRedText, "gfx/Steam/LMS_Jubilee_Black5_Tender.png") {
+	template_train16px(0, 121)
+}
diff --git a/src/trains/_spriteset/Steam_Sprites/LMS_Black5.pnml b/src/trains/_spriteset/Steam_Sprites/LMS_Black5.pnml
@@ -0,0 +1,44 @@
+spriteset(spriteset_LMSBlack5_Purchase, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_purchase_anim(0, 15)
+}
+
+spriteset(spriteset_LMSBlack5_LMSBlack, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_train24px(0, 29)
+}
+
+spriteset(spriteset_LMSBlack5_LMSBlackNamed, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_train24px(0, 86)
+}
+
+switch(FEAT_TRAINS,SELF, sw_LMSBlack5Loco,cargo_subtype){
+    spriteset_LMSBlack5_LMSBlack;	
+}
+
+switch(FEAT_TRAINS,SELF, sw_LMSBlack5Tender,cargo_subtype){
+    0:	spriteset_LMS_B5JubTender_LMSBlack;
+	1: 	spriteset_LMS_B5JubTender_BRBlackLion;
+	2:	spriteset_LMS_B5JubTender_BRBlackText;
+}
+
+
+switch(FEAT_TRAINS, SELF, sw_LMSBlack5, position_in_articulated_veh){
+	0: sw_LMSBlack5Loco;
+	1: sw_LMSBlack5Tender;
+}
+
+switch(FEAT_TRAINS, SELF, switch_LMSBlack5_length, position_in_articulated_veh) {	
+	0: return 5;
+	1: return 4;
+}
+
+switch (FEAT_TRAINS, SELF, switch_articulated_LMSBlack5, extra_callback_info1) {
+	1: return item_LMSBlack5;
+    return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
+}
+
+switch(FEAT_TRAINS,SELF,sw_LMSBlack5_cargo_subtype_text,cargo_subtype){
+	0: return string(str_LMSBlack);	
+	1: return string(str_BRLion);
+	2: return string(str_BRBlack);
+       return CB_RESULT_NO_TEXT;
+}
diff --git a/src/trains/_spriteset/Steam_Sprites/LMS_Jubilee.pnml b/src/trains/_spriteset/Steam_Sprites/LMS_Jubilee.pnml
@@ -0,0 +1,55 @@
+spriteset(spriteset_LMSJubilee_Purchase, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_purchase_anim(0, 0)
+}
+
+spriteset(spriteset_LMSJubilee_LMSBlack, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_train24px(0, 29)
+}
+spriteset(spriteset_LMSJubilee_LMSBlackNamed, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_train24px(0, 86)
+}
+
+spriteset(spriteset_LMSJubilee_LMSRed, "gfx/Steam/LMS_Jubilee_Black5.png") {
+	template_train24px(0, 60)
+}
+
+
+switch(FEAT_TRAINS,SELF, sw_LMSJubileeLoco,cargo_subtype){
+    0:	spriteset_LMSJubilee_LMSRed;
+	1:	spriteset_LMSJubilee_LMSBlack;
+	2:	spriteset_LMSJubilee_LMSRed;
+	3: 	spriteset_LMSJubilee_LMSBlack;
+	4:	spriteset_LMSJubilee_LMSBlack;
+}
+
+switch(FEAT_TRAINS,SELF, sw_LMSJubileeTender,cargo_subtype){
+    0:	spriteset_LMS_B5JubTender_LMSRed;
+	1:	spriteset_LMS_B5JubTender_LMSBlack;
+	2:	spriteset_LMS_B5JubTender_BRRedText;
+	3: 	spriteset_LMS_B5JubTender_BRBlackLion;
+	4:	spriteset_LMS_B5JubTender_BRBlackText;
+}
+
+switch(FEAT_TRAINS, SELF, sw_LMSJubilee, position_in_articulated_veh){
+	0: sw_LMSJubileeLoco;
+	1: sw_LMSJubileeTender;
+}
+
+switch(FEAT_TRAINS, SELF, switch_LMSJubilee_length, position_in_articulated_veh) {	
+	0: return 5;
+	1: return 4;
+}
+
+switch (FEAT_TRAINS, SELF, switch_articulated_LMSJubilee, extra_callback_info1) {
+	1: return item_LMSJubilee;
+    return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
+}
+
+switch(FEAT_TRAINS,SELF,sw_LMSJubilee_cargo_subtype_text,cargo_subtype){
+    0: return string(str_LMSRed);
+	1: return string(str_LMSBlack);
+	2: return string(str_BRTransitionalRed);
+	3: return string(str_BRLion);
+	4: return string(str_BRBlack);
+       return CB_RESULT_NO_TEXT;
+}
diff --git a/src/trains/steam/LMSBlack5.pnml b/src/trains/steam/LMSBlack5.pnml
@@ -1,91 +1,51 @@
 
-// spriteset(spriteset_LMSBlack5_Purchase, "gfx/Steam/LMSJubilee.png") {
-// 	template_purchase_anim(0, 0)
-// }
-
-// spriteset(spriteset_LMSBlack5_FurnessRed, "gfx/Steam/LMSJubilee.png") {
-// 	template_train20px(0, 13)
-// }
-
-// spriteset(spriteset_LMSBlack5T_FurnessRed, "gfx/Steam/LMSJubilee.png") {
-// 	template_train12px(0, 33)
-// }
-
-// switch(FEAT_TRAINS,SELF, sw_LMSBlack5Loco,cargo_subtype){
-//     0:	spriteset_LMSBlack5_FurnessRed;
-// }
-
-// switch(FEAT_TRAINS,SELF, sw_LMSBlack5Tender,cargo_subtype){
-//     0:	spriteset_LMSBlack5T_FurnessRed;
-// }
-
-// switch(FEAT_TRAINS, SELF, sw_LMSBlack5, position_in_articulated_veh){
-// 	0: sw_LMSBlack5Loco;
-// 	1: sw_LMSBlack5Tender;
-// }
-
-// switch(FEAT_TRAINS, SELF, switch_LMSBlack5_length, position_in_articulated_veh) {	
-// 	0: return 5;
-// 	1: return 3;
-// }
-
-// switch (FEAT_TRAINS, SELF, switch_articulated_LMSBlack5, extra_callback_info1) {
-// 	1: return item_LMSBlack5;
-//     return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
-// }
-
-// switch(FEAT_TRAINS,SELF,sw_LMSBlack5_cargo_subtype_text,cargo_subtype){
-//     0: return string(str_FurnessRed);
-//        return CB_RESULT_NO_TEXT;
-// }
-
-// item (FEAT_TRAINS, item_LMSBlack5, 590) {
-// 	property {
-// 		name: 							string(STR_NAME_LMSBlack5);
-// 		climates_available: 			ALL_CLIMATES;
-// 		introduction_date:				date(1934,2,1);
-// 		model_life:						40;
-// 		retire_early:					1;
-// 		vehicle_life:					40;
-// 		reliability_decay:				7;
-// 		refittable_cargo_classes:		0;
-// 		cargo_allow_refit:				[GOOD, FOOD];
-// 		loading_speed:					3;
-// 		cost_factor:					18;
-// 		running_cost_factor:			21;
-// 		sprite_id:						SPRITE_ID_NEW_TRAIN;
-// 		speed:							85 mph;
-// 		misc_flags:						TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
-// 		refit_cost:						0;
-// 		track_type:						RAIL;
-// 		ai_special_flag:				AI_FLAG_CARGO;
-// 		power:							1500 hp;
-// 		running_cost_base:				RUNNING_COST_STEAM;
-// 		dual_headed:					0;
-// 		default_cargo_type:				GOOD;
-// 		cargo_capacity:					1;
-// 		weight:							130 ton;
-// 		engine_class:					ENGINE_CLASS_STEAM;
-// 		tractive_effort_coefficient:	0.28; // RL 0.14, 24.4k lbf
-// 		air_drag_coefficient:			0.1;
-// 		length:							5;
-// 		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_STEAM;
-// 		extra_weight_per_wagon:			0;
-// 		bitmask_vehicle_info:			0;
-// 	}
-// 	graphics {
-// 	length: switch_LMSBlack5_length;	
-// 	additional_text:					return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_route_9),string(str_LMSBlack5_usage),string(str_LMSBlack5_eos),string(str_LMSBlack5_liveries)));
-// 	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
-// 	cargo_capacity:						return 0;
-// 	cargo_subtype_text:					sw_LMSBlack5_cargo_subtype_text;
-// 	articulated_part:        			switch_articulated_LMSBlack5;
-// 	default: 							sw_LMSBlack5;
-// 	purchase:							spriteset_LMSBlack5_Purchase;
-// 	colour_mapping: 					return PALETTE_CC_FIRST;
-// 	create_effect:						steam_create_visual_effect;
-// 	sound_effect:						sw_steam_sound;
-// 	cost_factor:	return(GetAdjustedCost(10));
-// 	running_cost_factor: return(GetAdjustedCost(10));
-// }
-// }
+item (FEAT_TRAINS, item_LMSBlack5, 659) {
+	property {
+		name: 							string(STR_NAME_LMSBlack5);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1934,2,1);
+		model_life:						40;
+		retire_early:					1;
+		vehicle_life:					40;
+		reliability_decay:				7;
+		refittable_cargo_classes:		0;
+		cargo_allow_refit:				[GOOD, FOOD];
+		loading_speed:					3;
+		cost_factor:					18;
+		running_cost_factor:			21;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							85 mph;
+		misc_flags:						TRAIN_FLAG_NO_BREAKDOWN_SMOKE;
+		refit_cost:						0;
+		track_type:						RAIL;
+		ai_special_flag:				AI_FLAG_CARGO;
+		power:							1500 hp;
+		running_cost_base:				RUNNING_COST_STEAM;
+		dual_headed:					0;
+		default_cargo_type:				GOOD;
+		cargo_capacity:					1;
+		weight:							130 ton;
+		engine_class:					ENGINE_CLASS_STEAM;
+		tractive_effort_coefficient:	0.28; // RL 0.14, 24.4k lbf
+		air_drag_coefficient:			0.1;
+		length:							5;
+		effect_spawn_model_and_powered:	EFFECT_SPAWN_MODEL_STEAM;
+		extra_weight_per_wagon:			0;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	length: switch_LMSBlack5_length;	
+	additional_text:					return(string(str_purchase_loco_with_liveries,string(str_purchase_type_steam),string(str_route_9),string(str_LMSBlack5_usage),string(str_LMSBlack5_eos),string(str_LMSBlack5_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	cargo_capacity:						return 0;
+	cargo_subtype_text:					sw_LMSBlack5_cargo_subtype_text;
+	articulated_part:        			switch_articulated_LMSBlack5;
+	default: 							sw_LMSBlack5;
+	purchase:							spriteset_LMSBlack5_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	create_effect:						steam_create_visual_effect;
+	sound_effect:						sw_steam_sound;
+	cost_factor:	return(GetAdjustedCost(10));
+	running_cost_factor: return(GetAdjustedCost(10));
+}
+}