Quenching recipe consistency

[Kribylet]

Summary

Bugfixes "Make Quenching/Tempered Steel recipes more consistent"

Purpose of change

I noticed an inconsistency with quenching recipes sometimes using only water, and other times permitting water and water_clean. Looking more closely, I noticed a few more inconsistencies with tool usage across sizes for some items and some items not requiring any water or quenching basin at all. Some recipes required the quenching proficiency but didn't involve tempering anything. This pull request aims to resolve some of those inconsistencies.

Describe the solution

Changed JSON entries that only permitted unsafe water to also accept clean water as an alternative for quenching purposes when crafting tempered armor.
Changed JSON entries that required the quenching proficiency, but did not involve tempering anything (eg. making chainmail out of tempered parts). Those recipes no longer involve the quenching proficiency.
Changed JSON entries that required the quenching proficiency, involved tempering, but did not require water or a quenching basin at all. Those recipes now require a metal_tank and water or water_clean.
Changed JSON entries for arm guards where the normal size variant required a swage and die set, but XL and XS variants did not. All those recipe size variants now require the tool.

Describe alternatives you've considered

I did not attempt to tackle inconsistencies with regards to tool use between recipes:
Some recipes require the swage and die set for armor parts that seem similar to other armor parts that don't.
Some helmets use a (clay/regular) crucible, but not a hot cut, while almost all other tempered steel recipes requires a hot cut.

The Tempered steel Battleaxe allows to substitute a hot cut with a drift, but no other tempered steel recipe permits this.

The Tempered steel mace does not require a hot cut, nor any substitute special tool, but I'm not familiar with blacksmithing and it seemed too close to reasonable that forging a tempered metal mass on a stick might not require a special tool beyond the quenching basin.

Several tempered armor sets offer a normal size and XL size variant, but no XS size variant. I'm not sure what the underlying reason might be or if it is merely an oversight, it seems reasonable enough that somebody could craft a small version of metal armor if they wanted to. In any case, I didn't feel comfortable trying to create new items with this pull request.

Testing

Started the world and checked recipes in the craft menu in a debug world. Checked that if the quenching proficiency was required, a water basin and water was also required. Checked that both water and clean water was permitted to be used.
Checked that recipes that create tempered equipment but does not actually temper anything during its crafting step does not require the quenching proficiency, eg. chainmail linking of tempered parts.

Additional context

[github-actions]

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

[JSON & C++ formatters](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/DEVELOPER_TOOLING.md)

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3252 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3387 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3404 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3539 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3556 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3941 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3965 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 3982 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4246 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4270 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4287 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4774 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4793 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4804 in 5b90962

"tools": [ [ [ "swage", -1 ] ], [ [ "hotcut_any", 1, "LIST" ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ]

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4941 in 5b90962

"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "polisher", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4957 in 5b90962

"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "polisher", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/armor/torso.json

Line 4968 in 5b90962

"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "polisher", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

---

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/recipes/weapon/cutting.json

Line 1163 in 5b90962

"tools": [ [ [ "hotcut_any", 1, "LIST" ], [ "drift", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ], [ "water_clean", -120 ] ] ],

[Procyonae]

Is there some issue with just using some "type": "requirement" to cut out all the repetition here? (We also have any_fresh_water/any_water at the very least rather than just adding clean water to all the entries)

[Kribylet]

Is there some issue with just using some "type": "requirement" to cut out all the repetition here? (We also have any_fresh_water/any_water at the very least rather than just adding clean water to all the entries)

Not at all. The only reason I didn't was because I modified things using the context clues from the other entries for tempered crafts (lack of experience with the JSON structure CDDA uses). I'll try to find entries that are expressed more cleanly and try to condense things sensibly according to that.