Add initial support for loading JokerPP savegames

See #123
This commit is contained in:
Jonathan G Rennison
2019-12-28 13:06:22 +00:00
parent c75ed00f0f
commit d56d4ea51f
15 changed files with 207 additions and 13 deletions

View File

@@ -153,6 +153,11 @@ min = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
max = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
to = SLV_22
;;game_creation.desert_amount
[SDT_NULL]
length = 2
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_NULL]
length = 1
from = SLV_22

View File

@@ -637,6 +637,10 @@ strval = STR_CONFIG_SETTING_TILE_LENGTH
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP, 2)
xref = ""construction.simulated_wormhole_signals""
[SDT_XREF]
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
xref = ""construction.simulated_wormhole_signals""
[SDT_VAR]
base = GameSettings
var = construction.max_bridge_height
@@ -693,6 +697,10 @@ patxname = ""signal_tunnel_bridge.construction.simulated_wormhole_signals""
xref = ""construction.maximum_signal_evaluations""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
[SDT_XREF]
xref = ""construction.chunnel""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
;; construction.longbridges
[SDT_NULL]
length = 1
@@ -803,6 +811,11 @@ strhelp = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT
strval = STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL
cat = SC_ADVANCED
;; economy.max_town_heightlevel
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
; link graph
[SDT_VAR]
@@ -837,7 +850,7 @@ var = linkgraph.recalc_not_scaled_by_daylength
def = true
str = STR_CONFIG_SETTING_LINKGRAPH_NOT_DAYLENGTH_SCALED
strhelp = STR_CONFIG_SETTING_LINKGRAPH_NOT_DAYLENGTH_SCALED_HELPTEXT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_LINKGRAPH_DAY_SCALE)
extver = SlXvFeatureTest([](uint16 version, bool version_in_range) -> bool { return version_in_range && SlXvIsFeaturePresent(XSLFI_LINKGRAPH_DAY_SCALE) && !SlXvIsFeaturePresent(XSLFI_JOKERPP); })
patxname = ""linkgraph_day_scale.linkgraph.recalc_not_scaled_by_daylength""
[SDT_ENUM]
@@ -1074,6 +1087,10 @@ strval = STR_JUST_INT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_TOWN_CARGO_ADJ, 1, 1)
patxname = ""town_cargo_adj.economy.town_cargo_factor""
[SDT_XREF]
xref = ""economy.old_town_cargo_factor""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = economy.town_cargo_scale_factor
@@ -1158,6 +1175,11 @@ strhelp = STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT
proc = InvalidateShipPathCache
cat = SC_EXPERT
;; pf.back_of_one_way_pbs_waiting_point
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = vehicle.max_train_length
@@ -1409,6 +1431,16 @@ str = STR_CONFIG_SETTING_WAGONSPEEDLIMITS
strhelp = STR_CONFIG_SETTING_WAGONSPEEDLIMITS_HELPTEXT
proc = UpdateConsists
;; vehicle.slow_road_vehicles_in_curves
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP, SL_JOKER_1_25)
;; vehicle.train_speed_adaption
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_BOOL]
base = GameSettings
var = vehicle.disable_elrails
@@ -1562,6 +1594,19 @@ cat = SC_EXPERT
length = 2
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
;; order.automatic_timetable_separation
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
;; order.timetable_auto_travel_buffer
;; order.timetable_auto_load_buffer
;; order.timetable_auto_travel_rounding
;; order.timetable_auto_load_rounding
[SDT_NULL]
length = 4
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP, SL_JOKER_1_24)
[SDTC_BOOL]
var = gui.sg_new_nonstop
from = SLV_22
@@ -1678,6 +1723,10 @@ str = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS
strhelp = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
patxname = ""custom_bridge_heads.construction.road_custom_bridge_heads""
[SDT_XREF]
xref = ""construction.road_custom_bridge_heads""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_BOOL]
base = GameSettings
var = construction.rail_custom_bridge_heads
@@ -1895,6 +1944,11 @@ str = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY
strhelp = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT
cat = SC_BASIC
;; game_creation.tree_line_height
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = game_creation.snow_line_height
@@ -1908,6 +1962,11 @@ strhelp = STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT
strval = STR_JUST_COMMA
cat = SC_BASIC
;;game_creation.desert_amount
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_NULL]
length = 4
to = SLV_144
@@ -2109,6 +2168,10 @@ strhelp = STR_CONFIG_SETTING_TOWN_MIN_DISTANCE_HELPTEXT
strval = STR_JUST_INT
patxname = ""town_min_distance.economy.town_min_distance""
[SDT_XREF]
xref = ""economy.town_min_distance""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_XREF]
xref = ""economy.infrastructure_sharing[0]""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_SPRINGPP)
@@ -2260,6 +2323,10 @@ str = STR_CONFIG_SETTING_SHARING_PAYMENT_IN_DEBT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.economy.sharing_payment_in_debt""
[SDT_XREF]
xref = ""economy.day_length_factor""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
; previously ai-new setting.
[SDT_NULL]
length = 1
@@ -3215,6 +3282,14 @@ strval = STR_CONFIG_SETTING_TREE_GROWTH_NORMAL
cat = SC_BASIC
patxname = ""reduced_tree_growth.construction.tree_growth_rate""
[SDT_XREF]
xref = ""construction.tree_growth_rate""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_XREF]
xref = ""construction.trees_around_snow_line_range""
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
[SDT_VAR]
base = GameSettings
var = game_creation.custom_sea_level
@@ -3258,6 +3333,11 @@ str = STR_CONFIG_SETTING_RIVER_AMOUNT
strhelp = STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT
strval = STR_RIVERS_NONE
;;game_creation.build_public_roads
[SDT_NULL]
length = 1
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_JOKERPP)
; locale
[SDT_OMANY]