(svn r26604) -Add: Most of the mapgen settings to advances settings window.

3 files changed, 57 insertions, 8 deletions

diff --git a/src/lang/english.txt b/src/lang/english.txt
index 3eaac61ee..69c33bd3c 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1247,21 +1247,37 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Display the pop
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Thickness of lines in graphs: {STRING2}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Width of the line in the graphs. A thin line is more precisely readable, a thicker line is easier to see and colours are easier to distinguish
 
+STR_CONFIG_SETTING_LANDSCAPE                                    :Landscape: {STRING2}
+STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Landscapes define basic gameplay scenarios with different cargos and town growth requirements. NewGRF and Game Scripts allow finer control though
 STR_CONFIG_SETTING_LAND_GENERATOR                               :Land generator: {STRING2}
+STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :The original generator depends on the base graphics set, and composes fixed landscape shapes. TerraGenesis is a Perlin noise based generator with finer control settings
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Original
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
+STR_CONFIG_SETTING_TERRAIN_TYPE                                 :Terrain type: {STRING2}
+STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT                        :(TerraGenesis only) Hilliness of the landscape
+STR_CONFIG_SETTING_INDUSTRY_DENSITY                             :Industry density: {STRING2}
+STR_CONFIG_SETTING_INDUSTRY_DENSITY_HELPTEXT                    :Set how many industries should be generated and what level should be maintained during the game
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :Maximum distance from edge for Oil refineries: {STRING2}
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT               :Oil refineries are only constructed near the map border, that is at the coast for island maps
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :Snow line height: {STRING2}
-STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :Roughness of terrain (TerraGenesis only) : {STRING2}
+STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT                     :Control at what height snow starts in sub-arctic landscape. Snow also affects industry generation and town growth requirements
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :Roughness of terrain: {STRING2}
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT                :(TerraGenesis only) Choose the frequency of hills: Smooth landscapes have fewer, more wide-spread hills. Rough landscapes have many hills, which may look repetitive
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Very Smooth
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Smooth
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH                   :Rough
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Very Rough
+STR_CONFIG_SETTING_VARIETY                                      :Variety distribution: {STRING2}
+STR_CONFIG_SETTING_VARIETY_HELPTEXT                             :(TerraGenesis only) Control whether the map contains both mountainous and flat areas. Since this only makes the map flatter, other settings should be set to mountainous
+STR_CONFIG_SETTING_RIVER_AMOUNT                                 :River amount: {STRING2}
+STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT                        :Choose how many rivers to generate
 STR_CONFIG_SETTING_TREE_PLACER                                  :Tree placer algorithm: {STRING2}
+STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT                         :Choose the distribution of trees on the map: 'Original' plants trees uniformly scattered, 'Improved' plants them in groups
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :None
 STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Original
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Improved
+STR_CONFIG_SETTING_ROAD_SIDE                                    :Road vehicles: {STRING2}
+STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT                           :Choose the driving side
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :Heightmap rotation: {STRING2}
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Counter clockwise
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Clockwise
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 8917fe25e..496e5ca3b 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -1597,9 +1597,19 @@ static SettingEntry _settings_disasters[] = {
 static SettingsPage _settings_disasters_page = {_settings_disasters, lengthof(_settings_disasters)};
 
 static SettingEntry _settings_genworld[] = {
+	SettingEntry("game_creation.landscape"),
+	SettingEntry("game_creation.land_generator"),
+	SettingEntry("difficulty.terrain_type"),
+	SettingEntry("game_creation.tgen_smoothness"),
+	SettingEntry("game_creation.variety"),
+	SettingEntry("game_creation.snow_line_height"),
+	SettingEntry("game_creation.amount_of_rivers"),
+	SettingEntry("game_creation.tree_placer"),
+	SettingEntry("vehicle.road_side"),
 	SettingEntry("economy.larger_towns"),
 	SettingEntry("economy.initial_city_size"),
 	SettingEntry("economy.town_layout"),
+	SettingEntry("difficulty.industry_density"),
 	SettingEntry("gui.pause_on_newgame"),
 };
 
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 5fdfa71d2..c201d1e40 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -129,11 +129,13 @@ base     = GameSettings
 var      = difficulty.industry_density
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SGF_MULTISTRING
 def      = ID_END - 1
 min      = 0
 max      = ID_END - 1
 interval = 1
+str      = STR_CONFIG_SETTING_INDUSTRY_DENSITY
+strhelp  = STR_CONFIG_SETTING_INDUSTRY_DENSITY_HELPTEXT
 strval   = STR_FUNDING_ONLY
 cat      = SC_BASIC
 
@@ -250,11 +252,13 @@ base     = GameSettings
 var      = difficulty.terrain_type
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NEWGAME_ONLY
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
 max      = 3
 interval = 1
+str      = STR_CONFIG_SETTING_TERRAIN_TYPE
+strhelp  = STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT
 strval   = STR_TERRAIN_TYPE_VERY_FLAT
 cat      = SC_BASIC
 
@@ -341,11 +345,14 @@ base     = GameSettings
 var      = game_creation.landscape
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NO_NETWORK
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 max      = 3
 full     = _climates
 load     = ConvertLandscape
+str      = STR_CONFIG_SETTING_LANDSCAPE
+strhelp  = STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT
+strval   = STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE
 cat      = SC_BASIC
 
 ; Snow line (or snow_line_height * TILE_HEIGHT)
@@ -359,10 +366,13 @@ base     = GameSettings
 var      = vehicle.road_side
 type     = SLE_UINT8
 from     = 97
-guiflags = SGF_NO_NETWORK
+guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
 def      = 1
 max      = 1
 full     = _roadsides
+str      = STR_CONFIG_SETTING_ROAD_SIDE
+strhelp  = STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT
+strval   = STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT
 proc     = CheckRoadSide
 
 ; Construction
@@ -1309,10 +1319,12 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.snow_line_height
 type     = SLE_UINT8
+guiflags = SGF_NO_NETWORK
 def      = DEF_SNOWLINE_HEIGHT
 min      = MIN_SNOWLINE_HEIGHT
 max      = MAX_SNOWLINE_HEIGHT
 str      = STR_CONFIG_SETTING_SNOWLINE_HEIGHT
+strhelp  = STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT
 strval   = STR_JUST_COMMA
 cat      = SC_BASIC
 
@@ -2106,11 +2118,12 @@ base     = GameSettings
 var      = game_creation.land_generator
 type     = SLE_UINT8
 from     = 30
-guiflags = SGF_MULTISTRING
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
 max      = 1
 str      = STR_CONFIG_SETTING_LAND_GENERATOR
+strhelp  = STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT
 strval   = STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL
 
 [SDT_VAR]
@@ -2130,11 +2143,12 @@ base     = GameSettings
 var      = game_creation.tgen_smoothness
 type     = SLE_UINT8
 from     = 30
-guiflags = SGF_MULTISTRING
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
 max      = 3
 str      = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
+strhelp  = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT
 strval   = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH
 cat      = SC_BASIC
 
@@ -2143,9 +2157,13 @@ base     = GameSettings
 var      = game_creation.variety
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 min      = 0
 max      = 5
+str      = STR_CONFIG_SETTING_VARIETY
+strhelp  = STR_CONFIG_SETTING_VARIETY_HELPTEXT
+strval   = STR_VARIETY_NONE
 
 [SDT_VAR]
 base     = GameSettings
@@ -2162,11 +2180,12 @@ base     = GameSettings
 var      = game_creation.tree_placer
 type     = SLE_UINT8
 from     = 30
-guiflags = SGF_MULTISTRING
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 2
 min      = 0
 max      = 2
 str      = STR_CONFIG_SETTING_TREE_PLACER
+strhelp  = STR_CONFIG_SETTING_TREE_PLACER_HELPTEXT
 strval   = STR_CONFIG_SETTING_TREE_PLACER_NONE
 
 [SDT_VAR]
@@ -2291,9 +2310,13 @@ base     = GameSettings
 var      = game_creation.amount_of_rivers
 type     = SLE_UINT8
 from     = 163
+guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 2
 min      = 0
 max      = 3
+str      = STR_CONFIG_SETTING_RIVER_AMOUNT
+strhelp  = STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT
+strval   = STR_RIVERS_NONE
 
 ; locale