Replace carnivore and cannibal with source patches utilizing blood drinker trait

5 files changed, 38 insertions, 51 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 240e64c..fc6ee51 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_material_type.json
@@ -34,5 +34,29 @@
     "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,
+    "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 }
+    ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
index 45a915d..cc6163c 100644
--- a/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
+++ b/vamp_stuff/Modification_Files/Items/Misc/v_materials.json
@@ -15,11 +15,11 @@
     "calories": 300,
     "description": "Blood, possibly that of a human.  Disgusting!",
     "price": "1 USD",
-    "material": [ "hflesh" ],
+    "material": [ "blood" ],
     "volume": "250 ml",
     "phase": "liquid",
     "fun": 10,
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ]
   },
   {
     "id": "melted_bloodrune",
@@ -92,10 +92,10 @@
     "quench": 0,
     "healthy": 1,
     "nutrition": 3,
-    "material": [ "hflesh" ],
+    "material": [ "blood" ],
     "symbol": "'",
     "color": "red",
-    "flags": [ "ZERO_WEIGHT" ]
+    "flags": [ "ZERO_WEIGHT", "VAMPIRISM" ]
   },
   {
     "id": "bloodextract",
@@ -109,10 +109,11 @@
     "quench": 0,
     "healthy": 2,
     "nutrition": 2,
-    "material": [ "hflesh" ],
+    "material": [ "blood" ],
     "symbol": "~",
     "color": "pink",
-    "count": 3
+    "count": 3,
+    "flags": [ "VAMPIRISM" ]
   },
   {
     "id": "compactsheet",
@@ -158,12 +159,12 @@
     "healthy": 2,
     "calories": 150,
     "description": "Synthetic blood, not possibly that of a human.  Still disgusting!",
-   "price": "1 USD",
-    "material": [ "hflesh" ],
+    "price": "1 USD",
+    "material": [ "blood" ],
     "volume": "250 ml",
     "phase": "liquid",
     "fun": 5,
-    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ]
+    "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "VAMPIRISM" ]
   },
   {
     "id": "synthbloodpowder",
@@ -179,9 +180,9 @@
     "quench": 0,
     "healthy": 0,
     "nutrition": 2,
-    "material": [ "hflesh" ],
+    "material": [ "blood" ],
     "symbol": "'",
     "color": "red",
-    "flags": [ "ZERO_WEIGHT" ]
+    "flags": [ "ZERO_WEIGHT", "VAMPIRISM" ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations.json b/vamp_stuff/Modification_Files/Mutation/mutations.json
index 15784aa..4cd765e 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations.json
@@ -118,29 +118,6 @@
   },
   {
     "type": "mutation",
-    "id": "CANNIBAL",
-    "name": { "str": "Cannibal" },
-    "points": 1,
-    "description": "For your whole life you've been forbidden from indulging in your peculiar tastes.  Now the world's ended, and you'll be damned if anyone is going to tell you that you can't eat people.",
-    "starting_trait": true,
-    "valid": false,
-    "cancels": [ "VEGETARIAN" ],
-    "category": [ "VAMP" ],
-    "flags": [ "CANNIBAL" ]
-  },
-  {
-    "type": "mutation",
-    "id": "CARNIVORE",
-    "name": { "str": "Carnivore" },
-    "points": -4,
-    "description": "Your body's ability to digest fruits, vegetables, grains and nuts is severely hampered.  You cannot eat anything besides meat.",
-    "cancels": [ "VEGETARIAN", "HERBIVORE", "RUMINANT", "GRAZER" ],
-    "leads_to": [ "SAPROVORE" ],
-    "category": [ "LIZARD", "BEAST", "SPIDER", "CHIMERA", "RAPTOR", "FELINE", "VAMP" ],
-    "vitamin_rates": [ [ "vitC", -1200 ] ]
-  },
-  {
-    "type": "mutation",
     "id": "WEAKSCENT",
     "name": { "str": "Weak Scent" },
     "points": 1,
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
index eb63213..98088be 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
@@ -219,6 +219,7 @@
     "category": [ "VAMP" ],
     "cancels": [ "THIRST", "THIRST2", "THIRST3" ],
     "valid": false,
-    "purifiable": false
+    "purifiable": false,
+    "flags": [ "VAMPIRE" ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/NPC/v_classes.json b/vamp_stuff/Modification_Files/NPC/v_classes.json
index 5846450..0dc3fd8 100644
--- a/vamp_stuff/Modification_Files/NPC/v_classes.json
+++ b/vamp_stuff/Modification_Files/NPC/v_classes.json
@@ -37,8 +37,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -90,8 +88,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -143,8 +139,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -201,8 +195,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -253,8 +245,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -305,8 +295,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -357,8 +345,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],
@@ -416,8 +402,6 @@
       [ "INFRESIST", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
-      [ "CANNIBAL", 100 ],
-      [ "CARNIVORE", 100 ],
       [ "WEAKSCENT", 100 ],
       [ "SHMELD", 100],
       [ "BEAUTIFULVAMP", 100],