Consume the sheet of glass when placing a glass shards trap #33465
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 "Placing a glass shards trap now consumes the sheet of glass"
Purpose of change
Fixes #33124 - Using sheet of glass doesn't consume it
Describe the solution
In
player.cpp
, afteractually_used->type->invoke( ... )
, when we check if weconsume_charges( ... )
ori_rem( ... )
, I added a condition that ifmethod == "place_trap"
wei_rem( ... )
Describe alternatives you've considered
Since the condition already works when we place traps from items of type
TOOL
, I considered changing (in the JSON) itemglass_sheet
to be of typeTOOL
instead ofGENERIC
, that would resolve the issue without code, but it does not make sens, a sheet of glass is not really a tool :)Additional context