Added BR VGA and VKA covered vans

docs/changelog.txt

@@ -6,7 +6,7 @@
 - Conflat B (needs coding)
 - Class 59 (code liveries and add to lang file)
 - LNER Gresley BCK
-- BR VGA and VKA vans
+- Coronation Coaches
 - More LNER Black 5 and Jubilee liveries
 - GWR Great Bear and Hall class rework
 
@@ -19,6 +19,7 @@
 - Added Class 93
 - Added Class 99
 - Added LNER Gresley 61 Ft 6 teak coach
+- Added BR VGA and VKA vans
 - Adjusted EyeCandy engine to hopefully discourage AI use
 - Reworked Southern Region CC Class (OG BR Class 70)
 - Added a pile of liveries for Class 66

lang/english.lng

@@ -21,6 +21,7 @@ STR_CONCAT_4s	: {STRING} {STRING} {STRING} {STRING}
 STR_CONCAT_5s	: {STRING} {STRING} {STRING} {STRING} {STRING}
 
 STR_LIVERY          : ({STRING} - {STRING})
+STR_LIVERY_EXTENDED : ({STRING} - {STRING} - {STRING})
 STR_LIVERY_SPECIAL  : ({STRING} - {STRING} - {SILVER}{STRING})
 
 # Company name, whyte notation, nickname
@@ -84,10 +85,13 @@ str_col_Maroon                :Maroon
 str_col_BloodCustard          :Blood and Custard
 str_col_Teak                  :Teak
 str_col_Orange                :Orange
+str_col_Grey                  :Grey
 
 str_var_Named                 :Named
 str_var_Olympics              :Olympics
 str_var_Unnamed               :Unnamed
+str_var_Speedlink             :Speedlink
+str_var_Exhibition            :Exhibition
 
 # Variant group headers
 STR_LU_Subsurface_Header        :London Underground sub-surface units
@@ -114,6 +118,7 @@ STR_Departmental_Header         :National Rail Maintenance Vehicles
 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
+STR_CoveredVan_Header           :British Rail VGA/VKA Covered Vans
 
 # Parameters 
 STR_PARAM_MAX_SPEED             :Max Speed
@@ -337,7 +342,6 @@ str_purchase_loco				:{BLACK}Type: {STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLAC
 str_purchase_steam_liveries		:{BLACK}Type: {STRING}{}{BLACK}Usage: {GOLD}{STRING}{}{BLACK}Withdrawal: {GOLD}{STRING}{}{BLACK}Liveries: {GOLD}{STRING}{BLACK}
 str_purchase_coach				:{BLACK}Liveries: {GOLD}{STRING}{BLACK}
 
-
 str_purchase_type_diesel		:{RED}Diesel locomotive
 str_purchase_type_steam			:{GREEN}Steam Locomotive
 str_purchase_type_bimode        :{PURPLE}Bi-Mode Locomotive
@@ -1252,7 +1256,7 @@ str_BR800_eos					:---
 str_BR800_liveries				:Hitachi, GWR
 
 STR_NAME_FurnessGoodsVan		:Furness Railway Goods Van
-str_FurnessGoodsVan_usage		:Misc Cargo
+str_FurnessGoodsVan_usage		:Goods, Misc. Cargo
 str_FurnessGoodsVan_eos			:---
 str_FurnessGoodsVan_liveries	:Grey, Brown
 
@@ -1281,6 +1285,14 @@ str_BRTTA_usage					:Liquid Cargo
 str_BRTTA_eos					:---
 str_BRTTA_liveries				:Mobil, Esso, BP (x3), SUKO, Gulf, Shell (x2), Murco, Total, VTG
 
+STR_NAME_BRVGA					:BR VGA Wagon
+str_BRVGA_usage					:Goods, Misc. Cargo
+str_BRVGA_liveries				:BR Grey, BR Grey (Speedlink), BR Grey (Exhibition)
+
+STR_NAME_BRVKA					:BR VKA Wagon
+str_BRVKA_usage					:Goods, Misc. Cargo
+str_BRVKA_liveries				:BR Grey, BR Grey (Speedlink), BR Grey (Exhibition)
+
 STR_NAME_BRContainer			:BR Container Flatbed Wagon
 str_BRContainer_usage			:Misc. Cargo
 str_BRContainer_eos				:---

src/sortpurchase.pnml

@@ -274,6 +274,9 @@ header_LU_Deeplevel,
  item_RS_SWB_Hopper,
  item_BRHHA,
  item_BRTTA,
+header_CoveredVan,
+    item_BRVGA,
+    item_BRVGA,
  item_BRContainer,
  item_RMTPO,
 item_LNERTK,

src/trains/freight_wagons/BR/BR_VGA.pnml

@@ -0,0 +1,63 @@
+spriteset(spriteset_BRVGA_Purchase, "gfx/Freight/BR_VGA_VKA_vans.png") {
+	template_purchase(0, 0)
+}
+
+spriteset(spriteset_BRVGA_Grey, "gfx/Freight/BR_VGA_VKA_vans.png") {
+	template_train20px(0, 13)
+}
+
+spriteset(spriteset_BRVGA_Grey_Speedlink, "gfx/Freight/BR_VGA_VKA_vans.png") {
+	template_train20px(0, 39)
+}
+
+spriteset(spriteset_BRVGA_Grey_Exhibition, "gfx/Freight/BR_VGA_VKA_vans.png") {
+	template_train20px(0, 65)
+}
+
+// Called first
+// Skips the "loading stage" switch above if using an eyecandy livery
+switch(FEAT_TRAINS, SELF, sw_BRVGA, cargo_subtype){	
+	0: spriteset_BRVGA_Grey;
+	1: spriteset_BRVGA_Grey_Speedlink;
+	2: spriteset_BRVGA_Grey_Exhibition;
+}
+
+switch(FEAT_TRAINS,SELF,sw_BRVGA_cargo_subtype_text,cargo_subtype){    
+	0:	return string(STR_LIVERY, string(str_abbr_BR), string(str_col_Grey));
+	1:	return string(STR_LIVERY_EXTENDED, string(str_abbr_BR), string(str_col_Grey), string(str_var_Speedlink));
+	2:	return string(STR_LIVERY_EXTENDED, string(str_abbr_BR), string(str_col_Grey), string(str_var_Exhibition));
+}
+
+item (FEAT_TRAINS, item_BRVGA, 700) {
+	property {
+		variant_group:					header_CoveredVan;
+		name: 							string(STR_NAME_BRVGA);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1981,1,1);
+		model_life:						VEHICLE_NEVER_EXPIRES;
+		refittable_cargo_classes:		bitmask(CC_PIECE_GOODS, CC_EXPRESS, CC_HAZARDOUS, CC_REFRIGERATED, CC_NON_POURABLE, CC_NEO_BULK, CC_OVERSIZED, CC_ARMOURED);		
+		default_cargo_type:				GOOD;
+		loading_speed:					25;
+		cost_factor:					1;
+		running_cost_factor:			1;
+		power:							0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		cargo_capacity:					28;
+		weight:							20 ton;		
+		air_drag_coefficient:			0.07;
+		length:							5;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	additional_text:					return(string(str_purchase_coach,string(str_BRVGA_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	default: 							sw_BRVGA;
+	purchase:							spriteset_BRVGA_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BRVGA_cargo_subtype_text;
+	cost_factor:	return(GetAdjustedCost(29));
+	running_cost_factor: return(GetAdjustedCost(17));
+}
+}

src/trains/freight_wagons/BR/BR_VKA.pnml

@@ -0,0 +1,35 @@
+// Sprites are shared with VGA
+
+item (FEAT_TRAINS, item_BRVKA, 701) {
+	property {
+		variant_group:					header_CoveredVan;
+		name: 							string(STR_NAME_BRVKA);
+		climates_available: 			ALL_CLIMATES;
+		introduction_date:				date(1983,1,1);
+		model_life:						VEHICLE_NEVER_EXPIRES;
+		refittable_cargo_classes:		bitmask(CC_PIECE_GOODS, CC_EXPRESS, CC_HAZARDOUS, CC_REFRIGERATED, CC_NON_POURABLE, CC_NEO_BULK, CC_OVERSIZED, CC_ARMOURED);		
+		default_cargo_type:				GOOD;
+		loading_speed:					25;
+		cost_factor:					1;
+		running_cost_factor:			1;
+		power:							0;
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		refit_cost:						0;
+		running_cost_base:				RUNNING_COST_STEAM;
+		cargo_capacity:					35; // Uprated acles vs VGA
+		weight:							20 ton;		
+		air_drag_coefficient:			0.07;
+		length:							5;
+		bitmask_vehicle_info:			0;
+	}
+	graphics {
+	additional_text:					return(string(str_purchase_coach,string(str_BRVKA_liveries)));
+	can_attach_wagon:					CB_RESULT_ATTACH_ALLOW;
+	default: 							sw_BRVGA;
+	purchase:							spriteset_BRVGA_Purchase;
+	colour_mapping: 					return PALETTE_CC_FIRST;
+	cargo_subtype_text:					sw_BRVGA_cargo_subtype_text;
+	cost_factor:	return(GetAdjustedCost(32));
+	running_cost_factor: return(GetAdjustedCost(21));
+}
+}

src/trains/variantheaders/CoveredVan_Header.pnml

@@ -0,0 +1,11 @@
+item (FEAT_TRAINS, header_CoveredVan, 10030) {
+	property {
+		name: 							string(STR_CoveredVan_Header);
+		climates_available: 			NO_CLIMATE;					
+		sprite_id:						SPRITE_ID_NEW_TRAIN;
+		power:							0;
+	}
+	graphics {
+		purchase: spriteset_BRVGA_Purchase;
+	}
+}