Skip to content

Commit

Permalink
Updates Hardening and Tempering recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
Drew4484 committed Sep 13, 2022
1 parent 8e76843 commit 8698643
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 108 deletions.
29 changes: 16 additions & 13 deletions data/json/recipes/armor/arms.json
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"time": "120 m",
"autolearn": true,
"components": [ [ [ "sheet_metal", 1 ] ], [ [ "cordage_6_leather", 8 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 }, { "id": "DRILL", "level": 1 } ]
},
{
Expand All @@ -242,8 +242,9 @@
"difficulty": 6,
"time": "4 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 64 ] ], [ [ "armguard_metal", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 3 ],
"components": [ [ "armguard_metal", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 64 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -290,8 +291,9 @@
"difficulty": 6,
"time": "3 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 16 ] ], [ [ "armguard_metal_sheets_elbows", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 2 ],
"components": [ [ "armguard_metal_sheets_elbows", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 16 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -320,8 +322,9 @@
"difficulty": 6,
"time": "3 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 16 ] ], [ [ "armguard_metal_sheets_shoulders", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 1 ],
"components": [ [ "armguard_metal_sheets_shoulders", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 16 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -975,7 +978,7 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
Expand All @@ -997,7 +1000,7 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
},
{
"result": "armor_lc_armguard",
Expand Down Expand Up @@ -1176,7 +1179,7 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
Expand All @@ -1198,7 +1201,7 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
},
{
"result": "armor_lc_heavyarmguard",
Expand Down Expand Up @@ -1377,7 +1380,7 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
Expand All @@ -1399,6 +1402,6 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
}
]
24 changes: 16 additions & 8 deletions data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -1335,8 +1335,12 @@
"difficulty": 6,
"time": "3 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 16 ] ], [ [ "sabaton_metal_sheets", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ [ "carbon", 2 ], [ "sabaton_metal_sheets", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_case_hardening" }
],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 16 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -1434,7 +1438,8 @@
[ "fabric_leather_fur_hide", 2 ],
[ "blacksmithing_standard", 16 ],
[ "lc_steel_standard", 1 ],
[ "armor_chainmail_assembling", 1 ]
[ "armor_chainmail_assembling", 1 ],
[ "carbon", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
Expand All @@ -1443,7 +1448,8 @@
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_case_hardening" }
]
},
{
Expand All @@ -1455,7 +1461,8 @@
[ "fabric_leather_fur_hide", 3 ],
[ "blacksmithing_standard", 22 ],
[ "lc_steel_standard", 2 ],
[ "armor_chainmail_assembling", 2 ]
[ "armor_chainmail_assembling", 2 ],
[ "carbon", 3 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ]
Expand All @@ -1477,13 +1484,14 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_quenching" }
]
},
{
Expand All @@ -1498,6 +1506,6 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
}
]
41 changes: 27 additions & 14 deletions data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,8 @@
[ "fabric_leather_fur_hide", 1 ],
[ "blacksmithing_standard", 16 ],
[ "lc_steel_standard", 2 ],
[ "armor_chainmail_assembling", 1 ]
[ "armor_chainmail_assembling", 1 ],
[ "carbon", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
Expand All @@ -1220,7 +1221,8 @@
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_case_hardening" }
]
},
{
Expand All @@ -1232,7 +1234,8 @@
[ "fabric_leather_fur_hide", 2 ],
[ "blacksmithing_standard", 22 ],
[ "lc_steel_standard", 3 ],
[ "armor_chainmail_assembling", 2 ]
[ "armor_chainmail_assembling", 2 ],
[ "carbon", 3 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ]
Expand All @@ -1254,13 +1257,14 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_quenching" }
]
},
{
Expand All @@ -1275,7 +1279,7 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
},
{
"result": "lc_mitten_gaunt",
Expand Down Expand Up @@ -1342,8 +1346,13 @@
"difficulty": 6,
"time": "3 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 16 ] ], [ [ "mitten_gaunt_metal_sheets", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 2 ],
"components": [ [ "mitten_gaunt_metal_sheets", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_case_hardening" }
],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 16 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -1441,7 +1450,8 @@
[ "fabric_leather_fur_hide", 1 ],
[ "blacksmithing_standard", 16 ],
[ "lc_steel_standard", 3 ],
[ "armor_chainmail_assembling", 1 ]
[ "armor_chainmail_assembling", 1 ],
[ "carbon", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
Expand All @@ -1450,7 +1460,8 @@
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_case_hardening" }
]
},
{
Expand All @@ -1462,7 +1473,8 @@
[ "fabric_leather_fur_hide", 2 ],
[ "blacksmithing_standard", 22 ],
[ "lc_steel_standard", 4 ],
[ "armor_chainmail_assembling", 2 ]
[ "armor_chainmail_assembling", 2 ],
[ "carbon", 3 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ]
Expand All @@ -1484,13 +1496,14 @@
[ "armor_chainmail_assembling", 1 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_quenching" }
]
},
{
Expand All @@ -1505,6 +1518,6 @@
[ "armor_chainmail_assembling", 2 ]
],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
}
]
23 changes: 13 additions & 10 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,9 @@
"difficulty": 6,
"time": "4 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 64 ] ], [ [ "helmet_metal_sheets_full", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 3 ],
"components": [ [ "helmet_metal_sheets_full", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 64 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -939,8 +940,9 @@
"difficulty": 6,
"time": "4 h",
"book_learn": [ [ "textbook_armwest", 6 ], [ "welding_book", 6 ] ],
"components": [ [ [ "charcoal", 64 ] ], [ [ "helmet_metal_sheets", 1 ] ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" } ],
"using": [ "carbon", 3 ],
"components": [ [ "helmet_metal_sheets", 1 ] ],
"proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_blacksmithing" }, { "proficiency": "prof_case_hardening" } ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "forge", 64 ] ], [ [ "metalworking_tongs", -1 ] ] ]
},
Expand Down Expand Up @@ -2731,23 +2733,23 @@
"difficulty": 8,
"time": "5 d 12 h",
"book_learn": [ [ "textbook_armwest", 7 ] ],
"using": [ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 2 ] ],
"using": [ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "lc_steel_standard", 2 ], [ "carbon", 2 ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }, { "proficiency": "prof_case_hardening" }
]
},
{
"result": "xl_ch_helm_close",
"type": "recipe",
"copy-from": "ch_helm_close",
"time": "6 d 8 h",
"using": [ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 22 ], [ "lc_steel_standard", 3 ] ],
"using": [ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 22 ], [ "lc_steel_standard", 3 ], [ "carbon", 3 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ]
},
Expand All @@ -2763,13 +2765,14 @@
"book_learn": [ [ "textbook_armwest", 7 ] ],
"using": [ [ "fabric_leather_fur_hide", 1 ], [ "blacksmithing_standard", 16 ], [ "mc_steel_standard", 2 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ],
"proficiencies": [
{ "proficiency": "prof_armorsmithing" },
{ "proficiency": "prof_closures", "time_multiplier": 1.25, "fail_multiplier": 1.15 },
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 }
{ "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 },
{ "proficiency": "prof_quenching" }
]
},
{
Expand All @@ -2779,6 +2782,6 @@
"time": "6 d 12 h",
"using": [ [ "fabric_leather_fur_hide", 2 ], [ "blacksmithing_standard", 22 ], [ "mc_steel_standard", 3 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
"tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ], [ [ "metal_tank", -1 ] ], [ [ "water", -120 ] ] ]
}
]
Loading

0 comments on commit 8698643

Please sign in to comment.