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 bronze variants to many recipes. #70712

Merged
merged 33 commits into from
Jan 9, 2024
Merged

Add bronze variants to many recipes. #70712

merged 33 commits into from
Jan 9, 2024

Conversation

juur
Copy link
Contributor

@juur juur commented Jan 6, 2024

Summary

Content "Add bronze variants to ingredients for many recipes"

Purpose of change

I enjoy mods such as Innawood, but the base game lacks some of the basic bronze items/construction paths. This patch is the first (if it's accepted and worth doing!) to try and introduce parity for bronze age construction and crafting, alongside the (default) "steel age".

Describe the solution

For each key item, e.g. "nail", i've introduced a bronze variant (recipe for those will follow in future), as an alternative ingredient.

Describe alternatives you've considered

None

Testing

I've tested it in the base game. I need to do more testing with some of the bundled mods to see if it causes 'downstream' problems.

Additional context

Copy link
Contributor

github-actions bot commented Jan 6, 2024

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 new contributor [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Containers Things that hold other things Items: Armor / Clothing Armor and clothing and removed new contributor labels Jan 6, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

JSON & C++ formatters

data/json/recipes/armor/arms.json|1738|
data/json/recipes/armor/arms.json|1955|
data/json/recipes/armor/arms.json|2243|
data/json/recipes/armor/arms.json|2260|
data/json/recipes/armor/feet.json|1935|
data/json/recipes/armor/feet.json|1957|
data/json/recipes/armor/hands.json|1450|
data/json/recipes/armor/hands.json|1472|
data/json/recipes/armor/hands.json|1689|
data/json/recipes/armor/hands.json|1711|
data/json/recipes/armor/head.json|2938|
data/json/recipes/armor/head.json|2955|
data/json/recipes/armor/head.json|3090|
data/json/recipes/armor/head.json|3107|
data/json/recipes/armor/head.json|3242|
data/json/recipes/armor/head.json|3259|
data/json/recipes/armor/legs.json|1778|
data/json/recipes/armor/legs.json|1795|
data/json/recipes/armor/legs.json|1937|
data/json/recipes/armor/legs.json|1954|
data/json/recipes/armor/legs.json|2096|
data/json/recipes/armor/legs.json|2113|
data/json/recipes/armor/storage.json|1062|
data/json/recipes/armor/suit.json|2593|
data/json/recipes/armor/suit.json|2602|
data/json/recipes/armor/suit.json|2964|
data/json/recipes/armor/suit.json|2973|
data/json/recipes/armor/suit.json|3347|
data/json/recipes/armor/suit.json|3356|
data/json/recipes/other/parts_construction.json|24|
data/json/recipes/recipe_ammo.json|265|
data/json/recipes/recipe_ammo.json|447|
data/json/recipes/recipe_others.json|2935|
data/json/recipes/tools/tools_hand.json|1480|
data/json/recipes/tools/tools_hand.json|1590|
data/json/recipes/tools/tools_primitive.json|80|
data/json/recipes/tools/tools_primitive.json|104|
data/json/recipes/weapon/cutting.json|100|
data/json/recipes/weapon/cutting.json|711|
data/json/recipes/weapon/cutting.json|816|
data/json/recipes/weapon/cutting.json|917|
data/json/recipes/weapon/cutting.json|1268|
data/json/recipes/weapon/cutting.json|1369|
data/json/recipes/weapon/cutting.json|1470|
data/json/recipes/weapon/cutting.json|1571|
data/json/recipes/weapon/cutting.json|1672|
data/json/recipes/weapon/cutting.json|1773|
data/json/recipes/weapon/cutting.json|1874|
data/json/recipes/weapon/cutting.json|1975|
data/json/recipes/weapon/cutting.json|2076|
data/json/recipes/weapon/cutting.json|2177|
data/json/recipes/weapon/cutting.json|2501|
data/json/recipes/weapon/cutting.json|2602|
data/json/recipes/weapon/explosive.json|232|
data/json/recipes/weapon/piercing.json|1046|
data/json/recipes/weapon/piercing.json|1409|
data/json/recipes/weapon/ranged.json|1310|
data/json/requirements/toolsets.json|99|
data/json/requirements/toolsets.json|106|

@Karol1223
Copy link
Contributor

Karol1223 commented Jan 6, 2024

  1. Summoning @Drew4484 to look over this. Sorry to throw you under the rails of another metalworking PR but I am not sure a bronze file is viable?
  2. Uh. Did you add crafting recipes for the new items? I couldn't find them.
  3. You're missing some spots bronze tongs should be added in requirements at

Overall I was hoping we'd wait with bronze tools until we can implement tools wearing out as they're used... But I can't stop you if it does make sense, and I'd like Drew to confirm whether it does.

@juur
Copy link
Contributor Author

juur commented Jan 6, 2024

  1. Summoning @Drew4484 to look over this. Sorry to throw you under the rails of another metalworking PR but I am not sure a bronze file is viable?
  2. Uh. Did you add crafting recipes for the new items? I couldn't find them.

Not yet, that might need a bit more research (and I wasn't sure how open to such a change CDDA was)

  1. You're missing some spots bronze tongs should be added in requirements at

Will check - I left bronze nails out of vehicles (i'm unsure if that would structurally make sense, I believe bronze is stronger [or can be] than iron, but less than steel)

@Drew4484
Copy link
Contributor

Drew4484 commented Jan 6, 2024

  1. Summoning @Drew4484 to look over this. Sorry to throw you under the rails of another metalworking PR but I am not sure a bronze file is viable?
  2. Uh. Did you add crafting recipes for the new items? I couldn't find them.
  3. You're missing some spots bronze tongs should be added in requirements at

Overall I was hoping we'd wait with bronze tools until we can implement tools wearing out as they're used... But I can't stop you if it does make sense, and I'd like Drew to confirm whether it does.

Bronze files are viable, subject to greater wear than iron/steel, and not really suitable for working on harder metals like carbon steel but will probably work well enough. IIRC our in-game bronze isn't a specific alloy so there is some variance between a copper/tin alloy and one with aluminum, but without adding a dozen alloys I'd let this proceed.

@Drew4484
Copy link
Contributor

Drew4484 commented Jan 6, 2024

  1. Summoning @Drew4484 to look over this. Sorry to throw you under the rails of another metalworking PR but I am not sure a bronze file is viable?
  2. Uh. Did you add crafting recipes for the new items? I couldn't find them.

Not yet, that might need a bit more research (and I wasn't sure how open to such a change CDDA was)

  1. You're missing some spots bronze tongs should be added in requirements at

Will check - I left bronze nails out of vehicles (i'm unsure if that would structurally make sense, I believe bronze is stronger [or can be] than iron, but less than steel)

A nice resource is MakeItFrom.com, you need to know a bit about what you're looking at but it does a good job of showing side-by-side comparisons. In general, brone/copper alloy is approximate to steel but heavier and more likely to deform than fracture (bend vs. break). Bronze nails are fine for things like a wooden wagon or cart.

Copy link
Contributor

github-actions bot commented Jan 8, 2024

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • bronze filesets

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@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 Jan 8, 2024
@Maleclypse Maleclypse merged commit 2e405f0 into CleverRaven:master Jan 9, 2024
@Procyonae Procyonae mentioned this pull request Jan 21, 2024
Maleclypse added a commit that referenced this pull request Jan 25, 2024
* Initial Commit

* Why so many :c

* Regex to the rescue

* Change any_nail to nails

* Revert "Change any_nail to nails"

This reverts commit 2fa5487.

* Revert "Regex to the rescue"

This reverts commit ee613a9.

* Regex to the rescue except correct this time

* any_nail -> nails again

* Catch the stragglers

* Requirements

* any_hotcut

* any_metalworking_tongs

* any_metalworking_file

* Better requirement names

* Lint

* Minor errors

---------

Co-authored-by: Maleclypse <[email protected]>
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 Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants