Offload several of the vamp_immunities to mutations

4 files changed, 67 insertions, 10 deletions

diff --git a/vamp_stuff/Modification_Files/Mutation/crt-lift/crt_vamp_mutations.json b/vamp_stuff/Modification_Files/Mutation/crt-lift/crt_vamp_mutations.json
index af25eaf..5759607 100644
--- a/vamp_stuff/Modification_Files/Mutation/crt-lift/crt_vamp_mutations.json
+++ b/vamp_stuff/Modification_Files/Mutation/crt-lift/crt_vamp_mutations.json
@@ -8,6 +8,7 @@
     "valid": false,
     "purifiable": false,
     "threshold": true,
+    "cancels": [ "ASTHMA" ],
     "enchantments": [ "VAMP_ench" ]
   },
   {
@@ -99,6 +100,36 @@
   },
   {
     "type": "mutation",
+    "id": "INFRESIST",
+    "name": { "str": "Infection Resistant" },
+    "points": 2,
+    "description": "Your immune system is particularly good at resisting infections.  You have an increased chance for bad wounds and infections to heal on their own, and only suffer reduced penalties from them.",
+    "starting_trait": true,
+    "changes_to": [ "INFIMMUNE" ],
+    "category": [ "TROGLOBITE", "RAT", "MEDICAL", "VAMP" ]
+  },
+  {
+    "type": "mutation",
+    "id": "DISIMMUNE",
+    "name": { "str": "Disease Immune" },
+    "points": 2,
+    "description": "Your body is simply immune to diseases.  You will never catch an ambient disease.",
+    "prereqs": [ "DISRESISTANT" ],
+    "category": [ "PLANT", "SLIME", "TROGLOBITE", "VAMP" ],
+    "flags": [ "NO_DISEASE" ]
+  },
+  {
+    "type": "mutation",
+    "id": "PARAIMMUNE",
+    "name": { "str": "Parasite Immune" },
+    "points": 1,
+    "description": "Your body is unusually inhospitable to parasitic lifeforms.  You will never become infested with internal parasites.",
+    "prereqs": [ "DISRESISTANT" ],
+    "prereqs2": [ "INFRESIST" ],
+    "category": [ "ELFA", "CHIMERA", "MEDICAL", "SLIME", "VAMP" ]
+  },
+  {
+    "type": "mutation",
     "id": "NIGHTVISION",
     "name": "Night Vision",
     "points": 2,
diff --git a/vamp_stuff/Modification_Files/Mutation/crt-lift/vamp_mut_cat.json b/vamp_stuff/Modification_Files/Mutation/crt-lift/vamp_mut_cat.json
index f0e07e6..d86818f 100644
--- a/vamp_stuff/Modification_Files/Mutation/crt-lift/vamp_mut_cat.json
+++ b/vamp_stuff/Modification_Files/Mutation/crt-lift/vamp_mut_cat.json
@@ -17,13 +17,19 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a strange dream about the shadows.", "Your dreams give you a peculiar feeling of sinking into the dark." ],
+    "messages": [
+      "You have a strange dream about the shadows.",
+      "Your dreams give you a peculiar feeling of sinking into the dark."
+    ],
     "category": "VAMP",
     "strength": 1
   },
   {
     "type": "dream",
-    "messages": [ "You have a vivid dream of talking a midnight stroll.", "You dream of drinking copious amounts of warm water." ],
+    "messages": [
+      "You have a vivid dream of talking a midnight stroll.",
+      "You dream of drinking copious amounts of warm water."
+    ],
     "category": "VAMP",
     "strength": 2
   },
diff --git a/vamp_stuff/Modification_Files/NPC/v_classes.json b/vamp_stuff/Modification_Files/NPC/v_classes.json
index ea5af7c..aaf0f3b 100644
--- a/vamp_stuff/Modification_Files/NPC/v_classes.json
+++ b/vamp_stuff/Modification_Files/NPC/v_classes.json
@@ -30,6 +30,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -79,6 +82,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -129,6 +135,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -184,6 +193,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -233,6 +245,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -282,6 +297,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -331,6 +349,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
@@ -387,6 +408,9 @@
       [ "GOODCARDIO", 100 ],
       [ "REGEN", 100 ],
       [ "PAINRESIST", 100 ],
+      [ "INFRESIST", 100 ],
+      [ "DISIMMUNE", 100 ],
+      [ "PARAIMMUNE", 100 ],
       [ "DEFT", 100 ],
       [ "TERRIFYING", 100 ],
       [ "LIGHTSTEP", 100 ],
diff --git a/vamp_stuff/Modification_Files/Others/v_effects.json b/vamp_stuff/Modification_Files/Others/v_effects.json
index b8cf22a..732511d 100644
--- a/vamp_stuff/Modification_Files/Others/v_effects.json
+++ b/vamp_stuff/Modification_Files/Others/v_effects.json
@@ -2,17 +2,13 @@
   {
     "type": "effect_type",
     "id": "vamp_immunity",
-    "removes_effects": [ "stung", "poison", "badpoison", "paralyzepoison", "smoke", "teargas", "relax_gas", "paralyzepoison", "migo_atmosphere",
-                         "asthma",
+    "blocks_effects": [ "stung", "poison", "badpoison", "paralyzepoison", "smoke", "teargas", "relax_gas", "paralyzepoison", "migo_atmosphere",
                          "anemia", "hypocalcemia", "hypovitA", "hypovitB", "scurvy", "hypervitaminosis",
                          "stim_overdose",
-                         "common_cold", "flu",
-                         "bloodworms", "brainworms", "paincysts", "tapeworm", "tetanus" ],
-    "blocks_effects": [ "stung", "poison", "badpoison", "paralyzepoison", "smoke", "teargas", "relax_gas", "paralyzepoison", "migo_atmosphere",
-                         "asthma",
+                         "tetanus" ],
+    "removes_effects": [ "stung", "poison", "badpoison", "paralyzepoison", "smoke", "teargas", "relax_gas", "paralyzepoison", "migo_atmosphere",
                          "anemia", "hypocalcemia", "hypovitA", "hypovitB", "scurvy", "hypervitaminosis",
                          "stim_overdose",
-                         "common_cold", "flu",
-                         "bloodworms", "brainworms", "paincysts", "tapeworm", "tetanus" ]
+                         "tetanus" ]
   }
 ]