Port to DDA.

4 files changed, 565 insertions, 194 deletions

diff --git a/vamp_stuff/Modification_Files/Items/Armor_Set/Infused/v_bloodinfusedset.json b/vamp_stuff/Modification_Files/Items/Armor_Set/Infused/v_bloodinfusedset.json
index 257bfa3..7289ad8 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/Infused/v_bloodinfusedset.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/Infused/v_bloodinfusedset.json
@@ -1,139 +1,286 @@
 [
   {
     "id": "bloodinfused_survivorhood",
+    "looks_like": "hood_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "blood-infused survivor hood" },
     "description": "A customized, heavily armored leather and Kevlar hood, designed to provide comfort and protection from harm.  It has been augmented with blood leather sheets for increased protection.",
-    "weight": "920 g",
+    "weight": "820 g",
     "volume": "2 L",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
     "bashing": 10,
-    "material": [ "compactblood", "kevlar", "leather" ],
+    "material": [ "compactblood", "kevlar_layered", "leather" ],
     "symbol": "[",
-    "looks_like": "hood_survivor",
     "color": "red",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 25,
     "warmth": 15,
     "material_thickness": 4,
-    "environmental_protection": 4,
+    "environmental_protection": 3,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HELMET_COMPAT" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ]
   },
+
   {
     "id": "bloodinfused_survivorpants",
+    "looks_like": "pants_survivor",
     "type": "ARMOR",
-    "name": { "str": "blood-infused survivor cargo pants", "str_pl": "blood-infused survivor cargo pants" },
+    "category": "armor",
+    "name": { "str_sp": "blood-infused survivor cargo pants" },
     "description": "A pair of Kevlar armored pants covered with pouches and pockets.  Custom-built to be durable, comfortable, and easy to wear.  They have been augmented with blood leather sheets for increased protection.",
-    "weight": "2200 g",
+    "weight": "2100 g",
     "volume": "3 L",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood", "cotton", "kevlar" ],
     "symbol": "[",
-    "looks_like": "pants_survivor",
     "color": "red",
-    "covers": [ "leg_l", "leg_r" ],
-    "coverage": 100,
-    "encumbrance": 10,
-    "max_encumbrance": 20,
-    "storage": "3500 ml",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1250 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "21 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1250 ml",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "21 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "15 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 100
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 100
+      }
+    ],
     "warmth": 15,
     "material_thickness": 4,
