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

fix: Fixing recipes with sewing quality, tweaking of recipes #4471

Merged
merged 11 commits into from
Apr 12, 2024
4 changes: 2 additions & 2 deletions data/json/recipes/animals/medium_quadruped_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"skills_required": [ "fabrication", 3 ],
"time": "112 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 30 ] ],
"components": [ [ [ "duct_tape", 175 ] ], [ [ "coat_rain", 7 ] ] ]
},
{
Expand All @@ -164,7 +164,7 @@
"skills_required": [ "fabrication", 3 ],
"time": "210 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 30 ] ],
"components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "fabric_standard", 70, "LIST" ] ] ]
}
]
4 changes: 2 additions & 2 deletions data/json/recipes/animals/small_quadruped_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"skills_required": [ "fabrication", 1 ],
"time": "16 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "duct_tape", 25 ] ], [ [ "coat_rain", 1 ] ] ]
},
{
Expand All @@ -130,7 +130,7 @@
"skills_required": [ "fabrication", 1 ],
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "duct_tape", 50 ] ], [ [ "bag_plastic", 10 ] ], [ [ "fabric_standard", 10, "LIST" ] ] ]
}
]
4 changes: 2 additions & 2 deletions data/json/recipes/armor/arms.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
"using": [ [ "sewing_standard", 16 ] ],
"components": [ [ [ "acidchitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
},
{
"result": "armguard_hard",
Expand Down
3 changes: 1 addition & 2 deletions data/json/recipes/armor/feet.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"time": "1 h 20 m",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"using": [ [ "cordage", 1 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 64 ] ],
"components": [ [ [ "acidchitin_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/hands.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"time": "1 h",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "acidchitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
},
{
"result": "gauntlets_larmor",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/head.json
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@
"time": "2 h",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
"using": [ [ "sewing_standard", 24 ] ],
"components": [ [ [ "acidchitin_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
},
{
"result": "helmet_conical",
Expand Down
3 changes: 1 addition & 2 deletions data/json/recipes/armor/legs.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "mag_tailor", 1 ], [ "manual_tailor", 1 ] ],
"using": [ [ "filament", 15 ] ],
"qualities": [ { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 15 ] ],
"components": [ [ [ "rag", 3 ] ] ]
},
{
Expand Down
80 changes: 38 additions & 42 deletions data/json/recipes/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
"skills_required": [ "gun", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 9 ] ], [ [ "scrap", 3 ], [ "sheet_metal_small", 1 ] ], [ [ "filament", 20, "LIST" ] ] ]
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"using": [ [ "sewing_standard", 20 ] ],
"components": [ [ [ "leather", 9 ] ], [ [ "scrap", 3 ], [ "sheet_metal_small", 1 ] ] ]
},
{
"result": "ammo_satchel",
Expand All @@ -35,8 +36,8 @@
"skills_required": [ [ "throw", 1 ] ],
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "fabric_hides_any", 12, "LIST" ], [ "fabric_standard", 12, "LIST" ] ], [ [ "filament", 20, "LIST" ] ] ]
"using": [ [ "sewing_standard", 20 ] ],
"components": [ [ [ "fabric_hides_any", 12, "LIST" ], [ "fabric_standard", 12, "LIST" ] ] ]
},
{
"result": "chestrig",
Expand All @@ -60,8 +61,8 @@
"difficulty": 4,
"time": "20 m",
"autolearn": true,
"using": [ [ "adhesive", 1 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
"using": [ [ "adhesive", 1 ], [ "sewing_standard", 10 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "leather", 5 ] ], [ [ "scrap", 3 ], [ "sheet_metal_small", 1 ] ], [ [ "nail", 4 ] ] ]
},
{
Expand All @@ -74,8 +75,8 @@
"skills_required": [ "gun", 1 ],
"time": "18 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "filament", 30, "LIST" ] ] ]
"using": [ [ "sewing_standard", 15 ] ],
"components": [ [ [ "leather", 7 ] ] ]
},
{
"result": "backpack",
Expand Down Expand Up @@ -178,8 +179,8 @@
"skills_required": [ [ "gun", 1 ], [ "rifle", 1 ] ],
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "rag", 4 ] ], [ [ "filament", 8, "LIST" ] ] ]
"using": [ [ "sewing_standard", 8 ] ],
"components": [ [ [ "rag", 4 ] ] ]
},
{
"result": "bholster",
Expand Down Expand Up @@ -219,8 +220,8 @@
"skills_required": [ "melee", 1 ],
"time": "1 h 5 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 3 ] ], [ [ "filament", 5, "LIST" ] ] ]
"using": [ [ "sewing_standard", 5 ] ],
"components": [ [ [ "leather", 3 ] ] ]
},
{
"result": "bootstrap",
Expand All @@ -232,8 +233,8 @@
"skills_required": [ "pistol", 1 ],
"time": "1 h 15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 3 ] ], [ [ "filament", 5, "LIST" ] ] ]
"using": [ [ "sewing_standard", 5 ] ],
"components": [ [ [ "leather", 3 ] ] ]
},
{
"result": "wristsheath",
Expand All @@ -245,8 +246,8 @@
"skills_required": [ "melee", 1 ],
"time": "50 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 2 ] ], [ [ "filament", 3, "LIST" ] ] ]
"using": [ [ "sewing_standard", 3 ] ],
"components": [ [ [ "leather", 2 ] ] ]
},
{
"result": "wristholster",
Expand All @@ -258,8 +259,8 @@
"skills_required": [ "pistol", 1 ],
"time": "50 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 2 ] ], [ [ "filament", 3, "LIST" ] ] ]
"using": [ [ "sewing_standard", 3 ] ],
"components": [ [ [ "leather", 2 ] ] ]
},
{
"result": "bow_sling",
Expand All @@ -271,8 +272,7 @@
"skills_required": [ "archery", 1 ],
"time": "18 m",
"autolearn": true,
"using": [ [ "filament", 40 ] ],
"qualities": [ { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 40 ] ],
"components": [
[ [ "fabric_standard", 10, "LIST" ], [ "fabric_hides_any", 10, "LIST" ] ],
[ [ "plastic_chunk", 2 ], [ "scrap", 1 ], [ "sheet_metal_small", 1 ] ],
Expand Down Expand Up @@ -343,8 +343,8 @@
"skills_required": [ [ "gun", 1 ] ],
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"result": "grenade_pouch",
Expand All @@ -356,9 +356,9 @@
"skills_required": [ [ "gun", 1 ], [ "launcher", 1 ] ],
"time": "1 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 10 ] ],
"tools": [ [ [ "mold_plastic", -1 ] ] ],
"components": [ [ [ "rag", 4 ] ], [ [ "plastic_chunk", 2 ] ], [ [ "filament", 10, "LIST" ] ] ]
"components": [ [ [ "rag", 4 ] ], [ [ "plastic_chunk", 2 ] ] ]
},
{
"result": "hide_bag",
Expand Down Expand Up @@ -394,8 +394,8 @@
"skills_required": [ "gun", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"result": "shoulder_holster",
Expand All @@ -407,8 +407,8 @@
"skills_required": [ "gun", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "holster", 1 ] ], [ [ "shoulder_strap", 1 ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "holster", 1 ] ], [ [ "shoulder_strap", 1 ] ] ]
},
{
"result": "jerrypack",
Expand Down Expand Up @@ -459,8 +459,8 @@
"skills_required": [ "survival", 1 ],
"time": "10 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "fabric_hides_proper", 6, "LIST" ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
},
{
"result": "ammo_pouch",
Expand Down Expand Up @@ -663,8 +663,8 @@
"skills_required": [ "melee", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"result": "sholster",
Expand All @@ -676,8 +676,8 @@
"skills_required": [ "gun", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "filament", 20, "LIST" ] ] ]
"using": [ [ "sewing_standard", 15 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"result": "spearsling",
Expand All @@ -689,11 +689,8 @@
"skills_required": [ "melee", 1 ],
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [
[ [ "felt_patch", 7 ], [ "fabric_standard", 7, "LIST" ], [ "fabric_hides_any", 7, "LIST" ] ],
[ [ "filament", 20, "LIST" ] ]
]
"using": [ [ "sewing_standard", 15 ] ],
"components": [ [ [ "felt_patch", 7 ], [ "fabric_standard", 7, "LIST" ], [ "fabric_hides_any", 7, "LIST" ] ] ]
},
{
"result": "straw_basket",
Expand Down Expand Up @@ -1002,7 +999,6 @@
"skills_required": [ "fabrication", 2 ],
"time": "45 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 50 ] ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "mold_plastic", -1 ] ] ],
"components": [ [ [ "rag", 12 ] ], [ [ "plastic_chunk", 4 ] ] ]
Expand All @@ -1017,7 +1013,7 @@
"skills_required": [ "survival", 1 ],
"time": "10 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "fabric_standard", 3, "LIST" ], [ "fabric_hides_any", 3, "LIST" ] ], [ [ "filament", 5, "LIST" ] ] ]
"using": [ [ "sewing_standard", 5 ] ],
"components": [ [ [ "fabric_standard", 3, "LIST" ], [ "fabric_hides_any", 3, "LIST" ] ] ]
}
]
3 changes: 1 addition & 2 deletions data/json/recipes/armor/suit.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@
"time": "3 h 20 m",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"using": [ [ "cordage", 2 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 150 ] ],
"components": [ [ [ "acidchitin_piece", 36 ] ], [ [ "fabric_hides_proper", 36, "LIST" ] ] ]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/torso.json
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@
"difficulty": 5,
"time": "3 h 20 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"using": [ [ "sewing_standard", 60 ] ],
"book_learn": [ [ "trappers_companion", 6 ], [ "survival_book", 4 ] ],
"components": [ [ [ "stomach_sealed", 16 ], [ "large_stomach_sealed", 10 ] ], [ [ "sinew", 60 ] ] ]
"components": [ [ [ "stomach_sealed", 16 ], [ "large_stomach_sealed", 10 ] ] ]
},
{
"result": "coat_rain",
Expand Down
12 changes: 6 additions & 6 deletions data/json/recipes/other/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"difficulty": 2,
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 6 ], [ "fur", 6 ] ], [ [ "filament", 10, "LIST" ] ] ]
"using": [ [ "sewing_standard", 10 ] ],
"components": [ [ [ "leather", 6 ] ] ]
},
{
"type": "recipe",
Expand All @@ -22,8 +22,8 @@
"difficulty": 2,
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 14 ], [ "fur", 14 ] ], [ [ "filament", 20, "LIST" ] ] ]
"using": [ [ "sewing_standard", 20 ] ],
"components": [ [ [ "leather", 14 ] ] ]
},
{
"type": "recipe",
Expand All @@ -35,8 +35,8 @@
"difficulty": 3,
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 24 ], [ "fur", 24 ] ], [ [ "filament", 30, "LIST" ] ] ]
"using": [ [ "sewing_standard", 30 ] ],
"components": [ [ [ "leather", 24 ] ] ]
},
{
"type": "recipe",
Expand Down
3 changes: 0 additions & 3 deletions data/json/recipes/other/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,6 @@
"time": "1 m",
"autolearn": true,
"using": [ [ "filament", 8 ] ],
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "rag", 10 ] ] ],
"flags": [ "BLIND_HARD" ]
},
Expand All @@ -1001,7 +1000,6 @@
"time": "1 m",
"autolearn": true,
"using": [ [ "filament", 8 ] ],
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "leather", 10 ] ] ],
"flags": [ "BLIND_HARD" ]
},
Expand All @@ -1016,7 +1014,6 @@
"time": "1 m",
"autolearn": true,
"using": [ [ "filament", 8 ] ],
"qualities": [ { "id": "SEW", "level": 1 } ],
"components": [ [ [ "felt_patch", 10 ] ] ],
"flags": [ "BLIND_HARD" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/other/medical.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"time": "2 m 30 s",
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 } ],
"using": [ [ "sewing_standard", 5 ] ],
"components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "hose", 1 ], [ "makeshift_hose", 1 ] ], [ [ "fabric_standard", 2, "LIST" ] ] ]
},
{
Expand Down
Loading
Loading