Replace the blood extractor with regular tools.

Clean up many item descriptions.

6 files changed, 35 insertions, 75 deletions

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 8c7bd41..240e64c 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
@@ -2,7 +2,7 @@
   {
     "type": "material",
     "ident": "compactblood",
-    "name": "Blood Compact",
+    "name": "Compacted Blood",
     "density": 4,
     "soft": true,
     "bash_resist": 8,
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
index 4c0a827..c2fdbcc 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
@@ -25,8 +25,8 @@
     "id": "melted_bloodrune",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": { "str": "melted bloodrune stone" },
-    "description": "Finely crushed and extremely heated bloodrune stone. It merely generates a faint glow and seems to maintain its power in its phase.",
+    "name": { "str": "powdered bloodrune" },
+    "description": "Fine powder made from heating and refining a bloodrune. It generates a stable faint glow.",
     "weight": "750 g",
     "volume": "250 ml",
     "price": 0,
@@ -39,8 +39,8 @@
     "id": "bloodrune",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": { "str": "bloodrune stone" },
-    "description": "A pleasant ruby stone, possibly owned by a vampire. Its core mimics a heartbeat with unreadable marks appearing again and again from its outside layer. The strange power seems to be used with certain crafts.",
+    "name": { "str": "bloodrune" },
+    "description": "A stone similar to a fist-sized ruby, the final remains of a slain vampire. Its core mimics a heartbeat with unreadable marks appearing again and again from its outside layer.",
     "weight": "750 g",
     "volume": "250 ml",
     "price": 0,
@@ -54,8 +54,8 @@
     "id": "bigbloodrune",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": { "str": "large bloodrune stone" },
-    "description": "A large bloodrune stone, seemingly compressed by an unknown source. It trembles by its own, eager to shatter from its shell.",
+    "name": { "str": "large bloodrune" },
+    "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,
@@ -69,7 +69,7 @@
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "sticky blood" },
-    "description": "A sticky, rounded human blood, as literally. Its adhesiveness is compare to the regular superglues.",
+    "description": "A sticky glob of concentrated human blood.",
     "weight": "250 g",
     "volume": "250 ml",
     "price": 0,
@@ -83,7 +83,8 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str": "blood powder" },
-    "description": "A powdered human blood. Perfect vampire getaway snacks.",
+    "looks_like": "protein_powder",
+    "description": "Powdered human blood. Useful as a crafting material, or a snack if you are so inclined.",
     "weight": "10 g",
     "volume": "3 ml",
     "price": 1,
@@ -101,7 +102,7 @@
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
     "name": { "str": "blood extract" },
-    "description": "A sticky sap after the process of extraction from the blood.",
+    "description": "A sticky sap leftover from the process of dehydrating blood.",
     "weight": "40 g",
     "volume": "250 ml",
     "price": 0,
@@ -117,8 +118,8 @@
     "id": "compactsheet",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": { "str": "blood compact sheet" },
-    "description": "Well compressed leathery sheet. It is known as an aesthetics clothing material, due to its unique reddish appearance. But from now, it was proven superior to armorcraft.",
+    "name": { "str": "blood leather patch" },
+    "description": "A patch of fabric made from compacted blood. While initially known for its aesthetic qualities, blood leather has proven comparable to kevlar for use use in body armor.",
     "weight": "250 g",
     "volume": "250 ml",
     "price": 0,
@@ -131,7 +132,7 @@
     "type": "GENERIC",
     "category": "spare_parts",
     "name": { "str": "blood pellet" },
-    "description": "A tiny blood pellet, sparkling like bits of fined rubies.",
+    "description": "A tiny blood pellet, sparkling like a sanguine ruby.",
     "weight": "10 g",
     "volume": "3 ml",
     "price": 0,
@@ -168,8 +169,9 @@
     "id": "synthbloodpowder",
     "type": "COMESTIBLE",
     "comestible_type": "FOOD",
+    "looks_like": "bloodpowder",
     "name": { "str": "synthetic blood powder" },
