fix bio shock with unarmed weapon like knuckle #78814
Merged
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
Bugfixes "Fix bio shock with knuckle or other unarmed weapon"
As we didn't check if the unarm weapon like knuckle is conductive, bio shock will never triger with it. Use knuckle should be allowed to trigger bio shock.
Purpose of change
Allow conductive unarmed weapon trigger bio shock.
Describe the solution
Check if "weap" is conductive, not "weapon" of character, which is always null when unarmed.
Describe alternatives you've considered
Pass a bool into Character::melee_special_effects to check if character is unarmed,
Testing
Test conductive armed weapon;
Test unconductive armed weapon;
Test conductive unarmed weapon;
Test unconductive unarmed weapon.
Additional context