-    "valid_mods": [ "steel_padded" ],
-    "environmental_protection": 4,
-    "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ]
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "POCKETS", "STURDY", "WATERPROOF" ],
+    "armor": [ { "encumbrance": [ 10, 20 ], "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ]
   },
   {
     "id": "bloodinfused_survivorduster",
+    "looks_like": "duster_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "blood-infused survivor duster" },
     "description": "A Kevlar armored custom full-length duster, covered with pouches and pockets.  Comfortable, durable, and great for storage.  It has been augmented with blood leather sheets for increased protection.",
-    "weight": "2692 g",
+    "weight": "2592 g",
     "volume": "9500 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
-    "material": [ "compactblood", "cotton", "kevlar" ],
+    "material": [ "compactblood", "canvas", "kevlar" ],
     "symbol": "[",
-    "looks_like": "duster_survivor",
     "color": "red",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 85,
-    "encumbrance": 7,
-    "max_encumbrance": 13,
-    "storage": "9 L",
-    "warmth": 10,
-    "material_thickness": 4,
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 86,
+        "encumbrance": [ 5, 6 ],
+        "specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
+        "layers": [ "BELTED" ]
+      },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 8, 8 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "31 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "31 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "25 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "25 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
+    "warmth": 20,
+    "material_thickness": 3,
     "valid_mods": [ "steel_padded" ],
-    "environmental_protection": 4,
+    "environmental_protection": 3,
     "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ]
   },
   {
     "id": "bloodinfused_survivorgloves",
+    "looks_like": "gloves_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "pair of blood-infused survivor gloves", "str_pl": "pairs of blood-infused survivor gloves" },
     "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.  They have been augmented with blood leather sheets for increased protection.",
-    "weight": "330 g",
+    "weight": "230 g",
     "volume": "750 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": 2,
     "material": [ "compactblood", "kevlar", "leather" ],
     "symbol": "[",
-    "looks_like": "gloves_survivor",
     "color": "red",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
-    "encumbrance": 20,
     "warmth": 15,
-    "material_thickness": 4,
-    "environmental_protection": 4,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+    "material_thickness": 3,
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "armor": [ { "encumbrance": 20, "coverage": 100, "covers": [ "hand_l", "hand_r" ] } ]
   },
   {
     "id": "bloodinfused_survivorboots",
+    "looks_like": "boots_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "pair of blood-infused survivor boots", "str_pl": "pairs of blood-infused survivor boots" },
     "description": "A pair of customized leather boots, armored with Kevlar and modified to provide maximum protection from harm, even when knee-deep in the dead.  They have been augmented with blood leather sheets for increased protection.",
-    "weight": "1430 g",
+    "weight": "1330 g",
     "volume": "2500 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
     "bashing": 1,
     "material": [ "compactblood", "kevlar", "leather" ],
     "symbol": "[",
-    "looks_like": "boots_survivor",
     "color": "red",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
-    "encumbrance": 24,
     "warmth": 15,
-    "material_thickness": 5,
-    "environmental_protection": 4,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+    "material_thickness": 3.5,
+    "environmental_protection": 3,
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "armor": [ { "encumbrance": 24, "coverage": 100, "covers": [ "foot_l", "foot_r" ] } ]
   },
   {
     "id": "bloodinfused_survivortrenchcoat",
+    "looks_like": "trenchcoat_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "blood-infused survivor trenchcoat" },
     "description": "A Kevlar armored custom trenchcoat, covered with pouches and pockets.  Comfortable, durable, and great for storage.  It has been augmented with blood leather sheets for increased protection.",
-    "weight": "2120 g",
+    "weight": "1920 g",
     "volume": "7 L",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
-    "material": [ "compactblood", "cotton", "kevlar" ],
+    "material": [ "compactblood", "canvas", "kevlar" ],
     "symbol": "[",
-    "looks_like": "trenchcoat_survivor",
     "color": "red",
-    "covers": [ "torso", "arm_l", "arm_r" ],
-    "coverage": 85,
-    "encumbrance": 7,
-    "max_encumbrance": 15,
-    "storage": "9 L",
-    "warmth": 10,
-    "material_thickness": 4,
-    "valid_mods": [ "steel_padded" ],
-    "environmental_protection": 4,
+    "armor": [
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ], "coverage": 100, "encumbrance": [ 8, 15 ] },
+      { "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ], "coverage": 95, "encumbrance": [ 0, 0 ] },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 8, 8 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "31 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "31 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "25 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "25 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
+    "warmth": 20,
+    "material_thickness": 3,
+    "environmental_protection": 3,
     "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Armor_Set/Normal/v_bloodset.json b/vamp_stuff/Modification_Files/Items/Armor_Set/Normal/v_bloodset.json
index 02a3b1c..5878ff7 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/Normal/v_bloodset.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/Normal/v_bloodset.json
@@ -1,126 +1,225 @@
 [
   {
     "id": "blood_suit",
+    "looks_like": "armor_nomad",
     "type": "ARMOR",
-    "name": { "str": "blood leather suit" },
-    "description": "A lightweight, blood red suit made completely of flexible compacted blood sheets and designed to be worn under your clothes. Protects vital extremeties.",
-    "weight": "685 g",
-    "volume": "750 ml",
-    "price": "0 cent",
-    "to_hit": -1,
-    "bashing": 3,
-    "material": [ "compactblood" ],
+    "name": { "str": "nomad jumpsuit" },
+    "description": "A reinforced but airy jumpsuit designed to survive the long-term wear and tear of exploring the apocalyptic wasteland.  Its clever construction adds additional core support, helping you to carry more equipment.",
+    "weight": "610 g",
+    "volume": "3500 ml",
+    "price": 0,
+    "to_hit": -3,
+    "material": [ "compactblood", "leather" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 100,
-    "encumbrance": 5,
-    "warmth": 10,
-    "material_thickness": 1,
+    "armor": [
+      {
+        "material": [
+          { "type": "compactblood", "covered_by_mat": 100, "thickness": 0.5 },
+          { "type": "leather", "covered_by_mat": 90, "thickness": 1.5 }
+        ],
+        "covers": [ "leg_l", "leg_r", "arm_l", "arm_r", "torso" ],
+        "coverage": 100,
+        "encumbrance": [ 6, 6 ],
+        "breathability": "GOOD"
+      }
+    ],
+    "warmth": 20,
+    "material_thickness": 2,
     "environmental_protection": 1,
-    "flags": [ "WATERPROOF", "STURDY", "SKINTIGHT" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SKINTIGHT" ]
   },
   {
     "id": "blood_hood",
+    "looks_like": "hood_survivor",
     "type": "ARMOR",
+    "category": "armor",
     "name": { "str": "blood leather hood" },
     "description": "Hood made from compacted blood and leather, this is tough and provides decent protection from damage.",
     "weight": "745 g",
-    "volume": "1250 ml",
-    "price": "0 cent",
+    "volume": "2 L",
+    "price": 0,
     "to_hit": -1,
-    "bashing": 9,
+    "bashing": 10,
     "material": [ "compactblood", "leather" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "head" ],
-    "coverage": 100,
-    "encumbrance": 15,
     "warmth": 20,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HOOD" ]
+    "techniques": [ "WBLOCK_1" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ],
+    "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 100, "covers": [ "head" ] } ]
   },
   {
     "id": "blood_duster",
+    "looks_like": "duster",
     "type": "ARMOR",
     "name": { "str": "blood leather duster" },
     "description": "Consists of compacted blood sheets and leather. This duster provides good storage and warmth.",
     "weight": "1997 g",
-    "volume": "8500 ml",
-    "price": "0 cent",
+    "volume": "7 L",
+    "price": 0,
     "to_hit": -1,
     "material": [ "compactblood", "leather" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "torso", "arm_l", "arm_r", "leg_l", "leg_r" ],
-    "coverage": 85,
-    "encumbrance": 8,
-    "max_encumbrance": 15,
-    "storage": "8 L",
+    "armor": [
+      { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] },
+      {
+        "covers": [ "leg_l", "leg_r" ],
+        "coverage": 86,
+        "encumbrance": [ 4, 5 ],
+        "specifically_covers": [ "leg_draped_l", "leg_draped_r" ],
+        "layers": [ "BELTED" ]
+      },
+      { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }
+    ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "24 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1500 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "24 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "21 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "1 L",
+        "max_contains_weight": "2 kg",
+        "max_item_length": "21 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "13 cm",
+        "moves": 120
+      }
+    ],
     "warmth": 20,
-    "material_thickness": 1,
+    "material_thickness": 1.5,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "POCKETS", "HOOD", "COLLAR", "STURDY", "WATERPROOF", "RAINPROOF", "OUTER" ]
+    "flags": [ "VARSIZE", "POCKETS", "OUTER", "WATERPROOF", "RAINPROOF", "HOOD", "COLLAR", "STURDY" ]
   },
   {
     "id": "blood_gloves",
+    "looks_like": "gloves_leather",
     "type": "ARMOR",
     "name": { "str": "pair of blood leather gloves", "str_pl": "pairs of blood leather gloves" },
     "description": "A combination of compacted blood sheets and leather. This pair of gloves offer great protection against environment.",
-    "weight": "230 g",
-    "volume": "500 ml",
-    "price": "0 cent",
+    "weight": "160 g",
+    "volume": "250 ml",
+    "price": 0,
     "to_hit": 2,
     "material": [ "compactblood", "leather" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "hand_l", "hand_r" ],
-    "coverage": 100,
-    "encumbrance": 10,
     "warmth": 15,
     "material_thickness": 1,
-    "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+    "valid_mods": [ "steel_padded" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "armor": [ { "encumbrance": 10, "coverage": 95, "covers": [ "hand_l", "hand_r" ] } ]
   },
   {
     "id": "blood_pants",
+    "looks_like": "pants_leather",
     "type": "ARMOR",
     "name": { "str": "blood leather pants", "str_pl": "blood leather pants" },
     "description": "A pair of pants created from leather and compacted blood sheets. Offers decent protection.",
-    "weight": "1920 g",
-    "volume": "2250 ml",
-    "price": "0 cent",
+    "weight": "980 g",
+    "volume": "2500 ml",
+    "price": 0,
+    "to_hit": 1,
     "material": [ "compactblood", "leather" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "leg_l", "leg_r" ],
-    "coverage": 100,
-    "encumbrance": 10,
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "19 cm",
+        "moves": 80
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "800 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "19 cm",
+        "moves": 80
+      }
+    ],
     "warmth": 15,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "STURDY", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "STURDY", "WATERPROOF" ],
