Fixed La Poste TGV cargo capacities

BRTrains · Apr 2, 2024 · c9f405c · c9f405c
1 parent c9dc219
commit c9f405c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/trains/_spriteset/EMU_Sprites/TGV.pnml b/src/trains/_spriteset/EMU_Sprites/TGV.pnml
@@ -89,13 +89,6 @@ switch(FEAT_TRAINS, SELF, switch_TGV_particles, position_in_articulated_veh % 9)
 	visual_effect_and_powered(VISUAL_EFFECT_DISABLE, 0, DISABLE_WAGON_POWER);
 }
 
-switch(FEAT_TRAINS, SELF, sw_TGV_cargo_capacity, position_in_articulated_veh) {
-	// 0 is first car, 1 is second car, 2 is third car, so on...
-	1: return(0);
-	9: return(0);
-	return(800/8);
-}
-
 // Only allow the same train type to be added to itself
 switch(FEAT_TRAINS, SELF, switch_TGV_can_attach_wagon, vehicle_type_id) {
 	item_TGV: return CB_RESULT_ATTACH_ALLOW;	

diff --git a/src/trains/emu/TGV.pnml b/src/trains/emu/TGV.pnml
@@ -9,18 +9,13 @@ item(FEAT_TRAINS, item_TGV, 589) {
 		default_cargo_type:				MAIL;
 		refittable_cargo_classes:		bitmask(CC_MAIL, CC_EXPRESS, CC_ARMOURED);
 		cargo_allow_refit:				[MAIL];
-
-		non_refittable_cargo_classes: bitmask();
 		cost_factor: 200;
 		loading_speed: 10;
-		running_cost_factor: 90;
-		cargo_allow_refit: [];
-		cargo_disallow_refit: [];		
+		running_cost_factor: 90;	
 		speed: 168 mph;
 		power: 9119 hp;
 		cargo_capacity: (800/8);
 		weight: 345 ton;
-
 		sprite_id: SPRITE_ID_NEW_TRAIN; // required
 		misc_flags: bitmask(TRAIN_FLAG_MU); // acts as multiple-unit
 		refit_cost: 0;
@@ -46,7 +41,7 @@ item(FEAT_TRAINS, item_TGV, 589) {
 		can_attach_wagon: switch_TGV_can_attach_wagon;
 		visual_effect_and_powered: switch_TGV_particles;	
 		additional_text: string(STR_DSC_TGV);		
-		cargo_capacity:	sw_TGV_cargo_capacity;
+		cargo_capacity:	800/8;
 		cost_factor:	return(GetAdjustedCost(134));
 		running_cost_factor: return(GetAdjustedCost(90));