diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp index ccf0b6b5ea..a2f8f34646 100644 --- a/src/game/game_gui.cpp +++ b/src/game/game_gui.cpp @@ -206,14 +206,14 @@ struct GSConfigWindow : public Window { TextColour colour; uint idx = 0; if (config_item.description.empty()) { - if (Game::GetInstance() == nullptr && config_item.random_deviation != 0 && !GetGameSettings().script.script_disable_param_randomisation) { + if (Game::GetInstance() == nullptr && config_item.random_deviation != 0) { str = STR_AI_SETTINGS_JUST_DEVIATION; } else { str = STR_JUST_STRING1; } colour = TC_ORANGE; } else { - if (Game::GetInstance() == nullptr && config_item.random_deviation != 0 && !GetGameSettings().script.script_disable_param_randomisation) { + if (Game::GetInstance() == nullptr && config_item.random_deviation != 0) { str = STR_AI_SETTINGS_SETTING_DEVIATION; } else { str = STR_AI_SETTINGS_SETTING; @@ -232,7 +232,7 @@ struct GSConfigWindow : public Window { DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value); } - if (Game::GetInstance() != nullptr || config_item.random_deviation == 0 || GetGameSettings().script.script_disable_param_randomisation) { + if (Game::GetInstance() != nullptr || config_item.random_deviation == 0) { auto config_iterator = config_item.labels.find(current_value); if (config_iterator != config_item.labels.end()) { SetDParam(idx++, STR_JUST_RAW_STRING); diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 868cc3a9af..380f6aabb5 100644 --- a/src/lang/extra/english.txt +++ b/src/lang/extra/english.txt @@ -2298,9 +2298,6 @@ STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT :Display if a to STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS :Path signals only -STR_CONFIG_SETTING_SCRIPT_DISABLE_PARAM_RANDOM :Disable script parameter randomisation: {STRING2} -STR_CONFIG_SETTING_SCRIPT_DISABLE_PARAM_RANDOM_HELPTEXT :Disable the randomisation of AI/GS script parameters. - STR_CONFIG_SETTING_RESTRICT_PATCH :Non-standard settings which are not in vanilla OpenTTD ###length 4 diff --git a/src/script/script_config.cpp b/src/script/script_config.cpp index d3038d5592..22d66c8d46 100644 --- a/src/script/script_config.cpp +++ b/src/script/script_config.cpp @@ -126,7 +126,6 @@ void ScriptConfig::ResetEditableSettings(bool yet_to_start) void ScriptConfig::AddRandomDeviation(CompanyID owner) { - if (GetGameSettings().script.script_disable_param_randomisation) return; for (const auto &item : *this->GetConfigList()) { if (item.random_deviation != 0) { this->SetSetting(item.name, ScriptObject::GetRandomizer(owner).Next(item.random_deviation * 2 + 1) - item.random_deviation + this->GetSetting(item.name)); diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp index 1bb84b5c57..13ba19a4a6 100644 --- a/src/script/script_gui.cpp +++ b/src/script/script_gui.cpp @@ -393,14 +393,14 @@ struct ScriptSettingsWindow : public Window { TextColour colour; uint idx = 0; if (config_item.description.empty()) { - if (this->slot != OWNER_DEITY && !Company::IsValidID(this->slot) && config_item.random_deviation != 0 && !GetGameSettings().script.script_disable_param_randomisation) { + if (this->slot != OWNER_DEITY && !Company::IsValidID(this->slot) && config_item.random_deviation != 0) { str = STR_AI_SETTINGS_JUST_DEVIATION; } else { str = STR_JUST_STRING1; } colour = TC_ORANGE; } else { - if (this->slot != OWNER_DEITY && !Company::IsValidID(this->slot) && config_item.random_deviation != 0 && !GetGameSettings().script.script_disable_param_randomisation) { + if (this->slot != OWNER_DEITY && !Company::IsValidID(this->slot) && config_item.random_deviation != 0) { str = STR_AI_SETTINGS_SETTING_DEVIATION; } else { str = STR_AI_SETTINGS_SETTING; @@ -419,7 +419,7 @@ struct ScriptSettingsWindow : public Window { DrawArrowButtons(br.left, y + button_y_offset, COLOUR_YELLOW, (this->clicked_button == i) ? 1 + (this->clicked_increase != rtl) : 0, editable && current_value > config_item.min_value, editable && current_value < config_item.max_value); } - if (this->slot == OWNER_DEITY || Company::IsValidID(this->slot) || config_item.random_deviation == 0 || GetGameSettings().script.script_disable_param_randomisation) { + if (this->slot == OWNER_DEITY || Company::IsValidID(this->slot) || config_item.random_deviation == 0) { auto config_iterator = config_item.labels.find(current_value); if (config_iterator != config_item.labels.end()) { SetDParam(idx++, STR_JUST_RAW_STRING); diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 1de70e6006..4bc3c3914a 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -2701,7 +2701,6 @@ static SettingsContainer &GetSettingsTree() { npc->Add(new SettingEntry("script.script_max_opcode_till_suspend")); npc->Add(new SettingEntry("script.script_max_memory_megabytes")); - npc->Add(new SettingEntry("script.script_disable_param_randomisation")); npc->Add(new SettingEntry("difficulty.competitor_speed")); npc->Add(new SettingEntry("ai.ai_in_multiplayer")); npc->Add(new SettingEntry("ai.ai_disable_veh_train")); diff --git a/src/settings_type.h b/src/settings_type.h index 712578966f..f0d971cde9 100644 --- a/src/settings_type.h +++ b/src/settings_type.h @@ -568,7 +568,6 @@ struct AISettings { struct ScriptSettings { uint32_t script_max_opcode_till_suspend; ///< max opcode calls till scripts will suspend uint32_t script_max_memory_megabytes; ///< limit on memory a single script instance may have allocated - bool script_disable_param_randomisation; ///< disable script parameter randomisation }; /** Settings related to the new pathfinder. */ diff --git a/src/table/settings/script_settings.ini b/src/table/settings/script_settings.ini index 8f9904f9c7..c59c77e8e2 100644 --- a/src/table/settings/script_settings.ini +++ b/src/table/settings/script_settings.ini @@ -76,15 +76,6 @@ pre_cb = CheckScriptMaxMemoryChange post_cb = ScriptMaxMemoryChange cat = SC_EXPERT -[SDT_BOOL] -var = script.script_disable_param_randomisation -flags = SF_PATCH -def = false -str = STR_CONFIG_SETTING_SCRIPT_DISABLE_PARAM_RANDOM -strhelp = STR_CONFIG_SETTING_SCRIPT_DISABLE_PARAM_RANDOM_HELPTEXT -post_cb = [](auto) { InvalidateWindowClassesData(WC_SCRIPT_SETTINGS); InvalidateWindowClassesData(WC_GAME_OPTIONS); } -cat = SC_ADVANCED - [SDT_BOOL] var = ai.ai_in_multiplayer def = true