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

Add "strictly_unarmed" to buff_taekwondo_static2 #72356

Merged
merged 1 commit into from
Mar 15, 2024

Conversation

Zenefess
Copy link
Contributor

Summary

Bugfixes "Prevent Tae Kwon Do's 'Unhindered' static buff from activating when hands are not empty."

Purpose of change

Addresses issue #72179

Describe the solution

Added the strictly_unarmed property to buff_taekwondo_static2 and set it to true.

Describe alternatives you've considered

It's a simple fix, so didn't need to think of another solution.

Testing

Loaded an existing save. "Unhindered" appears. Pick up freezer. "Unhindered" disappears. Drop freezer and wait a turn. "Unhindered" reappears. Repeated the process with a rifle, carving knife, and knuckle dusters; same result.
Started a new game and repeated above process with a pocket knife; same result as above.

Additional context

N/A

Prevent Tae Kwon Do's "Unhindered" static buff from activating when hands are not empty.
Copy link
Contributor

You are creating a pull request with the master branch as the head branch. This is likely a mistake unless you really know what you are doing. You may read https://docs.github.com/en/get-started/quickstart/contributing-to-projects#creating-a-branch-to-work-on for a typical workflow of contributing to a project on GitHub.

@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Martial Arts Arts, Techniques, weapons and anything touching martial arts. labels Mar 13, 2024
@Zenefess
Copy link
Contributor Author

Zenefess commented Mar 13, 2024

I realised I modified my master branch after committing. Senior moment. If it's not an issue on your end and you're satisfied with this compromise (I figured losing the bonus with unarmed weapons vs. always having the buff active), @Maleclypse , I'll leave it as is until it's merged/closed.

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Mar 13, 2024
@Zenefess
Copy link
Contributor Author

Zenefess commented Mar 13, 2024

After rereading Taekwondo's description, it states "Focused on kicks, it does not benefit from wielded weapons", so not allowing the unarmed weapons to be used with the +33% damage boost would make sense.

...Now that I think about it, should unarmed_allowed be false for all Taekwondo buffs, since those weapons aren't attached to the legs?

@RedMisao
Copy link
Contributor

RedMisao commented Mar 13, 2024

After rereading Taekwondo's description, it states "Focused on kicks, it does not benefit from wielded weapons", so not allowing the unarmed weapons to be used with the +33% damage boost would make sense.

I was going to comment something about wielding vs wearing weapons and give some ingame examples, but the UNARMED_WEAPON flag was removed from items and I'm unaware how the game considers a weapon to be unarmed.

...Now that I think about it, should unarmed_allowed be false for all Taekwondo buffs, since those weapons aren't attached to the legs?

"unarmed_allowed": true means the buff is applied when you have no weapon equipped. If you equip any weapon the buff goes away. If it's set to false, you don't get the buff if you're unarmed.
Similarly, "melee_allowed": true means the buff is applied when you have a weapon equipped. If you unequip the weapon, the buff goes away. If it's set to false, you don't get the buff if you're wielding a weapon.

So, by setting "unarmed_allowed": false you will only make the Taekwondo buffs to not be applied by being unarmed.

Edited: either one being false don't remove the buffs.

@Zenefess
Copy link
Contributor Author

@RedMisao
Ahh; cool. So what should I do about this pull request; leave it as is? Close it? I figure -- in the grand scheme of things -- this is a low priority issue when it comes to dedicating time to testing & merging.

@RedMisao
Copy link
Contributor

Nvm I was wrong, setting unarmed_allowed or melee_allowed to false don't remove the buffs, it just means the buffs are not applied in either condition.

The PR you submitted will fix the issue of the Unhindered buff being applied while not being unarmed.

@Zenefess
Copy link
Contributor Author

@RedMisao I appreciate the assistance. I've been experiencing "brain fog", some days, and it's frustrating to lose my confidence.

@Maleclypse Maleclypse merged commit 773fa35 into CleverRaven:master Mar 15, 2024
24 of 26 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) [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Martial Arts Arts, Techniques, weapons and anything touching martial arts.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants