From 7a1a36344ae2b6c113dedfa3eb1ed594f25652dd Mon Sep 17 00:00:00 2001 From: AviationGamerX <76180779+AviationGamerX@users.noreply.github.com> Date: Thu, 3 Oct 2024 00:15:06 +0300 Subject: [PATCH] FInalized everything, made the setting values accept only in 100% intervals. And changed English texts to fit the new changes. --- src/company_base.h | 2 +- src/lang/english.txt | 2 +- src/lang/english_US.txt | 6 +++--- src/table/settings/difficulty_settings.ini | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/company_base.h b/src/company_base.h index e43d3ec209..461a88a340 100644 --- a/src/company_base.h +++ b/src/company_base.h @@ -195,7 +195,7 @@ struct Company : CompanyProperties, CompanyPool::PoolItem<&_company_pool> { */ inline uint32_t GetMaxLoanFromPercentage() { - return ((_settings_game.difficulty.max_loan_percentage / 100) * 300000) * GetCurrency().rate; + return ((_settings_game.difficulty.max_loan_percentage / 100) * (300000 * GetCurrency().rate)); } diff --git a/src/lang/english.txt b/src/lang/english.txt index a420327c6e..a1c876908e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1274,7 +1274,7 @@ STR_CONFIG_SETTING_INFINITE_MONEY :Infinite money: STR_CONFIG_SETTING_INFINITE_MONEY_HELPTEXT :Allow unlimited spending and disable bankruptcy of companies STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Maximum initial loan percentage: {STRING2} -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Maximum percentage a company can loan. If set to "No loan", no money will be available unless provided by a Game Script or the "Infinite money" setting +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Sets the maximum loan a company can loan. Default maximum loan is at 100%. If set to "No loan", no money will be available unless provided by a Game Script or the "Infinite money" setting STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{NUM}% ###setting-zero-is-special STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 80c0f8396e..97382c3ff9 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1273,9 +1273,9 @@ STR_CONFIG_SETTING_SECONDS_VALUE :{COMMA}{NBSP}se STR_CONFIG_SETTING_INFINITE_MONEY :Infinite money: {STRING} STR_CONFIG_SETTING_INFINITE_MONEY_HELPTEXT :Allow unlimited spending and disable bankruptcy of companies -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Maximum initial loan: {STRING} -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Maximum amount a company can loan (without taking inflation into account). If set to "No loan", no money will be available unless provided by a Game Script or the "Infinite money" setting -STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{CURRENCY_LONG} +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN :Maximum initial loan percentage: {STRING} +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT :Sets the maximum loan a company can loan. Default maximum loan is at 100%. If set to "No loan", no money will be available unless provided by a Game Script or the "Infinite money" setting +STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{NUM}% ###setting-zero-is-special STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan diff --git a/src/table/settings/difficulty_settings.ini b/src/table/settings/difficulty_settings.ini index 5e552d81ff..0619214ce2 100644 --- a/src/table/settings/difficulty_settings.ini +++ b/src/table/settings/difficulty_settings.ini @@ -113,7 +113,7 @@ flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_0_IS_SPECIAL def = 100 min = 100 max = 6000000 -pre_cb = [](auto &new_value) { new_value = (new_value + 10 / 2) / 10 * 10; return true; } +pre_cb = [](auto &new_value) { new_value = (new_value + 100 / 2) / 100 * 100; return true; } interval = 100 str = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN strhelp = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT