Port back a number of fixes and cleanups from my attempt to port the mod to DDA.

6 files changed, 47 insertions, 46 deletions

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 df294e3..7c72d1f 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/v_FANCIES.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "blood_necklace",
+    "looks_like": "ruby_silver_pendant_necklace",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "bloodrune necklace" },
@@ -10,11 +11,11 @@
     "material": [ "compactblood", "silver" ],
     "symbol": "[",
     "color": "red",
-    "looks_like": "ruby_silver_pendant_necklace",
     "flags": [ "SUPER_FANCY" ]
   },
   {
     "id": "blood_talisman",
+    "looks_like": "ruby_silver_pendant_necklace",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "bloodrune talisman" },
@@ -26,11 +27,11 @@
     "material": [ "compactblood", "silver" ],
     "symbol": "(",
     "color": "red",
-    "looks_like": "ruby_silver_pendant_necklace",
     "flags": [ "SUPER_FANCY" ]
   },
   {
     "id": "blood_cring",
+    "looks_like": "ruby_silver_ring",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "bloodrune ring" },
@@ -41,7 +42,6 @@
     "material": [ "compactblood", "silver" ],
     "symbol": "(",
     "color": "red",
-    "looks_like": "ruby_silver_ring",
     "flags": [ "FANCY" ]
   }
 ]
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 9f7fb2b..df392e8 100644
--- a/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
+++ b/vamp_stuff/Modification_Files/Items/Armor_Set/v_bloodgear.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "bloodbootsheath",
+    "looks_like": "bootsheath",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "blood leather ankle sheath" },
@@ -24,11 +25,11 @@
       "draw_cost": 30,
       "flags": [ "SHEATH_KNIFE" ]
     },
-    "looks_like": "sheath",
     "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
   },
   {
     "id": "bloodwristsheath",
+    "looks_like": "bandolier_wrist",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "blood leather wrist sheath" },
@@ -52,23 +53,22 @@
       "draw_cost": 5,
       "flags": [ "SHEATH_KNIFE" ]
     },
-    "looks_like": "sheath",
     "flags": [ "BELTED", "OVERSIZE", "STURDY", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY" ]
   },
   {
     "id": "bloodpack",
+    "//": "Rebased on a leather backpack.",
+    "looks_like": "backpack_leather",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "blood leather backpack" },
     "description": "A small backpack handmade from blood leather. Good durable storage for a little encumbrance.",
-    "//": "Rebased on a leather backpack.",
     "weight": "950 g",
-    "volume": "2000 ml",
+    "volume": "2 L",
     "price": "0 cent",
     "rigid": false,
     "material": [ "compactblood" ],
     "symbol": "[",
-    "looks_like": "backpack",
     "color": "red",
     "covers": [ "torso" ],
     "coverage": 30,
@@ -81,18 +81,18 @@
   },
   {
     "id": "bigbloodpack",
+    "//": "Rebased on a military rucksack.",
+    "looks_like": "rucksack",
     "type": "ARMOR",
     "category": "clothing",
     "name": { "str": "blood leather rucksack" },
     "description": "A large blood leather rucksack, provides a lot of storage and is quite durable.",
-    "//": "Rebased on a military rucksack.",
     "weight": "1250 g",
     "volume": "4 L",
     "price": "0 cent",
     "rigid": false,
     "material": [ "compactblood" ],
     "symbol": "[",
-    "looks_like": "rucksack",
     "color": "red",
     "covers": [ "torso" ],
     "coverage": 40,
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 fc6ee51..1fe4907 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
@@ -50,6 +50,7 @@
     "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",
diff --git a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
index 8788234..dc921df 100644
--- a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
+++ b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
@@ -1,22 +1,22 @@
 [
   {
-    "ammo": [ "battery" ],
-    "bashing": 4,
-    "charges_per_use": 100,
-    "color": "red",
-    "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",
     "looks_like": "forge",
-    "material": [ "steel", "glass" ],
+    "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",
-    "qualities": [ [ "BINFUSING", 1 ], [ "HAMMER", 3 ], [ "CHISEL", 3 ] ],
-    "symbol": "Q",
     "to_hit": -2,
-    "type": "TOOL",
-    "volume": "3750 ml",
-    "weight": "14500 g",
+    "bashing": 4,
+    "material": [ "steel", "glass" ],
+    "color": "red",
+    "symbol": "Q",
+    "ammo": [ "battery" ],
+    "charges_per_use": 100,
+    "qualities": [ [ "BINFUSING", 1 ], [ "HAMMER", 3 ], [ "CHISEL", 3 ] ],
     "magazines": [
       [
         "battery",
@@ -25,23 +25,23 @@
     ]
   },
   {
-    "ammo": [ "battery" ],
-    "bashing": 3,
-    "charges_per_use": 150,
-    "color": "red",
-    "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",
     "looks_like": "tailors_kit",
-    "material": [ "steel", "glass" ],
+    "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",
-    "qualities": [ [ "BCOMPRESSING", 1 ], [ "CUT", 3 ] ],
-    "symbol": "H",
     "to_hit": -1,
-    "type": "TOOL",
-    "volume": "3250 ml",
-    "weight": "5350 g",
+    "bashing": 3,
+    "material": [ "steel", "glass" ],
+    "color": "red",
+    "symbol": "H",
+    "ammo": [ "battery" ],
+    "charges_per_use": 150,
+    "qualities": [ [ "BCOMPRESSING", 1 ], [ "CUT", 3 ] ],
     "magazines": [
       [
         "battery",
@@ -50,23 +50,23 @@
     ]
   },
   {
-    "ammo": [ "battery" ],
-    "bashing": 3,
-    "charges_per_use": 10,
-    "color": "red",
-    "description": "A simple blood chemistry set. It has the complete tools in making chemicals and adhesives for essential projects.",
     "id": "bloodchem",
     "looks_like": "chemistry_set",
-    "material": [ "steel", "glass" ],
+    "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",
-    "qualities": [ [ "BCHEMISTRY", 1 ], [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ],
-    "symbol": "&",
     "to_hit": -1,
-    "type": "TOOL",
-    "volume": "3250 ml",
-    "weight": "4850 g",
+    "bashing": 3,
+    "material": [ "steel", "glass" ],
+    "color": "red",
+    "symbol": "&",
+    "ammo": [ "battery" ],
+    "charges_per_use": 10,
+    "qualities": [ [ "BCHEMISTRY", 1 ], [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ],
     "magazines": [
       [
         "battery",
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
index 39f245f..f2a7575 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/melee_weapon.json
@@ -1,6 +1,6 @@
 [
   {
-    "note": "Bloodrune upgrade add 2 cutting and 1 bashing damage, and its ultimate techniques are learned for that weapon (if available)",
+    "//": "Bloodrune upgrade add 2 cutting and 1 bashing damage, and its ultimate techniques are learned for that weapon (if available)",
     "id": "sword_sip",
     "type": "GENERIC",
     "name": { "str": "blood sipper", "str_pl": "blood sippers" },
diff --git a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
index 0b32ae7..6c8d665 100644
--- a/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
+++ b/vamp_stuff/Modification_Files/Items/Weapons/ranged_weapon.json
@@ -17,9 +17,9 @@
     "volume": "3000 ml",
     "bashing": 4,
     "cutting": 14,
-    "armor_data": { "covers": [ "torso" ], "coverage": 15, "material_thickness": 1, "encumbrance": 27 },
+    "armor_data": { "covers": [ "torso" ], "coverage": 15, "material_thickness": 1, "encumbrance": 18 },
     "ranged_damage": { "damage_type": "stab", "amount": 16 },
-    "range": 21,
+    "range": 14,
     "dispersion": 185,
     "durability": 8,
     "clip_size": 1,