Many updates to get this mod working properly. See the readme.

8 files changed, 119 insertions, 89 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 646e7c9..a2d3ad0 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
@@ -21,7 +21,7 @@
     "material_thickness": 1,
     "environmental_protection": 2,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HOOD" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ]
   },
   {
     "id": "bloodinfused_survivorpants",
@@ -38,10 +38,7 @@
     "covers": [ "LEG_L", "LEG_R" ],
     "coverage": 100,
     "encumbrance": 20,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1750 ml", "max_contains_weight": "3500 g", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1750 ml", "max_contains_weight": "3500 g", "moves": 75 }
-    ],
+    "storage": "3500 ml",
     "warmth": 10,
     "material_thickness": 1,
     "environmental_protection": 2,
@@ -63,14 +60,7 @@
     "covers": [ "TORSO", "ARM_L", "ARM_R", "LEG_L", "LEG_R" ],
     "coverage": 85,
     "encumbrance": 15,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }
-    ],
+    "storage": "9 L",
     "warmth": 15,
     "material_thickness": 1,
     "environmental_protection": 2,
@@ -135,14 +125,7 @@
     "covers": [ "TORSO", "ARM_L", "ARM_R" ],
     "coverage": 85,
     "encumbrance": 15,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }
-    ],
+    "storage": "9 L",
     "warmth": 15,
     "material_thickness": 1,
     "environmental_protection": 2,
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 0d9bfc4..25d703d 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
@@ -41,7 +41,7 @@
     "warmth": 20,
     "material_thickness": 1,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER", "HOOD" ]
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "OUTER" ]
   },
   {
     "id": "blood_duster",
@@ -59,14 +59,7 @@
     "covers": [ "TORSO", "ARM_L", "ARM_R", "LEG_L", "LEG_R" ],
     "coverage": 85,
     "encumbrance": 10,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "5 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "2500 ml", "max_contains_weight": "5 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1 L", "max_contains_weight": "2 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }
-    ],
+    "storage": "8 L",
     "warmth": 20,
     "material_thickness": 1,
     "environmental_protection": 1,
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 dc2ce79..a9802a4 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
@@ -19,7 +19,7 @@
       "type": "holster",
       "holster_prompt": "Sheath knife",
       "holster_msg": "You have sheath your %s",
-      "max_volume": 2,
+      "max_volume": "500 ml",
       "draw_cost": 30,
       "flags": [ "SHEATH_KNIFE" ]
     },
@@ -46,7 +46,7 @@
       "type": "holster",
       "holster_prompt": "Sheath knife",
       "holster_msg": "You have sheath your %s",
-      "max_volume": 1,
+      "max_volume": "250 ml",
       "draw_cost": 5,
       "flags": [ "SHEATH_KNIFE" ]
     },
@@ -57,7 +57,7 @@
     "id": "bloodpack",
     "type": "ARMOR",
     "name": { "str": "bloodpack" },
-    "description": "Handcrafted backpack made of tough blood compact sheets customized to occupy large amount of storage at a cost of encumbrance.",
+    "description": "Handcrafted backpack made of tough blood compact sheets.",
     "weight": "950 g",
     "volume": 11,
     "price": 0,
@@ -65,16 +65,10 @@
     "symbol": "[",
     "color": "red",
     "covers": [ "TORSO" ],
-    "coverage": 5,
-    "encumbrance": 10,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "3 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "500 ml", "max_contains_weight": "1 kg", "moves": 80 }
-    ],
+    "coverage": 30,
+    "encumbrance": 2,
+    "max_encumbrance": 15,
+    "storage": "15 L",
     "material_thickness": 1,
     "looks_like": "backpack",
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
@@ -83,7 +77,7 @@
     "id": "bigbloodpack",
     "type": "ARMOR",
     "name": { "str": "large bloodpack" },
-    "description": "Improved bloodpack with additional pocket arrangements around it for even larger storage occupation. Encumbrance and weight has increased, tho.",
+    "description": "Improved bloodpack with additional pockets for even more storage.",
     "weight": "1250 g",
     "volume": 12,
     "price": 0,
@@ -91,16 +85,10 @@
     "symbol": "[",
     "color": "red",
     "covers": [ "TORSO" ],
