Fix road mapgen to check the correct neighbours #52168
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
The changes in CleverRaven#51913 altered how neighbours were entered into the mapgendata context. For JSON mapgen this fixed issues, but for hardcoded mapgen it could break things. In particular, for road mapgen it caused problems. Add a new flag to allow specific oter_ts to opt out of this new behaviour, and apply it to roads.
BrettDong
added
<Bugfix>
ralreegorganon
added a commit
to ralreegorganon/Cataclysm-DDA
that referenced
this pull request
Dec 16, 2023
The changes in CleverRaven#51913 broke the rotation of lake shores when used as predecessors by essentially pre-rotating the entries in the mapgendata neighbors even though the shore itself is not a rotatable terrain. As a result, the predecessor omt generation would be rotated in the direction of the final mapgen, negating the predecessor application logic that would pre-rotate it in the opposite direction so that the final mapgen rotation would put it in the correct spot. The end result would be that the lake shores used as predecessor terrain would be incorrect in all orientations except north. To fix this, I applied the IGNORE_ROTATION_FOR_ADJACENCY flag that was added in CleverRaven#52168 to lake and ocean shores so that their mapgendata is provided as expected. ...however, that implementation only worked for the final overmap terrain and not predecessors because the mapgendata constructor that swaped overmap terrain types didn't reevaluate the flag to see if the neighbors should be rotated. Consequently, if the final one is rotated, all the predecessors got rotated data even if they set this flag. I updated it so now it checks for a difference in rotation between the original and new overmap terrain type, and adjusts the neighbors.
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 "Fix road mapgen"
Purpose of change
The changes in #51913 altered how neighbours were entered into the
mapgendatacontext. For JSON mapgen this fixed issues, but for hardcoded mapgen it could break things.In particular, for road mapgen it caused problems, as seen in this discourse thread.
Describe the solution
Add a new flag to allow specific
oter_ts to opt out of this new behaviour, and apply it to roads.Describe alternatives you've considered
Jsonify road mapgen. I see Aftershock has already done that, so it's probably feasible.
Testing
Launched the game before and after the change to see the difference in newly generated roads.
Additional context
Some screenshots of roads after the fix (I forgot to take the 'before' screenshots):
