Migrate ACT_PICKUP to the activity actor system #39297
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
ifreund
added
[C++]
ifreund
force-pushed
the
migrate-act-pickup
branch
from
d0fff1a to
ed26539
Compare
|
rebased to resolve conflicts |
|
Please hold off on merging this until #39646 is merged as this will likely cause conflicts and I'd rather resolve them here. |
ifreund
force-pushed
the
migrate-act-pickup
branch
from
08b1253 to
5857b78
Compare
|
Conflicts resolved |
ZhilkinSerg
reviewed
May 7, 2020
| who.cancel_activity(); | ||
|
|
||
| if( who.get_value( "THIEF_MODE_KEEP" ) != "YES" ) { | ||
| who.set_value( "THIEF_MODE", "THIF_ASK" ); |
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: Infrastructure "Migrate ACT_PICKUP to the activity actor system."
Purpose of change
Update legacy activities to use the new system added in #37450.
Testing
Ran the test suite locally. Picked up items using the advanced inventory and without.
Additional context
I discovered that the move all function of the advanced inventory does, and has never, worked for wearing items, so I added a debug message if it is used and opened #39296.