(svn r24792) -Add: Readd difficulty settings to advanced settings unless they are already present in other settings windows.

1 files changed, 36 insertions, 25 deletions

diff --git a/src/table/settings.ini b/src/table/settings.ini
index 243d59db7..95c33e95d 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -146,6 +146,9 @@ def      = 300000
 min      = 100000
 max      = 500000
 interval = 50000
+str      = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN
+strhelp  = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN_HELPTEXT
+strval   = STR_JUST_CURRENCY_LONG
 cat      = SC_BASIC
 
 [SDT_VAR]
@@ -158,18 +161,22 @@ def      = 2
 min      = 2
 max      = 4
 interval = 1
-cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_INTEREST_RATE
+strhelp  = STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT
+strval   = STR_CONFIG_SETTING_PERCENTAGE
 
 [SDT_VAR]
 base     = GameSettings
 var      = difficulty.vehicle_costs
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
 interval = 1
+str      = STR_CONFIG_SETTING_RUNNING_COSTS
+strhelp  = STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT
 strval   = STR_SEA_LEVEL_LOW
 cat      = SC_BASIC
 
@@ -178,10 +185,13 @@ base     = GameSettings
 var      = difficulty.competitor_speed
 type     = SLE_UINT8
 from     = 97
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 4
 interval = 1
+str      = STR_CONFIG_SETTING_CONSTRUCTION_SPEED
+strhelp  = STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT
 strval   = STR_AI_SPEED_VERY_SLOW
 cat      = SC_BASIC
 
@@ -195,10 +205,13 @@ base     = GameSettings
 var      = difficulty.vehicle_breakdowns
 type     = SLE_UINT8
 from     = 97
+guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
 max      = 2
 interval = 1
+str      = STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS
+strhelp  = STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT
 strval   = STR_DISASTER_NONE
 cat      = SC_BASIC
 
@@ -207,10 +220,13 @@ base     = GameSettings
 var      = difficulty.subsidy_multiplier
 type     = SLE_UINT8
 from     = 97
+guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
 max      = 3
 interval = 1
+str      = STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER
+strhelp  = STR_CONFIG_SETTING_SUBSIDY_MULTIPLIER_HELPTEXT
 strval   = STR_SUBSIDY_X1_5
 
 [SDT_VAR]
@@ -218,11 +234,13 @@ base     = GameSettings
 var      = difficulty.construction_cost
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
 interval = 1
+str      = STR_CONFIG_SETTING_CONSTRUCTION_COSTS
+strhelp  = STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT
 strval   = STR_SEA_LEVEL_LOW
 cat      = SC_BASIC
 
@@ -252,39 +270,29 @@ interval = 1
 strval   = STR_SEA_LEVEL_VERY_LOW
 cat      = SC_BASIC
 
-[SDT_VAR]
+[SDT_BOOL]
 base     = GameSettings
 var      = difficulty.economy
-type     = SLE_UINT8
 from     = 97
-def      = 0
-min      = 0
-max      = 1
-interval = 1
-strval   = STR_ECONOMY_STEADY
-cat      = SC_BASIC
+def      = false
+str      = STR_CONFIG_SETTING_RECESSIONS
+strhelp  = STR_CONFIG_SETTING_RECESSIONS_HELPTEXT
 
-[SDT_VAR]
+[SDT_BOOL]
 base     = GameSettings
 var      = difficulty.line_reverse_mode
-type     = SLE_UINT8
 from     = 97
-def      = 0
-min      = 0
-max      = 1
-interval = 1
-strval   = STR_REVERSE_AT_END_OF_LINE_AND_AT_STATIONS
+def      = false
+str      = STR_CONFIG_SETTING_TRAIN_REVERSING
+strhelp  = STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT
 
-[SDT_VAR]
+[SDT_BOOL]
 base     = GameSettings
 var      = difficulty.disasters
-type     = SLE_UINT8
 from     = 97
-def      = 0
-min      = 0
-max      = 1
-interval = 1
-strval   = STR_CONFIG_SETTING_OFF
+def      = false
+str      = STR_CONFIG_SETTING_DISASTERS
+strhelp  = STR_CONFIG_SETTING_DISASTERS_HELPTEXT
 cat      = SC_BASIC
 
 [SDT_VAR]
@@ -292,10 +300,13 @@ base     = GameSettings
 var      = difficulty.town_council_tolerance
 type     = SLE_UINT8
 from     = 97
+guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
 max      = 2
 interval = 1
+str      = STR_CONFIG_SETTING_CITY_APPROVAL
+strhelp  = STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT
 strval   = STR_CITY_APPROVAL_PERMISSIVE
 proc     = DifficultyNoiseChange