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 new worn unarmed weapons #49914

Merged
merged 1 commit into from
Aug 8, 2021

Conversation

Saelfen
Copy link
Contributor

@Saelfen Saelfen commented Jul 13, 2021

Summary

Content "Add Impact and Skewer Knuckles"

Purpose of change

This is a re-PR of #49118. Merge conflicts, as well as converting to the new armor portion format was addressed in this re-PR to make it safe to merge.

Add content to unarmed combat caused by the void left over by #48503. By this point, only 4 unarmed weapons exist in the game. I saw this as an opportunity to use infrastructure added in #41209 for top layer gloves to be used as unarmed weapons to give them a useful niche of their own.

Describe the solution

Create Impact Knuckles and Skewer Knuckles with stats based relative to existing items.
Impact Knuckles has 12 bash (same damage as a pipe), and Skewer Knuckles with 10 pierce ( same damage as a steel sewing awl). From a weapons damage perspective, they are relatively weak combat stat-wise, Impact knuckles being barely stronger than a cudgel which is craftable seconds after starting the game, and Skewer Knuckles being only slightly stronger than a steak knife. This is intentional since unarmed weapons should not be stronger than armed weapons due to leverage and reach.

Describe alternatives you've considered

Not make them at all

Testing

Impact Knuckles:
image

Skewer Knuckles:
image

Additional context

Additional changes in this PR:
Moved previously unarmed weapons out of the unarmed json file since they are no longer unarmed weapons.
Removed Bolt cutters from studded gloves since studs do not need bolt cutters to make, only a hammer.

data/json/items/melee/unarmed_weapons.json Outdated Show resolved Hide resolved
data/json/items/melee/unarmed_weapons.json Outdated Show resolved Hide resolved
@actual-nh actual-nh added Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items / Item Actions / Item Qualities Items and how they work and interact Melee Melee weapons, tactics, techniques, reach attack [JSON] Changes (can be) made in JSON labels Jul 13, 2021
@Saelfen Saelfen force-pushed the Unarmed-weapons-2 branch from 26e44c5 to 704c48a Compare July 20, 2021 20:36
@Saelfen Saelfen force-pushed the Unarmed-weapons-2 branch 2 times, most recently from 0cc5361 to a6c8c5c Compare August 2, 2021 00:45
Update data/json/items/melee/unarmed_weapons.json

Update data/json/items/melee/unarmed_weapons.json

astyle monmove even though its unrelated

Co-Authored-By: Jianxiang Wang (王健翔) <[email protected]>
@Saelfen Saelfen force-pushed the Unarmed-weapons-2 branch from a6c8c5c to fbf32e0 Compare August 2, 2021 12:08
@kevingranade kevingranade merged commit 8a481a5 into CleverRaven:master Aug 8, 2021
satheon49 pushed a commit to satheon49/Cataclysm-DDA that referenced this pull request Aug 14, 2021
Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON Melee Melee weapons, tactics, techniques, reach attack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants