Fix some problems of thievery #1582
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
54cb088 to
79e3e13
Compare
79e3e13 to
892e728
Compare
Coolthulhu
reviewed
Jun 10, 2022
src/npc.h
Outdated
| @@ -1341,6 +1340,7 @@ class npc : public player | |||
| static constexpr tripoint_abs_omt no_goal_point{ tripoint_min }; | |||
| job_data job; | |||
| time_point last_updated; | |||
| static bool has_thievery_witness; | |||
There was a problem hiding this comment.
static - now that's evil.
And unnecessary evil at that. You could inline npc::witness_thievery() where it is used and just handle all witnessing there.
There was a problem hiding this comment.
I‘ve noticed there are still some static variables in npc.h, so they are considered bad right?
Inline npc::witness_thievery as well.
|
Certainly looks better now, though I don't like it that Will have to spend some time to test it for edge cases, but if it works like it looks it does, it's good. |
|
Can't move-steal the items in advanced inventory at all. I assume this is intended. |
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] "Fix some problems of thievery "
Purpose of change
Fix #1572
Fix #1581
Action "Sort out my loot" does not move items that do not belong to the player faction (no theft).
Describe the solution
For #1572, make the NPC talk about thievery immediately once they notice you steal something.
For #1581, move the code to right position (I believe they are placed wrong during the migration).
Add items owner check in move loot action.
Describe alternatives you've considered
Testing
Tested thievery in refugee center. Works as intended apparently.
Additional context