Phased mapgen fixes #53842
Merged
Phased mapgen fixes #53842
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
We have two styles of mapgen: the "objects" and the "setmap" style. The objects were already being done in phases but the setmap mapgen was not, and it was done entirely before the objects. That meant that mapgen could happen in an unhelpful order, such as map bashing happening before furniture placement (which in turn led to attempted furniture placement on open air). Refactor the mapgen so that the two styles are interleaved on a phase-by-phase basis. This ensures that all mapgen happens in the proper order.
github-actions
bot
added
astyled
NetSysFire
added
<Bugfix>
github-actions
bot
added
the
BasicBuildPassed
jbytheway
added a commit
to jbytheway/Cataclysm-DDA
that referenced
this pull request
Dec 30, 2021
Work in CleverRaven#53842 introduced a bug whereby the wrong mapgendata (with the wrong params) was passed downward to nest mapgen. Fix that.
This was referenced Dec 30, 2021
Merged
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
Bugfixes "Perform mapgen in a more correct order"
Purpose of change
A while back I updated mapgen to proceed in phases. This is needed to prevent certain sorts of issues like bashing being done before terrain or furniture is placed, leading to furniture on
t_open_airtiles or rubble on otherwise-undamaged tiles.However, we have two sorts of mapgen;
object-based andsetmap_points-based. Previously I had only fixed the former. Thesetmap_pointsmapgen all happened first and was usually used for bashing, leading to the above sorts of issues.Describe the solution
Add phases to
setmap_pointsmapgen also, and interleave the two types of mapgen phase-by-phase so that everything happens in the proper order.I also took the opportunity to remove some code duplication since three different parts of the code were performing similar mapgen of the two types.
Describe alternatives you've considered
Testing
Unit tests. Ran the exhaustive mapgen test which is currently disabled. Other issues remain that prevent that from being re-enabled yet.
Additional context
(This is one of the issues I mentioned in #53698).