From ae2ed101fccb596c33b2ca3b536ec000c533f361 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Tue, 22 Oct 2019 01:19:17 -0500 Subject: [PATCH] Stupid Sexy Survivor: Synthetic Fabrics pt 2 (#34871) * stash for work comp https://link.springer.com/content/pdf/bbm%3A978-3-540-26360-9%2F1.pdf http://www.matweb.com/search/DataSheet.aspx?MatGUID=0619837e5f584a1f8c5e6f692952898a http://www.polyurethanes.basf.de/pu/solutions/en/function/conversions:/publish/content/group/Arbeitsgebiete_und_Produkte/Thermoplastische_Spezialelastomere/Infomaterial/elastollan_material_uk.pdf --- data/json/itemgroups/clothing.json | 11 +++- data/json/itemgroups/item_groups.json | 6 ++ data/json/itemgroups/mall_item_groups.json | 2 + data/json/itemgroups/mansion.json | 10 +++ data/json/items/armor.json | 75 +++++++++++++++++++++- data/json/items/armor/holster.json | 2 +- data/json/items/resources/plastic.json | 29 +++++++++ data/json/items/tools.json | 24 +++++-- data/json/materials.json | 56 ++++++++++++++++ data/json/recipes/armor/legs.json | 26 ++++++++ data/json/recipes/armor/storage.json | 13 ++++ data/json/recipes/armor/suit.json | 12 ++++ data/json/recipes/armor/torso.json | 60 +++++++++++++++++ data/json/requirements/materials.json | 16 ++++- 14 files changed, 330 insertions(+), 12 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index e8130224c44b2..c19f67221b839 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -445,6 +445,7 @@ [ "jersey", 40 ], [ "coat_rain", 15 ], [ "hood_rain", 15 ], + [ "unitard", 10 ], [ "gloves_wraps", 45 ], [ "jeans", 30 ], [ "sports_bra", 25 ], @@ -520,6 +521,8 @@ [ "nanoskirt", 30 ], [ "camisole", 60 ], [ "corset", 20 ], + [ "unitard", 5 ], + [ "leotard", 10 ], [ "stockings", 50 ], [ "leggings", 20 ], [ "tights", 50 ] @@ -661,6 +664,7 @@ [ "firecracker", 5 ], [ "wolfsuit", 4 ], [ "dinosuit", 4 ], + [ "zentai", 5 ], [ "vibrator", 5 ], { "item": "condom", "prob": 30, "count": [ 1, 5 ] }, [ "snuggie", 5 ], @@ -669,6 +673,7 @@ [ "socks_wool", 30 ], [ "pocketwatch", 5 ], [ "flask_hip", 2 ], + [ "bholster", 5 ], [ "tux", 1 ], [ "dress_wedding", 1 ], [ "clogs", 2 ], @@ -996,7 +1001,7 @@ { "type": "item_group", "id": "male_underwear_top", - "items": [ [ "undershirt", 50 ], [ "long_undertop", 20 ], [ "under_armor", 20 ], [ "tank_top", 50 ] ] + "items": [ [ "undershirt", 50 ], [ "long_undertop", 20 ], [ "thermal_shirt", 10 ], [ "under_armor", 20 ], [ "tank_top", 50 ] ] }, { "type": "item_group", @@ -1065,6 +1070,7 @@ [ "thermal_suit", 2 ], [ "thermal_mask", 2 ], [ "thermal_outfit", 1 ], + [ "thermal_shirt", 1 ], [ "gloves_winter", 40 ], [ "gloves_liner", 25 ], [ "gloves_leather", 45 ], @@ -1090,6 +1096,8 @@ [ "long_underpants", 40 ], [ "long_undertop", 40 ], [ "union_suit", 20 ], + [ "leotard", 3 ], + [ "unitard", 1 ], [ "arm_warmers", 20 ], [ "leg_warmers", 20 ], [ "trenchcoat_leather", 12 ], @@ -1122,6 +1130,7 @@ [ "clownshoes", 1 ], [ "bondage_suit", 1 ], [ "bondage_mask", 1 ], + [ "zentai", 1 ], [ "corset", 10 ], [ "chestwrap", 5 ], [ "boots_combat", 10 ], diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index d992c231332fc..b8f24f6eb40df 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -1006,6 +1006,7 @@ [ "picklocks", 10 ], [ "wolfsuit", 4 ], [ "dinosuit", 4 ], + [ "zentai", 4 ], [ "glowstick", 60 ], [ "handflare", 40 ], [ "blanket", 10 ], @@ -1956,6 +1957,8 @@ [ "longshirt", 70 ], [ "tank_top", 50 ], [ "sports_bra", 30 ], + [ "unitard", 10 ], + [ "leotard", 5 ], [ "trunks", 50 ], [ "bikini_top", 50 ], [ "arm_warmers", 20 ], @@ -6756,6 +6759,7 @@ [ "backpack", 38 ], [ "backpack_leather", 28 ], [ "holster", 8 ], + [ "bholster", 2 ], [ "armguard_soft", 40 ], [ "armguard_hard", 20 ], [ "legguard_hard", 15 ], @@ -8025,6 +8029,8 @@ [ "armguard_soft", 50 ], [ "armguard_hard", 20 ], [ "legguard_hard", 50 ], + [ "leotard", 5 ], + [ "unitard", 5 ], [ "hat_ball", 100 ], [ "helmet_ball", 80 ], [ "baseball", 100 ], diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json index 42b983079b919..d9f14c31b8f36 100644 --- a/data/json/itemgroups/mall_item_groups.json +++ b/data/json/itemgroups/mall_item_groups.json @@ -313,6 +313,8 @@ [ "postman_shirt", 50 ], [ "postman_shorts", 30 ], [ "robe", 45 ], + [ "leotard", 5 ], + [ "zentai", 5 ], [ "kimono", 25 ], [ "yukata", 20 ], [ "coat_lab", 20 ], diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json index 2eeb21becb850..e05dc84122fa1 100644 --- a/data/json/itemgroups/mansion.json +++ b/data/json/itemgroups/mansion.json @@ -631,6 +631,7 @@ { "item": "blood", "prob": 10, "container-item": "jar_3l_glass" }, [ "bone_human", 10 ], [ "bondage_mask", 10 ], + [ "zentai", 5 ], [ "bondage_suit", 5 ] ] }, @@ -660,6 +661,7 @@ [ "novel_erotic", 10 ], [ "bondage_suit", 10 ], [ "bondage_mask", 10 ], + [ "zentai", 2 ], [ "bullwhip", 10 ], [ "leather_cat_ears", 5 ], [ "leather_cat_tail", 5 ], @@ -1021,6 +1023,8 @@ [ "tshirt", 60 ], [ "sneakers", 60 ], [ "hot_pants", 44 ], + [ "leotard", 10 ], + [ "unitard", 10 ], [ "undershirt", 60 ], [ "hoodie", 50 ], [ "shorts", 60 ], @@ -1209,6 +1213,8 @@ { "group": "bed", "prob": 30, "damage": [ 0, 2 ] }, [ "sewing_kit", 30 ], [ "rag", 30 ], + [ "lycra_patch", 15 ], + [ "nylon", 10 ], [ "tailors_kit", 20 ] ] }, @@ -1301,6 +1307,8 @@ [ "hoodie", 65 ], [ "under_armor", 20 ], [ "under_armor_shorts", 20 ], + [ "leotard", 5 ], + [ "unitard", 5 ], [ "long_underpants", 40 ], [ "long_undertop", 40 ], [ "union_suit", 20 ], @@ -1346,6 +1354,8 @@ [ "long_underpants", 40 ], [ "long_undertop", 40 ], [ "union_suit", 20 ], + [ "leotard", 5 ], + [ "unitard", 5 ], [ "corset", 10 ], [ "halter_top", 50 ], [ "nanoskirt", 10 ] diff --git a/data/json/items/armor.json b/data/json/items/armor.json index 16e1b3e04df88..36b15562b7162 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -5785,7 +5785,7 @@ "weight": "155 g", "volume": "500 ml", "price": 1000, - "material": [ "cotton", "plastic" ], + "material": [ "lycra" ], "symbol": "[", "color": "dark_gray", "covers": [ "LEGS" ], @@ -5920,6 +5920,24 @@ "material_thickness": 2, "flags": [ "VARSIZE", "WATER_FRIENDLY", "BELTED" ] }, + { + "id": "leotard", + "type": "ARMOR", + "name": "leotard", + "name_plural": "leotard", + "description": "A skin-tight spandex garment, covering the body from the groin to the shoulders. With its deep scoop-cut back and high waist cuts, this garment is perfect for showcasing your physique on the stage.", + "weight": "60 g", + "volume": "500 ml", + "price": 1000, + "material": [ "lycra" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "LEGS" ], + "coverage": 55, + "warmth": 5, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ] + }, { "id": "linuxtshirt", "type": "ARMOR", @@ -7309,6 +7327,23 @@ "material_thickness": 3, "flags": [ "VARSIZE" ] }, + { + "id": "thermal_shirt", + "type": "ARMOR", + "name": "thermal shirt", + "description": "A lightweight, form-fitting long sleeved undershirt that helps maintains body temperature.", + "weight": "92 g", + "volume": "250 ml", + "price": 3200, + "material": [ "lycra" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "TORSO", "ARMS" ], + "coverage": 95, + "warmth": 20, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ] + }, { "id": "tie_skinny", "type": "ARMOR", @@ -8868,7 +8903,7 @@ "weight": "92 g", "volume": "250 ml", "price": 2000, - "material": [ "cotton", "plastic" ], + "material": [ "lycra" ], "symbol": "[", "color": "dark_gray", "covers": [ "TORSO" ], @@ -8886,7 +8921,7 @@ "weight": "82 g", "volume": "250 ml", "price": 2000, - "material": [ "cotton", "plastic" ], + "material": [ "lycra" ], "symbol": "[", "color": "dark_gray", "covers": [ "LEGS" ], @@ -9610,5 +9645,39 @@ "material_thickness": 1, "environmental_protection": 1, "flags": [ "OVERSIZE", "OUTER", "WATERPROOF", "ALLOWS_NATURAL_ATTACKS" ] + }, + { + "id": "unitard", + "type": "ARMOR", + "name": "unitard", + "description": "A skin-tight spandex garment resembling a crew necked leotard combined with leggings. Commonly used by gymnasts, dancers and equestrian vaulters, the unitard provides overall coverage with great flexibility.", + "weight": "110 g", + "volume": "250 ml", + "price": 3100, + "material": [ "lycra" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "TORSO", "LEGS" ], + "coverage": 90, + "warmth": 20, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ] + }, + { + "id": "zentai", + "type": "ARMOR", + "name": "zentai", + "description": "Short for 'zenshin taitsu', a zentai is a form fitting full body nylon and spandex garment. Though it covers your face, you can see through the integrated hood. With a couple of these and some friends and you could put on some kabuki.", + "weight": "300 g", + "volume": "500 ml", + "price": 2500, + "material": [ "lycra" ], + "symbol": "[", + "color": "dark_gray", + "covers": [ "HEAD", "MOUTH", "EYES", "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ], + "coverage": 100, + "warmth": 20, + "material_thickness": 1, + "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY" ] } ] diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index 9b7096be3a4bd..ad4dd40635b47 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -102,7 +102,7 @@ "volume": "250 ml", "price": 3000, "price_postapoc": 1900, - "material": "plastic", + "material": "lycra", "covers": [ "LEGS" ], "encumbrance": 1, "use_action": { diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index baea60252b7ab..4e30446938085 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -13,6 +13,35 @@ "color": "light_blue", "flags": [ "NO_SALVAGE" ] }, + { + "id": "nylon", + "type": "TOOL", + "category": "spare_parts", + "name": "synthetic fabric", + "description": "This is small bolt of synthetic fabric. Unlike you and other natural materials, it won't degrade much with age. Maybe that's less of a bad thing now.", + "weight": "55 g", + "volume": "250 ml", + "price": 0, + "material": "nylon", + "symbol": ",", + "color": "white", + "flags": [ "NO_SALVAGE" ] + }, + { + "id": "lycra_patch", + "type": "TOOL", + "category": "spare_parts", + "name": "lycra patch", + "name_plural": "lycra patches", + "description": "This is a small bolt of a synthetic fabric blended with stretchy lycra fibers. It could be used to make flexible yet strong clothing. Stylish, but bad for the environment; at least you're recycling it.", + "weight": "87 g", + "volume": "250 ml", + "price": 0, + "material": "lycra", + "symbol": ",", + "color": "light_blue", + "flags": [ "NO_SALVAGE" ] + }, { "id": "plastic_sheet", "type": "GENERIC", diff --git a/data/json/items/tools.json b/data/json/items/tools.json index ea31fd4d80d7e..8a29ff728221a 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -4105,7 +4105,7 @@ "use_action": { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], + "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], "skill": "tailor", "tool_quality": -1, "cost_scaling": 0.1, @@ -4159,7 +4159,7 @@ "use_action": { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "gutskin" ], + "materials": [ "cotton", "lycra", "nylon", "leather", "wool", "fur", "faux_fur", "nomex", "gutskin" ], "skill": "tailor", "tool_quality": -1, "cost_scaling": 0.1, @@ -5184,7 +5184,7 @@ "use_action": { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], + "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "gutskin" ], "skill": "tailor", "tool_quality": 0, "cost_scaling": 0.1, @@ -5741,7 +5741,7 @@ { "type": "repair_item", "item_action_type": "repair_fabric", - "materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin" ], + "materials": [ "cotton", "leather", "lycra", "nylon", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin" ], "skill": "tailor", "tool_quality": 1, "cost_scaling": 0.1, @@ -5749,7 +5749,21 @@ }, { "type": "sew_advanced", - "materials": [ "cotton", "leather", "wool", "fur", "faux_fur", "nomex", "kevlar", "neoprene", "gutskin", "plastic", "kevlar_rigid" ], + "materials": [ + "cotton", + "leather", + "lycra", + "nylon", + "wool", + "fur", + "faux_fur", + "nomex", + "kevlar", + "neoprene", + "gutskin", + "plastic", + "kevlar_rigid" + ], "skill": "tailor", "clothing_mods": [ "leather_padded", "kevlar_padded", "furred", "wooled" ] } diff --git a/data/json/materials.json b/data/json/materials.json index 8291a878f1d0c..c733aa1eacc5c 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -737,6 +737,34 @@ { "fuel": 1, "smoke": 3, "burn": 2 } ] }, + { + "type": "material", + "ident": "lycra", + "name": "Lycra", + "//": "not actually pure lycra, but poly/nylon and lycra blend", + "density": 2, + "specific_heat_liquid": 1.7, + "specific_heat_solid": 1.7, + "latent_heat": 27, + "soft": true, + "reinforces": true, + "bash_resist": 2, + "cut_resist": 2, + "acid_resist": 9, + "fire_resist": 2, + "elec_resist": 2, + "chip_resist": 6, + "repaired_with": "lycra_patch", + "salvaged_into": "lycra_patch", + "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], + "bash_dmg_verb": "ripped", + "cut_dmg_verb": "cut", + "burn_data": [ + { "fuel": 1, "smoke": 2, "burn": 1, "volume_per_turn": "650 ml" }, + { "fuel": 1, "smoke": 3, "burn": 3 }, + { "fuel": 1, "smoke": 5, "burn": 5 } + ] + }, { "type": "material", "ident": "milk", @@ -1103,6 +1131,34 @@ "bash_dmg_verb": "dented", "cut_dmg_verb": "scratched" }, + { + "type": "material", + "ident": "nylon", + "name": "Synthetic Fabric", + "//": "blend between nylon 6 and 6,6", + "density": 2, + "specific_heat_liquid": 1.7, + "specific_heat_solid": 1.7, + "latent_heat": 42, + "soft": true, + "reinforces": true, + "bash_resist": 3, + "cut_resist": 3, + "acid_resist": 9, + "fire_resist": 2, + "elec_resist": 2, + "chip_resist": 7, + "repaired_with": "nylon", + "salvaged_into": "nylon", + "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], + "bash_dmg_verb": "ripped", + "cut_dmg_verb": "cut", + "burn_data": [ + { "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "650 ml" }, + { "fuel": 1, "smoke": 1, "burn": 1 }, + { "fuel": 1, "smoke": 1, "burn": 2 } + ] + }, { "type": "material", "ident": "tin", diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json index 20f98c70da0bd..09b06a3330ff7 100644 --- a/data/json/recipes/armor/legs.json +++ b/data/json/recipes/armor/legs.json @@ -225,6 +225,19 @@ "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "fur", 10 ], [ "tanned_pelt", 2 ] ] ] }, + { + "result": "leggings", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_LEGS", + "skill_used": "tailor", + "difficulty": 3, + "time": "35 m", + "autolearn": true, + "book_learn": [ [ "mag_tailor", 2 ], [ "manual_tailor", 2 ] ], + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "lycra_patch", 10 ] ] ] + }, { "result": "legguard_hard", "type": "recipe", @@ -572,6 +585,19 @@ "using": [ [ "sewing_standard", 24 ] ], "components": [ [ [ "rag", 30 ] ] ] }, + { + "result": "under_armor_shorts", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_LEGS", + "skill_used": "tailor", + "difficulty": 3, + "time": "25 m", + "autolearn": true, + "book_learn": [ [ "mag_tailor", 2 ], [ "manual_tailor", 2 ] ], + "using": [ [ "sewing_standard", 10 ] ], + "components": [ [ [ "lycra_patch", 5 ] ] ] + }, { "result": "chainmail_legs", "type": "recipe", diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index d761c968e66cf..24c9f1952402b 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -162,6 +162,19 @@ "qualities": [ { "id": "SEW", "level": 1 } ], "components": [ [ [ "rag", 4 ] ], [ [ "string_6", 4 ], [ "filament", 200, "LIST" ] ] ] }, + { + "result": "bholster", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "tailor", + "difficulty": 1, + "skills_required": [ [ "gun", 1 ], [ "pistol", 1 ] ], + "time": "10 m", + "autolearn": true, + "using": [ [ "sewing_standard", 18 ] ], + "components": [ [ [ "lycra_patch", 12 ] ] ] + }, { "result": "bindle", "type": "recipe", diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index e5ecf5588d7b6..930a31a14c1b1 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -863,5 +863,17 @@ "book_learn": [ [ "tailor_japanese", 3 ] ], "using": [ [ "sewing_standard", 18 ] ], "components": [ [ [ "rag", 16 ] ] ] + }, + { + "result": "zentai", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_SUIT", + "skill_used": "tailor", + "difficulty": 4, + "time": "2 h", + "book_learn": [ [ "mag_animecon", 1 ] ], + "using": [ [ "sewing_standard", 36 ] ], + "components": [ [ [ "lycra_patch", 34 ] ] ] } ] diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json index 8a4b66516eaf2..633d62f9176f0 100644 --- a/data/json/recipes/armor/torso.json +++ b/data/json/recipes/armor/torso.json @@ -399,6 +399,18 @@ "qualities": [ { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "jacket_leather", 1 ], [ "jacket_leather_red", 1 ] ], [ [ "scrap", 9 ] ] ] }, + { + "result": "leotard", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 2, + "time": "30 m", + "autolearn": true, + "using": [ [ "sewing_standard", 13 ] ], + "components": [ [ [ "lycra_patch", 8 ] ] ] + }, { "result": "long_undertop", "type": "recipe", @@ -942,6 +954,18 @@ "using": [ [ "sewing_standard", 8 ] ], "components": [ [ [ "rag", 8 ] ] ] }, + { + "result": "sports_bra", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 3, + "time": "35 m", + "autolearn": true, + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "lycra_patch", 2 ] ] ] + }, { "result": "sundress", "type": "recipe", @@ -979,6 +1003,18 @@ "using": [ [ "sewing_standard", 4 ] ], "components": [ [ [ "rag", 4 ] ] ] }, + { + "result": "thermal_shirt", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 3, + "time": "42 m", + "autolearn": true, + "using": [ [ "sewing_standard", 8 ] ], + "components": [ [ [ "lycra_patch", 7 ] ] ] + }, { "result": "trenchcoat", "type": "recipe", @@ -1096,6 +1132,18 @@ "using": [ [ "sewing_standard", 10 ] ], "components": [ [ [ "rag", 10 ] ] ] }, + { + "result": "under_armor", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 3, + "time": "35 m", + "autolearn": true, + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "lycra_patch", 4 ] ] ] + }, { "result": "undershirt", "type": "recipe", @@ -1108,6 +1156,18 @@ "using": [ [ "sewing_standard", 15 ] ], "components": [ [ [ "rag", 4 ] ] ] }, + { + "result": "unitard", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_TORSO", + "skill_used": "tailor", + "difficulty": 2, + "time": "35 m", + "autolearn": true, + "using": [ [ "sewing_standard", 15 ] ], + "components": [ [ [ "lycra_patch", 10 ] ] ] + }, { "result": "xlkevlar", "type": "recipe", diff --git a/data/json/requirements/materials.json b/data/json/requirements/materials.json index b7d61df1f2300..5aea017d1a95b 100644 --- a/data/json/requirements/materials.json +++ b/data/json/requirements/materials.json @@ -50,8 +50,20 @@ { "id": "fabric_standard", "type": "requirement", - "//": "Materials used for crafting or repairing clothing or sheeting", - "components": [ [ [ "rag", 1 ], [ "leather", 1 ], [ "nomex", 1 ], [ "neoprene", 1 ] ] ] + "//": "Materials used for crafting or repairing clothing or sheeting, etc.", + "components": [ [ [ "rag", 1 ], [ "lycra_patch", 1 ], [ "nylon", 1 ], [ "leather", 1 ], [ "nomex", 1 ], [ "neoprene", 1 ] ] ] + }, + { + "id": "fabric_standard_permeable", + "type": "requirement", + "//": "Materials used for crafting or repairing woven fabrics", + "components": [ [ [ "rag", 1 ], [ "lycra_patch", 1 ], [ "nylon", 1 ], [ "nomex", 1 ] ] ] + }, + { + "id": "fabric_standard_nostretch", + "type": "requirement", + "//": "Materials used for crafting or repairing non-form fitting clothing", + "components": [ [ [ "rag", 1 ], [ "nylon", 1 ], [ "nomex", 1 ] ] ] }, { "id": "filament",