Skip to content

Commit

Permalink
feat(balance): tweaks for crafting and disassembly consistency (#3517)
Browse files Browse the repository at this point in the history
* Reduce rag disassembly times, add assorted uncraft recipes for common loot

* Revert "Reduce rag disassembly times, add assorted uncraft recipes for common loot"

This reverts commit 92eef4f.

* Assorted crafting and uncrafting consistency tweaks

* Replace refersible flag on knitted clothes with separate uncraft recipe taking less time
  • Loading branch information
YeOldeMiller authored Nov 6, 2023
1 parent 6d88ca6 commit 56b8820
Show file tree
Hide file tree
Showing 10 changed files with 550 additions and 177 deletions.
2 changes: 1 addition & 1 deletion data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@
"type": "ARMOR",
"name": { "str": "pair of wool socks", "str_pl": "pairs of wool socks" },
"description": "Warm socks made of wool.",
"weight": "44 g",
"weight": "74 g",
"volume": "250 ml",
"price": 1200,
"price_postapoc": 150,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@
"type": "ARMOR",
"name": { "str": "pair of mittens", "str_pl": "pairs of mittens" },
"description": "A pair of warm mittens. They are extremely cumbersome.",
"weight": "364 g",
"weight": "135 g",
"volume": "750 ml",
"price": 2500,
"price_postapoc": 50,
Expand Down
4 changes: 1 addition & 3 deletions data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "1 h",
"reversible": true,
"autolearn": true,
"using": [ [ "tailoring_wool_knitting", 80 ] ]
},
Expand Down Expand Up @@ -500,9 +499,8 @@
"skill_used": "tailor",
"difficulty": 2,
"time": "90 m",
"reversible": true,
"autolearn": true,
"using": [ [ "tailoring_wool_knitting", 320 ] ]
"using": [ [ "tailoring_wool_knitting", 120 ] ]
},
{
"result": "straw_sandals",
Expand Down
7 changes: 4 additions & 3 deletions data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@
"skill_used": "tailor",
"difficulty": 2,
"time": "1 h 15 m",
"reversible": true,
"autolearn": true,
"using": [ [ "tailoring_wool_knitting", 240 ] ]
"using": [ [ "tailoring_wool_knitting", 140 ] ]
},
{
"result": "gloves_fur_fingerless",
Expand Down Expand Up @@ -330,6 +329,7 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "1 h",
"reversible": true,
"autolearn": [ [ "tailor", 5 ] ],
"book_learn": [ [ "manual_tailor", 1 ], [ "mag_tailor", 0 ], [ "textbook_survival", 2 ], [ "pocket_survival", 2 ] ],
"using": [ [ "tailoring_wool_knitting", 160 ] ]
Expand Down Expand Up @@ -535,9 +535,10 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "50 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 250 ] ] ]
"components": [ [ [ "yarn", 125 ] ] ]
},
{
"result": "nomex_gloves",
Expand Down
13 changes: 5 additions & 8 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,9 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "40 m",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 75 ] ] ]
"components": [ [ [ "yarn", 110 ] ] ]
},
{
"result": "hat_noise_cancelling",
Expand Down Expand Up @@ -836,9 +835,8 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "40 m",
"reversible": true,
"autolearn": true,
"using": [ [ "tailoring_cotton_knitting", 600 ] ]
"using": [ [ "tailoring_cotton_knitting", 100 ] ]
},
{
"result": "leather_cat_ears",
Expand All @@ -861,9 +859,8 @@
"skill_used": "tailor",
"difficulty": 1,
"time": "1 h",
"reversible": true,
"autolearn": true,
"using": [ [ "tailoring_cotton_knitting", 900 ] ]
"using": [ [ "tailoring_cotton_knitting", 200 ] ]
},
{
"result": "long_patchwork_scarf",
Expand Down Expand Up @@ -1326,7 +1323,7 @@
"time": "1 h",
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 150 ] ] ]
"components": [ [ [ "yarn", 75 ] ] ]
},
{
"result": "scarf_fur",
Expand Down Expand Up @@ -1382,7 +1379,7 @@
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 300 ] ] ]
"components": [ [ [ "yarn", 150 ] ] ]
},
{
"result": "straw_fedora",
Expand Down
10 changes: 5 additions & 5 deletions data/json/recipes/armor/torso.json
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@
"time": "3 h",
"autolearn": true,
"using": [ [ "sewing_standard", 80 ] ],
"components": [ [ [ "felt_patch", 30 ] ] ]
"components": [ [ [ "felt_patch", 18 ] ] ]
},
{
"result": "poncho",
Expand All @@ -605,10 +605,10 @@
"subcategory": "CSC_ARMOR_TORSO",
"skill_used": "tailor",
"difficulty": 4,
"time": "3 h",
"time": "6 h",
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 300 ] ] ]
"components": [ [ [ "yarn", 900 ] ] ]
},
{
"result": "sleeveless_duster",
Expand Down Expand Up @@ -988,10 +988,10 @@
"subcategory": "CSC_ARMOR_TORSO",
"skill_used": "tailor",
"difficulty": 3,
"time": "6 h",
"time": "3 h",
"autolearn": true,
"qualities": [ { "id": "KNIT", "level": 1 } ],
"components": [ [ [ "yarn", 600 ] ] ]
"components": [ [ [ "yarn", 350 ] ] ]
},
{
"result": "tank_top",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/other/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 3 } ],
"tools": [ [ [ "press", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "copper_scrap_equivalent", 20, "LIST" ] ], [ [ "tin", 30 ] ] ]
"components": [ [ [ "copper_scrap_equivalent", 14, "LIST" ] ], [ [ "tin", 30 ] ] ]
},
{
"type": "recipe",
Expand All @@ -998,7 +998,7 @@
"qualities": [ { "id": "HAMMER", "level": 3 } ],
"tools": [ [ [ "electrolysis_kit", 10 ] ], [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [
[ [ "copper_scrap_equivalent", 20, "LIST" ] ],
[ [ "copper_scrap_equivalent", 14, "LIST" ] ],
[ [ "tin", 30 ] ],
[ [ "water", 3 ], [ "water_clean", 3 ] ],
[ [ "acid", 1 ] ]
Expand Down
Loading

0 comments on commit 56b8820

Please sign in to comment.