diff --git a/src/settings_type.h b/src/settings_type.h --- a/src/settings_type.h +++ b/src/settings_type.h @@ -81,6 +81,7 @@ struct DifficultySettings { byte vehicle_costs; ///< amount of money spent on vehicle running cost byte competitor_speed; ///< the speed at which the AI builds byte vehicle_breakdowns; ///< likelihood of vehicles breaking down + uint32 vehicle_breakdown_scaler; ///< likelihood of vehicles breaking down REDUX byte subsidy_multiplier; ///< payment multiplier for subsidized deliveries uint16 subsidy_duration; ///< duration of subsidies byte construction_cost; ///< how expensive is building @@ -138,6 +139,7 @@ struct GUISettings { bool autosave_on_network_disconnect; ///< save an autosave when you get disconnected from a network game with an error? uint8 date_format_in_default_names; ///< should the default savegame/screenshot name use long dates (31th Dec 2008), short dates (31-12-2008) or ISO dates (2008-12-31) byte max_num_autosaves; ///< controls how many autosavegames are made before the game starts to overwrite (names them 0 to max_num_autosaves - 1) + bool colour_based_on_town_rating; ///< colour code the town name based on rating? bool population_in_label; ///< show the population of a town in its label? uint8 right_mouse_btn_emulation; ///< should we emulate right mouse clicking? uint8 scrollwheel_scrolling; ///< scrolling using the scroll wheel? @@ -192,6 +194,8 @@ struct GUISettings { bool newgrf_show_old_versions; ///< whether to show old versions in the NewGRF list uint8 newgrf_default_palette; ///< default palette to use for NewGRFs without action 14 palette information + bool load_legacy_patchpack_savedata; ///< whether or not to handle legacy patchpack savedata from version 5.x + /** * Returns true when the user has sufficient privileges to edit newgrfs on a running game * @return whether the user has sufficient privileges to edit newgrfs in an existing game @@ -298,6 +302,7 @@ struct NetworkSettings { bool reload_cfg; ///< reload the config file before restarting std::string last_joined; ///< Last joined server bool no_http_content_downloads; ///< do not do content downloads over HTTP + bool save_password; ///< If password file is used UseRelayService use_relay_service; ///< Use relay service? }; @@ -354,6 +359,8 @@ struct ConstructionSettings { uint16 clear_frame_burst; ///< how many tiles may, over a short period, be cleared? uint32 tree_per_64k_frames; ///< how many trees may, over a long period, be planted per 65536 frames? uint16 tree_frame_burst; ///< how many trees may, over a short period, be planted? + + uint8 name_stations_based_on_industries; ///< ttr patchpack: name stations based on nearby industries? }; /** Settings related to the AI. */ @@ -494,12 +501,15 @@ struct VehicleSettings { byte extend_vehicle_life; ///< extend vehicle life by this many years byte road_side; ///< the side of the road vehicles drive on uint8 plane_crashes; ///< number of plane crashes, 0 = none, 1 = reduced, 2 = normal + uint8 plane_range_multiplier; ///< ttr patchpack: range multiplier + bool improved_breakdowns; ///< different types, chances and serverities of breakdowns }; /** Settings related to the economy. */ struct EconomySettings { bool inflation; ///< disable inflation bool bribe; ///< enable bribing the local authority + bool bribe_risky; ///< ttr patchpack: whether or not there is a risk of being caught while bribing EconomyType type; ///< economy type (original/smooth/frozen) bool allow_shares; ///< allow the buying/selling of shares uint8 min_years_for_shares; ///< minimum age of a company for it to trade shares @@ -522,6 +532,28 @@ struct EconomySettings { uint16 town_noise_population[3]; ///< population to base decision on noise evaluation (@see town_council_tolerance) bool allow_town_level_crossings; ///< towns are allowed to build level crossings bool infrastructure_maintenance; ///< enable monthly maintenance fee for owner infrastructure + uint16 infrastructure_base_cost_rail; ///< ttr patchpack: rail infrastructure cost base price + uint16 infrastructure_base_cost_road; ///< ttr patchpack: road infrastructure cost base price + uint16 infrastructure_base_cost_water; ///< ttr patchpack: water infrastructure cost base price + uint16 infrastructure_base_cost_air; ///< ttr patchpack: air infrastructure cost base price + uint16 infrastructure_base_cost_station; ///< ttr patchpack: station infrastructure cost base price + uint8 daylength_multiplier; ///< ttr patchpack: day length multiplier + uint8 town_growth_multiplier; ///< ttr patchpack: town growth multiplier + uint16 running_cost_multiplier_rail; ///< ttr patchpack: rail running cost multiplier + uint16 running_cost_multiplier_road; ///< ttr patchpack: road running cost multiplier + uint16 running_cost_multiplier_water; ///< ttr patchpack: water running cost multiplier + uint16 running_cost_multiplier_air; ///< ttr patchpack: air running cost multiplier + uint16 dilapidation_max_amount; ///< ttr patchpack: maximum amount of dilapidation allowed at station + uint16 dilapidation_increase; ///< ttr patchpack: amount of dilapidation to add on ratings update if station is overcrowded + uint16 dilapidation_decrease; ///< ttr patchpack: amount of dilapidation to remove on ratings update if station is not overcrowded + uint16 dilapidation_pop_rail; ///< ttr patchpack: amount of pop allowed at rail station before it is considered dilapidated + uint16 dilapidation_pop_road; ///< ttr patchpack: amount of pop allowed at road station before it is considered dilapidated + uint16 dilapidation_pop_water; ///< ttr patchpack: amount of pop allowed at water station before it is considered dilapidated + uint16 dilapidation_pop_air; ///< ttr patchpack: amount of pop allowed at air station before it is considered dilapidated + uint32 dilapidation_fine_rail; ///< ttr patchpack: monthly fine per dilapidation point at rail stations + uint32 dilapidation_fine_road; ///< ttr patchpack: monthly fine per dilapidation point at road stations + uint32 dilapidation_fine_water; ///< ttr patchpack: monthly fine per dilapidation point at water stations + uint32 dilapidation_fine_air; ///< ttr patchpack: monthly fine per dilapidation point at air stations }; struct LinkGraphSettings {