From d2fd73ad9c9c64938a579c74e467d3af9f172348 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 5 Aug 2024 16:50:55 +0100 Subject: [PATCH] Tidied up variant headers, removed unnecessary properties etc --- src/trains/variantheaders/BRMk1_Header.pnml | 32 ++--------- src/trains/variantheaders/BRMk2_Header.pnml | 59 +-------------------- src/trains/variantheaders/BRMk3_Header.pnml | 31 +---------- src/trains/variantheaders/BRMk4_Header.pnml | 40 +++----------- src/trains/variantheaders/BRMk5_Header.pnml | 33 +----------- 5 files changed, 17 insertions(+), 178 deletions(-) diff --git a/src/trains/variantheaders/BRMk1_Header.pnml b/src/trains/variantheaders/BRMk1_Header.pnml index 4861ce1e..1ab4afa4 100644 --- a/src/trains/variantheaders/BRMk1_Header.pnml +++ b/src/trains/variantheaders/BRMk1_Header.pnml @@ -1,34 +1,10 @@ item (FEAT_TRAINS, header_BRMk1, 10001) { property { name: string(STR_NAME_BRMk1_Header); - climates_available: NO_CLIMATE; - introduction_date: date(1963,4,21); - model_life: 100; - cargo_allow_refit: [PASS, TOUR]; - loading_speed: 10; - cost_factor: 49; - running_cost_factor: 17; - power: 0; + climates_available: NO_CLIMATE; sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - running_cost_base: RUNNING_COST_STEAM; - default_cargo_type: PASS; - cargo_capacity: 48; - weight: 32 ton; - length: 7; - bitmask_vehicle_info: 0; - cargo_age_period: 185; } - graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk1SO_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk1_cargo_subtype_text; - default: sw_BRMk1SO; - purchase: spriteset_BRMk1SO_Purchase; - colour_mapping: return PALETTE_CC_FIRST; - cargo_capacity: return(48 * param_pax); - cost_factor: return(GetAdjustedCost(49)); - running_cost_factor: return(GetAdjustedCost(17)); - -} + graphics { + purchase: spriteset_BRMk1SO_Purchase; + } } \ No newline at end of file diff --git a/src/trains/variantheaders/BRMk2_Header.pnml b/src/trains/variantheaders/BRMk2_Header.pnml index b62befc5..2dbec6c8 100644 --- a/src/trains/variantheaders/BRMk2_Header.pnml +++ b/src/trains/variantheaders/BRMk2_Header.pnml @@ -2,66 +2,9 @@ item (FEAT_TRAINS, header_BRMk2, 10002) { property { name: string(STR_NAME_BRMk2_Header); climates_available: NO_CLIMATE; - introduction_date: date(1964,4,21); - model_life: 100; - cargo_allow_refit: [PASS, TOUR]; - loading_speed: 10; - cost_factor: 50; - running_cost_factor: 17; - power: 0; sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - running_cost_base: RUNNING_COST_STEAM; - default_cargo_type: PASS; - cargo_capacity: 64; - weight: 32 ton; - length: 8; - bitmask_vehicle_info: 0; - cargo_age_period: 185; } graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2_Early_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2_cargo_subtype_text; - default: sw_BRMk2_Early_SO; - purchase: spriteset_BRMk2_Early_SO_Purchase; - colour_mapping: return PALETTE_CC_FIRST; - cargo_capacity: return(64 * param_pax); - cost_factor: return(GetAdjustedCost(50)); - running_cost_factor: return(GetAdjustedCost(17)); -} -} - -item (FEAT_TRAINS, item_BRMk2_Early_FO, 625) { - property { - name: string(STR_NAME_BRMk2_Early_FO); - climates_available: ALL_CLIMATES; - introduction_date: date(1964,4,21); - model_life: 100; - cargo_allow_refit: [PASS, TOUR]; - loading_speed: 10; - cost_factor: 50; - running_cost_factor: 17; - power: 0; - sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - running_cost_base: RUNNING_COST_STEAM; - default_cargo_type: PASS; - cargo_capacity: 42; - weight: 32 ton; - length: 8; - bitmask_vehicle_info: 0; - cargo_age_period: 250; + purchase: spriteset_BRMk2_Early_SO_Purchase; } - graphics { - additional_text: return(string(str_purchase_coach,string(str_BRMk2_Early_liveries))); - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - cargo_subtype_text: sw_BRMk2_cargo_subtype_text; - default: sw_BRMk2_Early_FO; - purchase: spriteset_BRMk2_Early_FO_Purchase; - colour_mapping: return PALETTE_CC_FIRST; - cargo_capacity: return(42 * param_pax); - cost_factor: return(GetAdjustedCost(50)); - running_cost_factor: return(GetAdjustedCost(17)); -} } \ No newline at end of file diff --git a/src/trains/variantheaders/BRMk3_Header.pnml b/src/trains/variantheaders/BRMk3_Header.pnml index 1fdc98e2..54f3a57e 100644 --- a/src/trains/variantheaders/BRMk3_Header.pnml +++ b/src/trains/variantheaders/BRMk3_Header.pnml @@ -2,36 +2,9 @@ item (FEAT_TRAINS, header_BRMk3, 10003) { property { name: string(STR_NAME_BRMk3_Header); climates_available: NO_CLIMATE; - refittable_cargo_classes: CC_PASSENGERS; - cargo_allow_refit: [PASS, TOUR]; - loading_speed: 14; - cost_factor: 52; - running_cost_factor: 0; sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - track_type: RAIL; - power: 0; - speed: 125 mph; - running_cost_base: RUNNING_COST_STEAM; - dual_headed: 0; - default_cargo_type: PASS; - cargo_capacity: 72; - weight: 0; - tractive_effort_coefficient: 0; - air_drag_coefficient: 0; - length: 8; - effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_NONE; - extra_weight_per_wagon: 0; - bitmask_vehicle_info: 0; - cargo_age_period: 185; } graphics { - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - default: sw_253_BRMk3TS; - colour_mapping: return PALETTE_CC_FIRST; - cargo_subtype_text: sw_BR253_cargo_subtype_text; - purchase: spriteset_BRMk3TS_purchase; - speed: 200; - cargo_capacity: return(72 * param_pax); -} + purchase: spriteset_BRMk3TS_purchase; + } } \ No newline at end of file diff --git a/src/trains/variantheaders/BRMk4_Header.pnml b/src/trains/variantheaders/BRMk4_Header.pnml index bc1e143e..c040e27d 100644 --- a/src/trains/variantheaders/BRMk4_Header.pnml +++ b/src/trains/variantheaders/BRMk4_Header.pnml @@ -1,34 +1,10 @@ item (FEAT_TRAINS, header_BRMk4, 10004) { - property { - name: string(STR_NAME_BRMk4_Header); - climates_available: NO_CLIMATE; - refittable_cargo_classes: 0; - cargo_allow_refit: [PASS]; - loading_speed: 14; - cost_factor: 0; - running_cost_factor: 0; - sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - track_type: ELRL; - power: 0; - running_cost_base: RUNNING_COST_NONE; - dual_headed: 0; - default_cargo_type: PASS; - cargo_capacity: 76; - weight: 0; - tractive_effort_coefficient: 0; - air_drag_coefficient: 0; - length: 8; - effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_NONE; - extra_weight_per_wagon: 0; - bitmask_vehicle_info: 0; - } - graphics { - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - default: sw_91_BRMk4TSO; - colour_mapping: return PALETTE_CC_FIRST; - cargo_capacity: return(76 * param_pax); - cargo_subtype_text: sw_BR91_cargo_subtype_text; - purchase: spriteset_BRMk4TS_purchase; -} + property { + name: string(STR_NAME_BRMk4_Header); + climates_available: NO_CLIMATE; + sprite_id: SPRITE_ID_NEW_TRAIN; + } + graphics { + purchase: spriteset_BRMk4TS_purchase; + } } diff --git a/src/trains/variantheaders/BRMk5_Header.pnml b/src/trains/variantheaders/BRMk5_Header.pnml index ceb627ab..e169439d 100644 --- a/src/trains/variantheaders/BRMk5_Header.pnml +++ b/src/trains/variantheaders/BRMk5_Header.pnml @@ -2,38 +2,9 @@ item (FEAT_TRAINS, header_BRMk5, 10005) { property { name: string(STR_NAME_BRMk5_Header); climates_available: NO_CLIMATE; - refittable_cargo_classes: CC_PASSENGERS; - introduction_date: date(2019, 08, 04); - model_life: VEHICLE_NEVER_EXPIRES; - cargo_allow_refit: [PASS, TOUR]; - loading_speed: 14; - cost_factor: 52; - running_cost_factor: 17; sprite_id: SPRITE_ID_NEW_TRAIN; - refit_cost: 0; - track_type: RAIL; - speed: 125 mph; - power: 0; - running_cost_base: RUNNING_COST_STEAM; - dual_headed: 0; - default_cargo_type: PASS; - cargo_capacity: 60; - weight: 40 ton; - tractive_effort_coefficient: 0; - air_drag_coefficient: 0; - length: 8; - effect_spawn_model_and_powered: EFFECT_SPAWN_MODEL_NONE; - extra_weight_per_wagon: 0; - bitmask_vehicle_info: 0; - cargo_age_period: 185; } graphics { - can_attach_wagon: CB_RESULT_ATTACH_ALLOW; - default: sw_br_68_5a_middle; - colour_mapping: return PALETTE_CC_FIRST; - purchase: spriteset_BRMk5a_purchase; - cargo_capacity: return(60 * param_pax); - cost_factor: return(GetAdjustedCost(52)); - running_cost_factor: return(GetAdjustedCost(17)); -} + purchase: spriteset_BRMk5a_purchase; + } } \ No newline at end of file