-    "coverage": 10,
-    "encumbrance": 20,
-    "pocket_data": [
-      { "pocket_type": "CONTAINER", "max_contains_volume": "5 L", "max_contains_weight": "10 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "5 L", "max_contains_weight": "10 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "3 L", "max_contains_weight": "6 kg", "moves": 75 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1375 ml", "max_contains_weight": "2 kg", "moves": 80 },
-      { "pocket_type": "CONTAINER", "max_contains_volume": "1375 ml", "max_contains_weight": "2 kg", "moves": 80 }
-    ],
+    "coverage": 40,
+    "encumbrance": 2,
+    "max_encumbrance": 20,
+    "storage": "22 L",
     "material_thickness": 1,
     "looks_like": "backpack",
     "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED" ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
index 4ff25ac..7d261b9 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
@@ -10,15 +10,16 @@
     "container": "flask_glass",
     "comestible_type": "DRINK",
     "symbol": "~",
-    "quench": 5,
-    "healthy": -8,
-    "calories": 43,
+    "quench": 20,
+    "healthy": 4,
+    "calories": 150,
     "description": "Blood, possibly that of a human.  Disgusting!",
     "price": 100,
     "material": [ "hflesh" ],
     "volume": "250 ml",
     "phase": "liquid",
-    "fun": -50
+    "fun": 10,
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
   },
   {
     "id": "melted_bloodrune",
@@ -88,7 +89,7 @@
     "price": 1,
     "count": 10,
     "quench": 1,
-    "healthy": -3,
+    "healthy": 1,
     "nutrition": 3,
     "material": [ "hflesh" ],
     "symbol": "'",
@@ -105,8 +106,8 @@
     "volume": "250 ml",
     "price": 0,
     "quench": 5,
-    "healthy": -3,
-    "nutrition": -2,
+    "healthy": 2,
+    "nutrition": 2,
     "material": [ "hflesh" ],
     "symbol": "~",
     "color": "pink",
@@ -139,5 +140,28 @@
     "symbol": ".",
     "color": "red",
     "flags": [ "ZERO_WEIGHT" ]
+  },
+  {
+    "//": "Reduced weight.",
+    "type": "COMESTIBLE",
+    "id": "synthblood",
+    "copy-from": "blood",
+    "looks_like": "blood",
+    "name": { "str": "synthetic blood", "str_pl": "synthetic blood" },
+    "weight": "5 g",
+    "color": "red",
+    "container": "flask_glass",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": 10,
+    "healthy": 2,
+    "calories": 75,
+    "description": "Synthetic blood, not possibly that of a human.  Still disgusting!",
+    "price": 100,
+    "material": [ "hflesh" ],
+    "volume": "250 ml",
+    "phase": "liquid",
+    "fun": 5,
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json b/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
index b2d29cf..5813d4a 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
@@ -292,5 +292,19 @@
     "time": 250,
     "qualities": [ { "id": "HAMMER", "level": 3 } ],
     "components": [ [ [ "bigbloodrune", 1 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "synthblood",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DRINKS",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "time": "5 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "BOIL", "level": 1 } ],
+    "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ],
+    "components": [ [ [ "protein_powder", 1 ] ], [ [ "water_clean", 1 ] ], [ [ "sugar", 5 ] ] ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
index 0e099f4..146fc3d 100644
--- a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
+++ b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
@@ -4,11 +4,10 @@
     "bashing": 4,
     "charges_per_use": 100,
     "color": "red",
-    "description": "A primitive tool used in vampiric crafts. This is much like of a normal forge, but it requires the correct materials to work with it. Uses normal batteries whatsoever.",
+    "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.",
     "id": "blood_forge_infuse",
     "material": [ "steel", "glass" ],
-    "max_charges": 500,
-    "name": "blood infusing forge",
+    "name": "blood infusion forge",
     "price": 0,
     "price_postapoc": 150000,
     "qualities": [ [ "BINFUSING", 1 ], [ "HAMMER", 3 ], [ "CHISEL", 3 ] ],
@@ -16,18 +15,23 @@
     "to_hit": -2,
     "type": "TOOL",
     "volume": 15,
-    "weight": "14500 g"
+    "weight": "14500 g",
+    "magazines": [
+      [
+        "battery",
+          [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
+      ]
+    ]
   },
   {
     "ammo": [ "battery" ],
     "bashing": 3,
     "charges_per_use": 25,
     "color": "red",
-    "description": "A small, heating container used in extracting water components from blood, turning it into a powder speckles. It uses common batteries.",
+    "description": "A small heating container used in dehydrating blood, turning it into a powder. Uses common light size batteries.",
     "id": "bloodextractor",
     "material": [ "steel", "glass" ],
-    "max_charges": 250,
-    "name": "blood extractor",
+    "name": "blood dehydrator",
     "price": 0,
     "price_postapoc": 100000,
     "qualities": [ [ "BREFINING", 1 ] ],
@@ -35,18 +39,23 @@
     "to_hit": -1,
     "type": "TOOL",
     "volume": "1250 ml",
-    "weight": "1150 g"
+    "weight": "1150 g",
+    "magazines": [
+      [
+        "battery",
+          [ "light_battery_cell", "light_plus_battery_cell", "light_atomic_battery_cell", "light_disposable_cell" ]
+      ]
+    ]
   },
   {
     "ammo": [ "battery" ],
     "bashing": 3,
     "charges_per_use": 150,
     "color": "red",
-    "description": "A large, essential compressing tool to make blood compacts from vast amounts of powders. The tiny tissue filaments of human cells will be reinforced into a strong and tough, leathery sheets, which is then be tailored into clothing. High battery consumption per use.",
+    "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.",
     "id": "bloodcompressor",
     "material": [ "steel", "glass" ],
-    "max_charges": 500,
-    "name": "blood compressor",
+    "name": "blood compactor",
     "price": 0,
     "price_postapoc": 150000,
     "qualities": [ [ "BCOMPRESSING", 1 ], [ "CUT", 3 ] ],
@@ -54,18 +63,23 @@
     "to_hit": -1,
     "type": "TOOL",
     "volume": 13,
-    "weight": "5350 g"
+    "weight": "5350 g",
+    "magazines": [
+      [
+        "battery",
+          [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ]
+      ]
+    ]
   },
   {
     "ammo": [ "battery" ],
     "bashing": 3,
     "charges_per_use": 10,
     "color": "red",
-    "description": "A simple blood chemistry set, much look like a copied version of human's. It has the complete tools in making chemicals and adhesives for essential projects.",
+    "description": "A simple blood chemistry set. It has the complete tools in making chemicals and adhesives for essential projects.",
     "id": "bloodchem",
     "material": [ "steel", "glass" ],
-    "max_charges": 100,
-    "name": "blood chemistry",
+    "name": "blood chemistry set",
     "price": 0,
     "price_postapoc": 150000,
     "qualities": [ [ "BCHEMISTRY", 1 ], [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ],
@@ -73,6 +87,12 @@
     "to_hit": -1,
     "type": "TOOL",
     "volume": 13,
-    "weight": "4850 g"
+    "weight": "4850 g",
+    "magazines": [
+      [
+        "battery",
+          [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ]
+      ]
+    ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index 0bbcb01..437ffbf 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -4,7 +4,7 @@
     "id": "sword_sip",
     "type": "GENERIC",
     "name": { "str": "blood sipper", "str_pl": "blood sippers" },
-    "description": "A large, dual-handed, heavily serrated sword. The blade retracts into sharp teeth-like formation everytime it is swung, while vice versa, it becomes flat when not in use. The weight of this sword is problematic.",
+    "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",
     "symbol": "!",
@@ -23,7 +23,7 @@
     "id": "sword_sipplus",
     "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 sharp teeth-like formation everytime it is swung, while vice versa, it becomes flat when not in use. The weight of this sword is problematic.",
+    "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": "!",
@@ -34,7 +34,7 @@
     "cutting": 35,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH", "HEAD_GRIND" ],
+    "techniques": [ "WBLOCK_2", "UPRIGHT_SLASH", "DOWNWARD_SLASH" ],
     "flags": [ "SHEATH_SWORD", "DURABLE_MELEE" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 22 ] ]
   },
@@ -42,7 +42,7 @@
     "id": "sword_dive",
     "type": "GENERIC",
     "name": { "str": "blood diver", "str_pl": "blood divers" },
-    "description": "A small, serrated dagger. Its handle is made for quick precise stabs, and the lightweight of this weapon makes it versatile to use. The unique form of its blade is great for skinning, but there's a better purpose other than that.",
+    "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",
     "symbol": "f",
@@ -61,7 +61,7 @@
     "id": "sword_diveplus",
     "type": "GENERIC",
     "name": { "str": "blood diver+", "str_pl": "blood divers+" },
-    "description": "A small, serrated dagger, textured in red hue. Its handle is designed for quick precise stabs, and the weight of this weapon makes it versatile to use. The unique form of its blade is great for skinning, but there's a better purpose other than that.",
+    "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",
@@ -80,7 +80,7 @@
     "id": "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. Every successful impacts will cause it to bite quickly to its prey.",
+    "description": "A pair of knuckles designed to imitate a jaw with heavily arranged metal teeth. Every successful impact will cause it to bite into its prey.",
     "weight": "850 g",
     "volume": "500 ml",
     "symbol": "f",
@@ -98,7 +98,7 @@
     "id": "punchie_bitieplus",
     "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 impacts will cause it to bite quickly to its prey.",
+    "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",
@@ -116,7 +116,7 @@
     "id": "hammerius",
     "type": "GENERIC",
     "name": { "str": "hammerius", "str_pl": "hammeriuses" },
-    "description": "A huge, fearsome battle hammer. Its flattened surface has symmetric holes, in which spikes are seen beneath it, and everytime you bash an opponent, it retracts to puncture the prey's innards.",
+    "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",
     "symbol": "T",
@@ -134,7 +134,7 @@
     "id": "hammeriusplus",
     "type": "GENERIC",
     "name": { "str": "hammerius+", "str_pl": "hammeriuses+" },
-    "description": "A huge, fearsome battle hammer, textured in red hue. Its flattened surface has symmetric holes, in which spikes are seen, and everytime you bash an opponent, it retracts to puncture the prey's inner flesh.",
+    "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",
@@ -145,14 +145,14 @@
     "cutting": 14,
     "material": [ "steel", "compactblood" ],
     "color": "red",
-    "techniques": [ "WBLOCK_1", "UPRIGHT_BASH", "DOWNWARD_BASH", "TRENCH" ],
+    "techniques": [ "WBLOCK_1", "UPRIGHT_BASH", "DOWNWARD_BASH" ],
     "flags": [ "STAB", "DURABLE_MELEE" ]
   },
   {
     "id": "falc_crimsword",
     "type": "GENERIC",
     "name": { "str": "fanged falchion" },
-    "description": "A plain longsword with peculiar hilt and its forked tip imitates a pair of fangs of some sort. Pretty easy to use and its weight is unique for such a fearsome sword.",
+    "description": "A longsword with peculiar hilt and forked tip mimicking a pair of fangs.",
     "weight": "2680 g",
     "volume": "3 L",
     "symbol": "!",
@@ -171,7 +171,7 @@
     "id": "falc_crimswordplus",
     "type": "GENERIC",
     "name": { "str": "fanged falchion+", "str_pl": "fanged falchions+" },
-    "description": "A plain longsword hued in crimson with peculiar hilt and its forked tip imitates a pair of fangs of some sort. Pretty easy to use and its weight is unique for such a fearsome sword.",
+    "description": "A longsword hued in crimson with peculiar hilt and forked tip mimicking a pair of fangs.",
     "weight": "2785 g",
     "volume": "3 L",
     "symbol": "!",
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
index c5ec568..0b2987f 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
@@ -24,6 +24,7 @@
     "dispersion": 185,
     "durability": 8,
     "clip_size": 1,
+    "reload": 135,
     "valid_mod_locations": [ [ "sights", 1 ], [ "accessories", 2 ] ]
   },
   {
@@ -49,6 +50,7 @@
     "durability": 7,
     "burst": 3,
     "clip_size": 16,
+    "reload": 80,
     "loudness": 155,
     "valid_mod_locations": [
       [ "accessories", 4 ],
@@ -84,6 +86,7 @@
     "recoil": 12,
     "durability": 6,
     "clip_size": 12,
+    "reload": 100,
     "loudness": 3,
     "range": 10,
     "ranged_damage": { "damage_type": "stab", "amount": 2 },
@@ -119,6 +122,7 @@
     "recoil": 20,
     "durability": 8,
     "clip_size": 10,
+    "reload": 100,
     "loudness": 3,
     "range": 20,
     "ranged_damage": { "damage_type": "stab", "amount": 15 },
@@ -156,9 +160,11 @@
     "modes": [ [ "DEFAULT", "semi-auto", 3 ], [ "BURST", "5 rd.", 9 ], [ "AUTO", "auto", 60 ] ],
     "dispersion": 180,
     "sight_dispersion": 100,
+    "aim_speed": 2,
     "recoil": 30,
     "durability": 8,
     "clip_size": 400,
+    "reload": 175,
     "loudness": 3,
     "ranged_damage": { "damage_type": "stab", "amount": 5 },
     "valid_mod_locations": [
@@ -191,9 +197,11 @@
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "5 rd.", 5 ], [ "AUTO", "auto", 20 ] ],
     "dispersion": 185,
     "sight_dispersion": 95,
+    "aim_speed": 3,
     "recoil": 10,
     "durability": 8,
     "clip_size": 100,
+    "reload": 75,
     "loudness": 3,
     "ranged_damage": { "damage_type": "stab", "amount": 3 },
     "valid_mod_locations": [