Merge branch 'jgrpp' into jgrpp-beta

# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
This commit is contained in:
Jonathan G Rennison
2021-10-29 22:22:54 +01:00
45 changed files with 382 additions and 107 deletions

View File

@@ -923,6 +923,36 @@ strval = STR_JUST_INT
cat = SC_BASIC
patxname = ""max_town_heightlevel.economy.max_town_heightlevel""
[SDT_VAR]
base = GameSettings
var = economy.min_town_land_area
type = SLE_UINT16
guiflags = SGF_0ISDISABLED
def = 0
min = 0
max = 400
interval = 5
str = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA
strhelp = STR_CONFIG_SETTING_MIN_TOWN_LAND_AREA_HELPTEXT
strval = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE
cat = SC_BASIC
patxname = ""max_town_heightlevel.economy.min_town_land_area""
[SDT_VAR]
base = GameSettings
var = economy.min_city_land_area
type = SLE_UINT16
guiflags = SGF_0ISDISABLED
def = 75
min = 0
max = 400
interval = 5
str = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA
strhelp = STR_CONFIG_SETTING_MIN_CITY_LAND_AREA_HELPTEXT
strval = STR_CONFIG_SETTING_MIN_LAND_AREA_VALUE
cat = SC_BASIC
patxname = ""max_town_heightlevel.economy.min_city_land_area""
; link graph
[SDT_VAR]