Added Blackpool 1924 Standard 147 and Glasgow Wooden Tram (both WIP), updated changelog

audigex · audigex · commit 8abfaf864161 · 2024-05-30T02:55:50.000+01:00
diff --git a/docs/SpriteIDs.xlsx b/docs/SpriteIDs.xlsx
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,5 +1,8 @@
 # In progress/nightly releases, not yet on BaNaNaS (may require debug mode parameter to be enabled, graphics may not yet be coded etc)
 - Added Class 321
+- Furness Railway Railmotor?
+- Added Glasgow Wooden Tram
+- Added Blackpool 1924 Standard 147
 
 # v2.10
 - Added Class 555
diff --git a/gfx/Tram/Blackpool_Standard147.png b/gfx/Tram/Blackpool_Standard147.png
diff --git a/gfx/Tram/Glasgow_Wooden.png b/gfx/Tram/Glasgow_Wooden.png
diff --git a/lang/english.lng b/lang/english.lng
@@ -79,6 +79,8 @@ STR_DESC_EyeCandy                       :An invisible locomotive intended for us
 STR_EyeCandy_NoAttachedUnit             :Cannot start Eye Candy locomotive without an attached unit
 
 # TRAM NAMES
+STR_NAME_GlasgowWooden                :Glasgow Trams Wooden Double Decker
+STR_NAME_BlackpoolStandard147         :Blackpool Trams 1920s "Standard" Double Decker
 STR_NAME_CR4000                       :London Trams CR4000 (2-car Single Unit)
 STR_NAME_LondonVariobahn              :London Trams Variobahn (5-car Single Unit)
 STR_NAME_BirminghamUrbos              :West Midlands Metro Urbos 3 (5-car Single Unit)
