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

Unarmed weapons are wearable and added wrist sub-limbs #54313

Merged
merged 33 commits into from
Feb 17, 2022
Merged

Unarmed weapons are wearable and added wrist sub-limbs #54313

merged 33 commits into from
Feb 17, 2022

Conversation

Hymore246
Copy link
Contributor

@Hymore246 Hymore246 commented Jan 12, 2022

Summary

Balance "Unarmed weapons are wearable and added wrist sub-limbs"

Purpose of change

Fixes #53822
Unarmed weapons are wearable. Added Wrist and Fingers sub-limbs

Describe the solution

This PR is focused on several changes regarding the character's "hand" limb.

Unarmed Weapons are now wearable. Following the example of #41209 all other non-CBM unarmed weapons have been converted to ARMOR items that are worn on the hands. These items no longer have the UNARMED_WEAPON flag meaning they must be worn to add their damage to unarmed attacks. The follow items have been changed:

Name Encumbrance Coverage
pair of brass knuckles 5 10
pair of nail knuckles 7 20
pair of scrap knuckles 7 20
pair of steel knuckles 5 10

In addition, these items are no longer classified as style weapons for Aikido and Judo. Wearing the above items and attacking without a weapon will still make them contribute unarmed damage as normal. Due to the nature of tiger claws (bagh nakha) and bionic claws, they are still classified as style weapons for Aikido and Judo and retain the UNARMED_WEAPON flag.

Added wrist sub-limbs. arm_wrist_r and arm_wrist_l have been added to the body parts list as a sub-limbs of hand_r and hand_l respectively. Items that cover the wrist have been updated to state they specifically cover the wrist part of the hand. These items are all watches:

  • radiation biomonitor
  • fitness band
  • All watches

Added fingers sub-limbs. arm_fingers_r and arm_fingers_l have been added to the body parts list as a sub-limbs of hand_r and hand_l respectively. The above unarmed weapons and all ring jewelry use this slot.

@bombasticSlacks
Copy link
Contributor

if something doesn't specify sublocations it is assumed to cover all sublocations on that body part.

So if the intent is for there to be two distinct zones "fingers" where you have brass knuckles or whatever and "wrist" where you have a watch. you have to make a fingers sublocation too.

@bombasticSlacks
Copy link
Contributor

also the overall limb needs to have a list of sub parts too. See line 307 for an example
image

@Shodan14
Copy link

Shodan14 commented Jan 12, 2022

There's also the fitness band, game watch, radiation monitor and bracelets.

@NetSysFire
Copy link
Member

Relevant: #53822

@NetSysFire NetSysFire added [JSON] Changes (can be) made in JSON Items: Armor / Clothing Armor and clothing Melee Melee weapons, tactics, techniques, reach attack labels Jan 12, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jan 12, 2022
@catdach
Copy link
Contributor

catdach commented Feb 10, 2022

It seems that in the comments of #41209 it was decided not to have the "knuckles" items be wearable as they actually take up space in the palm and therefore prevent other things from being held in the hands. They don't just wrap around the fingers like the cestus.

Copy link
Contributor

@bombasticSlacks bombasticSlacks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these shouldn't have secondary. Basically no sublimbs should

Hymore246 and others added 2 commits February 10, 2022 17:15
Co-authored-by: Dillon Matchett <[email protected]>
Co-authored-by: Dillon Matchett <[email protected]>
@Hymore246
Copy link
Contributor Author

It seems that in the comments of #41209 it was decided not to have the "knuckles" items be wearable as they actually take up space in the palm and therefore prevent other things from being held in the hands. They don't just wrap around the fingers like the cestus.

I see where that is coming from but there is no mistake that Brass Knuckles and the like need to be placed on the fingers to be used. You couldn't just hold a pair of Spiked Brass Knuckles in your hand and attack with them the same way as if they were worn. The best idea I can think of as a compromise is to make these weapon have a large amount of hand encumbrance to discourage holding another item.

@catdach
Copy link
Contributor

catdach commented Feb 12, 2022

It seems that in the comments of #41209 it was decided not to have the "knuckles" items be wearable as they actually take up space in the palm and therefore prevent other things from being held in the hands. They don't just wrap around the fingers like the cestus.

I see where that is coming from but there is no mistake that Brass Knuckles and the like need to be placed on the fingers to be used. You couldn't just hold a pair of Spiked Brass Knuckles in your hand and attack with them the same way as if they were worn. The best idea I can think of as a compromise is to make these weapon have a large amount of hand encumbrance to discourage holding another item.

But increasing hand encumbrance would also make unarmed attacks worse too, right?

@Hymore246
Copy link
Contributor Author

It seems that in the comments of #41209 it was decided not to have the "knuckles" items be wearable as they actually take up space in the palm and therefore prevent other things from being held in the hands. They don't just wrap around the fingers like the cestus.

I see where that is coming from but there is no mistake that Brass Knuckles and the like need to be placed on the fingers to be used. You couldn't just hold a pair of Spiked Brass Knuckles in your hand and attack with them the same way as if they were worn. The best idea I can think of as a compromise is to make these weapon have a large amount of hand encumbrance to discourage holding another item.

But increasing hand encumbrance would also make unarmed attacks worse too, right?

It would. Definitively sounds like this should be looked in more in-depth since neither choice seems ideal.

Copy link
Contributor

@bombasticSlacks bombasticSlacks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright so this makes the wrist 10% of the hand, fingers 50%, and adds a palm to round it out covering 40%.

When defining coverage for a place with sublocations you are telling the game how much of the sublocation is covered not how much of the overall location. So for example when a watch is 10 coverage, on the wrist the game thinks its 10% of the wrist (which is 10% of the hand; so 1% overall coverage). So I've adjusted the coverage values to maintain the numbers you already had but in that system where it converts.

{
"id": "hand_wrist_r",
"type": "sub_body_part",
"max_coverage": 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"max_coverage": 5,
"max_coverage": 10,

{
"id": "hand_fingers_r",
"type": "sub_body_part",
"max_coverage": 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"max_coverage": 5,
"max_coverage": 50,

{
"id": "hand_wrist_l",
"type": "sub_body_part",
"max_coverage": 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"max_coverage": 5,
"max_coverage": 10,

{
"id": "hand_fingers_l",
"type": "sub_body_part",
"max_coverage": 5,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"max_coverage": 5,
"max_coverage": 50,

Hymore246 and others added 16 commits February 14, 2022 22:09
Co-authored-by: Dillon Matchett <[email protected]>
Co-authored-by: Dillon Matchett <[email protected]>
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 15, 2022
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 Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Briefcase and wrist watch conflict when worn on same side
6 participants