Skip to content

Commit

Permalink
Give a bunch of reversible crafts specified disassembly times (Clever…
Browse files Browse the repository at this point in the history
…Raven#75414)

* handle the reversibility

* include this shotgun here while you're at it
  • Loading branch information
Karol1223 authored Aug 4, 2024
1 parent 1fc1e9a commit b7a3317
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"difficulty": 4,
"time": "5 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "40 m" },
"using": [ [ "tailoring_felt_patchwork", 11 ] ]
},
{
Expand Down Expand Up @@ -2239,7 +2239,7 @@
"difficulty": 2,
"skills_required": [ "survival", 1 ],
"time": "2 h",
"reversible": true,
"reversible": { "time": "30 m" },
"autolearn": true,
"using": [ [ "tailoring_fur_patchwork_simple", 2 ] ],
"proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_furriery" } ]
Expand Down
30 changes: 15 additions & 15 deletions data/json/recipes/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@
"skills_required": [ "gun", 1 ],
"time": "15 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_leather_small", 6 ], [ "fastener_small", 2 ] ],
"proficiencies": [
{ "proficiency": "prof_closures" },
Expand All @@ -1131,7 +1131,7 @@
"skills_required": [ "gun", 1 ],
"time": "2 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 2 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand Down Expand Up @@ -1164,7 +1164,7 @@
"time": "6 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand All @@ -1181,7 +1181,7 @@
"time": "7 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 5 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand All @@ -1198,7 +1198,7 @@
"time": "7 h 30 m",
"autolearn": false,
"book_learn": [ [ "manual_gun", 2 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 5 ], [ "fastener_small", 2 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 2, "LIST" ] ], [ [ "clasps", 2, "LIST" ] ] ]
Expand All @@ -1215,7 +1215,7 @@
"time": "7 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 5 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 3, "LIST" ] ], [ [ "clasps", 3, "LIST" ] ] ]
Expand All @@ -1232,7 +1232,7 @@
"time": "3 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 2 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand All @@ -1249,7 +1249,7 @@
"time": "5 h 30 m",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand All @@ -1266,7 +1266,7 @@
"time": "8 h 30 m",
"autolearn": false,
"book_learn": [ [ "manual_gun", 2 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 6 ], [ "fastener_small", 2 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 2, "LIST" ] ], [ [ "clasps", 2, "LIST" ] ] ]
Expand All @@ -1283,7 +1283,7 @@
"time": "5 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 4 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 1, "LIST" ] ], [ [ "clasps", 1, "LIST" ] ] ]
Expand All @@ -1300,7 +1300,7 @@
"time": "15 h",
"autolearn": false,
"book_learn": [ [ "manual_gun", 2 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 9 ], [ "fastener_small", 6 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 3, "LIST" ] ], [ [ "clasps", 3, "LIST" ] ] ]
Expand All @@ -1317,7 +1317,7 @@
"time": "8 h 30 m",
"autolearn": false,
"book_learn": [ [ "manual_gun", 1 ] ],
"reversible": true,
"reversible": { "time": "10 m" },
"using": [ [ "tailoring_nylon_patchwork", 6 ], [ "fastener_small", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_small", 2, "LIST" ] ], [ [ "clasps", 2, "LIST" ] ] ]
Expand Down Expand Up @@ -1351,7 +1351,7 @@
"difficulty": 4,
"time": "5 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "15 m" },
"using": [ [ "tailoring_canvas_patchwork", 3 ] ],
"proficiencies": [ { "proficiency": "prof_closures" }, { "proficiency": "prof_closures_waterproofing" } ],
"components": [ [ [ "strap_large", 1, "LIST" ] ], [ [ "clasps", 2, "LIST" ] ] ]
Expand Down Expand Up @@ -1802,7 +1802,7 @@
"skills_required": [ "fabrication", 3 ],
"time": "13 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "90 m" },
"using": [ [ "tailoring_nylon_patchwork", 12 ], [ "strap_small", 3 ], [ "filament", 3 ] ]
},
{
Expand All @@ -1816,7 +1816,7 @@
"skills_required": [ "fabrication", 3 ],
"time": "38 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "90 m" },
"using": [ [ "tailoring_nylon_patchwork", 30 ], [ "strap_small", 6 ], [ "filament", 6 ] ]
},
{
Expand Down
8 changes: 4 additions & 4 deletions data/json/recipes/armor/suit.json
Original file line number Diff line number Diff line change
Expand Up @@ -1641,7 +1641,7 @@
"skill_used": "tailor",
"difficulty": 2,
"time": "3 h",
"reversible": true,
"reversible": { "time": "45 m" },
"autolearn": true,
"using": [ [ "tailoring_cotton_patchwork_simple", 34 ] ]
},
Expand All @@ -1654,7 +1654,7 @@
"skill_used": "tailor",
"difficulty": 2,
"time": "4 h",
"reversible": true,
"reversible": { "time": "45 m" },
"autolearn": true,
"using": [ [ "tailoring_denim_patchwork", 24 ] ],
"proficiencies": [ { "proficiency": "prof_closures" } ]
Expand All @@ -1669,7 +1669,7 @@
"difficulty": 2,
"skills_required": [ "survival", 1 ],
"time": "5 h",
"reversible": true,
"reversible": { "time": "45 m" },
"autolearn": true,
"book_learn": [ [ "textbook_survival", 1 ], [ "survival_book", 1 ] ],
"using": [ [ "tailoring_fur_patchwork_simple", 7 ] ],
Expand All @@ -1685,7 +1685,7 @@
"skill_used": "tailor",
"difficulty": 3,
"time": "5 h",
"reversible": true,
"reversible": { "time": "45 m" },
"autolearn": true,
"using": [ [ "tailoring_leather_patchwork_simple", 8 ] ],
"proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
Expand Down
28 changes: 14 additions & 14 deletions data/json/recipes/armor/torso.json
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@
"difficulty": 3,
"time": "8 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "50 m" },
"using": [ [ "tailoring_canvas_patchwork", 36 ], [ "fastener_large", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" } ]
},
Expand Down Expand Up @@ -816,7 +816,7 @@
"skills_required": [ "survival", 1 ],
"time": "10 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "50 m" },
"using": [ [ "sewing_standard", 60 ], [ "fabric_fur_pelt", 7 ], [ "fastener_large", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_closures" },
Expand Down Expand Up @@ -882,7 +882,7 @@
"difficulty": 6,
"time": "9 h",
"autolearn": true,
"reversible": { "time": "1 h" },
"reversible": { "time": "50 m" },
"book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
"using": [ [ "sewing_standard", 60 ], [ "tailoring_leather_patchwork", 9 ], [ "fastener_large", 1 ] ],
"proficiencies": [
Expand Down Expand Up @@ -1031,7 +1031,7 @@
"difficulty": 5,
"time": "10 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "50 m" },
"using": [ [ "sewing_standard", 160 ], [ "fabric_felt", 33 ], [ "fastener_large", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" } ]
},
Expand All @@ -1044,7 +1044,7 @@
"skill_used": "tailor",
"difficulty": 5,
"time": "3 h",
"reversible": true,
"reversible": { "time": "30 m" },
"book_learn": [ [ "tailor_japanese", 5 ] ],
"using": [ [ "tailoring_cotton_patchwork", 24 ] ]
},
Expand Down Expand Up @@ -1103,7 +1103,7 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "2 h",
"reversible": true,
"reversible": { "time": "45 m" },
"autolearn": true,
"using": [ [ "tailoring_cotton_patchwork", 36 ] ]
},
Expand Down Expand Up @@ -1817,7 +1817,7 @@
"difficulty": 3,
"time": "6 h 48 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "45 m" },
"using": [ [ "tailoring_canvas_patchwork", 32 ], [ "fastener_large", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures" } ]
},
Expand Down Expand Up @@ -1849,7 +1849,7 @@
"skills_required": [ "survival", 1 ],
"time": "8 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "45 m" },
"using": [ [ "tailoring_fur_patchwork", 8 ], [ "fastener_large", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_closures" },
Expand Down Expand Up @@ -1921,7 +1921,7 @@
"difficulty": 6,
"time": "7 h 39 m",
"autolearn": true,
"reversible": { "time": "1 h" },
"reversible": { "time": "45 m" },
"book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
"using": [ [ "tailoring_leather_patchwork", 8 ], [ "fastener_large", 1 ] ],
"proficiencies": [
Expand Down Expand Up @@ -2357,7 +2357,7 @@
"difficulty": 2,
"time": "5 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "25 m" },
"book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ], [ "mag_beauty", 1 ] ],
"using": [ [ "tailoring_cotton_patchwork", 14 ] ]
},
Expand Down Expand Up @@ -2411,7 +2411,7 @@
"difficulty": 3,
"time": "6 h",
"autolearn": true,
"reversible": true,
"reversible": { "time": "50 m" },
"using": [ [ "tailoring_canvas_patchwork", 30 ], [ "fastener_large", 1 ] ],
"proficiencies": [ { "proficiency": "prof_closures_waterproofing" }, { "proficiency": "prof_closures" } ]
},
Expand All @@ -2425,7 +2425,7 @@
"difficulty": 3,
"skills_required": [ "survival", 1 ],
"time": "8 h 20 m",
"reversible": true,
"reversible": { "time": "50 m" },
"autolearn": true,
"using": [ [ "tailoring_fur_patchwork", 12 ], [ "fastener_large", 1 ] ],
"proficiencies": [
Expand Down Expand Up @@ -2464,7 +2464,7 @@
"difficulty": 6,
"time": "7 h 40 m",
"autolearn": true,
"reversible": { "time": "1 h" },
"reversible": { "time": "50 m" },
"book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
"using": [ [ "tailoring_leather_patchwork", 12 ], [ "fastener_large", 1 ] ],
"proficiencies": [
Expand Down Expand Up @@ -2735,7 +2735,7 @@
"difficulty": 5,
"time": "3 h 30 m",
"autolearn": true,
"reversible": true,
"reversible": { "time": "40 m" },
"using": [ [ "tailoring_felt_patchwork", 20 ] ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/weapon/piercing.json
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,7 @@
"subcategory": "CSC_*_NESTED",
"skill_used": "fabrication",
"time": "2 h",
"reversible": true,
"reversible": { "time": "10 m" },
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.5, "skill_penalty": 0.15 } ],
"components": [
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/weapon/ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@
"skills_required": [ [ "traps", 1 ], [ "gun", 1 ] ],
"difficulty": 3,
"time": "2 h 30 m",
"reversible": true,
"reversible": { "time": "25 m" },
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_gunsmithing_basic" }, { "proficiency": "prof_gunsmithing_improv" } ],
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
Expand Down

0 comments on commit b7a3317

Please sign in to comment.