+    "armor": [ { "encumbrance": [ 15, 17 ], "coverage": 95, "covers": [ "leg_l", "leg_r" ] } ]
   },
   {
     "id": "blood_boots",
+    "looks_like": "boots",
     "type": "ARMOR",
     "name": { "str": "pair of blood leather boots", "str_pl": "pairs of blood leather boots" },
-    "description": "Pair of boots made from tough leather and compacted blood sheets. It's a great choice for rough journeys.",
+    "description": "Pair of boots made from compacted blood sheets. It's a great choice for rough journeys.",
     "weight": "1030 g",
     "volume": "2500 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
-    "bashing": 2,
-    "material": [ "compactblood", "leather" ],
-    "symbol": "[",
+    "bashing": 1,
     "color": "red",
-    "covers": [ "foot_l", "foot_r" ],
-    "coverage": 100,
-    "encumbrance": 15,
+    "symbol": "[",
     "warmth": 20,
-    "material_thickness": 1,
-    "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+    "environmental_protection": 2,
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ],
+    "armor": [
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [
+          "foot_toes_r",
+          "foot_toes_l",
+          "foot_ankle_r",
+          "foot_ankle_l",
+          "foot_heel_r",
+          "foot_heel_l",
+          "foot_arch_r",
+          "foot_arch_l"
+        ],
+        "material": [ { "type": "compactblood", "covered_by_mat": 100, "thickness": 2.5 } ],
+        "encumbrance": 12,
+        "coverage": 100
+      },
+      {
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_sole_r", "foot_sole_l" ],
+        "material": [
+          { "type": "compactblood", "covered_by_mat": 100, "thickness": 0.1 },
+          { "type": "rubber", "covered_by_mat": 100, "thickness": 6.0 }
+        ],
+        "coverage": 100
+      }
+    ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json b/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json
index 7c72d1f..7fbdc53 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json
@@ -1,47 +1,46 @@
 [
   {
-    "id": "blood_necklace",
+    "abstract": "v_jewelery_template",
     "looks_like": "ruby_silver_pendant_necklace",
     "type": "ARMOR",
     "category": "clothing",
-    "name": { "str": "bloodrune necklace" },
-    "description": "A shiny, silver necklace adorned with a bloodrune pendant. It mimics a heartbeat with unreadable markings on the interior that appear and disappear like clockwork.",
-    "weight": "250 g",
-    "volume": "250 ml",
-    "material": [ "compactblood", "silver" ],
+    "name": { "str": "jewelery template" },
+    "description": "This jewelery is a template for reducing duplicate code on jewelery. It should never appear in game, obviously.",
+    "weight": "70 g",
+    "volume": "15 ml",
+    "price": 0,
+    "material": [ { "type": "silver", "portion": 9 }, { "type": "compactblood" } ],
     "symbol": "[",
     "color": "red",
-    "flags": [ "SUPER_FANCY" ]
+    "flags": [ "SUPER_FANCY", "NO_WEAR_EFFECT", "TRADER_AVOID" ]
+  },
+  {
+    "id": "blood_necklace",
+    "copy-from": "v_jewelery_template",
+    "type": "ARMOR",
+    "category": "clothing",
+    "name": { "str": "bloodrune necklace" },
+    "description": "A shiny, silver necklace adorned with a bloodrune pendant. It mimics a heartbeat with unreadable markings on the interior that appear and disappear like clockwork."
   },
   {
     "id": "blood_talisman",
-    "looks_like": "ruby_silver_pendant_necklace",
+    "copy-from": "v_jewelery_template",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "bloodrune talisman" },
-    "description": "A shiny, silver necklace adorned with a bloodrune pendant carved in the shape of an vampire fang. If you prick your fingertip on its sharp point, you can feel your blood rushing towards the wound.",
-    "weight": "80 g",
-    "volume": "3 ml",
-    "price": "0 cent",
-    "price_postapoc": "25 kUSD",
-    "material": [ "compactblood", "silver" ],
-    "symbol": "(",
-    "color": "red",
-    "flags": [ "SUPER_FANCY" ]
+    "description": "A shiny, silver necklace adorned with a bloodrune pendant carved in the shape of an vampire fang. If you prick your fingertip on its sharp point, you can feel your blood rushing towards the wound."
   },
   {
     "id": "blood_cring",
+    "copy-from": "v_jewelery_template",
     "looks_like": "ruby_silver_ring",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "bloodrune ring" },
     "description": "A silver ring with a bloodrune mounted on top of it. The bloodrune has a symbol etched into it. It was given to you by the Vampire Cove Commander as proof of your loyalty.",
