basecamps: Modular camp fixes #31470
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mlangsdorf
added
<Bugfix>
mlangsdorf
changed the title
Using tinymap::load during data validation apparently causes all kinds of write-after-free errors and stomps over all the game data and is generally bad. So don't do that any more. Instead, borrow enough of the code from map::load and map::loadn to load a tinymap that is never intended to saved or integrated with the real MAPBUFFER. Similarly, when using a tinymap loaded by fake_map, don't try to retrieve the regional settings and just use a dummy variable.
the recipe is the fully encoded camp type, not just the camp type.
change the name of the core part of a modular camp to a modular hub, and differentiate betweeh the modular hub field (which is built in a field) and other modular hubs (such as one built on a mall roof). No other modular hubs are currently supported, but add some more scaffolding for that effort. Make sure that digging trenches produces appropriate amounts of rocks and soil.
When reloading factions from master.gsav after they've already been loaded from the templates by loading NPCs, find the existing factions instead of making multiple copies.
mlangsdorf
force-pushed
the
modular_camp_fixes
branch
from
a7e51e1 to
d0b490f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
SUMMARY: Bugfixes "basecamps: Modular camp fixes"Purpose of change
Fixes #31391
Fixes #31450
Fixes #31425
There may be some others.
modular basecamp recipes using blueprint_autocalc were accessing unallocated memory and stomping over everything. This caused all kinds of weird and subtle bugs.
Also, starting a faction camp did not correctly set the initial blueprint_provides, cutting off the development of the camp.
Also, digging a trench was supposed to provide huge amounts of soil, rocks, pebbles, and clay but was not.
Describe the solution
Rewrite get_changed_ids_from_update_mapgen() not attempt to get the actual regional settings and not to not really load the temporary tinymap. Instead, using a dummy regional settings variable and a new tinymap load_fake() function that does the minimal loading necessary for get_changed_ids_from_update_mapgen()'s purposes.
When defining a camp, pass the fully encoded base type, which is the name of the recipe, and not just the short type name, to update_provides().
Add some place_items() to the mapgen_update definitions for digging camp trenches.
Additional context
Whoops. Mea maxima culpa.