Merge branch upstream/master
This commit is contained in:
@@ -267,7 +267,7 @@ from = SLV_97
|
||||
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
|
||||
def = 1
|
||||
min = 0
|
||||
max = 4
|
||||
max = 5
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_TERRAIN_TYPE
|
||||
strhelp = STR_CONFIG_SETTING_TERRAIN_TYPE_HELPTEXT
|
||||
@@ -392,19 +392,30 @@ cat = SC_BASIC
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = construction.max_heightlevel
|
||||
var = construction.map_height_limit
|
||||
type = SLE_UINT8
|
||||
from = SLV_194
|
||||
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
|
||||
def = DEF_MAX_HEIGHTLEVEL
|
||||
min = MIN_MAX_HEIGHTLEVEL
|
||||
max = MAX_MAX_HEIGHTLEVEL
|
||||
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_0ISDISABLED
|
||||
def = 0
|
||||
min = MIN_MAP_HEIGHT_LIMIT
|
||||
max = MAX_MAP_HEIGHT_LIMIT
|
||||
interval = 1
|
||||
str = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL
|
||||
strhelp = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
|
||||
strval = STR_JUST_INT
|
||||
str = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT
|
||||
strhelp = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_VALUE
|
||||
proc = ChangeMaxHeightLevel
|
||||
cat = SC_BASIC
|
||||
cat = SC_ADVANCED
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = game_creation.heightmap_height
|
||||
type = SLE_UINT8
|
||||
from = SLV_MAPGEN_SETTINGS_REVAMP
|
||||
guiflags = SGF_NEWGAME_ONLY
|
||||
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
|
||||
min = MIN_HEIGHTMAP_HEIGHT
|
||||
max = MAX_MAP_HEIGHT_LIMIT
|
||||
interval = 1
|
||||
|
||||
[SDT_BOOL]
|
||||
base = GameSettings
|
||||
@@ -1409,7 +1420,7 @@ cat = SC_BASIC
|
||||
base = GameSettings
|
||||
var = game_creation.snow_line_height
|
||||
type = SLE_UINT8
|
||||
guiflags = SGF_NO_NETWORK
|
||||
guiflags = SGF_SCENEDIT_ONLY
|
||||
def = DEF_SNOWLINE_HEIGHT
|
||||
min = MIN_SNOWLINE_HEIGHT
|
||||
max = MAX_SNOWLINE_HEIGHT
|
||||
@@ -1419,6 +1430,36 @@ strhelp = STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT
|
||||
strval = STR_JUST_COMMA
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = game_creation.snow_coverage
|
||||
type = SLE_UINT8
|
||||
from = SLV_MAPGEN_SETTINGS_REVAMP
|
||||
guiflags = SGF_NEWGAME_ONLY
|
||||
def = DEF_SNOW_COVERAGE
|
||||
min = 0
|
||||
max = 100
|
||||
interval = 10
|
||||
str = STR_CONFIG_SETTING_SNOW_COVERAGE
|
||||
strhelp = STR_CONFIG_SETTING_SNOW_COVERAGE_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_SNOW_COVERAGE_VALUE
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = game_creation.desert_coverage
|
||||
type = SLE_UINT8
|
||||
from = SLV_MAPGEN_SETTINGS_REVAMP
|
||||
guiflags = SGF_NEWGAME_ONLY
|
||||
def = DEF_DESERT_COVERAGE
|
||||
min = 0
|
||||
max = 100
|
||||
interval = 10
|
||||
str = STR_CONFIG_SETTING_DESERT_COVERAGE
|
||||
strhelp = STR_CONFIG_SETTING_DESERT_COVERAGE_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_DESERT_COVERAGE_VALUE
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDT_NULL]
|
||||
length = 4
|
||||
to = SLV_144
|
||||
@@ -2423,6 +2464,17 @@ strhelp = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD
|
||||
cat = SC_BASIC
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = game_creation.custom_terrain_type
|
||||
type = SLE_UINT8
|
||||
from = SLV_MAPGEN_SETTINGS_REVAMP
|
||||
guiflags = SGF_NEWGAME_ONLY
|
||||
def = MAP_HEIGHT_LIMIT_AUTO_MINIMUM
|
||||
min = MIN_CUSTOM_TERRAIN_TYPE
|
||||
max = MAX_MAP_HEIGHT_LIMIT
|
||||
interval = 1
|
||||
|
||||
[SDT_VAR]
|
||||
base = GameSettings
|
||||
var = game_creation.custom_sea_level
|
||||
|
||||
Reference in New Issue
Block a user