-    "description": "A powdered synthetic blood. Near-perfect vampire getaway snacks.",
+    "description": "Powdered synthetic human blood. It lacks the supernatural potency of real blood for crafting, but can still be used as a snack if you are so inclined.",
     "weight": "10 g",
     "volume": "3 ml",
     "price": 1,
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json b/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
index 7550534..16d2aa0 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_recipe.json
@@ -152,25 +152,6 @@
     "components": [ [ [ "falc_crimsword", 1 ] ], [ [ "melted_bloodrune", 1 ] ] ]
   },
   {
-    "result": "bloodextractor",
-    "type": "recipe",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_TOOLS",
-    "skill_used": "electronics",
-    "difficulty": 8,
-    "time": 45000,
-    "book_learn": [ [ "vamp_upgradebook1", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "CHISEL", "level": 3 } ],
-    "components": [
-      [ [ "element", 5 ] ],
-      [ [ "scrap", 8 ] ],
-      [ [ "processor", 2 ] ],
-      [ [ "amplifier", 1 ] ],
-      [ [ "glass", 2 ] ],
-      [ [ "power_supply", 1 ] ]
-    ]
-  },
-  {
     "result": "blood_forge_infuse",
     "type": "recipe",
     "category": "CC_ELECTRONIC",
@@ -205,21 +186,6 @@
     "components": [ [ [ "bloodrune", 1 ] ] ]
   },
   {
-    "result": "bloodpowder",
-    "type": "recipe",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_DRY",
-    "skill_used": "cooking",
-    "difficulty": 4,
-    "charges": 4,
-    "time": "12 m",
-    "batch_time_factors": [83,3],
-    "book_learn": [ [ "vamp_upgradebook1", 10 ] ],
-    "byproducts": [ [ "bloodextract" ] ],
-    "qualities": [ { "id": "BREFINING", "level": 1 }, { "id": "CHEM", "level": 2 } ],
-    "components": [ [ [ "blood", 1 ] ] ]
-  },
-  {
     "result": "bloodcompressor",
     "type": "recipe",
     "category": "CC_ELECTRONIC",
@@ -310,6 +276,22 @@
     "components": [ [ [ "protein_powder", 1 ] ], [ [ "water_clean", 1 ] ], [ [ "sugar", 5 ] ], [ [ "salt", 5 ] ] ]
   },
   {
+    "result": "bloodpowder",
+    "type": "recipe",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DRY",
+    "skill_used": "cooking",
+    "difficulty": 4,
+    "charges": 4,
+    "time": "12 m",
+    "batch_time_factors": [83,3],
+    "book_learn": [ [ "vamp_upgradebook1", 10 ] ],
+    "byproducts": [ [ "bloodextract" ] ],
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "dehydrator", 25 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
+    "components": [ [ [ "blood", 1 ] ] ]
+  },
+  {
     "result": "synthbloodpowder",
     "type": "recipe",
     "category": "CC_FOOD",
@@ -321,7 +303,8 @@
     "batch_time_factors": [83,3],
     "book_learn": [ [ "vamp_upgradebook1", 10 ] ],
     "byproducts": [ [ "bloodextract" ] ],
-    "qualities": [ { "id": "BREFINING", "level": 1 }, { "id": "CHEM", "level": 2 } ],
+    "qualities": [ { "id": "CHEM", "level": 2 } ],
+    "tools": [ [ [ "dehydrator", 25 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
     "components": [ [ [ "synthblood", 1 ] ] ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
index 2420827..e838b46 100644
--- a/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
+++ b/vamp_stuff/Modification_Files/Items/Tools/v_tools.json
@@ -27,31 +27,6 @@
   {
     "ammo": [ "battery" ],
     "bashing": 3,
-    "charges_per_use": 25,
-    "color": "red",
-    "description": "A small heating container used in dehydrating blood, turning it into a powder. Uses common light size batteries.",
-    "id": "bloodextractor",
-    "looks_like": "dehydrator",
-    "material": [ "steel", "glass" ],
-    "name": "blood dehydrator",
-    "price": 0,
-    "price_postapoc": 100000,
-    "qualities": [ [ "BREFINING", 1 ] ],
-    "symbol": "g",
-    "to_hit": -1,
-    "type": "TOOL",
-    "volume": "1250 ml",
-    "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 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.",
diff --git a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
index 3e64f10..cc6d031 100644
--- a/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
+++ b/vamp_stuff/Modification_Files/NPC/npc_gears/npc_gears_sell.json
@@ -14,7 +14,6 @@
       [ "blood_talisman", 50 ],
       [ "blood_forge_infuse", 75 ],
       [ "bloodcompressor", 75 ],
-      [ "bloodextractor", 75 ],
       { "item": "synthblood", "prob": 100, "container-item": "bottle_plastic", "count-min": 2, "count-max": 5 },
       { "item": "protein_powder", "prob": 75, "count-min": 1, "count-max": 3 },
       { "item": "sugar", "prob": 75, "count-min": 1, "count-max": 3 },
diff --git a/vamp_stuff/readme b/vamp_stuff/readme
index a103a9e..5311bb7 100644
--- a/vamp_stuff/readme
+++ b/vamp_stuff/readme
@@ -29,6 +29,7 @@ Fix blood sheaths to use either limb instead of both.
 -Items
 Add synthetic blood and recipe.
 Fix blood to actually be healthy and enjoyable for vampires.
+Remove the blood extractor. The item seemed excessive for a single recipe just as easily based on using a chemistry set and dehydrator.
 
 -Merchants
 Add synthetic blood to vampire merchants.