mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

FInalized everything, made the setting values accept only in 100% intervals. And changed English texts to fit the new changes.

pull/12974/head
AviationGamerX 2024-10-03 00:15:06 +03:00
parent 42301884ce
commit 7a1a36344a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/company_base.h
View File

@ -195,7 +195,7 @@ struct Company : CompanyProperties, CompanyPool::PoolItem<&_company_pool> {
*/ */
inline uint32_t GetMaxLoanFromPercentage() 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));
} }

2
src/lang/english.txt
View File

@ -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_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 :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}% STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{NUM}%
###setting-zero-is-special ###setting-zero-is-special
STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan

6
src/lang/english_US.txt
View File

@ -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 :Infinite money: {STRING}
STR_CONFIG_SETTING_INFINITE_MONEY_HELPTEXT :Allow unlimited spending and disable bankruptcy of companies 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 :Maximum initial loan percentage: {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_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 :{CURRENCY_LONG} STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_VALUE :{NUM}%
###setting-zero-is-special ###setting-zero-is-special
STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_DISABLED :No loan

2
src/table/settings/difficulty_settings.ini
View File

@ -113,7 +113,7 @@ flags = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_0_IS_SPECIAL
def = 100 def = 100
min = 100 min = 100
max = 6000000 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 interval = 100
str = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN str = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN
strhelp = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT strhelp = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT