Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed wrong mission on non-allied guards #29073

Merged
merged 1 commit into from Mar 28, 2019

Conversation

Projects
None yet
3 participants
@davidpwbrown
Copy link
Contributor

commented Mar 28, 2019

Summary

SUMMARY: Bugfixes "Fixes all refugee centre NPCS becoming allies

Purpose 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

@kevingranade

This comment has been minimized.

Copy link
Member

commented Mar 28, 2019

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 ZhilkinSerg merged commit 3017165 into CleverRaven:master Mar 28, 2019

0 of 3 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
gorgon-ghprb Build started for merge commit.
Details

@davidpwbrown 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
You can’t perform that action at this time.