-    "weight": "55 g",
-    "volume": "3 ml",
-    "price": "0 cent",
-    "material": [ "compactblood", "silver" ],
-    "symbol": "(",
-    "color": "red",
-    "flags": [ "FANCY" ]
+    "weight": "10 mg",
+    "volume": "1 ml",
+    "sided": true,
+    "armor": [ { "coverage": 0, "covers": [ "hand_l", "hand_r" ], "specifically_covers": [ "hand_fingers_l", "hand_fingers_r" ] } ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json b/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
index 8fdf73b..5e2aea0 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
@@ -9,25 +9,35 @@
     "description": "A small concealed knife sheath worn on the ankle.  It is awkward to use without practice.  Activate to sheathe/draw a weapon.",
     "weight": "180 g",
     "volume": "500 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
     "material": [ "compactblood" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "foot_either" ],
-    "coverage": 5,
-    "encumbrance": 2,
-    "material_thickness": 1,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Sheath knife",
-      "holster_msg": "You sheath your %s",
-      "min_volume": "15 ml",
-      "max_volume": "500 ml",
-      "draw_cost": 30,
-      "flags": [ "SHEATH_KNIFE" ]
-    },
-    "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
+    "sided": true,
+    "pocket_data": [
+      {
+        "magazine_well": "200 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "30 cm"
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Sheath knife", "holster_msg": "You sheath your %s" },
+    "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ],
+    "armor": [
+      {
+        "material": [ { "type": "compactblood", "covered_by_mat": 100, "thickness": 1 } ],
+        "covers": [ "foot_l", "foot_r" ],
+        "specifically_covers": [ "foot_ankle_l", "foot_ankle_r" ],
+        "coverage": 25,
+        "encumbrance": [ 2, 3 ],
+        "layers": [ "BELTED" ]
+      }
+    ]
   },
   {
     "id": "bloodwristsheath",
@@ -39,25 +49,34 @@
     "description": "A small concealed knife sheath worn on the wrist.  It is awkward to use without practice.  Activate to sheathe/draw a weapon.",
     "weight": "180 g",
     "volume": "500 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
     "material": [ "compactblood" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "hand_either" ],
-    "coverage": 5,
-    "encumbrance": 2,
-    "material_thickness": 1,
-    "use_action": {
-      "type": "holster",
-      "holster_prompt": "Sheath knife",
-      "holster_msg": "You sheath your %s",
-      "min_volume": "15 ml",
-      "max_volume": "250 ml",
-      "draw_cost": 20,
-      "flags": [ "SHEATH_KNIFE" ]
-    },
-    "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
+    "sided": true,
+    "pocket_data": [
+      {
+        "magazine_well": "200 ml",
+        "holster": true,
+        "flag_restriction": [ "SHEATH_KNIFE" ],
+        "moves": 30,
+        "max_contains_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "max_item_length": "30 cm"
+      }
+    ],
+    "use_action": { "type": "holster", "holster_prompt": "Sheath knife", "holster_msg": "You sheath your %s" },
+    "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ],
+    "armor": [
+      {
+        "material": [ { "type": "compactblood", "covered_by_mat": 100, "thickness": 1 } ],
+        "covers": [ "hand_l", "hand_r" ],
+        "coverage": 5,
+        "encumbrance": [ 2, 3 ],
+        "layers": [ "BELTED" ]
+      }
+    ]
   },
   {
     "id": "bloodpack",
@@ -67,21 +86,33 @@
     "category": "clothing",
     "name": { "str": "blood leather backpack" },
     "description": "A small backpack handmade from blood leather. Good durable storage for a little encumbrance.",
-    "weight": "950 g",
+    "weight": "818 g",
     "volume": "2 L",
-    "price": "0 cent",
-    "rigid": false,
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "torso" ],
-    "coverage": 30,
-    "encumbrance": 3,
-    "max_encumbrance": 15,
-    "storage": "15 L",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "25 L",
+        "max_contains_weight": "30 kg",
+        "max_item_length": "40 cm",
+        "moves": 300
+      }
+    ],
     "warmth": 0,
-    "material_thickness": 1,
-    "flags": [ "BELTED", "WATER_FRIENDLY", "STURDY" ]
+    "material_thickness": 3,
+    "flags": [ "BELTED", "WATER_FRIENDLY", "STURDY" ],
+    "armor": [
+      {
+        "encumbrance": 4,
+        "volume_encumber_modifier": 0.2,
+        "coverage": 60,
+        "covers": [ "torso" ],
+        "specifically_covers": [ "torso_hanging_back" ]
+      }
+    ]
   },
   {
     "id": "bigbloodpack",
@@ -91,20 +122,115 @@
     "category": "clothing",
     "name": { "str": "blood leather rucksack" },
     "description": "A large blood leather rucksack, provides a lot of storage and is quite durable.",
-    "weight": "1250 g",
-    "volume": "4 L",
-    "price": "0 cent",
-    "rigid": false,
+    "weight": "1140 g",
+    "volume": "11 L",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "[",
     "color": "red",
-    "covers": [ "torso" ],
-    "coverage": 40,
-    "encumbrance": 2,
-    "max_encumbrance": 17,
-    "storage": "22 L",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "40 L",
+        "max_contains_weight": "60 kg",
+        "max_item_length": "55 cm",
+        "magazine_well": "8 L",
+        "moves": 300
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "5 L",
+        "max_contains_weight": "10 kg",
+        "max_item_length": "35 cm",
+        "magazine_well": "1 L",
+        "moves": 200
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "30 cm",
+        "magazine_well": "800 ml",
+        "moves": 120
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3 L",
+        "max_contains_weight": "3 kg",
+        "max_item_length": "30 cm",
+        "magazine_well": "800 ml",
+        "moves": 120
+      },
+      {
+        "//": "hydration pouch storage",
+        "pocket_type": "CONTAINER",
+        "max_contains_volume": "3001 ml",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "30 cm",
+        "moves": 500,
+        "description": "Pouch sized for a hydration pack."
+      },
+      {
+        "//": "tucked against back",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_volume": "5 L",
+        "max_contains_weight": "4 kg",
+        "max_item_length": "150 cm",
+        "min_item_length": "60 cm",
+        "moves": 200,
+        "extra_encumbrance": 10,
+        "description": "Tucked between your back and the backpack.",
+        "ripoff": 3
+      },
+      {
+        "//": "carabiner pocket",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_volume": "5 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "120 cm",
+        "min_item_length": "20 cm",
+        "moves": 150,
+        "extra_encumbrance": 3,
+        "ripoff": 2,
+        "description": "Attached with a carabiner or strap.",
+        "activity_noise": { "volume": 8, "chance": 10 }
+      },
+      {
+        "//": "carabiner pocket",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_volume": "5 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "120 cm",
+        "min_item_length": "20 cm",
+        "moves": 150,
+        "extra_encumbrance": 3,
+        "ripoff": 2,
+        "description": "Attached with a carabiner or strap.",
+        "activity_noise": { "volume": 8, "chance": 10 }
+      },
+      {
+        "//": "carabiner pocket",
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_volume": "5 L",
+        "max_contains_weight": "6 kg",
+        "max_item_length": "120 cm",
+        "min_item_length": "20 cm",
+        "moves": 150,
+        "extra_encumbrance": 3,
+        "ripoff": 2,
+        "description": "Attached with a carabiner or strap.",
+        "activity_noise": { "volume": 8, "chance": 10 }
+      }
+    ],
     "warmth": 0,
     "material_thickness": 1,
-    "flags": [ "BELTED", "WATER_FRIENDLY", "STURDY" ]
+    "flags": [ "BELTED", "WATER_FRIENDLY", "STURDY" ],
+    "armor": [
+      { "encumbrance": [ 10, 50 ], "coverage": 80, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_back" ] }
+    ]
   }
 ]