Fix use menu denial message and invoking items for comestibles without charges #67342
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
None
Purpose of change
Fixes #67330
Describe the solution
Exit early when checking
item::ammo_sufficient
for comestibles, so the menu and invoking items accepts comestibles as having the required charge.Describe alternatives you've considered
This whole chain of
item::ammo_sufficient
>item::shots_remaining
>item::ammo_required
>item::ammo_remaining
is really ugly, because it shouldn't even have anything to do with comestibles. But it's still checking them, expects comestibles to use 1 charge, but now obviously fails for uncharged comestibles. This really should get a rework to properly split things up, but that requires quite a bit more work.Testing
Activated a caffein pill from the use menu.
Additional context