Update materials for survivor suits

data/json/items/armor/bespoke_armor/custom_bodysuits.json

@@ -306,9 +306,16 @@
     "looks_like": "survivor_jumpsuit",
     "color": "green",
     "armor": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+  		{
+  	    "material" : [
+    		 { "type": "cotton", "covered_by_mat": 100, "thickness": 0.2 },
+    		 { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 },
+         { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 }
+  		 ],
+  		"covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r"  ],
+          "coverage": 100,
+          "encumbrance": [ 7, 7 ]
+  		}
     ],
     "pocket_data": [
       {
@@ -329,7 +336,6 @@
       }
     ],
     "warmth": 15,
-    "material_thickness": 4,
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
@@ -339,7 +345,7 @@
     "name": { "str": "XL light survivor suit" },
     "copy-from": "lsurvivor_jumpsuit",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
-    "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_lsurvivor_jumpsuit",
@@ -348,7 +354,7 @@
     "looks_like": "lsurvivor_jumpsuit",
     "name": { "str": "XS light survivor suit" },
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "survivor_jumpsuit",
@@ -365,9 +371,17 @@
     "looks_like": "touring_suit",
     "color": "brown",
     "armor": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 12 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 12, 12 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 12, 12 ] }
+  		{
+  	    "material" : [
+    		 { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 },
+    		 { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1 },
+         { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 },
+         { "type": "kevlar_layered", "covered_by_mat": 90, "thickness": 1 }
+  		 ],
+  		"covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ],
+          "coverage": 100,
+          "encumbrance": [ 12, 12 ]
+  		}
     ],
     "pocket_data": [
       {
@@ -388,65 +402,78 @@
       }
     ],
     "warmth": 15,
-    "material_thickness": 4,
     "valid_mods": [ "steel_padded" ],
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {
     "id": "xlsurvivor_jumpsuit",
     "type": "ARMOR",
-    "category": "armor",
     "name": { "str": "XL survivor suit" },
-    "description": "A massive hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit.  Protects from the elements as well as from harm.",
-    "weight": "12400 g",
-    "volume": "18 L",
-    "price": 150000,
-    "price_postapoc": 4000,
+    "copy-from": "survivor_jumpsuit",
+    "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xssurvivor_jumpsuit",
+    "type": "ARMOR",
+    "name": { "str": "XS survivor suit" },
+    "copy-from": "survivor_jumpsuit",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.75 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
+  },
+  {
+    "id": "hsurvivor_jumpsuit",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "heavy survivor suit" },
+    "description": "A heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit.  Protects from the elements as well as from harm.",
+    "weight": "15500 g",
+    "volume": "12 L",
+    "price": 200000,
+    "price_postapoc": 7000,
     "to_hit": -3,
     "bashing": 6,
-    "material": [ "kevlar_layered", "leather" ],
+    "material": [ "kevlar_layered", "low_steel", "leather" ],
     "symbol": "[",
-    "looks_like": "survivor_jumpsuit",
-    "color": "brown",
+    "looks_like": "survivor_suit",
+    "color": "dark_gray",
     "armor": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 17 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 17, 17 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 17, 17 ] }
+  		{
+        "material" : [
+          { "type": "leather", "covered_by_mat": 100, "thickness": 0.2 },
+          { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 2 },
+          { "type": "low_steel", "covered_by_mat": 90, "thickness": 1 },
+          { "type": "low_steel", "covered_by_mat": 90, "thickness": 1 }
+        ],
+        "covers": [ "torso", "leg_l", "leg_r", "arm_l", "arm_r" ],
+        "coverage": 100,
+        "encumbrance": [ 17, 17 ]
+  		}
     ],
     "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "max_contains_volume": "500 ml",
-        "max_contains_weight": "2 kg",
-        "moves": 80,
-        "max_item_length": "15 cm",
-        "description": "pants pocket"
-      },
-      {
-        "pocket_type": "CONTAINER",
-        "max_contains_volume": "500 ml",
-        "max_contains_weight": "2 kg",
-        "moves": 80,
-        "max_item_length": "15 cm",
-        "description": "pants pocket"
-      }
+      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 },
+      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "3 kg", "moves": 80 }
     ],
     "warmth": 15,
