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

feat(content): allow rocks for (staff) sling, add {big,small} lead sling bullets #2709

Merged
merged 9 commits into from
Apr 27, 2023

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented Apr 26, 2023

Summary

SUMMARY: Content "Changed sling and staff sling to be capable of using both rocks and pebbles as ammo, as well as added in new 'sling bullet' and 'small sling bullet' ammo as a higher-end lead ammo for slings and staff slings."

Purpose of change

Slings have been used to huck larger rocks historically, and staff slings are just a sling on the end of a staff. Furthermore, lead sling bullets are historically accurate and would serve as a nice alternative to ball bearings.

Describe the solution

It's a minor change to two items, two new items, and two new recipes.

Describe alternatives you've considered

You could keep the staff sling and sling as using rocks and pebbles respectively, but it's kind of a strange distinction to begin with.

Testing

I've made sure there are no json errors and it seems fairly balanced in terms of stats and crafting.

@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label Apr 26, 2023
data/json/recipes/ammo/other.json Outdated Show resolved Hide resolved
data/json/recipes/ammo/other.json Outdated Show resolved Hide resolved
"subcategory": "CSC_AMMO_OTHER",
"skill_used": "fabrication",
"difficulty": 3,
"time": "1 h",
Copy link
Member

Choose a reason for hiding this comment

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

Both these recipes can probably be made more granular, divided up to make 1 charge at a time for proportionately less time and material cost.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I intended to keep it at the same standard for ball bearings where you made a bunch at once, but that's probably a good idea.

yay855 and others added 3 commits April 26, 2023 02:04
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
data/json/recipes/ammo/other.json Outdated Show resolved Hide resolved
Co-authored-by: scarf <greenscarf005@gmail.com>
@yay855
Copy link
Contributor Author

yay855 commented Apr 26, 2023

Sheesh. I keep screwing this stuff up. I appreciate the help, guys.

"description": "A ball of lead roughly the size of a baseball. Traditionally thrown from a sling, and hits a lot harder than any old rock.",
"material": "lead",
"ammo_type": "rock",
"weight": "28 g",
Copy link
Member

Choose a reason for hiding this comment

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

50 units of lead per charge of sling_bullet would be 150 grams. Even then that's pretty light compared to regular rocks being 657 grams. But then again that's way over a whole pound, so honestly going for a value in the neighborhood of 150 grams and 50 ml would be good enough to match the lead item's density without having to tweak the recipe any further.

"description": "A small ball of lead traditionally thrown from a sling. It hits a lot harder than any old pebble.",
"material": "lead",
"ammo_type": "pebble",
"weight": "12 g",
Copy link
Member

@chaosvolt chaosvolt Apr 27, 2023

Choose a reason for hiding this comment

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

Similar deal with the other item, recipe uses 150 grams of lead to make 6 shots, so would make sense to use 25 grams as weight. Possibly also dragging count down to only 30, so a stack of 250 ml weights 750 grams (again making it consistent with lead itself).

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Bug reported in previous review got fixed so dunno why it's still showing as changes requested, guess I can mark it as dismissed or whatever's needed to clear it.

  1. Load-tested JSON changes in compiled test build.
  2. Spawned in pebbles, rocks, and both sizes of sling bullet.
  3. Spawned a sling and staff sling, confirmed that both can load all four ammo items.

Ranges also match that of pebbles and rocks, but honestly it's already weird that pebbles and rocks also have the exact same range so I feel like that's a completely separate issue anyway. Looks good to me.

@chaosvolt chaosvolt requested a review from scarf005 April 27, 2023 02:07
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.

image

hecc, i was going to approve it but was carried away doing other things while automated tests were running. i'll edit PR title and summary to be shorter before merging.

@chaosvolt
Copy link
Member

No worries. Will merge once it shows all green just in case I missed anything then, so long as lightning continues to fuck off and not affect my power or net. >:C

@scarf005 scarf005 changed the title Let Slings and Staff Slings Use Rocks and Pebble Ammo Types, Plus New Sling Bullet Ammo feat(content): allow rocks as ammo for (staff) sling, add big and small lead sling bullets Apr 27, 2023
@scarf005 scarf005 changed the title feat(content): allow rocks as ammo for (staff) sling, add big and small lead sling bullets feat(content): allow rocks for (staff) sling, add {big,small} lead sling bullets Apr 27, 2023
@scarf005 scarf005 merged commit ad014d8 into cataclysmbnteam:upload Apr 27, 2023
14 checks passed
@scarf005
Copy link
Member

oh hecc, forgot to mention without "looks_like" field they will use ASCII tiles
nevermind, i'll add a followup PR

scarf005 added a commit to scarf005/Cataclysm-BN that referenced this pull request Apr 27, 2023
chaosvolt pushed a commit that referenced this pull request Apr 27, 2023
@yay855 yay855 deleted the sling-bullets 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