Changes to foldable gear

data/json/items/armor/coats.json

@@ -279,6 +279,25 @@
     "environmental_protection": 3,
     "flags": [ "VARSIZE", "POCKETS", "WATERPROOF", "RAINPROOF", "HOOD", "OUTER", "SOFT" ]
   },
+  {
+    "id": "folding_poncho",
+    "repairs_like": "sheet",
+    "type": "ARMOR",
+    "category": "clothing",
+    "symbol": "[",
+    "color": "yellow",
+    "name": { "str": "rain poncho" },
+    "description": "A lightweight plastic rain poncho with a hood.  It folds into a very compact form when not in use.",
+    "price": 5000,
+    "price_postapoc": 50,
+    "material": [ "plastic" ],
+    "weight": "280 g",
+    "volume": "250 ml",
+    "flags": [ "WATERPROOF", "RAINPROOF", "HOOD", "OVERSIZE", "OUTER", "SOFT" ],
+    "environmental_protection": 1,
+    "material_thickness": 0.1,
+    "armor": [ { "coverage": 90, "covers": [ "torso", "arm_l", "arm_r" ] } ]
+  },
   {
     "id": "coat_straw",
     "type": "ARMOR",

data/json/items/armor/misc.json

@@ -102,29 +102,22 @@
   {
     "id": "sleeping_bag_roll",
     "type": "ARMOR",
+    "copy-from": "sleeping_bag",
     "name": { "str": "rolled sleeping bag" },
-    "description": "A large sleeping bag rolled up for transport.  It has a strap to carry it with.",
-    "weight": "981 g",
-    "volume": "1 L",
-    "price": 20500,
-    "price_postapoc": 1500,
-    "to_hit": -1,
-    "material": [ "cotton" ],
-    "symbol": "(",
-    "looks_like": "duffelbag",
-    "color": "light_red",
+    "description": "A large sleeping bag that covers you head to toe, with a strap for carrying it on back when not in use.  This one is medium weight.  It is currently carried on back; activate it to use it for warmth.",
+    "looks_like": "sleeping_bag",
     "material_thickness": 4,
     "flags": [ "OVERSIZE", "BELTED" ],
     "use_action": { "menu_text": "Unroll", "type": "transform", "target": "sleeping_bag", "msg": "You unroll the sleeping bag." },
-    "armor": [ { "encumbrance": 20, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
+    "armor": [ { "encumbrance": 4, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
   },
   {
     "id": "sleeping_bag_fur",
     "type": "ARMOR",
     "name": { "str": "fur sleeping bag" },
-    "description": "A large sleeping bag lined with fur.  Who needs a tent?",
+    "description": "A large sleeping bag lined with fur, with a strap for carrying it on back when not in use.  Who needs a tent?  It is currently used for warmth; activate it to carry it on back.",
     "weight": "1175 g",
-    "volume": "4500 ml",
+    "volume": "2 L",
     "price": 32500,
     "price_postapoc": 2000,
     "to_hit": -1,
@@ -153,26 +146,13 @@
   {
     "id": "sleeping_bag_fur_roll",
     "type": "ARMOR",
+    "copy-from": "sleeping_bag_fur",
     "name": { "str": "rolled fur sleeping bag" },
-    "description": "A large sleeping bag lined with fur, rolled for transport.  It has a strap to carry it with.",
-    "weight": "1175 g",
-    "volume": "2 L",
-    "price": 32500,
-    "price_postapoc": 2000,
-    "to_hit": -1,
-    "material": [ "cotton", "fur" ],
-    "symbol": "(",
+    "description": "A large sleeping bag lined with fur, with a strap for carrying it on back when not in use.  Who needs a tent?  It is currently carried on back; activate it to use it for warmth.",
     "looks_like": "sleeping_bag_roll",
-    "color": "brown",
-    "material_thickness": 5,
     "flags": [ "OVERSIZE", "BELTED" ],
-    "use_action": {
-      "menu_text": "Unroll",
-      "type": "transform",
-      "target": "sleeping_bag_fur",
-      "msg": "You unroll up the fur sleeping bag."
-    },
-    "armor": [ { "encumbrance": 20, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
+    "use_action": { "menu_text": "Unroll", "type": "transform", "target": "sleeping_bag_fur", "msg": "You unroll the fur sleeping bag." },
+    "armor": [ { "encumbrance": 5, "coverage": 20, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] } ]
   },
   {
     "id": "tie_bow",

data/json/items/generic/bedding.json

@@ -190,13 +190,39 @@
       }
     ]
   },
+  {
+    "id": "emer_blanket",
+    "repairs_like": "sheet",
+    "type": "ARMOR",
+    "category": "clothing",
+    "symbol": "[",
+    "color": "light_gray",
+    "name": { "str": "emergency blanket" },
+    "description": "A blanket made of space-age material that covers your most important body parts.  It folds into a very compact form when not in use.",
+    "price": 425,
+    "price_postapoc": 10,
+    "material": [ "plastic" ],
+    "weight": "622 g",
+    "volume": "500 ml",
+    "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS", "SOFT" ],
+    "warmth": 50,
+    "environmental_protection": 1,
+    "material_thickness": 0.1,
+    "armor": [
+      {
+        "encumbrance": 50,
+        "coverage": 90,
+        "covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
+      }
+    ]
+  },
   {
     "id": "sleeping_bag",
     "type": "ARMOR",
     "name": { "str": "sleeping bag" },
-    "description": "A large sleeping bag that covers you head to toe.  This one is medium weight.",
+    "description": "A large sleeping bag that covers you head to toe, with a strap for carrying it on back when not in use.  This one is medium weight.  It is currently used for warmth; activate it to carry it on back.",
     "weight": "1600 g",
-    "volume": "14 L",
+    "volume": "1 L",
     "price": 20500,
     "price_postapoc": 500,
     "to_hit": -1,

data/json/items/migration.json

@@ -1713,6 +1713,16 @@
     "type": "MIGRATION",
     "replace": "high_end_folding_stock"
   },
+  {
+    "id": "folding_poncho_on",
+    "type": "MIGRATION",
+    "replace": "folding_poncho"
+  },
+  {
+    "id": "emer_blanket_on",
+    "type": "MIGRATION",
+    "replace": "emer_blanket"
+  },
   {
     "id": "tire_iron",
     "type": "MIGRATION",

data/json/items/tool_armor.json

@@ -2074,85 +2074,6 @@
     },
     "environmental_protection": 16
   },
-  {
-    "type": "TOOL",
-    "id": "folding_poncho",
-    "symbol": ",",
-    "color": "yellow",
-    "name": { "str": "folded poncho" },
-    "description": "A folded lightweight plastic rain poncho with a hood.  Use it to unfold for use.",
-    "price": 5000,
-    "price_postapoc": 50,
-    "material": [ "plastic" ],
-    "weight": "280 g",
-    "volume": "250 ml",
-    "use_action": [ "UNPACK_ITEM" ]
-  },
-  {
-    "id": "folding_poncho_on",
-    "repairs_like": "sheet",
-    "type": "TOOL_ARMOR",
-    "category": "clothing",
-    "symbol": "[",
-    "color": "yellow",
-    "name": { "str": "unfolded poncho" },
-    "description": "A lightweight plastic rain poncho with a hood.  Use it to fold for storage.",
-    "price": 5000,
-    "price_postapoc": 50,
-    "material": [ "plastic" ],
-    "weight": "280 g",
-    "volume": "1500 ml",
-    "to_hit": -3,
-    "revert_to": "folding_poncho",
-    "use_action": [ "PACK_ITEM" ],
-    "flags": [ "WATERPROOF", "RAINPROOF", "HOOD", "OVERSIZE", "OUTER" ],
-    "environmental_protection": 1,
-    "material_thickness": 0.1,
-    "armor": [ { "coverage": 90, "covers": [ "torso", "arm_l", "arm_r" ] } ]
-  },
-  {
-    "type": "TOOL",
-    "id": "emer_blanket",
-    "repairs_like": "sheet",
-    "symbol": ",",
-    "color": "light_gray",
-    "name": { "str": "folded emergency blanket" },
-    "description": "A folded blanket made of space-age materials that covers your most important body parts.  Use it to unfold for use.",
-    "price": 425,
-    "price_postapoc": 10,
-    "material": [ "plastic" ],
-    "weight": "622 g",
-    "volume": "500 ml",
-    "use_action": [ "UNPACK_ITEM" ]
-  },
-  {
-    "id": "emer_blanket_on",
-    "type": "TOOL_ARMOR",
-    "category": "clothing",
-    "symbol": "[",
-    "color": "light_gray",
-    "name": { "str": "emergency blanket" },
-    "description": "A blanket made of space-age material that covers your most important body parts.  Use it to fold for storage.",
-    "price": 425,
-    "price_postapoc": 10,
-    "material": [ "plastic" ],
-    "weight": "622 g",
-    "volume": "2500 ml",
-    "to_hit": -3,
-    "revert_to": "emer_blanket",
-    "use_action": [ "PACK_ITEM" ],
-    "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS", "SOFT" ],
-    "warmth": 50,
-    "environmental_protection": 1,
-    "material_thickness": 0.1,
-    "armor": [
-      {
-        "encumbrance": 50,
-        "coverage": 90,
-        "covers": [ "torso", "arm_l", "arm_r", "hand_l", "hand_r", "leg_l", "leg_r", "foot_l", "foot_r" ]
-      }
-    ]
-  },
   {
     "id": "rad_monitor",
     "type": "TOOL_ARMOR",

data/json/npcs/items_generic.json

@@ -131,7 +131,7 @@
       [ "trenchcoat", 20 ],
       [ "jacket_jean", 20 ],
       [ "jacket_windbreaker", 10 ],
-      [ "folding_poncho_on", 10 ],
+      [ "folding_poncho", 10 ],
       [ "jacket_leather_mod", 5 ],
       [ "american_flag", 5 ],
       [ "jacket_leather_red", 10 ],

data/json/professions.json

@@ -416,7 +416,7 @@
           "socks_wool",
           "socks",
           "hoodie",
-          "folding_poncho_on",
+          "folding_poncho",
           "knit_scarf",
           "jug_plastic",
           "can_beans",

data/mods/Magiclysm/professions.json

@@ -595,10 +595,10 @@
           "hatchet",
           "balclava",
           "rifle_case_soft",
-          "emer_blanket",
           "mess_tin"
         ],
         "entries": [
+          { "item": "emer_blanket", "custom-flags": [ "no_auto_equip" ] },
           { "group": "charged_two_way_radio" },
           {
             "item": "boreal_mosin",