Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bio shock with unarmed weapon like knuckle #78814

Merged
merged 1 commit into from
Jan 11, 2025

Conversation

EliadOArias
Copy link
Contributor

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

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Melee Melee weapons, tactics, techniques, reach attack <Bugfix> This is a fix for a bug (or closes open issue) new contributor astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 28, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 5, 2025
@GuardianDll GuardianDll merged commit 40a53b3 into CleverRaven:master Jan 11, 2025
29 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack new contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants