Port to DDA.

1 files changed, 7 insertions, 34 deletions

diff --git a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
index 311bbc2..c311305 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
@@ -11,7 +11,8 @@
     "cancels": [ "VAMP_GHOUL", "VAMP_BLOODDOLL" ],
     "enchantments": [ "VAMP_ench" ],
     "passive_mods": { "str_mod": 2, "dex_mod": 2, "int_mod": 2, "per_mod": 2 },
-    "vitamin_rates": [ [ "vitA", -1200 ], [ "vitB", -1200 ], [ "vitC", -1200 ], [ "calcium", -1200 ], [ "iron", -1200 ]  ]
+    "vitamin_rates": [ [ "vitA", -1200 ], [ "vitB", -1200 ], [ "vitC", -1200 ], [ "calcium", -1200 ], [ "iron", -1200 ]  ],
+    "flags": [ "VAMPIRE", "NO_THIRST", "MEND_ALL" ]
   },
   {
     "type": "mutation",
@@ -119,16 +120,12 @@
     "visibility": 1,
     "ugliness": 1,
     "description": "Your eyes have a slitted pupil and an iris of hypnotic scarlet.  People feel mildly persuaded, and frightened, by you.",
+    "types": [ "EYES", "eye_color" ],
     "valid": false,
     "purifiable": false,
     "threshreq": [ "THRESH_REAL_VAMP" ],
-    "cancels": [
-        "BIRD_EYE", "CEPH_EYES", "COMPOUND_EYES", "ELFAEYES", "FEL_EYE", "LIZ_EYE", "URSINE_EYE",
-        "eye_blue", "eye_brown", "eye_hazel", "eye_amber", "eye_gray", "eye_green"
-    ],
     "category": [ "REAL_VAMP" ],
-    "social_modifiers": { "lie": 5, "persuade": 10, "intimidate": 5 },
-    "types": [ "eye_color" ]
+    "social_modifiers": { "lie": 5, "persuade": 10, "intimidate": 5 }
   },
   {
     "type": "mutation",
@@ -136,16 +133,12 @@
     "name": { "str": "Vampire Nightsight" },
     "points": 6,
     "description": "You are a creature of the night and your eyes are tuned to function in total darkness.  Activate to toggle NV-visible areas on or off.",
+    "types": [ "VISION" ],
     "valid": false,
     "purifiable": false,
     "prereqs": [ "REAL_VAMP_EYES" ],
     "threshreq": [ "THRESH_REAL_VAMP" ],
     "leads_to": [ "INFRARED" ],
-    "cancels": [
-      "ELFA_NV", "ELFA_FNV",
-      "FEL_NV",
-      "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3"
-    ],
     "category": [ "REAL_VAMP" ],
     "active": true,
     "starts_active": true,
@@ -164,11 +157,6 @@
     "threshreq": [ "THRESH_REAL_VAMP" ],
     "category": [ "REAL_VAMP" ],
     "armor": [ { "parts": "ALL", "bash": 10, "bullet": 5, "cut": 5, "stab": 5, "electric": 5 } ],
-    "cancels": [
-      "ASTHMA",
-      "ALBINO", "PALE", "SUNBURN",
-      "SKIN_DARK", "SKIN_LIGHT", "SKIN_MEDIUM", "SKIN_PINK", "SKIN_TAN"
-    ],
     "types": [ "SKIN", "skin_tone" ]
   },
   {
@@ -181,7 +169,6 @@
     "purifiable": false,
     "types": [ "TEETH" ],
     "threshreq": [ "THRESH_REAL_VAMP" ],
-    "cancels": [ "FANGS", "MANDIBLES", "MOUTH_TENTACLES" ],
     "category": [ "REAL_VAMP" ],
     "attacks": [
       {
@@ -206,11 +193,6 @@
     "types": [ "CLAWS" ],
     "threshreq": [ "THRESH_REAL_VAMP" ],
     "prereqs": [ "NAILS" ],
-    "cancels": [
-      "ARM_TENTACLES", "ARM_TENTACLES_4", "ARM_TENTACLES_8",
-      "CLAWS", "CLAWS_RAT", "CLAWS_RETRACT",
-      "TALONS"
-    ],
     "category": [ "REAL_VAMP" ]
   },
   {
@@ -219,10 +201,10 @@
     "name": "Damned",
     "points": -10,
     "description": "Your unholy nature has marked you as forever banished from the divine light. Exposure to natural sunlight or fire can kill you in seconds. Artificial sunlight, such as from a SAD lamp or tanning bad, is harmless.",
+    "types": [ "SUNLIGHT" ],
     "valid": false,
     "purifiable": false,
     "threshreq": [ "THRESH_REAL_VAMP" ],
-    "cancels": [ "SUNLIGHT_DEPENDENT", "TROGLO", "TROGLO2", "TROGLO3" ],
     "category": [ "REAL_VAMP" ]
   },
   {
@@ -231,18 +213,9 @@
     "name": { "str": "Blood Drinker" },
     "points": -6,
     "description": "Your undead metabolism requires the regular consumption of blood, both as sustinance and as an addiction. You find it hard to focus when you are hungry, and consuming anything else will cause you to vomit it back up.",
+    "types": [ "CONSTITUTION", "DIET", "THIRST" ],
     "threshreq": [ "THRESH_REAL_VAMP" ],
     "category": [ "REAL_VAMP" ],
-    "cancels": [
-      "THIRST", "THIRST2", "THIRST3",
-      "VEGETARIAN", "HERBIVORE", "RUMINANT",
-      "MEATARIAN", "CARNIVORE", "CANNIBAL",
-      "ANTIFRUIT",
-      "LACTOSE",
-      "ANTIJUNK", "PROJUNK",
-      "ALCMET",
-      "SAPROVORE"
-    ],
     "valid": false,
     "purifiable": false,
     "flags": [ "VAMPIRE" ]