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

Nested Recipes - Chain Armor #60268

Merged
merged 18 commits into from
Aug 19, 2022
Merged

Conversation

ANickelN
Copy link
Contributor

@ANickelN ANickelN commented Aug 18, 2022

Summary

Interface "Nested Recipes - Chain Armor"

Purpose of change

Add nesting for chainmail armors. Shaves off about 100 recipes! Yay!

Remove duplicate chain coif recipes, Drew448 confirmed on Discord that the longer recipe is the correct one.

Describe the solution

Add (and remove) the necessary JSON.

Describe alternatives you've considered

Bonking Drew on the head.

Testing

cataclysm-tiles_OvsLsx2wbk

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Armor / Clothing Armor and clothing Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions labels Aug 18, 2022
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 18, 2022
@github-actions
Copy link
Contributor

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

Click to expand
  • all steel chain coifs
  • hardened steel chain coifs
  • high steel chain coifs
  • low steel chain coifs
  • medium steel chain coifs
  • tempered steel chain coifs

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 removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 19, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 19, 2022
@ANickelN ANickelN marked this pull request as ready for review August 19, 2022 00:51
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 19, 2022
@bombasticSlacks bombasticSlacks merged commit 0bd8c02 into CleverRaven:master Aug 19, 2022
@ANickelN ANickelN deleted the chainarmor branch August 20, 2022 00:30
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Aug 21, 2022
* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
* Hide Recipes for Chain Gauntlets

* add nest chainmail gloves

* Hide Chainmail Sleeve Recipes

* Nested Chainmail Sleeves

* lint

* Hide Chainmail Boot Recipes

* Nested Chainmail Chausses Added

* Hide Chainmail Legging Recipes

* Nested Chain Leggings Recipes

* Hide Chainmail Vest Recipes

* Nested Chain Vests Recipes

* Fix Chainmail Hood recipes and hide remaining ones

* Nested Recipes Chain Coifs

* Hide Chain Hauberk Recipes

* Nested Chainmail Hauberks Recipes

* Hide Chainmail Suit Recipes

* Nested Recipes Chainmail Suits

* lint
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 Info / User Interface Game - player communication, menus, etc. Items: Armor / Clothing Armor and clothing [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.

2 participants