Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upFixed wrong mission on non-allied guards #29073
Conversation
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/major-game-breaking-bug/19430/9 |
ZhilkinSerg
added
[C++]
<Bugfix>
labels
Mar 28, 2019
ZhilkinSerg
merged commit 3017165
into
CleverRaven:master
Mar 28, 2019
davidpwbrown
deleted the
davidpwbrown:npc_shout_fix
branch
Apr 2, 2019
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.
davidpwbrown commentedMar 28, 2019
Summary
SUMMARY: Bugfixes "Fixes all refugee centre NPCS becoming alliesPurpose of change
Fixes #29063
Describe the solution
The problem wasnt actually the shout, all refugees became followers as soon as they were close enough.
This was because of a change in the order of NPC_MISSION enums - they were all set to mission_guard_ally instead of mission_guard. And the game logic for picking up who is a follower nearby checks their mission type.
( The issue was seemingly logged before the change to enums was merged - and it seems there was a merge conflict somewhere, perhaps in what mlangsdorf and I were doing - as I very deliberately was careful with the order of mission enums - as I thought there was a risk of this happening )
This changes the order to match what all the NPCS mission type is in JSON, existing NPC allied guards may now have problems, I cant think of a way to validate that, and it's a lesser problem than the current bug.
Not many people would have saved in the window for this bug with a follower guarding nearby, thereby serializing the followers mission, so hopefully it wont screw up too many savegames.
Describe alternatives you've considered
N/A
Additional context
N/A