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 expansion #2715

Merged
merged 18 commits into from
May 11, 2023

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented Apr 27, 2023

Summary

SUMMARY: [Features] "Expanded number of readily available to craft unarmed weapons"

Purpose of change

The list of unarmed weapons in the early and mid game is sadly quite small. These are some items I made for my mod and which I've decided to try and port to mainline, as well as making some of the vanilla ones autolearn.

Describe the solution

It's a series of unarmed weapons, each serving a different purpose for combat relative to the punch dagger- the sai is lower damage but higher defense, the spiked boxing gloves are good for earlygame, and the katar has higher damage but is larger and swings slower. I've also made some of the vanilla items easier to craft, since they're really not that complicated and shouldn't require a book to know how to make them. Furthermore, the razorbar katar and cestus are both relatively simple weapons to make and shouldn't require a book to know how to make them.

Describe alternatives you've considered

The main issue is that I want to balance the stats right, and I'm not quite sure how to do it better than this. Advice would be appreciated.

Testing

The new weapons and changed recipes are both from my mod, so I've tested them quite a bit.

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Apr 27, 2023
data/json/items/melee/unarmed_weapons.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/bashing.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/cutting.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/piercing.json Outdated Show resolved Hide resolved
@chaosvolt
Copy link
Member

Easy enough to lintfix these, can run file contents through this next time you need it: http://dev.narc.ro/cataclysm/format.html

data/json/recipes/weapon/cutting.json Outdated Show resolved Hide resolved
data/json/recipes/weapon/piercing.json Outdated Show resolved Hide resolved
yay855 and others added 2 commits May 4, 2023 02:41
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@scarf005 scarf005 requested a review from chaosvolt May 4, 2023 06:55
chaosvolt
chaosvolt previously approved these changes May 4, 2023
Copy link
Member

@scarf005 scarf005 left a comment

Choose a reason for hiding this comment

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

looks good, some of my nitpicks:

  1. there's an recipe for spiked boxing gloves yet no recipe for regular boxing gloves. this could be solved by
  • adding recipe for gloves
  • changing recipe for spiked boxing gloves as boxing glove + 8 nails
  1. sai and katar takes too much metal to craft.
tanto katar sai
weight 560g 1150g 775g
fab. lv 7 7 6
steel lump 1 3 2

could you decrease metal requirement from 3 -> 2 for katar and 2 -> 1 for sai?

other than that, i think it's a great addition.
Cataclysm: Bright Nights - cbn-experimental-2023-05-04-0526-8-g718e52ebae4_12
sai looks super weird on ground tho

@chaosvolt
Copy link
Member

Sai is clearly being screwed up by the graphical overmap tile for the sai telecom areas it seems. Easy fix would be changing the weapon's ID a lil. Also side note, the katar's weight is currently same as the makeshift one so it could be changed in any particular direction desired, the previous tweak suggested was just a quickfix to it being weightless and missing some properties.

@scarf005 scarf005 enabled auto-merge (squash) May 11, 2023 04:42
@scarf005 scarf005 self-requested a review May 11, 2023 04:42
@scarf005 scarf005 merged commit c15c6ec into cataclysmbnteam:upload May 11, 2023
14 checks passed
@yay855 yay855 deleted the unarmed-weapons-expansion branch May 24, 2023 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants