Change mutation IDs so as to no longer conflict with CRT.

Update readme.

7 files changed, 61 insertions, 58 deletions

diff --git a/vamp_stuff/Modification_Files/Mutation/mutation_category_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutation_category_vamp.json
index aaec605..e5ebebe 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutation_category_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutation_category_vamp.json
@@ -1,11 +1,11 @@
 [
   {
     "type": "mutation_category",
-    "id": "VAMP",
+    "id": "REAL_VAMP",
     "name": "Vampire",
-    "threshold_mut": "THRESH_VAMP",
-    "mutagen_message": "Nearby shadows seem to bend towards you for a moment and then reality warps back into place.",
-    "iv_message": "You twitch and pant randomly as your desire to slake your inhuman thirst becomes overwhelming.",
+    "threshold_mut": "THRESH_REAL_VAMP",
+    "mutagen_message": "This message should never appear because there are no mutagens for real vampirism.",
+    "iv_message": "This message should also never appear because there are no mutagens for real vampirism.",
     "iv_min_mutations": 1,
     "iv_additional_mutations": 2,
     "iv_additional_mutations_chance": 3,
@@ -21,7 +21,7 @@
       "You have a strange dream about the shadows.",
       "Your dreams give you a peculiar feeling of sinking into the dark."
     ],
-    "category": "VAMP",
+    "category": "REAL_VAMP",
     "strength": 1
   },
   {
@@ -30,7 +30,7 @@
       "You have a vivid dream of talking a midnight stroll.",
       "You dream of drinking copious amounts of warm water."
     ],
-    "category": "VAMP",
+    "category": "REAL_VAMP",
     "strength": 2
   },
   {
@@ -39,7 +39,7 @@
       "You have a dream of being chased by dogs as something warm drips from your mouth.",
       "Snippets of stalking something in the star-lit night shakes you awake."
     ],
-    "category": "VAMP",
+    "category": "REAL_VAMP",
     "strength": 3
   },
   {
@@ -57,7 +57,7 @@
       "It is almost dawn! You can't find anywhere to shield yourself. You run and run and finally the light peeks over the horizon and...you jolt awake in bed. Just a nightmare.",
       "You have a dream where you are being mocked by a rival vampire. They make you so angry, you don't notice the trap they had placed until it was too late. They walk away laughing as you slowly starve."
     ],
-    "category": "VAMP",
+    "category": "REAL_VAMP",
     "strength": 4
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations.json b/vamp_stuff/Modification_Files/Mutation/mutations.json
index d1af40b..5964cc8 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations.json
@@ -3,19 +3,19 @@
     "type": "mutation",
     "id": "GOODHEARING",
     "copy-from": "GOODHEARING",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
     "id": "GOODCARDIO",
     "copy-from": "GOODCARDIO",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
     "id": "REGEN",
     "copy-from": "REGEN",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
@@ -24,14 +24,14 @@
     "points": 3,
     "description": "You recover from pain much faster than normal.",
     "prereqs": [ "PAINREC2" ],
-    "category": [ "MEDICAL", "VAMP" ],
+    "category": [ "MEDICAL", "REAL_VAMP" ],
     "pain_recovery": 1.0
   },
   {
     "type": "mutation",
     "id": "PAINRESIST",
     "copy-from": "PAINRESIST",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
@@ -41,30 +41,30 @@
     "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" ]
+    "category": [ "TROGLOBITE", "RAT", "MEDICAL", "REAL_VAMP" ]
   },
   {
     "type": "mutation",
     "id": "PARAIMMUNE",
     "copy-from": "PARAIMMUNE",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
     "id": "INFRARED",
     "copy-from": "INFRARED",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
     "id": "TERRIFYING",
     "copy-from": "TERRIFYING",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   },
   {
     "type": "mutation",
     "id": "WEAKSCENT",
     "copy-from": "WEAKSCENT",
-    "extend": { "category": [ "VAMP"] }
+    "extend": { "category": [ "REAL_VAMP"] }
   }
 ]
