Port to DDA.

13 files changed, 760 insertions, 462 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" ] }
+    ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_currency.json b/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
index af7c4b1..f739cd7 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_currency.json
@@ -1,11 +1,12 @@
 [
   {
     "type": "GENERIC",
+    "category": "currency",
     "id": "bloodcoin",
     "name": { "str": "Velvet Token" },
     "description": "A well-made, handcrafted crimson coin produced from the blood of an unknown creature. Its one side is adorned in impressive etched decorations, and the other shows the image of a man, with undecipherable text below it.",
-    "price": "50 cent",
-    "price_postapoc": "1000 cent",
+    "price": 50,
+    "price_postapoc": 1000,
     "weight": "2 g",
     "volume": "2 ml",
     "to_hit": -3,
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
index 125490f..2e3e236 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
@@ -1,63 +1,55 @@
 [
   {
     "type": "material",
-    "ident": "compactblood",
+    "//": "Loosely based on leather.",
+    "id": "compactblood",
     "name": "Compacted Blood",
     "density": 4,
+    "specific_heat_liquid": 1.5,
+    "specific_heat_solid": 1.5,
+    "latent_heat": 273,
     "soft": true,
+    "reinforces": true,
     "bash_resist": 8,
     "cut_resist": 5,
+    "bullet_resist": 8,
     "acid_resist": 1,
     "fire_resist": 1,
     "elec_resist": 2,
     "chip_resist": 12,
-    "bullet_resist": 8,
+    "breathability": "POOR",
+    "wind_resist": 90,
     "repaired_with": "compactsheet",
     "salvaged_into": "compactsheet",
     "dmg_adj": [ "scratched", "cut", "shredded", "tattered" ],
     "bash_dmg_verb": "ripped",
-    "cut_dmg_verb": "sliced"
+    "cut_dmg_verb": "sliced",
+    "burn_data": [
+      { "fuel": 0, "smoke": 0, "burn": 0 },
+      { "fuel": 1, "smoke": 3, "burn": 2, "volume_per_turn": "500 ml" },
+      { "fuel": 1, "smoke": 3, "burn": 2 }
+    ],
+    "burn_products": [ [ "corpse_ash", 0.035 ] ]
   },
   {
     "type": "material",
-    "ident": "ethereal",
+    "id": "ethereal",
     "name": "Ethereal",
     "density": 0,
+    "specific_heat_liquid": 0.82,
+    "specific_heat_solid": 0.45,
+    "latent_heat": 273,
     "soft": true,
     "bash_resist": 1000,
     "cut_resist": 1000,
+    "bullet_resist": 800,
     "acid_resist": 0,
     "fire_resist": 0,
     "elec_resist": 0,
     "chip_resist": 100,
-    "bullet_resist": 800,
     "dmg_adj": [ "invincible", "invincible", "invincible", "invincible" ],
     "bash_dmg_verb": "invincible",
-    "cut_dmg_verb": "invincible"
-  },
-  {
-    "type": "material",
-    "id": "blood",
-    "name": "Blood",
-    "density": 1,
-    "specific_heat_liquid": 4.186,
-    "specific_heat_solid": 2.108,
-    "latent_heat": 333,
-    "edible": true,
-    "bash_resist": 0,
-    "cut_resist": 0,
-    "acid_resist": 0,
-    "fire_resist": 1,
-    "elec_resist": 0,
-    "chip_resist": 0,
-    "bullet_resist": 0,
-    "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
-    "bash_dmg_verb": "damaged",
-    "cut_dmg_verb": "damaged",
-    "burn_data": [
-      { "fuel": -100, "smoke": 1, "burn": 1 },
-      { "fuel": -50, "smoke": 2, "burn": 1 },
-      { "fuel": -10, "smoke": 2, "burn": 2 }
-    ]
+    "cut_dmg_verb": "invincible",
+    "burn_products": [ [ "pebble", 1 ] ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
index ee0dbd1..eb21ccc 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
@@ -6,10 +6,10 @@
     "copy-from": "blood",
     "name": { "str": "blood", "str_pl": "blood" },
     "description": "Blood, possibly that of a human.  Disgusting!",
-    "weight": "265 g",
+    "weight": "262 g",
     "volume": "250 ml",
-    "price": "0 cent",
-    "material": [ "blood" ],
+    "price": 0,
+    "material": [ "hblood" ],
     "phase": "liquid",
     "symbol": "~",
     "color": "red",
@@ -19,7 +19,8 @@
     "healthy": 4,
     "fun": 15,
     "spoils_in": "1 days",
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ]
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ],
+    "vitamins": [ [ "blood", 15 ] ]
   },
   {
     "id": "blood_reconstituted",
@@ -61,8 +62,8 @@
     "description": "Dehydrated blood powder. Mix with water to make drinkable blood.",
     "weight": "3 g",
     "volume": "3 ml",
-    "price": "0 cent",
-    "material": [ "powder", "blood" ],
+    "price": 0,
+    "material": [ "powder", "hblood" ],
     "primary_material": "powder",
     "symbol": "'",
     "color": "red",
@@ -90,7 +91,7 @@
     "description": "A patch of fabric made from powdered blood. While initially known for its aesthetic qualities, blood leather has proven comparable to kevlar for use in body armor.",
     "weight": "250 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "#",
     "color": "red"
@@ -103,7 +104,7 @@
     "description": "A sticky glob of concentrated blood.",
     "weight": "250 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "o",
     "color": "red"
@@ -116,7 +117,7 @@
     "description": "A tiny blood pellet, sparkling like a sanguine ruby.",
     "weight": "10 g",
     "volume": "3 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -129,7 +130,7 @@
     "description": "Fine powder made from heating and refining a bloodrune. It generates a stable faint glow.",
     "weight": "750 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": "~",
     "color": "red"
@@ -142,7 +143,7 @@
     "description": "A stone similar to a fist-sized ruby, the final remains of a slain vampire. It mimics a heartbeat with unreadable markings on the interior that appear and disappear like clockwork.",
     "weight": "750 g",
     "volume": "250 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -155,7 +156,7 @@
     "description": "A stone similar to a head-sized ruby, the final remains of a powerful vampire. It trembles of its own volition, as if the power inside is eager to escape.",
     "weight": "3000 g",
     "volume": "1750 ml",
-    "price": "0 cent",
+    "price": 0,
     "material": [ "compactblood" ],
     "symbol": ".",
     "color": "red"
@@ -169,9 +170,9 @@
     "description": "This is a sealed IV bag containing blood.  Use to open.",
     "weight": "540 g",
     "volume": "550 ml",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": -1,
-    "material": [ "plastic", "blood" ],
+    "material": [ "plastic", "hblood" ],
     "symbol": ")",
     "color": "red",
     "use_action": {
diff --git a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
index 5d8bbe2..d4080d4 100644
--- a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
+++ b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
@@ -1,14 +1,14 @@
 [
   {
     "id": "bloodcompressor",
-    "looks_like": "tailors_kit",
+    "looks_like": "sewing_kit",
     "type": "TOOL",
     "name": { "str": "blood compactor" },
     "description": "A large compaction tool essential to make blood compacts from powders. The tiny tissue filaments of human cells will be reinforced into strong and tough leathery sheets, which can then be tailored into clothing.",
     "weight": "5350 g",
     "volume": "3250 ml",
-    "price": "0 cent",
-    "price_postapoc": "1500 USD",
+    "price": 0,
+    "price_postapoc": 150000,
     "to_hit": -1,
     "bashing": 3,
     "material": [ "steel", "glass" ],
@@ -17,11 +17,9 @@
     "ammo": [ "battery" ],
     "charges_per_use": 150,
     "qualities": [ [ "BCOMPRESSING", 1 ], [ "CUT", 3 ] ],
-    "magazines": [
-      [
-        "battery",
-          [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ]
-      ]
+    "flags": [ "WATER_BREAK_ACTIVE", "ELECTRONIC" ],
+    "pocket_data": [
+      { "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_HEAVY" ], "default_magazine": "heavy_battery_cell" }
     ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Tools/z_obsolete.json b/vamp_stuff/Modification_Files/Items/Tools/z_obsolete.json
deleted file mode 100644
index eb1e48a..0000000
--- a/vamp_stuff/Modification_Files/Items/Tools/z_obsolete.json
+++ /dev/null
@@ -1,78 +0,0 @@
-[
-  {
-    "id": "blood_forge_infuse",
-    "looks_like": "forge",
-    "type": "TOOL",
-    "name": { "str": "blood infusion forge" },
-    "description": "A primitive tool used in vampiric crafts. This is much like a normal battery-operated forge, but with additional components that allow working with blood.",
-    "weight": "14500 g",
-    "volume": "3750 ml",
-    "price": "0 cent",
-    "price_postapoc": "1500 USD",
-    "to_hit": -2,
-    "bashing": 4,
-    "material": [ "steel", "glass" ],
-    "color": "dark_gray",
-    "symbol": ";",
-    "ammo": [ "battery" ],
-    "charges_per_use": 100,
-    "qualities": [ [ "BINFUSING", 1 ], [ "HAMMER", 3 ], [ "CHISEL", 3 ] ],
-    "magazines": [
-      [
-        "battery",
-          [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
-      ]
-    ]
-  },
-  {
-    "id": "bloodextractor",
-    "looks_like": "dehydrator",
-    "type": "TOOL",
-    "name": { "str": "blood dehydrator" },
-    "description": "A small, heating container used in extracting water components from blood, turning it into a powder speckles. It uses common batteries.",
-    "weight": "1150 g",
-    "volume": "1250 ml",
-    "price": "0 cent",
-    "price_postapoc": "1000 USD",
-    "to_hit": -1,
-    "bashing": 3,
-    "material": [ "steel", "glass" ],
-    "color": "blue",
-    "symbol": ";",
-    "ammo": [ "battery" ],
-    "charges_per_use": 25,
-    "max_charges": 250,
-    "qualities": [ [ "BREFINING", 1 ] ],
-    "magazines": [
-      [
-        "battery",
-          [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
-      ]
-    ]
-  },
-  {
-    "id": "bloodchem",
-    "looks_like": "chemistry_set",
-    "type": "TOOL",
-    "name": { "str": "blood chemistry set" },
-    "description": "A simple blood chemistry set. It has the complete tools in making chemicals and adhesives for essential projects.",
-    "weight": "4850 g",
-    "volume": "3250 ml",
-    "price": "0 cent",
-    "price_postapoc": "1500 USD",
-    "to_hit": -1,
-    "bashing": 3,
-    "material": [ "steel", "glass" ],
-    "color": "light_gray",
-    "symbol": ";",
-    "ammo": [ "battery" ],
-    "charges_per_use": 10,
-    "qualities": [ [ "BCHEMISTRY", 1 ], [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ],
-    "magazines": [
-      [
-        "battery",
-          [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
-      ]
-    ]
-  }
-]
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ammo.json b/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
index 59627a2..a3c0f09 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ammo.json
@@ -6,12 +6,11 @@
     "description": "This heavily compressed blood ammunition is used specifically with vampiric guns.",
     "weight": "5 g",
     "volume": "250 ml",
-    "price": "20 USD",
-    "price_postapoc": "3 USD",
-    "material": [ "hflesh" ],
+    "price": 2000,
+    "price_postapoc": 300,
+    "material": [ "hblood" ],
     "symbol": "=",
     "color": "red",
-    "phase": "liquid",
     "count": 5,
     "stack_size": 20,
     "ammo_type": "ammoblood",
@@ -43,7 +42,7 @@
     "copy-from": "bloodypressure",
     "name": { "str": "traversed blood" },
     "description": "A combination of pure and infected blood used specifically with vampiric guns. It is much more viscous than normal blood.",
-    "material": [ "hflesh", "flesh" ],
+    "material": [ "blood", "hblood" ],
     "color": "green",
     "count": 10,
     "stack_size": 20,
@@ -62,8 +61,8 @@
     "description": "A shell filled with compacted blood pellets. Extremely damaging, plus the spread makes it very accurate at short range. Favored by vampires.",
     "weight": "35 g",
     "volume": "250 ml",
-    "price": "315 USD",
-    "price_postapoc": "60 USD",
+    "price": 31500,
+    "price_postapoc": 6000,
     "material": [ "compactblood", "plastic", "powder" ],
     "symbol": "=",
     "color": "red",
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index f2a7575..f5a033d 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -7,35 +7,32 @@
     "description": "A large, dual-handed, heavily serrated sword. The blade retracts into a horizontal closed maw when not in use.",
     "weight": "3150 g",
     "volume": "4 L",
+    "longest_side": "180 cm",
     "symbol": "!",
-    "price": "2470 USD",
-    "price_postapoc": "780 USD",
-    "to_hit": 1,
+    "price": 247000,
+    "price_postapoc": 78000,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" },
     "bashing": 11,
     "cutting": 33,
     "material": [ "steel" ],
     "color": "red",
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE", "ALWAYS_TWOHAND" ],
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ]
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "GREAT_SWORDS" ]
   },
   {
     "id": "sword_sipplus",
+    "copy-from": "sword_sip",
     "type": "GENERIC",
     "name": { "str": "blood sipper+", "str_pl": "blood sippers+" },
     "description": "A large, dual-handed, heavily serrated sword, textured in red hue. The blade retracts into a horizontal closed maw when not in use.",
     "weight": "3300 g",
-    "volume": "4 L",
-    "symbol": "!",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 1,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 12,
     "cutting": 35,
     "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
-    "flags": [ "SHEATH_SWORD", "DURABLE_MELEE", "ALWAYS_TWOHAND" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   },
   {
@@ -45,35 +42,32 @@
     "description": "A small, serrated dagger. Its handle is made for quick precise cuts, and the light weight of this weapon makes it versatile to use. The blade is also great for skinning, but it was made for combat.",
     "weight": "475 g",
     "volume": "250 ml",
+    "longest_side": "30 cm",
     "symbol": "f",
-    "price": "1905 USD",
-    "price_postapoc": "490 USD",
-    "to_hit": 2,
+    "price": 190500,
+    "price_postapoc": 49000,
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "good" },
     "cutting": 14,
     "bashing": 2,
     "material": [ "steel" ],
     "color": "red",
     "techniques": [ "RAPID" ],
-    "flags": [ "SHEATH_KNIFE", "DURABLE_MELEE", "STAB" ],
-    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 35 ] ]
+    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE" ],
+    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 35 ] ],
+    "weapon_category": [ "KNIVES" ]
   },
   {
     "id": "sword_diveplus",
+    "copy-from": "sword_dive",
     "type": "GENERIC",
     "name": { "str": "blood diver+", "str_pl": "blood divers+" },
     "description": "A small, serrated dagger, textured in red hue. Its handle is made for quick precise cuts, and the light weight of this weapon makes it versatile to use. The blade is also great for skinning, but it was made for combat",
     "weight": "725 g",
-    "volume": "250 ml",
-    "symbol": "f",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "cutting": 16,
     "bashing": 3,
     "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "RAPID" ],
-    "flags": [ "SHEATH_KNIFE", "DURABLE_MELEE", "STAB" ],
     "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 37 ] ]
   },
   {
@@ -84,31 +78,28 @@
     "weight": "850 g",
     "volume": "500 ml",
     "symbol": "f",
-    "price": "1665 USD",
-    "price_postapoc": "585 USD",
-    "to_hit": 2,
+    "price": 166500,
+    "price_postapoc": 58500,
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "good" },
     "cutting": 8,
     "bashing": 4,
     "material": [ "steel" ],
     "color": "red",
-    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB" ]
+    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE" ],
+    "weapon_category": [ "KNIVES" ]
   },
   {
     "id": "punchie_bitieplus",
+    "copy-from": "punchie_bitie",
     "type": "GENERIC",
     "name": { "str": "pair of knuckle biters+", "str_pl": "pairs of knuckle biters+" },
     "description": "A pair of knuckles designed to imitate a jaw with heavily arranged metal teeth, textured in red hue. Every successful impact will cause it to bite into its prey.",
     "weight": "1000 g",
-    "volume": "500 ml",
-    "symbol": "f",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "cutting": 10,
     "bashing": 5,
-    "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "flags": [ "UNARMED_WEAPON", "DURABLE_MELEE", "STAB" ]
+    "material": [ "steel", "compactblood" ]
   },
   {
     "id": "hammerius",
@@ -117,34 +108,31 @@
     "description": "A huge, fearsome battle hammer. Its flattened surface has symmetrical holes, concealing teeth that deploy just before impact.",
     "weight": "4520 g",
     "volume": "5 L",
+    "longest_side": "200 cm",
     "symbol": "T",
-    "price": "3105 USD",
-    "price_postapoc": "1035 USD",
-    "to_hit": 1,
+    "price": 310500,
+    "price_postapoc": 103500,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "bashing": 30,
     "cutting": 12,
     "material": [ "steel" ],
     "color": "red",
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "STAB", "DURABLE_MELEE", "ALWAYS_TWOHAND" ]
+    "flags": [ "STAB", "DURABLE_MELEE", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_HAMMERS" ]
   },
   {
     "id": "hammeriusplus",
+    "copy-from": "hammerius",
     "type": "GENERIC",
     "name": { "str": "hammerius+", "str_pl": "hammeriuses+" },
     "description": "A huge, fearsome battle hammer, textured in red hue. Its flattened surface has symmetrical holes, concealing teeth that deploy just before impact.",
     "weight": "3705 g",
-    "volume": "5 L",
-    "symbol": "T",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
-    "to_hit": 1,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 31,
     "cutting": 14,
-    "material": [ "steel", "compactblood" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "flags": [ "STAB", "DURABLE_MELEE", "ALWAYS_TWOHAND" ]
+    "material": [ "steel", "compactblood" ]
   },
   {
     "id": "falc_crimsword",
@@ -153,35 +141,32 @@
     "description": "A longsword with peculiar hilt and forked tip mimicking a pair of fangs.",
     "weight": "2680 g",
     "volume": "3 L",
+    "longest_side": "120 cm",
     "symbol": "!",
-    "price": "20500 USD",
-    "price_postapoc": "780 USD",
-    "to_hit": 2,
+    "price": 2050000,
+    "price_postapoc": 78000,
+    "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "bashing": 4,
     "cutting": 24,
     "material": [ "steel" ],
     "color": "red",
     "techniques": [ "WBLOCK_2" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
-    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ]
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 20 ] ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "LONG_SWORDS", "GREAT_SWORDS" ]
   },
   {
     "id": "falc_crimswordplus",
+    "copy-from": "falc_crimsword",
     "type": "GENERIC",
     "name": { "str": "fanged falchion+", "str_pl": "fanged falchions+" },
     "description": "A longsword hued in crimson with peculiar hilt and forked tip mimicking a pair of fangs.",
     "weight": "2785 g",
-    "volume": "3 L",
-    "symbol": "!",
-    "price_postapoc": "0 cent",
-    "price": "0 cent",
-    "to_hit": 2,
+    "price": 0,
+    "price_postapoc": 0,
     "bashing": 5,
     "cutting": 26,
     "material": [ "steel" ],
-    "color": "red",
-    "techniques": [ "WBLOCK_2" ],
-    "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
index 26031d2..210d15f 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
@@ -1,67 +1,103 @@
 [
   {
     "id": "invy_bow",
+    "looks_like": "recurbow",
     "type": "GUN",
-    "symbol": "{",
-    "price": "0 cent",
-    "price_postapoc": "0 cent",
+    "symbol": "(",
     "color": "red",
     "name": { "str": "Invynel's bow" },
     "description": "A heavy, steel bow. Its serrated, blade handle makes it available for melee, but unwieldy. Well trained archers find this useful for long to mid range combats greatly.",
-    "material": [ "steel" ],
-    "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ],
+    "//": "60in Fiberglass recurved bow at 26in draw, 80lb draw, 54J, 0.403 slugs with 30g arrow.",
+    "material": [ "steel", "plastic" ],
+    "flags": [
+      "FIRE_TWOHAND",
+      "RELOAD_AND_SHOOT",
+      "PRIMITIVE_RANGED_WEAPON",
+      "BELTED",
+      "WATER_FRIENDLY",
+      "SHEATH_BOW",
+      "WATERPROOF_GUN",
+      "NEVER_JAMS"
+    ],
+    "ammo_effects": [ "NEVER_MISFIRES" ],
     "skill": "archery",
     "min_strength": 10,
-    "weight": "1225 g",
     "ammo": [ "arrow" ],
+    "weight": "540 g",
     "volume": "3000 ml",
-    "bashing": 4,
-    "cutting": 14,
-    "armor_data": { "covers": [ "torso" ], "coverage": 15, "material_thickness": 1, "encumbrance": 18 },
-    "ranged_damage": { "damage_type": "bullet", "amount": 16 },
+    "longest_side": "152 cm",
+    "price": 0,
+    "price_postapoc": 2000,
+    "bashing": 12,
+    "armor_data": {
+      "armor": [
+        {
+          "material": [
+            { "type": "steel", "covered_by_mat": 100, "thickness": 1.0 },
+            { "type": "plastic", "covered_by_mat": 100, "thickness": 1.0 }
+          ],
+          "encumbrance": 20,
+          "coverage": 10,
+          "covers": [ "torso" ],
+          "specifically_covers": [ "torso_hanging_back" ]
+        }
+      ]
+    },
+    "reload_noise_volume": 3,
+    "loudness": 8,
+    "ranged_damage": { "damage_type": "stab", "amount": 6 },
     "range": 14,
-    "dispersion": 185,
+    "dispersion": 550,
+    "sight_dispersion": 3000,
     "durability": 8,
-    "clip_size": 1,
-    "reload": 135,
-    "valid_mod_locations": [ [ "sights", 1 ], [ "accessories", 2 ] ]
+    "valid_mod_locations": [
+      [ "underbarrel", 1 ],
+      [ "sights", 1 ],
+      [ "accessories", 2 ],
+      [ "stabilizer", 1 ],
+      [ "dampening", 1 ],
+      [ "arrow rest", 1 ]
+    ],
+    "reload": 50,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ]
   },
   {
     "id": "b11_striker",
+    "looks_like": "shotgun_d",
+    "copy-from": "shotgun_base",
     "type": "GUN",
-    "symbol": "(",
-    "color": "red",
-    "name": { "str": "blood striker" },
-    "description": "A modified and beautifully designed striker shotgun created by vampires. Unlike human's, it has a bigger revolving wheel, which occupies additional bullets and a two-shot burst mode for barraging shots with its improved accuracy.",
-    "price": "0 cent",
-    "price_postapoc": "13185 USD",
-    "material": [ "steel", "compactblood" ],
-    "flags": [ "MODE_BURST", "RELOAD_ONE" ],
-    "skill": "shotgun",
+    "name": { "str": "double barrel shotgun" },
+    "description": "An old shotgun, possibly antique.  It is little more than a pair of barrels, a wood stock, and a hammer to strike the cartridges.",
+    "ascii_picture": "2barrel_shotgun",
     "weight": "3620 g",
-    "ammo": [ "bloodshot" ],
-    "volume": "2500 ml",
-    "bashing": 8,
-    "to_hit": 0,
-    "dispersion": 205,
-    "sight_dispersion": 190,
+    "volume": "2946 ml",
+    "longest_side": "95 cm",
+    "price": 0,
+    "price_postapoc": 1318500,
+    "to_hit": -1,
     "recoil": 40,
-    "durability": 7,
-    "burst": 2,
-    "clip_size": 16,
-    "reload": 80,
-    "loudness": 155,
+    "bashing": 12,
+    "material": [ "steel", "wood" ],
+    "dispersion": 210,
+    "sight_dispersion": 190,
+    "durability": 9,
+    "modes": [ [ "DEFAULT", "single", 1 ], [ "DOUBLE", "double", 2 ] ],
+    "ammo": [ "bloodshot" ],
+    "barrel_volume": "980 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
-      [ "grip", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
       [ "stock", 1 ],
+      [ "grip", 1 ],
+      [ "rail", 1 ],
       [ "underbarrel", 1 ]
-    ]
+    ],
+    "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "RELOAD_ONE" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "bloodshot": 16 } } ]
   },
   {
     "id": "blood_slinger",
@@ -70,8 +106,8 @@
     "color": "red",
     "name": { "str": "blood slinger" },
     "description": "A lightweight vampiric gun with special mounted blood-fed container. It uses thickened blood as the primary ammunition, and shoots at high velocity, regardless of its small size.",
-    "price": "0 cent",
-    "price_postapoc": "225 USD",
+    "price": 0,
+    "price_postapoc": 22500,
     "material": [ "steel", "compactblood" ],
     "flags": [ "NEVER_JAMS" ],
     "skill": "pistol",
@@ -84,7 +120,6 @@
     "sight_dispersion": 105,
     "recoil": 12,
     "durability": 6,
-    "clip_size": 12,
     "reload": 100,
     "loudness": 3,
     "range": 10,
@@ -97,7 +132,8 @@
       [ "rail", 1 ],
       [ "sights", 1 ],
       [ "stock", 1 ]
-    ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammoblood": 12 } } ]
   },
   {
     "id": "blood_stinger",
@@ -106,8 +142,8 @@
     "color": "red",
     "name": { "str": "blood stinger" },
     "description": "A unique vampiric gun with specially designed barrel and a built-in blood-feed container input method. It uses thickened blood as the primary ammunition, and shoots at extremely high velocity, dealing damage nearly the same to high caliber firearms.",
-    "price": "0 cent",
-    "price_postapoc": "7305 USD",
+    "price": 0,
+    "price_postapoc": 730500,
     "material": [ "steel", "compactblood" ],
     "flags": [ "NEVER_JAMS" ],
     "skill": "rifle",
@@ -120,7 +156,6 @@
     "sight_dispersion": 100,
     "recoil": 20,
     "durability": 8,
-    "clip_size": 10,
     "reload": 100,
     "loudness": 3,
     "range": 20,
@@ -137,7 +172,8 @@
       [ "sights", 1 ],
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
-    ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammoblood": 10 } } ]
   },
   {
     "id": "blood_stream_shooter",
@@ -146,8 +182,8 @@
     "color": "red",
     "name": { "str": "blood stream shooter" },
     "description": "A heavy vampiric gun with very large, built-in blood-feed container input method and a trio-rotational barrel chambers. It uses thickened blood as the primary ammunition, and shoots at maximum firing rate without generating disrupting sounds.",
-    "price": "0 cent",
-    "price_postapoc": "11829 USD",
+    "price": 0,
+    "price_postapoc": 1182900,
     "material": [ "steel", "compactblood" ],
     "flags": [ "NEVER_JAMS" ],
     "skill": "smg",
@@ -161,7 +197,6 @@
     "sight_dispersion": 100,
     "recoil": 30,
     "durability": 8,
-    "clip_size": 400,
     "reload": 175,
     "loudness": 3,
     "ranged_damage": { "damage_type": "bullet", "amount": 5 },
@@ -173,7 +208,8 @@
       [ "sights", 1 ],
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
-    ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammoblood": 400 } } ]
   },
   {
     "id": "blood_sprayer",
@@ -182,8 +218,8 @@
     "color": "red",
     "name": { "str": "blood sprayer" },
     "description": "A lightweight vampiric gun with large, built-in blood-feed container input method. It uses thickened blood as the primary ammunition, and shoots at high firing rate without generating disrupting sounds.",
-    "price": "0 cent",
-    "price_postapoc": "4235 USD",
+    "price": 0,
+    "price_postapoc": 423500,
     "material": [ "steel", "compactblood" ],
     "flags": [ "NEVER_JAMS" ],
     "skill": "smg",
@@ -197,7 +233,6 @@
     "sight_dispersion": 95,
     "recoil": 10,
     "durability": 8,
-    "clip_size": 100,
     "reload": 75,
     "loudness": 3,
     "ranged_damage": { "damage_type": "bullet", "amount": 3 },
@@ -210,6 +245,7 @@
       [ "sights", 1 ],
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
-    ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "ammoblood": 100 } } ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon_mod.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon_mod.json
index cc3de91..beb7b98 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon_mod.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon_mod.json
@@ -6,25 +6,18 @@
     "description": "Odd barrel extension specialized for blood stinger rifles. It has a vented metal end point that pressurizes liquid before firing, increasing damage, accuracy and aiming time.",
     "weight": "650 g",
     "volume": "1 L",
-    "price": "0 cent",
+    "price": 0,
     "to_hit": 2,
     "bashing": 5,
+    "install_time": "5 m",
     "material": [ "steel", "compactblood" ],
     "symbol": ":",
     "color": "red",
     "location": "barrel",
     "mod_targets": [ "rifle" ],
-    "gun_data": {
-      "ammo": "ammoblood",
-      "skill": "rifle",
-      "ranged_damage": { "damage_type": "bullet", "amount": 1 },
-      "dispersion": 170,
-      "durability": 8,
-      "clip_size": 10,
-      "reload": 100
-    },
+    "damage_modifier": { "damage_type": "bullet", "amount": 1 },
     "dispersion_modifier": -70,
-    "flags": [ "IRREMOVABLE" ],
-    "min_skills": [ [ "weapon", 6 ] ]
+    "min_skills": [ [ "weapon", 6 ] ],
+    "flags": [ "IRREMOVABLE" ]
   }
 ]