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.

Sign up for GitHub

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

Recipes make more use of other fabric and leather options for handle or backing components #2138

Merged
merged 10 commits into from
Jun 19, 2023
Merged

Recipes make more use of other fabric and leather options for handle or backing components #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
858391c
Commit for remote
chaosvolt Oct 28, 2022
c7ca8a2
Continue work on it, fix name override
chaosvolt Oct 29, 2022
a262fd8
Fix load error, continue adding up to other folder
chaosvolt Oct 29, 2022
fe55093
And weapon folder
chaosvolt Oct 29, 2022
ac7b745
Update materials.json
chaosvolt Oct 29, 2022
f27ee89
Revert back to rags only for lsurv items
chaosvolt Oct 30, 2022
f1ebcbf
Update head.json
chaosvolt Oct 30, 2022
7fa20c8
Merge remote-tracking branch 'upstream/upload' into moar-patch-variety
chaosvolt Apr 13, 2023
e13ca57
Merge branch 'upload' into moar-patch-variety
chaosvolt Apr 30, 2023
dc12889
Merge branch 'upload' into moar-patch-variety
chaosvolt May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions data/json/recipes/animals/medium_quadruped_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"time": "210 m",
"autolearn": true,
"using": [ [ "sewing_standard", 190 ] ],
"components": [ [ [ "kevlar_plate", 56 ] ], [ [ "rag", 42 ] ], [ [ "leather", 24 ] ] ]
"components": [ [ [ "kevlar_plate", 56 ] ], [ [ "fabric_standard", 42, "LIST" ] ], [ [ "fabric_hides_proper", 24, "LIST" ] ] ]
},
{
"result": "leather_armor_medium_quadruped",
Expand All @@ -54,7 +54,7 @@
"time": "105 m",
"byproducts": [ [ "leather", 21 ] ],
"using": [ [ "sewing_standard", 30 ] ],
"components": [ [ [ "armor_blarmor", 3 ] ], [ [ "rag", 18 ] ] ]
"components": [ [ [ "armor_blarmor", 3 ] ], [ [ "fabric_standard", 18, "LIST" ] ] ]
},
{
"result": "leather_armor_medium_quadruped",
Expand All @@ -78,7 +78,14 @@
],
[ [ "salt", 150 ] ],
[ [ "leather", 105 ] ],
[ [ "rag", 18 ] ]
[
[ "rag", 18 ],
[ "lycra_patch", 18 ],
[ "nylon", 18 ],
[ "leather", 18 ],
[ "nomex", 18 ],
[ "neoprene", 18 ]
]
]
},
{
Expand Down Expand Up @@ -158,6 +165,6 @@
"time": "210 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "rag", 70 ] ] ]
"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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"time": "70 m",
"autolearn": true,
"using": [ [ "sewing_standard", 63 ] ],
"components": [ [ [ "kevlar_plate", 18 ] ], [ [ "rag", 14 ] ], [ [ "leather", 8 ] ] ]
"components": [ [ [ "kevlar_plate", 18 ] ], [ [ "fabric_standard", 14, "LIST" ] ], [ [ "fabric_hides_proper", 8, "LIST" ] ] ]
},
{
"result": "leather_armor_small_quadruped",
Expand Down Expand Up @@ -131,6 +131,6 @@
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ],
"components": [ [ [ "duct_tape", 50 ] ], [ [ "bag_plastic", 10 ] ], [ [ "rag", 10 ] ] ]
"components": [ [ [ "duct_tape", 50 ] ], [ [ "bag_plastic", 10 ] ], [ [ "fabric_standard", 10, "LIST" ] ] ]
}
]
16 changes: 8 additions & 8 deletions data/json/recipes/armor/arms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"autolearn": true,
"using": [ [ "cordage_short", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "2x4", 1 ] ], [ [ "rag", 1 ] ] ]
"components": [ [ [ "2x4", 1 ] ], [ [ "fabric_standard", 1, "LIST" ] ] ]
},
{
"result": "arm_warmers",
Expand All @@ -34,7 +34,7 @@
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ], [ [ "leather", 4 ] ] ]
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
},
{
"result": "armguard_acidchitin",
Expand All @@ -47,7 +47,7 @@
"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 ] ], [ [ "leather", 4 ] ] ]
"components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "acidchitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
},
{
"result": "armguard_hard",
Expand All @@ -72,7 +72,7 @@
"time": "40 m",
"autolearn": true,
"using": [ [ "sewing_standard", 16 ] ],
"components": [ [ [ "leather", 12 ], [ "fur", 12 ] ] ]
"components": [ [ [ "fabric_hides_proper", 12, "LIST" ] ] ]
},
{
"result": "armguard_lightplate",
Expand All @@ -84,7 +84,7 @@
"skills_required": [ [ "tailor", 3 ] ],
"time": "50 m",
"book_learn": [ [ "textbook_armwest", 6 ] ],
"components": [ [ [ "steel_lump", 6 ], [ "steel_chunk", 24 ] ], [ [ "fur", 6 ], [ "leather", 6 ] ] ],
"components": [ [ [ "steel_lump", 6 ], [ "steel_chunk", 24 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ]
},
Expand Down Expand Up @@ -152,7 +152,7 @@
"autolearn": true,
"using": [ [ "sewing_standard", 10 ] ],
"tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
"components": [ [ [ "plastic_chunk", 4 ] ], [ [ "rag", 2 ], [ "leather", 2 ], [ "fur", 2 ] ] ]
"components": [ [ [ "plastic_chunk", 4 ] ], [ [ "fabric_standard", 2, "LIST" ], [ "fabric_hides_proper", 2, "LIST" ] ] ]
},
{
"result": "stockings_tent_arms",
Expand Down Expand Up @@ -189,7 +189,7 @@
"time": "30 m",
"autolearn": true,
"using": [ [ "sewing_standard", 8 ] ],
"components": [ [ [ "leather", 4 ], [ "fur", 4 ] ] ]
"components": [ [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
},
{
"result": "chainmail_arms",
Expand All @@ -202,6 +202,6 @@
"time": "40 m",
"book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ],
"using": [ [ "chainmail_standard", 3 ] ],
"components": [ [ [ "link_sheet", 3 ] ], [ [ "chain_link", 75 ] ], [ [ "wire", 1 ] ], [ [ "fur", 6 ], [ "leather", 6 ] ] ]
"components": [ [ [ "link_sheet", 3 ] ], [ [ "chain_link", 75 ] ], [ [ "wire", 1 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
}
]
18 changes: 9 additions & 9 deletions data/json/recipes/armor/feet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"using": [ [ "cordage", 1 ] ],
"components": [ [ [ "chitin_piece", 16 ] ], [ [ "leather", 16 ] ] ]
"components": [ [ [ "chitin_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
},
{
"result": "boots_acidchitin",
Expand All @@ -48,7 +48,7 @@
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"using": [ [ "cordage", 1 ] ],
"qualities": [ { "id": "CUT_FINE", "level": 1 }, { "id": "SEW", "level": 1 } ],
"components": [ [ [ "acidchitin_piece", 16 ] ], [ [ "leather", 16 ] ] ]
"components": [ [ [ "acidchitin_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
},
{
"result": "boots_fsurvivor",
Expand Down Expand Up @@ -117,8 +117,8 @@
"using": [ [ "sewing_standard", 60 ] ],
"tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
"components": [
[ [ "rag", 4 ] ],
[ [ "leather", 4 ] ],
[ [ "fabric_standard", 4, "LIST" ] ],
[ [ "fabric_hides_proper", 4, "LIST" ] ],
[ [ "steel_chunk", 4 ], [ "scrap", 12 ] ],
[ [ "kevlar_plate", 4 ] ],
[ [ "duct_tape", 100 ] ],
Expand Down Expand Up @@ -156,7 +156,7 @@
"time": "40 m",
"autolearn": true,
"using": [ [ "sewing_standard", 24 ] ],
"components": [ [ [ "leather", 18 ], [ "fur", 18 ] ] ]
"components": [ [ [ "fabric_hides_proper", 18, "LIST" ] ] ]
},
{
"result": "boots_lsurvivor",
Expand Down Expand Up @@ -189,7 +189,7 @@
"using": [ [ "blacksmithing_standard", 32 ], [ "steel_standard", 8 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
"components": [ [ [ "fur", 16 ], [ "leather", 16 ] ] ]
"components": [ [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
},
{
"result": "boots_scrap",
Expand Down Expand Up @@ -219,7 +219,7 @@
"using": [ [ "sewing_standard", 80 ] ],
"tools": [ [ [ "welder", 21 ], [ "welder_crude", 32 ], [ "soldering_iron", 32 ], [ "toolset", 32 ] ] ],
"components": [
[ [ "leather", 8 ] ],
[ [ "fabric_hides_proper", 8, "LIST" ] ],
[ [ "kevlar_plate", 4 ] ],
[ [ "duct_tape", 100 ] ],
[ [ "boots_combat", 1 ], [ "boots_steel", 1 ], [ "boots_hiking", 1 ], [ "boots_bunker", 1 ], [ "boots", 1 ] ]
Expand Down Expand Up @@ -281,8 +281,8 @@
"using": [ [ "sewing_standard", 160 ] ],
"tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
"components": [
[ [ "leather", 24 ] ],
[ [ "rag", 6 ] ],
[ [ "fabric_hides_proper", 24, "LIST" ] ],
[ [ "fabric_standard", 6, "LIST" ] ],
[ [ "scrap", 4 ] ],
[ [ "boots_combat", 2 ], [ "kevlar_plate", 10 ] ],
[ [ "duct_tape", 200 ] ]
Expand Down
26 changes: 13 additions & 13 deletions data/json/recipes/armor/hands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"time": "30 m",
"autolearn": true,
"book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 3 ] ], [ [ "leather", 3 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
},
{
"result": "gauntlets_acidchitin",
Expand All @@ -22,7 +22,7 @@
"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 ] ], [ [ "leather", 3 ] ] ]
"components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "acidchitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
},
{
"result": "gauntlets_larmor",
Expand All @@ -34,7 +34,7 @@
"time": "30 m",
"autolearn": true,
"using": [ [ "sewing_standard", 12 ] ],
"components": [ [ [ "leather", 6 ], [ "fur", 6 ] ] ]
"components": [ [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
},
{
"result": "gloves_bag",
Expand Down Expand Up @@ -100,7 +100,7 @@
"tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
"components": [
[ [ "nomex", 6 ] ],
[ [ "leather", 2 ] ],
[ [ "fabric_hides_proper", 2, "LIST" ] ],
[ [ "duct_tape", 120 ] ],
[ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ],
[ [ "nomex_gloves", 1 ], [ "fire_gauntlets", 1 ] ]
Expand Down Expand Up @@ -152,8 +152,8 @@
"using": [ [ "sewing_standard", 40 ] ],
"tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
"components": [
[ [ "rag", 2 ] ],
[ [ "leather", 2 ] ],
[ [ "fabric_standard", 2, "LIST" ] ],
[ [ "fabric_hides_proper", 2, "LIST" ] ],
[ [ "scrap", 4 ] ],
[ [ "duct_tape", 50 ] ],
[ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ],
Expand Down Expand Up @@ -245,7 +245,7 @@
"tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
"components": [
[ [ "rag", 6 ] ],
[ [ "leather", 2 ] ],
[ [ "fabric_hides_proper", 2, "LIST" ] ],
[ [ "duct_tape", 80 ] ],
[ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ],
[
Expand Down Expand Up @@ -280,7 +280,7 @@
"using": [ [ "blacksmithing_standard", 24 ], [ "steel_standard", 6 ] ],
"qualities": [ { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "swage", -1 ] ] ],
"components": [ [ [ "fur", 10 ], [ "leather", 10 ] ] ]
"components": [ [ [ "fabric_hides_proper", 10, "LIST" ] ] ]
},
{
"result": "gloves_survivor",
Expand All @@ -295,8 +295,8 @@
"using": [ [ "sewing_standard", 50 ] ],
"tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
"components": [
[ [ "rag", 2 ] ],
[ [ "leather", 6 ] ],
[ [ "fabric_standard", 2, "LIST" ] ],
[ [ "fabric_hides_proper", 6, "LIST" ] ],
[ [ "duct_tape", 80 ] ],
[ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ],
[
Expand Down Expand Up @@ -393,7 +393,7 @@
"using": [ [ "sewing_standard", 50 ] ],
"tools": [ [ [ "welder", 14 ], [ "welder_crude", 21 ], [ "soldering_iron", 21 ], [ "toolset", 21 ] ] ],
"components": [
[ [ "rag", 2 ] ],
[ [ "fabric_standard", 2, "LIST" ] ],
[ [ "fur", 8 ] ],
[ [ "duct_tape", 80 ] ],
[ [ "gloves_tactical", 1 ], [ "kevlar_plate", 4 ] ],
Expand All @@ -419,8 +419,8 @@
"using": [ [ "sewing_standard", 100 ] ],
"tools": [ [ [ "welder", 28 ], [ "welder_crude", 42 ], [ "soldering_iron", 42 ], [ "toolset", 42 ] ] ],
"components": [
[ [ "leather", 16 ] ],
[ [ "rag", 6 ] ],
[ [ "fabric_hides_proper", 16, "LIST" ] ],
[ [ "fabric_standard", 6, "LIST" ] ],
[ [ "scrap", 2 ] ],
[ [ "duct_tape", 160 ] ],
[ [ "gloves_tactical", 2 ], [ "kevlar_plate", 6 ] ]
Expand Down
Loading