diff --git a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
index 1e7474a..311bbc2 100644
--- a/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
+++ b/vamp_stuff/Modification_Files/Mutation/mutations_vamp.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "mutation",
-    "id": "THRESH_VAMP",
+    "id": "THRESH_REAL_VAMP",
     "name": { "str": "Vampire" },
     "points": 1,
     "description": "Easy prey are few these days. But if you play your cards right, you'll finally get a shot at ruling your own domain.",
@@ -21,7 +21,7 @@
     "description": "This is the Vampire that embraced you. You will always feel a bond with them.",
     "valid": false,
     "purifiable": false,
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "cancels": [ "VAMP_SIBLING", "VAMP_CHILDE", "VAMP_GHOUL", "VAMP_BLOODDOLL" ]
   },
   {
@@ -33,7 +33,7 @@
     "description": "This Vampire has the same sire as you.",
     "valid": false,
     "purifiable": false,
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "cancels": [ "VAMP_SIRE", "VAMP_CHILDE", "VAMP_GHOUL", "VAMP_BLOODDOLL" ]
   },
   {
@@ -44,7 +44,7 @@
     "description": "You embraced this Vampire. They will always feel a bond with you.",
     "valid": false,
     "purifiable": false,
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "cancels": [ "VAMP_SIRE", "VAMP_SIBLING", "VAMP_GHOUL", "VAMP_BLOODDOLL" ]
   },
   {
@@ -56,7 +56,7 @@
     "description": "You have enslaved this Vampire to your will.",
     "valid": false,
     "purifiable": false,
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "cancels": [ "VAMP_GHOUL", "VAMP_BLOODDOLL" ]
   },
   {
@@ -84,49 +84,49 @@
   },
   {
     "type": "mutation",
-    "id": "SHMELD",
+    "id": "REAL_SHADOW_MELD",
     "name": "Shadow Meld",
     "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" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "stealth_modifier": 25
   },
   {
     "type": "mutation",
-    "id": "BEAUTIFULVAMP",
+    "id": "REAL_BEAUTIFUL_VAMP",
     "name": "Moon-lit Grace",
     "points": 6,
     "ugliness": -7,
     "description": "Aside from your appearances, your movements are incredibly graceful and allow you to seemingly glide through every task.",
     "valid": false,
     "purifiable": false,
-    "threshreq": [ "THRESH_VAMP" ],
-    "category": [ "VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "noise_modifier": 0.2,
     "movecost_modifier": 0.9,
     "attackcost_modifier": 0.9
   },
   {
     "type": "mutation",
-    "id": "VAMP_EYES",
+    "id": "REAL_VAMP_EYES",
     "name": "Red Iris",
     "mixed_effect": true,
     "points": 4,
     "visibility": 1,
-    "ugliness": -1,
-    "description": "Your eyes are a pleasant shade of hypnotic scarlet.  People feel mildly persuaded by you.",
+    "ugliness": 1,
+    "description": "Your eyes have a slitted pupil and an iris of hypnotic scarlet.  People feel mildly persuaded, and frightened, by you.",
     "valid": false,
     "purifiable": false,
-    "threshreq": [ "THRESH_VAMP" ],
+    "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": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "social_modifiers": { "lie": 5, "persuade": 10, "intimidate": 5 },
     "types": [ "eye_color" ]
   },
@@ -138,15 +138,15 @@
     "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.",
     "valid": false,
     "purifiable": false,
-    "prereqs": [ "VAMP_EYES" ],
-    "threshreq": [ "THRESH_VAMP" ],
+    "prereqs": [ "REAL_VAMP_EYES" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
     "leads_to": [ "INFRARED" ],
     "cancels": [
       "ELFA_NV", "ELFA_FNV",
       "FEL_NV",
       "NIGHTVISION", "NIGHTVISION2", "NIGHTVISION3"
     ],
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "active": true,
     "starts_active": true,
     "night_vision_range": 15
@@ -161,8 +161,8 @@
     "description": "You look very pale and your skin is cold to the touch, and you no longer breathe nor does your heart beat. On the other hand you are immune to most conditions that would debilitate the living, as well as being resistant to regular injuries.",
     "valid": false,
     "purifiable": false,
-    "threshreq": [ "THRESH_VAMP" ],
-    "category": [ "VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "armor": [ { "parts": "ALL", "bash": 10, "bullet": 5, "cut": 5, "stab": 5, "electric": 5 } ],
     "cancels": [
       "ASTHMA",
@@ -180,9 +180,9 @@
     "valid": false,
     "purifiable": false,
     "types": [ "TEETH" ],
-    "threshreq": [ "THRESH_VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
     "cancels": [ "FANGS", "MANDIBLES", "MOUTH_TENTACLES" ],
-    "category": [ "VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "attacks": [
       {
         "attack_text_u": "You sink your fangs into %s",
@@ -204,14 +204,14 @@
     "valid": false,
     "purifiable": false,
     "types": [ "CLAWS" ],
-    "threshreq": [ "THRESH_VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
     "prereqs": [ "NAILS" ],
     "cancels": [
       "ARM_TENTACLES", "ARM_TENTACLES_4", "ARM_TENTACLES_8",
       "CLAWS", "CLAWS_RAT", "CLAWS_RETRACT",
       "TALONS"
     ],
-    "category": [ "VAMP" ]
+    "category": [ "REAL_VAMP" ]
   },
   {
     "type": "mutation",
@@ -221,9 +221,9 @@
     "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.",
     "valid": false,
     "purifiable": false,
-    "threshreq": [ "THRESH_VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
     "cancels": [ "SUNLIGHT_DEPENDENT", "TROGLO", "TROGLO2", "TROGLO3" ],
-    "category": [ "VAMP" ]
+    "category": [ "REAL_VAMP" ]
   },
   {
     "type": "mutation",
@@ -231,8 +231,8 @@
     "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.",
-    "threshreq": [ "THRESH_VAMP" ],
-    "category": [ "VAMP" ],
+    "threshreq": [ "THRESH_REAL_VAMP" ],
+    "category": [ "REAL_VAMP" ],
     "cancels": [
       "THIRST", "THIRST2", "THIRST3",
       "VEGETARIAN", "HERBIVORE", "RUMINANT",
diff --git a/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json b/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json
index a8a1582..722b6fd 100644
--- a/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json
+++ b/vamp_stuff/Modification_Files/Mutation/vampire-trait-group.json
@@ -4,16 +4,16 @@
     "id": "vampire_traits",
     "subtype": "collection",
     "traits": [
-      [ "THRESH_VAMP", 100 ],
+      [ "THRESH_REAL_VAMP", 100 ],
       [ "VAMP_CLAWS", 100 ],
       [ "VAMP_CURSE", 100 ],
-      [ "VAMP_EYES", 100 ],
+      [ "REAL_VAMP_EYES", 100 ],
       [ "VAMP_FANGS", 100 ],
       [ "VAMP_HUNGER", 100 ],
       [ "VAMP_SKIN", 100 ],
       [ "VAMP_VISION", 100 ],
-      [ "BEAUTIFULVAMP", 100],
-      [ "SHMELD", 100],
+      [ "REAL_BEAUTIFUL_VAMP", 100],
+      [ "REAL_SHADOW_MELD", 100],
 
       [ "GOODHEARING", 100 ],
       [ "GOODCARDIO", 100 ],
diff --git a/vamp_stuff/mod_tileset.json b/vamp_stuff/mod_tileset.json
index 0d55c8c..fe5316c 100644
--- a/vamp_stuff/mod_tileset.json
+++ b/vamp_stuff/mod_tileset.json
@@ -554,8 +554,8 @@
       },
       {
         "file": "ZZ_extra.png", "tiles": [
-          { "id": "overlay_male_mutation_VAMP_EYES", "fg": 320, "rotates": false },
-          { "id": "overlay_female_mutation_VAMP_EYES", "fg": 321, "rotates": false },
+          { "id": "overlay_male_mutation_REAL_VAMP_EYES", "fg": 320, "rotates": false },
+          { "id": "overlay_female_mutation_REAL_VAMP_EYES", "fg": 321, "rotates": false },
           { "id": "overlay_male_mutation_VAMP_SKIN", "fg": 322, "rotates": false },
           { "id": "overlay_female_mutation_VAMP_SKIN", "fg": 323, "rotates": false }
         ],
diff --git a/vamp_stuff/modinfo.json b/vamp_stuff/modinfo.json
index 36de29f..f50779d 100644
--- a/vamp_stuff/modinfo.json
+++ b/vamp_stuff/modinfo.json
@@ -8,7 +8,7 @@
     "description": "Adds night creatures, items, monsters, and locations. Also mutations, feeding on npcs, and spells.",
     "category": "content",
     "dependencies": [ "dda" ],
-    "conflicts": [ "vamp_stuff", "crt_expansion", "magiclysm" ]
+    "conflicts": [ "vamp_stuff" ]
   },
   {
     "type": "skill",
diff --git a/vamp_stuff/readme b/vamp_stuff/readme
index dded0f9..9d2291b 100644
--- a/vamp_stuff/readme
+++ b/vamp_stuff/readme
@@ -6,6 +6,7 @@ Update the mod based on Bright Nights
 
 --Mutations
 Added the vampire mutations from the CRT mod.
+-Renamed the mutation IDs so they no longer conflict with CRT.
 Make the vamp eyes trait visible.
 Fix several mutations to correctly specify they are linked to vampirism.
 Added more new vampire mutations.
@@ -112,11 +113,10 @@ Patch mutation layering for deadened body in the source.
 Patch in blood drinker as an alternate metabolic rehydration mutation so vampires only need blood.
 Patch in damned mutation to cause more dangerous sunlight burns for vampires.
 Patch in blood drinker to be used instead of Cannibal and Carnivore.
-Patch in actually working fast pain recovery traits.
 Prevent death from heart attacks or drug overdoses.
 Prevent human blood from corpses prompting offensive food warnings when vampires attempt to drink it.
 Prevent human blood from corpses causing massive morale nerfs when vampires drink it.
-Prevent vampires from eating other items flagged as CANNIBALISM.
+Prevent vampires from eating non-blood items flagged as CANNIBALISM.
 Patch in vampires not requiring splints to heal broken limbs.
 
 
@@ -134,7 +134,9 @@ Come up with better names for vampire fangs, vampire claws, deadened body (since
 Fix vampires having a human skin tone in addition to to their vampire one.
 
 Rename/redescribe spellcraft skill.
--Reusing the existing id was easier than adding an entirely new one, but causes a conflict with magiclysm.
+-Reusing the existing id was easier than adding an entirely new one.
+-Currently an exact copy of the Magiclysm Spellcraft skill, so using both mods is fine.
+Redescribe the mutations copied from CRT.
 Redo the Warlock and Profane Conjurer spells and descriptions.
 Add a tile for when using blood coat and blood ascension.
 Get the arcana side of the mod working as well.
@@ -142,11 +144,12 @@ Add a recipe to use bloodrunes to gain access to spellcasting classes.
 Add spell to simulate combat feeding.
 -Find a way to drink blood in combat without spilling or requiring a container as part of it.
 Figure out why blood purge fails to cleanse fungal infection.
+-Only a problem in Bright Nights.
 -Appears to be hardcoded in some way.
 -Other antifungal effects don't remove it normally, instead they invoke iuse functions that do so.
 
 Rebalance blood more so it won't make you fat so quickly.
--Not a problem in Bright Nights
+-Not a problem in Bright Nights.
 Finish thrall/vamp dialogue trees.
 -Create a way to be embraced into a vampire.
 -Create a way to embrace others into vampires.