Skip to content

Commit

Permalink
Added missing materials recipes and rebalance of material costs (#57791)
Browse files Browse the repository at this point in the history
* Added missing recipes and rebalance of materials

* Increased material requirements for creating nomex and synth fabric patches
  • Loading branch information
stubkan authored Jun 2, 2022
1 parent fad07d7 commit 53eefd0
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 28 deletions.
38 changes: 21 additions & 17 deletions data/json/items/resources/tailoring.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
"type": "GENERIC",
"name": { "str_sp": "Kevlar scraps" },
"description": "Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring projects. Normally it's disposed of, but since Kevlar would be very difficult to make in a post-apocalyptic world, it might be worth recycling it for Kevlar thread.",
"price": 5,
"price": 1,
"price_postapoc": 10,
"material": [ "kevlar" ]
},
{
Expand Down Expand Up @@ -106,6 +107,7 @@
"name": { "str_sp": "Nomex scraps" },
"description": "Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material from tailoring projects. Normally it's disposed of, but since Nomex would be very difficult to make in a post-apocalyptic world, it might be worth recycling it.",
"price": 5,
"price_postapoc": 8,
"material": [ "nomex" ]
},
{
Expand Down Expand Up @@ -142,7 +144,7 @@
"name": { "str": "leather patch", "str_pl": "leather patches" },
"description": "A smallish patch of leather, could be used to make tough clothing.",
"price": 2000,
"price_postapoc": 10,
"price_postapoc": 25,
"material": [ "leather", "flesh" ],
"flags": [ "NO_SALVAGE" ],
"weight": "100 g",
Expand Down Expand Up @@ -187,7 +189,7 @@
"name": { "str": "cured hide" },
"description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable leather.",
"price": 200,
"price_postapoc": 0,
"price_postapoc": 150,
"material": [ "flesh" ],
"flags": [ "NO_SALVAGE" ],
"weight": "100 g",
Expand Down Expand Up @@ -217,7 +219,7 @@
"name": { "str": "cured pelt" },
"description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable fur.",
"price": 200,
"price_postapoc": 0,
"price_postapoc": 150,
"material": [ "fur", "flesh" ],
"flags": [ "NO_SALVAGE" ],
"weight": "114 g",
Expand Down Expand Up @@ -249,7 +251,7 @@
"volume": "3 ml",
"//": "Density of 1.55 grams per mL",
"price": 1000,
"price_postapoc": 100,
"price_postapoc": 10,
"material": [ "cotton" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -264,7 +266,7 @@
"volume": "65 ml",
"//density": "1.55 grams per mL",
"price": 200,
"price_postapoc": 50
"price_postapoc": 20
},
{
"id": "sheet_faux_fur",
Expand All @@ -276,7 +278,7 @@
"volume": "25 ml",
"//": "Guesstimated density of 0.44 grams per mL based on felt",
"price": 5000,
"price_postapoc": 100,
"price_postapoc": 20,
"material": [ "faux_fur" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -303,7 +305,7 @@
"volume": "20 ml",
"//": "Density of 0.44 grams per mL",
"price": 2500,
"price_postapoc": 250,
"price_postapoc": 20,
"material": [ "wool" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -318,7 +320,7 @@
"volume": "360 ml",
"//": "Density of 0.44 grams per mL",
"price": 500,
"price_postapoc": 100
"price_postapoc": 50
},
{
"id": "sheet_kevlar",
Expand All @@ -330,7 +332,7 @@
"volume": "4 ml",
"//": "Density of 1.4 grams per mL",
"price": 900,
"price_postapoc": 500,
"price_postapoc": 50,
"material": [ "kevlar" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -345,7 +347,7 @@
"volume": "2 ml",
"//": "Density of 1.21-1.35 grams per mL, using 1.28",
"price": 5000,
"price_postapoc": 100,
"price_postapoc": 25,
"material": [ "lycra" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -360,6 +362,7 @@
"volume": "65 ml",
"//": "Density of 1.4 grams per mL; volume increased ~5% to account for some rigidity",
"price": 15000,
"price_postapoc": 150,
"material": [ "kevlar_layered" ],
"flags": [ "NO_SALVAGE" ],
"symbol": ",",
Expand All @@ -375,6 +378,7 @@
"volume": "235 ml",
"//": "Density of 1.4 grams per mL + 10% for being rigid and possibly oddly-shaped",
"price": 1000,
"price_postapoc": 250,
"material": [ "kevlar_rigid" ],
"flags": [ "NO_SALVAGE" ],
"symbol": ",",
Expand Down Expand Up @@ -402,7 +406,7 @@
"volume": "5 ml",
"//": "Density of 1.23 grams per mL",
"price": 5000,
"price_postapoc": 100,
"price_postapoc": 35,
"material": [ "neoprene" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -417,7 +421,7 @@
"volume": "100 ml",
"//": "Density of 1.23 grams per mL",
"price": 1000,
"price_postapoc": 50
"price_postapoc": 60
},
{
"id": "sheet_nomex",
Expand All @@ -429,7 +433,7 @@
"volume": "7 ml",
"//": "Density of 0.72-1.1 grams per mL, using ~0.72 to account for possible unwieldiness",
"price": 15000,
"price_postapoc": 250,
"price_postapoc": 40,
"material": [ "nomex" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -444,7 +448,7 @@
"volume": "110 ml",
"//": "Density of 0.72-1.1 grams per mL, using 0.91",
"price": 3000,
"price_postapoc": 50
"price_postapoc": 80
},
{
"id": "sheet_nylon",
Expand All @@ -456,7 +460,7 @@
"volume": "3 ml",
"//": "Density of 1.15 grams per mL",
"price": 5000,
"price_postapoc": 100,
"price_postapoc": 20,
"material": [ "nylon" ],
"symbol": "=",
"color": "dark_gray"
Expand All @@ -471,7 +475,7 @@
"volume": "50 ml",
"//": "Density of 1.15 grams per mL",
"price": 1000,
"price_postapoc": 50
"price_postapoc": 40
},
{
"type": "AMMO",
Expand Down
4 changes: 2 additions & 2 deletions data/json/recipes/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -1841,10 +1841,10 @@
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_STORAGE",
"skill_used": "tailor",
"time": "2 m",
"time": "6 m",
"autolearn": true,
"reversible": true,
"components": [ [ [ "cordage_short", 1, "LIST" ] ] ]
"components": [ [ [ "rope_any_short", 1, "LIST" ] ] ]
},
{
"result": "suspenders_holster",
Expand Down
41 changes: 32 additions & 9 deletions data/json/recipes/other/materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,38 @@
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"time": "2 h",
"time": "1 h",
"autolearn": true,
"reversible": true,
"using": [ [ "sewing_kevlar", 15 ] ],
"proficiencies": [ { "proficiency": "prof_polymerworking" } ],
"components": [ [ [ "sheet_kevlar", 16 ] ] ]
"components": [ [ [ "sheet_kevlar", 16 ], [ "thread", 30 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "nylon",
"id_suffix": "from_sheet",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"time": "5 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 2 } ],
"components": [ [ [ "sheet_nylon", 4 ], [ "thread", 10 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "nomex",
"id_suffix": "from_sheet",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"time": "15 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "sheet_nomex", 8 ], [ "thread", 20 ] ] ]
},
{
"type": "recipe",
Expand Down Expand Up @@ -526,7 +552,7 @@
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"batch_time_factors": [ 70, 1 ],
"time": "30 s",
"time": "5 m",
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_weaving" } ],
"tools": [ [ [ "spinwheelitem", -1 ] ] ],
Expand All @@ -540,10 +566,7 @@
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"//time1": "this time seems excessive to me but I have no actual experience tailoring",
"//time2": "also this was probably created originally before the proficiencies system",
"//time3": "so that might explain the time, not sure which proficiencies it should use though",
"time": "270 m",
"time": "60 m",
"autolearn": true,
"qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "filament", 15, "LIST" ] ] ]
Expand All @@ -555,7 +578,7 @@
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"time": "270 m",
"time": "60 m",
"autolearn": true,
"qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "neoprene", 5 ] ], [ [ "filament", 15, "LIST" ] ] ]
Expand All @@ -567,7 +590,7 @@
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "tailor",
"time": "270 m",
"time": "60 m",
"autolearn": true,
"qualities": [ { "id": "SEW_CURVED", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "nomex", 5 ] ], [ [ "thread_nomex", 15 ] ] ]
Expand Down

0 comments on commit 53eefd0

Please sign in to comment.