Add base game new region settings JSON #82955
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
None
Purpose of change
Describe the solution
See title; the base settings have to be merged before mod settings are merged.
This PR pulls from commit 237224e to avoid a loading failure.
building_bin::unfinalized_buildings
is unused forregion_settings_new
, so it would be empty when loading and cause an error.This PR also pulls from commit 09d8219 to move the region settings file deeper so that objects it uses are loaded first.
Describe alternatives you've considered
Testing
Loaded game without error, worked in #82631. CI should be fine, but double-check
Additional context