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

[Magiclysm] Parabolan wool gambesons #72054

Merged
merged 37 commits into from
Mar 1, 2024
Merged

Conversation

rty275
Copy link
Contributor

@rty275 rty275 commented Feb 28, 2024

Summary

Content "Adds parabolan wool armors"

Purpose of change

Parabolan wool is an incredibly bullet resistant material, it'd be a bit silly if nobody'd ever made armor out of it. And wool gambesons are right there to copy.

Describe the solution

Adjusted parabolan wool mass/volume based on a discord conversation, then created copies of wool gambesons based on that adjusted mass. Created recipes for those gambesons again based on the mass/volume adjustment of the patches. Added spawns for those gambesons in the Forge of Wonders shop, as per messages on discord. Also added a material for quilted parabolan wool, made equivalent to quilted wool proportionately.

Parabolan wool used to be 1/10th the mass of cotton, and is now 6/10ths the mass. Parabolan felt patches used to be the size of cotton sheets and are now the size of cotton patches, to match regular felt patches. Recipes for existing parabolan wool garments were changed appropriately.

Describe alternatives you've considered

Not adding these. Adjusting the material to be worse at ballistic protection and thus not make sense to make armor out of.

Testing

Clothes were wearable and craftable. Clothes protected more than adequately but not 100% completely from a CROWS turret, as expected. Clothes spawned at the Forge of Wonders and were on sale. Clothes were cut into appropriate amounts of patches.

Additional context

While this isn't my first first PR, it is absolutely the first that adds anything on this scale. I hope I have done things correctly.

Forgot to fix proportional warmth
The patches were the same mass as the breeches you created with 20 of them, so I divided the patch mass by 20 to make logical sense. This means that the gambeson pieces I'm making are going to take far more of the patches, but that seems fitting
The patch to garment mass ratio was all off for the pants, so I adjusted the patch's mass and have now adjusted the gambeson's patch quantities based on that mass
Adjusted per conversation on discord. .6 times the mass of cotton, or otherwise compared to wool appropriately
Copy link
Contributor

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 [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map Mods: Magiclysm Anything to do with the Magiclysm mod labels Feb 28, 2024
@github-actions github-actions bot requested a review from KorGgenT February 28, 2024 20:04
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/recipes/tailoring.json Outdated Show resolved Hide resolved
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Feb 28, 2024
rty275 and others added 6 commits February 28, 2024 12:06
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
rty275 and others added 9 commits February 28, 2024 12:07
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@rty275
Copy link
Contributor Author

rty275 commented Feb 28, 2024

Shoot, I probably should have made those one big commit. That's my bad.

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Feb 28, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Feb 28, 2024
data/mods/Magiclysm/items/enchanted_clothes.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/items/enchanted_clothes.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/items/enchanted_clothes.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/items/enchanted_clothes.json Outdated Show resolved Hide resolved
data/mods/Magiclysm/items/enchanted_clothes.json Outdated Show resolved Hide resolved
@rty275
Copy link
Contributor Author

rty275 commented Feb 28, 2024

But the Clang test said I needed spaces there! Fine, back to how it was before

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Feb 29, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 29, 2024
@Maleclypse
Copy link
Member

I am behind but I will try and look at this today :)

@rty275
Copy link
Contributor Author

rty275 commented Feb 29, 2024

Sounds good, there's no hurry!

@Maleclypse
Copy link
Member

Thank you for doing this!

@Maleclypse Maleclypse merged commit d87b5d9 into CleverRaven:master Mar 1, 2024
23 of 24 checks passed
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Magiclysm Anything to do with the Magiclysm mod Mods Issues related to mods or modding Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants