Rework monster equipment #36377
Merged
Rework monster equipment #36377
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
BevapDin
reviewed
Dec 23, 2019
|
This should be ready now. I'm postponing the monster inventory menu objectives for another PR because that one will probably be a few hundred lines on its own. |
BevapDin
reviewed
Dec 24, 2019
BevapDin
reviewed
Dec 24, 2019
BevapDin
reviewed
Dec 24, 2019
BevapDin
reviewed
Dec 24, 2019
BevapDin
reviewed
Dec 24, 2019
BevapDin
reviewed
Dec 26, 2019
BevapDin
reviewed
Dec 26, 2019
BevapDin
reviewed
Dec 26, 2019
BevapDin
reviewed
Dec 26, 2019
BevapDin
reviewed
Dec 26, 2019
BevapDin
reviewed
Dec 26, 2019
added 8 commits
December 30, 2019 11:35
added 15 commits
December 30, 2019 11:35
BevapDin
reviewed
Jan 1, 2020
This was referenced Jan 5, 2020
ZhilkinSerg
reviewed
Jan 14, 2020
| @@ -685,7 +685,8 @@ void Creature::deal_projectile_attack( Creature *source, dealt_projectile_attack | |||
| if( z ) { | |||
| if( !proj.get_drop().is_null() ) { | |||
| z->add_effect( effect_tied, 1_turns, num_bp, true ); | |||
| z->tied_item = proj.get_drop(); | |||
| item drop_item = proj.get_drop(); | |||
There was a problem hiding this comment.
drop_item is not used at all (see #37053)
There was a problem hiding this comment.
Probably got lost in the refactor for value pointers.
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 "Rework monster equipment handling"
Purpose of change
Fixes #36312
The code for monster inventories needs cleaning up and some of the interaction menus feel janky. Weight and volume checks are inconsistent. Animal equipment stats are not properly communicated to the player.
Describe the solution
Use
cata::value_ptr<item>s for specific use items that a monster can only have one of at once so we don't have to do weird stuff tracking item positions in its inventory.cata::value_ptr<item>for armor, tack, and storage itemsAllow checking current volume and weight of stored items on animalAllow removing selected items from animal's packTesting
Game compiles, menus and item interactions behave as intended. Correct items are dropped when the horse dies.