Allow auto-equipping items when the inventory item frees space for the equipped item #7496
+195
−147
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
|
Am I right in thinking that it would fail to equip the two hand sword in this case? |
|
Yes, that would fail in this PR as it attempts to unequip the right hand item (in this case a 2x3 shield) before lifting the left hand item to holdItem. I didn't want to try get too clever by searching for matching items in that case but it could be handled better. |
specifically where the larger item is in the right hand, this would fail previously in certain circumstances.
2024-10-21T205524_devilutionx.mp4 |
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.
New behaviour:
https://github.com/user-attachments/assets/3b7ab495-59f9-4315-a986-18a8b876c40d
Main thing of note is the item that used to be equipped will fill the gap left by the item being equipped if it fits.
Commit 2324108 is some prep that made it easier to reason about the steps required, I tried to keep the same behaviour/sound feedback. What I was attempting to show at about 10 seconds into this clip was trying to equip the short sword when there's no room to remove the two-handed sword would play the "I have no room" speech but the screen recording didn't capture sound :(
This builds on #7494, I've split them to hopefully make things easier to review.