Replace the fangs mutation with a concealable vampire fangs mutations

3 files changed, 32 insertions, 57 deletions

diff --git a/vamp_stuff/Modification_Files/Mutation/mutations.json b/vamp_stuff/Modification_Files/Mutation/mutations.json
index b27c91a..e018462 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations.json
@@ -374,52 +374,6 @@
   },
   {
     "type": "mutation",
-    "id": "FANGS",
-    "name": "Fangs",
-    "points": 2,
-    "visibility": 2,
-    "ugliness": 2,
-    "description": "Your teeth have grown into two-inch-long fangs, allowing you to make an extra attack when conditions favor it.",
-    "types": [ "TEETH" ],
-    "changes_to": [ "SABER_TEETH", "SHARKTEETH" ],
-    "category": [ "LIZARD", "FISH", "LUPINE", "FELINE", "CHIMERA" ],
-    "attacks": [
-      {
-        "attack_text_u": "You sink your fangs into %s",
-        "attack_text_npc": "%1$s sinks their fangs into %2$s",
-        "blocker_mutations": [ "MUZZLE", "MUZZLE_LONG", "MUZZLE_RAT" ],
-        "body_part": "MOUTH",
-        "chance": 20,
-        "base_damage": { "damage_type": "stab", "amount": 20 }
-      },
-      {
-        "attack_text_u": "You sink your fangs into %s",
-        "attack_text_npc": "%1$s sinks their fangs into %2$s",
-        "required_mutations": [ "MUZZLE" ],
-        "body_part": "MOUTH",
-        "chance": 18,
-        "base_damage": { "damage_type": "stab", "amount": 20 }
-      },
-      {
-        "attack_text_u": "You sink your fangs into %s",
-        "attack_text_npc": "%1$s sinks their fangs into %2$s",
-        "required_mutations": [ "MUZZLE_LONG" ],
-        "body_part": "MOUTH",
-        "chance": 15,
-        "base_damage": { "damage_type": "stab", "amount": 20 }
-      },
-      {
-        "attack_text_u": "You sink your fangs into %s",
-        "attack_text_npc": "%1$s sinks their fangs into %2$s",
-        "required_mutations": [ "MUZZLE_RAT" ],
-        "body_part": "MOUTH",
-        "chance": 19,
-        "base_damage": { "damage_type": "stab", "amount": 20 }
-      }
-    ]
-  },
-  {
-    "type": "mutation",
     "id": "NAILS",
     "name": "Long Fingernails",
     "points": 1,
@@ -428,7 +382,7 @@
     "types": [ "CLAWS" ],
     "changes_to": [ "CLAWS", "TALONS" ],
     "cancels": [ "ARM_TENTACLES", "ARM_TENTACLES_4", "ARM_TENTACLES_8" ],
-    "category": [ "RAPTOR" ]
+    "category": [ "RAPTOR", "VAMP" ]
   },
   {
     "type": "mutation",
@@ -471,7 +425,7 @@
     "points": -3,
     "description": "Your skin simply cannot handle ultraviolet radiation, such as sunlight.  It will seriously burn you.",
     "prereqs": [ "ALBINO" ],
-    "prereqs2": [ "TROGLO2", "TROGLO3" ],
+    "prereqs2": [ "TROGLO2", "TROGLO3", "VAMP" ],
     "category": [ "TROGLOBITE", "VAMP" ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
index 6955a33..fd33691 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
@@ -18,7 +18,6 @@
     "points": 4,
     "description": "The light around you bends strangely, making it harder for enemies to notice you.",
     "valid": false,
-    "purifiable": false,
     "prereqs": [ "WEAKSCENT" ],
     "threshreq": [ "THRESH_VAMP" ],
     "category": [ "VAMP" ],
@@ -66,5 +65,27 @@
     "category": [ "VAMP" ],
     "armor": [ { "parts": "ALL", "bash": 10, "cut": 5 } ],
     "types": [ "skin_tone" ]
+  },
+  {
+    "type": "mutation",
+    "id": "VAMPFANGS",
+    "name": "Vampire Fangs",
+    "points": 2,
+    "visibility": 0,
+    "ugliness": 0,
+    "description": "Your canine teeth have grown into fangs, which can be retracted at will. This enables you to avoid looking any differently, while still allowing you to make an extra attack when conditions favor it.",
+    "purifiable": false,
+    "types": [ "TEETH" ],
+    "threshreq": [ "THRESH_VAMP" ],
+    "category": [ "VAMP" ],
+    "attacks": [
+      {
+        "attack_text_u": "You sink your fangs into %s",
+        "attack_text_npc": "%1$s sinks their fangs into %2$s",
+        "body_part": "MOUTH",
+        "chance": 20,
+        "base_damage": { "damage_type": "stab", "amount": 25 }
+      }
+    ]
   }
 ]
diff --git a/vamp_stuff/Modification_Files/NPC/v_classes.json b/vamp_stuff/Modification_Files/NPC/v_classes.json
index 509052f..e076084 100644
--- a/vamp_stuff/Modification_Files/NPC/v_classes.json
+++ b/vamp_stuff/Modification_Files/NPC/v_classes.json
@@ -46,7 +46,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_long", 100 ],
@@ -100,7 +100,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_medium", 100 ]
@@ -154,7 +154,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_short", 100 ]
@@ -213,7 +213,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_crewcut", 100 ]
@@ -266,7 +266,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_medium", 100 ]
@@ -319,7 +319,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_crewcut", 100 ]
@@ -372,7 +372,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_short", 100 ]
@@ -432,7 +432,7 @@
       [ "NIGHTVISION3", 100 ],
       [ "INFRARED", 100 ],
       [ "VAMPEYES", 100 ],
-      [ "FANGS", 100 ],
+      [ "VAMPFANGS", 100 ],
       [ "NAILS", 100 ],
       [ "SUNBURN", 100 ],
       [ "hair_white_short", 100 ]