Repository navigation
quickfix: repair unassigned site_id on reclaimed fortresses - #5948
Merged
Merged
Conversation
Alistair-Afton
force-pushed
the
quickfix-site-id
branch
from
September 17, 2026 21:32
6324bb3 to
d388fbf
Compare
ab9rf
reviewed
Sep 20, 2026
| - `timestream`: deal properly with units who have breathing difficulties | ||
| - `stocks`: overlay now resets scroll position when collapsing categories so the item list is no longer left blank and unscrollable | ||
| - Fixed persistent site data API (``dfhack.persistent.saveSiteData``/``getSiteData``) failing on newly reclaimed fortresses until the first save | ||
| - ``quickfix``: repair ``plotinfo.site_id`` on load when DF leaves it unassigned on reclaimed fortresses |
Member
There was a problem hiding this comment.
This isn't a "fix"; fixes are changes that fix a defect in DFHack. Because it provides a mitigation for a defect in DF, this is a new feature and thus should be placed in that category.
ab9rf
approved these changes
Sep 21, 2026
This file contains hidden or 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
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
Implements the mitigation discussed in #5937: on map load, if
plotinfo.site_idis still -1 (a vanilla defect on reclaimed fortresses until the first save), it is restored fromplotinfo.main.fortress_site, which is set at embark.Lives in
quickfixalongside the existing entity race repair, called fromonMapLoad.default.init. Silent unless it actually repairs something.Testing
test/modules/quickfix_fortress.lua: fabricates the defect (site_id = -1), verifies the repair restoresfortress_site.id, and verifies a no-op when site_id is already assigned.