-    "material_thickness": 4,
-    "valid_mods": [ "steel_padded" ],
     "environmental_protection": 3,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
   },
   {
-    "id": "xssurvivor_jumpsuit",
+    "id": "xl_hsurvivor_jumpsuit",
     "type": "ARMOR",
-    "copy-from": "survivor_jumpsuit",
-    "looks_like": "survivor_jumpsuit",
-    "name": { "str": "XS survivor suit" },
-    "description": "A tiny hand-built combination armor made from a bulletproof vest and a reinforced leather jumpsuit.  Protects from the elements as well as from harm.",
-    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "UNDERSIZE" ]
+    "name": { "str": "XL heavy survivor suit" },
+    "copy-from": "hsurvivor_jumpsuit",
+    "proportional": { "weight": 1.13, "volume": 1.13, "price": 1.25 },
+    "extend": { "flags": [ "OVERSIZE" ] }
+  },
+  {
+    "id": "xs_hsurvivor_jumpsuit",
+    "type": "ARMOR",
+    "name": { "str": "XS heavy survivor suit" },
+    "copy-from": "hsurvivor_jumpsuit",
+    "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.75 },
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "wsurvivor_jumpsuit",

data/json/items/armor/bespoke_armor/cuttingroom.json

@@ -281,34 +281,12 @@
   {
     "id": "xlhsurvivor_suit",
     "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "XL heavy survivor suit" },
-    "description": "A massive, heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit.  Protects from the elements as well as from harm.",
-    "weight": "20500 g",
-    "volume": "18750 ml",
-    "price": 200000,
-    "price_postapoc": 5000,
-    "to_hit": -3,
-    "bashing": 6,
-    "material": [ "kevlar_layered", "steel", "leather" ],
-    "symbol": "[",
+    "copy-from": "hsurvivor_suit",
     "looks_like": "hsurvivor_suit",
-    "color": "dark_gray",
-    "armor": [
-      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 22, 39 ] },
-      { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 22, 28 ] },
-      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 22, 22 ] }
-    ],
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "2 L", "max_contains_weight": "6 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 120 }
-    ],
-    "warmth": 15,
-    "material_thickness": 6,
-    "environmental_protection": 3,
-    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ]
+    "name": { "str": "XL heavy survivor suit" },
+    "description": "A heavy, hand-built combination armor made from a reinforced bulletproof vest and a metal-plated leather jumpsuit.  Protects from the elements as well as from harm.",
+    "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
+    "flags": [ "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY", "OVERSIZE" ]
   },
   {
     "id": "xshsurvivor_suit",

data/json/recipes/armor/suit.json

@@ -1359,7 +1359,7 @@
     "components": [ [ [ "sheet_kevlar_layered", 25 ] ] ]
   },
   {
-    "result": "hsurvivor_suit",
+    "result": "hsurvivor_jumpsuit",
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "category": "CC_ARMOR",
@@ -1370,7 +1370,6 @@
     "time": "20 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 20 ], [ "fabric_leather_hide", 4 ] ],
-    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "proficiencies": [
       { "proficiency": "prof_leatherworking_basic" },
       { "proficiency": "prof_leatherworking" },
@@ -1380,6 +1379,7 @@
       { "proficiency": "prof_metalworking" },
       { "proficiency": "prof_articulation" }
     ],
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
     "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ],
     "components": [
       [ [ "steel_chunk", 4 ], [ "scrap", 12 ] ],
@@ -1406,12 +1406,11 @@
     ]
   },
   {
-    "result": "xshsurvivor_suit",
+    "result": "xs_hsurvivor_jumpsuit",
     "type": "recipe",
-    "copy-from": "hsurvivor_suit",
-    "time": "20 h",
-    "using": [ [ "sewing_standard", 150 ], [ "fabric_standard_nostretch", 15 ], [ "fabric_leather_hide", 3 ] ],
-    "tools": [ [ [ "welder", 56 ], [ "welder_crude", 84 ], [ "soldering_iron", 84 ], [ "toolset", 84 ] ] ],
+    "copy-from": "hsurvivor_jumpsuit",
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
+    "tools": [ [ [ "welder", 42 ], [ "welder_crude", 63 ], [ "soldering_iron", 63 ], [ "toolset", 63 ] ] ],
     "components": [
       [ [ "steel_chunk", 3 ], [ "scrap", 9 ] ],
       [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ],
@@ -1436,6 +1435,36 @@
       ]
     ]
   },
