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

Innawoods tailoring and misc fixes #58730

Merged
merged 23 commits into from Jun 26, 2022
Merged

Innawoods tailoring and misc fixes #58730

merged 23 commits into from Jun 26, 2022

Conversation

Sathra225
Copy link
Contributor

Summary

Mods "Innawoods tailoring fixes"

Purpose of change

Innawoods uses its own tailoring and materials requirements JSON due to fibercloth, so they needed to be updated to mainline numbers. As an example, a gambeson in mainline needs 80 cotton sheets, without this change it needs 1760 cotton or fibercloth sheets in Innawoods.

Describe the solution

Changed the relevant numbers in the files.

Describe alternatives you've considered

None. Numbers fix.

Testing

Made changes, quantities in Innawoods match those for mainline.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Innawood 🌲 Anything to do with Innawood mod json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Jun 26, 2022
@Sathra225
Copy link
Contributor Author

And yes, the commit history is a mess but not sure if trying to fix it will break my current PR's

@NetSysFire
Copy link
Member

I would git reset --soft 3b95bad, git commit and then force push.

@Sathra225
Copy link
Contributor Author

Yeah, its the force-pushing I'm concerned about breaking this and the camphine PR's

@NetSysFire
Copy link
Member

I do not see how that would break the PR. However, anyone merging this should squash regardless, so there is only one commit showing up in master later.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 26, 2022
@Sathra225
Copy link
Contributor Author

Sathra225 commented Jun 26, 2022

Adding Fibercloth material and updated weights of cotton (material) and fibercloth sheets to be in parity with mainline. The fibercloth material change is to allow items made from fibercloth sheets to salvage into cotton patches instead of deleting.

I did consider making a range of fibercloth patches and scraps, but at this point in time it wouldn't actually do anything but add item bloat as fibercloth is cotton sheets made from plant fiber.
The fix only works for fibercloth sheets made after the change for whatever reason.

@Sathra225 Sathra225 changed the title Innawoods tailoring Innawoods tailoring and misc fixes Jun 26, 2022
update fibercloth spinwheel time, make chitosan plastic craftable again.
@github-actions github-actions bot added the Crafting / Construction / Recipes Includes: Uncrafting / Disassembling label Jun 26, 2022
@Sathra225
Copy link
Contributor Author

Was informed that plastic from chitin wasn't possible anymore due to lye changes, so added potassium lye as an alternate
deacetylation chemical at a higher amount.
Data from here: https://pubmed.ncbi.nlm.nih.gov/21700271/
Also fixed up time of crafting fibercloth using spinwheel to the same as cotton sheets.

@dseguin dseguin merged commit b843003 into CleverRaven:master Jun 26, 2022
tornikeo pushed a commit to tornikeo/Cataclysm-DDA that referenced this pull request Jun 26, 2022
* Update nuts.json

* Update vegetable_dishes.json

* Update dry.json

* Update vegetable_dishes.json

* Update dry.json

* Update nuts.json

* Revert "Update nuts.json"

This reverts commit 13e8fc5.

* Revert "Update dry.json"

This reverts commit 396bb17.

* Revert "Update vegetable_dishes.json"

This reverts commit 09f15f6.

* Revert "Update dry.json"

This reverts commit 986a548.

* Revert "Update vegetable_dishes.json"

This reverts commit 1a66647.

* Revert "Update nuts.json"

This reverts commit 3b95bad.

* Update materials.json

updating numbers.

* Update tailoring.json

update numbers

* Update materials.json

fibercloth salvage fix

* Update tool_tailoring.json

fibercloth salvage fix

* Update materials.json

update fibercloth spinwheel time, make chitosan plastic craftable again.
Drew4484 pushed a commit to Drew4484/Cataclysm-DDA that referenced this pull request Jun 26, 2022
* Update nuts.json

* Update vegetable_dishes.json

* Update dry.json

* Update vegetable_dishes.json

* Update dry.json

* Update nuts.json

* Revert "Update nuts.json"

This reverts commit 13e8fc5.

* Revert "Update dry.json"

This reverts commit 396bb17.

* Revert "Update vegetable_dishes.json"

This reverts commit 09f15f6.

* Revert "Update dry.json"

This reverts commit 986a548.

* Revert "Update vegetable_dishes.json"

This reverts commit 1a66647.

* Revert "Update nuts.json"

This reverts commit 3b95bad.

* Update materials.json

updating numbers.

* Update tailoring.json

update numbers

* Update materials.json

fibercloth salvage fix

* Update tool_tailoring.json

fibercloth salvage fix

* Update materials.json

update fibercloth spinwheel time, make chitosan plastic craftable again.
@Sathra225 Sathra225 deleted the innawoods-tailoring branch June 26, 2022 22:03
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Innawood 🌲 Anything to do with Innawood mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants