update_mapgen: rotation fixes to solve the teleporting NPC issue #35534
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
Now that basecamps can be built in places that aren't fields, the basecamp overmap terrain id needs to include rotational data so that update_mapgen will correctly place upgrades on fire stations and evac shelters that are rotated.
mlangsdorf
added
<Bugfix>
BevapDin
reviewed
Nov 16, 2019
Fixes CleverRaven#35430 When a tinymap is rotated during update_mapgen, the NPCs would be moved via spawn_at_precise, which would clip their position to 0-11,0-11, effectively teleporting them to the upper left of the reality bubble. Rework rotate() to include a variable as to whether the rotation is setpos() safe, and use setpos() to relocate NPCs because that doesn't clip the position and teleport the NPCs.
mlangsdorf
force-pushed
the
rotation_fixes
branch
from
c9700c6 to
a0694a9
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 "update_mapgen: rotation fixes to solve the teleporting NPC issue"Purpose of change
Fixes #35430
NPCs teleport to the upper left corner to the reality bubble when an
update_mapgenfunction needs to rotate their overmap tile.While investigating that issue, I noticed that basecamps built in rotated fire stations or evac shelters didn't rotate after setting up the camp, which kept the NPC in place but meant that the upgrades were applied to the wrong part of the map.
Fix both issues.
Describe the solution
For the base camp issue, create a new rotational overmap tile ID for basecamps and set the overmap tile ID to that new ID including the rotation information. Further
update_mapgencalls will continue to rotate the map properly to put the updates in the correct relative position.map::rotate()usesnpc::spawn_at_precise()to move NPCs during rotation, but this explicitly clips the NPC's position to upper left of the reality bubble. Pass asetpos_safebool torotate()whenrotate()is called from anupdate_mapgenfunction, and usenpc::setpos()instead ofnpc::spawn_at_precise()so that position isn't clipped.npc::setpos()explicitly can't be called during normal mapgen, so this split is required.Describe alternatives you've considered
I hate CDDA's co-ordinate systems. Fixing them to be type safe isn't feasible.
Testing
Started a new game and went to an east facing refugee center. Performed the first two Old Guard rep missions, the second of which calls
update_mapgento place some NPCs, and verified that the other NPCs were not teleported away.Started a fire station faction camp in a west facing faction camp, and verified that the companion NPC wasn't teleported away and that the kitchen upgrade spawned in the kitchen correctly.