+  {
+    "result": "xl_hsurvivor_jumpsuit",
+    "type": "recipe",
+    "copy-from": "hsurvivor_jumpsuit",
+    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
+    "tools": [ [ [ "welder", 63 ], [ "welder_crude", 95 ], [ "soldering_iron", 95 ], [ "toolset", 95 ] ] ],
+    "components": [
+      [ [ "steel_chunk", 5 ], [ "scrap", 15 ] ],
+      [ [ "coat_rain", 1 ], [ "jacket_windbreaker", 1 ], [ "jacket_evac", 1 ], [ "coat_gut", 1 ] ],
+      [
+        [ "tacvest", 1 ],
+        [ "legrig", 1 ],
+        [ "vest", 1 ],
+        [ "tool_belt", 1 ],
+        [ "ragpouch", 6 ],
+        [ "leather_pouch", 4 ],
+        [ "dump_pouch", 1 ],
+        [ "purse", 2 ],
+        [ "fanny", 2 ]
+      ],
+      [ [ "duct_tape", 340 ] ],
+      [
+        [ "kevlar", 1 ],
+        [ "ballistic_vest_light", 1 ],
+        [ "ballistic_vest_esapi", 1 ],
+        [ "swat_armor", 1 ],
+        [ "sheet_kevlar_layered", 27 ]
+      ]
+    ]
+  },
   {
     "result": "jumpsuit",
     "type": "recipe",
@@ -1665,53 +1694,6 @@
     "autolearn": true,
     "using": [ [ "sewing_standard", 150 ], [ "fabric_felt", 24 ] ]
   },
-  {
-    "result": "xlhsurvivor_suit",
-    "type": "recipe",
-    "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
-    "skill_used": "tailor",
-    "difficulty": 8,
-    "skills_required": [ "fabrication", 8 ],
-    "time": "22 h 30 m",
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 200 ], [ "fabric_standard_nostretch", 30 ], [ "fabric_leather_hide", 7 ] ],
-    "qualities": [ { "id": "LEATHER_AWL", "level": 1 } ],
-    "proficiencies": [
-      { "proficiency": "prof_leatherworking_basic" },
-      { "proficiency": "prof_metalworking" },
-      { "proficiency": "prof_articulation" },
-      { "proficiency": "prof_leatherworking" },
-      { "proficiency": "prof_closures" },
-      { "proficiency": "prof_closures_waterproofing" },
-      { "proficiency": "prof_polymerworking" }
-    ],
-    "tools": [ [ [ "welder", 112 ], [ "welder_crude", 168 ], [ "soldering_iron", 168 ], [ "toolset", 168 ] ] ],
-    "components": [
-      [ [ "steel_chunk", 8 ], [ "scrap", 24 ] ],
-      [ [ "coat_rain", 2 ], [ "jacket_windbreaker", 2 ], [ "jacket_evac", 2 ], [ "coat_gut", 2 ] ],
-      [
-        [ "tacvest", 1 ],
-        [ "legrig", 1 ],
-        [ "vest", 1 ],
-        [ "tool_belt", 1 ],
-        [ "ragpouch", 6 ],
-        [ "leather_pouch", 4 ],
-        [ "dump_pouch", 1 ],
-        [ "purse", 2 ],
-        [ "fanny", 2 ]
-      ],
-      [ [ "duct_tape", 400 ] ],
-      [
-        [ "kevlar", 2 ],
-        [ "ballistic_vest_light", 2 ],
-        [ "ballistic_vest_esapi", 2 ],
-        [ "swat_armor", 2 ],
-        [ "sheet_kevlar_layered", 48 ]
-      ]
-    ]
-  },
   {
     "result": "yukata",
     "type": "recipe",