Merge branch 'jgrpp' into save_ext_spp

This commit is contained in:
Jonathan G Rennison
2015-08-15 15:24:21 +01:00
72 changed files with 6356 additions and 412 deletions

View File

@@ -373,6 +373,21 @@ cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_AUTO_TIMETABLE)
patxname = ""auto_timetables.order.timetable_separation""
[SDT_VAR]
base = GameSettings
var = order.timetable_separation_rate
type = SLE_UINT8
def = 100
min = 0
max = 100
interval = 10
str = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE
strhelp = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE_HELPTEXT
strval = STR_CONFIG_SETTING_PERCENTAGE
cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_AUTO_TIMETABLE)
patxname = ""auto_timetables.order.timetable_separation_rate""
; There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow
; these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI.
[SDT_OMANY]
@@ -2485,6 +2500,21 @@ min = 0
max = 1000000
cat = SC_EXPERT
[SDT_VAR]
base = GameSettings
var = order.occupancy_smoothness
type = SLE_UINT8
def = 75
min = 0
max = 100
interval = 10
str = STR_CONFIG_OCCUPANCY_SMOOTHNESS
strhelp = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT
strval = STR_CONFIG_SETTING_PERCENTAGE
cat = SC_EXPERT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)
patxname = ""order_occupancy.order.occupancy_smoothness""
##
[SDT_VAR]
base = GameSettings