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
CleverRaven · Oct 22, 2019 · ae2ed10 · ae2ed10
1 parent 6d11156
commit ae2ed10
Show file tree

Hide file tree

Showing 14 changed files with 330 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +5741,29 @@
       {
         "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,
         "move_cost": 800
       },
       {
         "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" ]
       }