diff --git a/src/templates_trams.pnml b/src/templates_trams.pnml
@@ -61,14 +61,14 @@ template template_tram20px(x,y){ // Clone to 4view when changed
 }
 template template_tram20px_tall(x,y){ // Clone to 4view when changed
     //left_x, upper_y, width, height, offset_x, offset_y
-    [ x,     y,  8, 25,  -3, -13] // n
-    [ x+9,   y, 16, 22,  -0, -11] //ne
-    [ x+26,  y, 21, 19,  -8,  -9] //e
-    [ x+48,  y, 16, 22,  -8,  -8] //se
-    [ x+65,  y,  8, 25,  -3, -13] //s
-    [ x+74,  y, 16, 22, -12,  -7] //sw
-    [ x+91,  y, 21, 19, -15,  -9] //w
-    [ x+113, y, 16, 22,  -8, -10] //nw
+    [ x,     y,  8, 25,  -3, -19] // n
+    [ x+9,   y, 16, 22,  -0, -17] //ne
+    [ x+26,  y, 21, 19,  -8, -15] //e
+    [ x+48,  y, 16, 22,  -8, -14] //se
+    [ x+65,  y,  8, 25,  -3, -19] //s
+    [ x+74,  y, 16, 22, -12, -13] //sw
+    [ x+91,  y, 21, 19, -15, -15] //w
+    [ x+113, y, 16, 22,  -8, -16] //nw
 }
 
 template template_tram24px(x,y){
diff --git a/src/trams/BlackpoolStandard147.pnml b/src/trams/BlackpoolStandard147.pnml
@@ -0,0 +1,45 @@
+switch (FEAT_ROADVEHS, SELF, switch_articulated_TRAM_BlackpoolStandard147, extra_callback_info1) {
+    return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
+}
+
+
+item (FEAT_ROADVEHS, item_TRAM_BlackpoolStandard147, 652) {
+	property {
+		misc_flags:                 	bitmask(ROADVEH_FLAG_TRAM);
+		name: 							string(STR_NAME_BlackpoolStandard147);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1924,4,1);
+		model_life:						VEHICLE_NEVER_EXPIRES;
+		retire_early:					1;
+		vehicle_life:					50;
+		reliability_decay:				7;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					29;
+		cost_factor:					20;
+		running_cost_factor:			18;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							35 mph;		
+		refit_cost:						0;		
+		power:							220 hp;
+		running_cost_base:           	RUNNING_COST_ROADVEH;		
+		default_cargo_type:				PASS;
+		cargo_capacity:					1;
+		weight:							1 ton;
+		tractive_effort_coefficient:	0.08;
+		air_drag_coefficient:			0.05;
+		length:							5;						
+		cargo_age_period:				185;
+	}
+	graphics {
+	cargo_subtype_text:					sw_TRAM_BlackpoolStandard147_cargo_subtype_text;
+	articulated_part:        			switch_articulated_TRAM_BlackpoolStandard147;
+	default: 							sw_TRAM_BlackpoolStandard147;
+	purchase:							spriteset_BlackpoolStandard147_purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_capacity: return(100 * param_pax);
+	cost_factor:	return(GetAdjustedCostTRAM(9));
+	running_cost_factor: return(GetAdjustedCostTRAM(9));
+	weight: 18;
+}
+}
diff --git a/src/trams/Glasgow_Wooden.pnml b/src/trams/Glasgow_Wooden.pnml
@@ -0,0 +1,45 @@
+switch (FEAT_ROADVEHS, SELF, switch_articulated_TRAM_GlasgowWooden, extra_callback_info1) {
+    return CB_RESULT_NO_MORE_ARTICULATED_PARTS; //stop adding vehicle parts
+}
+
+
+item (FEAT_ROADVEHS, item_TRAM_GlasgowWooden, 651) {
+	property {
+		misc_flags:                 	bitmask(ROADVEH_FLAG_TRAM);
+		name: 							string(STR_NAME_GlasgowWooden);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1899,4,1);
+		model_life:						VEHICLE_NEVER_EXPIRES;
+		retire_early:					1;
+		vehicle_life:					50;
+		reliability_decay:				7;
+		refittable_cargo_classes:		CC_PASSENGERS;
+		cargo_allow_refit:				[PASS, TOUR];
+		loading_speed:					29;
+		cost_factor:					20;
+		running_cost_factor:			18;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		speed:							25 mph;		
+		refit_cost:						0;		
+		power:							150 hp;
+		running_cost_base:           	RUNNING_COST_ROADVEH;		
+		default_cargo_type:				PASS;
+		cargo_capacity:					1;
+		weight:							1 ton;
+		tractive_effort_coefficient:	0.08;
+		air_drag_coefficient:			0.05;
+		length:							5;						
+		cargo_age_period:				185;
+	}
+	graphics {
+	cargo_subtype_text:					sw_TRAM_GlasgowWooden_cargo_subtype_text;
+	articulated_part:        			switch_articulated_TRAM_GlasgowWooden;
+	default: 							sw_TRAM_GlasgowWooden;
+	purchase:							spriteset_GlasgowWooden_purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_capacity: return(100 * param_pax);
+	cost_factor:	return(GetAdjustedCostTRAM(4));
+	running_cost_factor: return(GetAdjustedCostTRAM(4));
+	weight: 16;
+}
+}
diff --git a/src/trams/_spriteset/BlackpoolStandard147.pnml b/src/trams/_spriteset/BlackpoolStandard147.pnml
@@ -0,0 +1,20 @@
+spriteset (spriteset_BlackpoolStandard147_purchase, "gfx/Tram/Blackpool_Standard147.png") {
+	template_purchase(0,0)
+}
+
+spriteset (spriteset_BlackpoolStandard147, "gfx/Tram/Blackpool_Standard147.png") {
+	template_tram20px_tall(0, 13)
+}
+
+switch(FEAT_ROADVEHS,SELF,sw_TRAM_BlackpoolStandard147_cargo_subtype_text,cargo_subtype){
+    0:	return string(str_MetrolinkYellow);
+       return CB_RESULT_NO_TEXT;
+}
+
+switch(FEAT_ROADVEHS,SELF, sw_TRAM_BlackpoolStandard147_Metrolink, position_in_articulated_veh % 1){
+	0:spriteset_BlackpoolStandard147;	
+}
+
+switch(FEAT_ROADVEHS,SELF, sw_TRAM_BlackpoolStandard147,cargo_subtype){
+	0: sw_TRAM_BlackpoolStandard147_Metrolink;
+}
diff --git a/src/trams/_spriteset/Glasgow_Wooden.pnml b/src/trams/_spriteset/Glasgow_Wooden.pnml
@@ -0,0 +1,20 @@
+spriteset (spriteset_GlasgowWooden_purchase, "gfx/Tram/Glasgow_Wooden.png") {
+	template_purchase(0,0)
+}
+
+spriteset (spriteset_GlasgowWooden, "gfx/Tram/Glasgow_Wooden.png") {
+	template_tram20px_tall(0, 13)
+}
+
+switch(FEAT_ROADVEHS,SELF,sw_TRAM_GlasgowWooden_cargo_subtype_text,cargo_subtype){
+    0:	return string(str_MetrolinkYellow);
+       return CB_RESULT_NO_TEXT;
+}
+
+switch(FEAT_ROADVEHS,SELF, sw_TRAM_GlasgowWooden_Metrolink, position_in_articulated_veh % 1){
+	0:spriteset_GlasgowWooden;	
+}
+
+switch(FEAT_ROADVEHS,SELF, sw_TRAM_GlasgowWooden,cargo_subtype){
+	0: sw_TRAM_GlasgowWooden_Metrolink;
+}
