Fix a bunch of places I forgot to update the vampirism trait ID.

10 files changed, 48 insertions, 48 deletions

diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Isolated/v_lo_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Isolated/v_lo_responses.json
index 955640b..d947763 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Isolated/v_lo_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Isolated/v_lo_responses.json
@@ -21,7 +21,7 @@
     "id": "TALK_VAMP_LONELY",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "Greetings, vampire",
       "no": [ {
         "u_is_wearing": "blood_necklace",
@@ -74,12 +74,12 @@
     "dynamic_line": {
       "u_has_trait": "isolatedvampmark",
       "yes": [ {
-        "u_has_trait": "THRESH_VAMP",
+        "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "That marking... I see you've been helping our kindred with their troubles.",
         "no": "That marking... I see you've been helping my kindred with their troubles."
         } ],
       "no": [ {
-        "u_has_trait": "THRESH_VAMP",
+        "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Just like the others, you want me as a slave... I refuse, vampire.",
         "no": "Just like the others, you want me as a slave... I refuse, mortal."
         } ]
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ug_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ug_responses.json
index f98a3c2..e81d0ca 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ug_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ug_responses.json
@@ -6,7 +6,7 @@
       "u_is_wearing": "blood_necklace",
       "yes": "You look important.",
       "no": {
-        "u_has_trait": "THRESH_VAMP",
+        "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Vampire... You're up to something?",
         "no": "Mortal... You're up to something?"
       }
@@ -59,7 +59,7 @@
     "type": "talk_topic",
     "dynamic_line": "I know you know where you are. *grins*.",
     "responses": [
-      { "u_has_trait": "THRESH_VAMP",
+      { "u_has_trait": "THRESH_REAL_VAMP",
         "no": { "text": "Geez, don't show that to me.", "topic": "TALK_VAMP_UNDERGUARD1_teeth" },
         "yes": { "text": "Yeah I do. *grins back*", "topic": "TALK_VAMP_UNDERGUARD1_teeth" }
         },
@@ -71,7 +71,7 @@
     "id": "TALK_VAMP_UNDERGUARD1_flirt",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "no": "Shut up vampire, everyone likes me.",
       "yes": "Shut up mortal, everyone likes me."
     },
@@ -93,7 +93,7 @@
       "u_is_wearing": "blood_necklace",
       "yes": "Damn, you managed to wear that.",
       "no": {
-        "u_has_trait": "THRESH_VAMP",
+        "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Vampire, You look dazzled?",
         "no": "Mortal, You look dazzled?"
       }
@@ -157,7 +157,7 @@
     "id": "TALK_VAMP_UNDERGUARD2_cata",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "Scientific? So the humans made those things... Well, I can't blame you for that.",
       "no": "Scientific? So you humans made those things... Well, I can't blame you for that."},
     "responses": [ { "text": "You're right...", "topic": "TALK_VAMP_UNDERGUARD2" } ]
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ut_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ut_responses.json
index f2ef763..336efbf 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ut_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Underrefugee/v_ut_responses.json
@@ -22,7 +22,7 @@
     "dynamic_line": {
       "u_is_wearing": "blood_necklace",
       "yes": {
-        "u_has_trait": "THRESH_VAMP",
+        "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Do you need something, vampire?",
         "no": "Do you need something, mortal?"
       },
@@ -80,7 +80,7 @@
     "id": "TALK_VAMP_UNDERTRADER_artifact",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "Our master wants to help the last surviving humans by sharing our power with them. But he has made clear we are not giving these away, so they will need lots of valuables or cash to purchase our items.",
       "no": "Our master wants to help the last surviving humans by sharing our power with you all. But he has made clear we are not giving these away, so you will need lots of valuables or cash to purchase our items."
     },
@@ -90,7 +90,7 @@
     "id": "TALK_VAMP_UNDERTRADER_trading",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "I don't know. Our master said we have to accept any human valuables you have found in your travels.",
       "no": "I don't know. Our master said we have to accept any valuables you humans have found in your travels."
     },
@@ -114,7 +114,7 @@
     "id": "TALK_VAMP_UNDERTRADER_him",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "No. HE shall remain a mystery to you.",
       "no": "Nope. HE remains a mystery to all of your kind."
     },
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_vgs_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_vgs_responses.json
index 71306b1..02cf1c9 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_vgs_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_vgs_responses.json
@@ -2,7 +2,7 @@
   {
     "id": "TALK_VAMP_GUNSHOP_talkme",
     "type": "talk_topic",
-    "dynamic_line": { "u_has_trait": "THRESH_VAMP", "yes": "Vampire! Struggling with unlife?", "no": "Mortal! Struggling to live?" },
+    "dynamic_line": { "u_has_trait": "THRESH_REAL_VAMP", "yes": "Vampire! Struggling with unlife?", "no": "Mortal! Struggling to live?" },
     "responses": [ { "text": "Yes, and true.", "topic": "TALK_VAMP_GUNSHOP_maintalk" } ]
   },
   {
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg1_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg1_responses.json
index be52b40..f36188b 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg1_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg1_responses.json
@@ -2,7 +2,7 @@
 
   {
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": { "u_has_trait": "wsg1meet", "yes": "What is it, vampire?", "no": "You've come a long way, vampire." },
       "no": { "u_has_trait": "wsg1meet", "yes": "What is it, mortal?", "no": "You've come a long way, mortal." }
     },
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg2_responses.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg2_responses.json
index b717b7d..83ba629 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg2_responses.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/Wastelands_Outskirts/v_wg2_responses.json
@@ -98,7 +98,7 @@
     "id": "TALK_VAMP_WASTEGUARD2_whereisme",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_has_trait": "THRESH_VAMP",
+      "u_has_trait": "THRESH_REAL_VAMP",
       "yes": "You're at the wasteland outskirts, now move, vampire.",
       "no": "You're at the wasteland outskirts, now move, mortal."
     },
@@ -150,7 +150,7 @@
   {
     "id": "TALK_VAMP_WASTEGUARD2_seehimlol",
     "type": "talk_topic",
-    "dynamic_line": { "u_has_trait": "THRESH_VAMP",
+    "dynamic_line": { "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "That which will never happen to a neonate.",
         "no": "That which will never happen to a human." },
     "responses": [
@@ -218,7 +218,7 @@
   {
     "id": "TALK_VAMP_WASTEGUARD2_actshimlol",
     "type": "talk_topic",
-    "dynamic_line": { "u_has_trait": "THRESH_VAMP",
+    "dynamic_line": { "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Trust me, vampire, HIS movements are for the good cause",
         "no": "Trust me, human, HIS movements are for the good cause." },
     "responses": [
@@ -253,7 +253,7 @@
   {
     "id": "TALK_VAMP_WASTEGUARD2_secrethim",
     "type": "talk_topic",
-    "dynamic_line": { "u_has_trait": "THRESH_VAMP",
+    "dynamic_line": { "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Don't worry, vampire. Eventually, you'll meet someone to quench your thirst for deeper answers.",
         "no": "Don't worry, mortal. Eventually, you'll meet someone to quench your thirst for deeper answers." },
     "responses": [
@@ -302,7 +302,7 @@
   {
     "id": "TALK_VAMP_WASTEGUARD2_drunk",
     "type": "talk_topic",
-    "dynamic_line": { "u_has_trait": "THRESH_VAMP",
+    "dynamic_line": { "u_has_trait": "THRESH_REAL_VAMP",
         "yes": "Blood, of course! We drink blood from the cows as our substitute to humans. Don't drink from the refugees here, we are under orders to protect them.",
         "no": "Blood, of course! We drink blood from the cows as our substitute to humans. Don't worry about the refugees here, we are under orders to protect them." },
     "responses": [
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json
index 18062c7..9a4cc30 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json
@@ -7,8 +7,8 @@
       {
         "text": "*Consider drinking their blood*",
         "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": "is_by_radio" },
           { "not": "u_driving" },
           { "not": "npc_driving" }
@@ -25,8 +25,8 @@
       {
         "text": "*Consider drinking their blood*",
         "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": "is_by_radio" },
           { "not": "u_driving" },
           { "not": "npc_driving" }
@@ -43,7 +43,7 @@
       {
         "text": "No, these are my feeding grounds!",
         "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
           { "not": "is_by_radio" },
           { "not": "u_driving" },
           { "not": "npc_driving" }
@@ -62,7 +62,7 @@
       {
         "text": "No, these are my feeding grounds!",
        "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
           { "not": "is_by_radio" },
           { "not": "u_driving" },
           { "not": "npc_driving" }
@@ -100,7 +100,7 @@
       {
         "text": "Would you mind sharing some of your blood?",
         "//": "vampires will refuse and possibly attack you for merely being asked to give blood.",
-        "condition": { "npc_has_trait": "THRESH_VAMP" },
+        "condition": { "npc_has_trait": "THRESH_REAL_VAMP" },
         "trial": { "type": "PERSUADE", "difficulty": 15, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] },
         "success": { "topic": "TALK_BLOODDRINK_VAMPIRE_REFUSE", "opinion": { "trust": -2, "anger": 2 } },
         "failure": { "topic": "TALK_BLOODDRINK_VAMPIRE_ATTACK" }
@@ -113,7 +113,7 @@
             { "not":
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL",
                 "VAMP_BLOODDRINK_REFUSED"
               ] }
@@ -143,7 +143,7 @@
             { "not":
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -183,7 +183,7 @@
             { "not":
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -224,7 +224,7 @@
             { "not":
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -256,14 +256,14 @@
       {
         "text": "*Forcefully take blood*",
         "//": "Take blood by force. Vampires.",
-        "condition": { "npc_has_trait": "THRESH_VAMP" },
+        "condition": { "npc_has_trait": "THRESH_REAL_VAMP" },
         "topic": "TALK_BLOODDRINK_BY_FORCE_VAMP"
       },
       {
         "text": "*Forcefully take blood*",
         "//": "Take blood by force. Mutants with traits that make biting them a bad idea. Cut/Stab Armour 5 or higher, acid, spines, but not poison.",
         "condition": { "and": [
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "npc_has_any_trait": [
             "THICK_SCALES",
             "CHITIN",
@@ -288,7 +288,7 @@
         "text": "*Forcefully take blood*",
         "//": "Take blood by force. Humans.",
         "condition": { "and": [
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_any_trait": [
             "THICK_SCALES",
             "CHITIN",
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json
index a09e352..75de780 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json
@@ -7,8 +7,8 @@
       {
         "text": "*Consider making your follower into a vampire*.",
         "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
           { "not": "is_by_radio" },
diff --git a/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json b/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json
index a129c2c..3053572 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json
@@ -7,8 +7,8 @@
       {
         "text": "*Consider making your follower into a ghoul*",
         "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
           { "not": "is_by_radio" },
@@ -27,7 +27,7 @@
       {
         "text": "*Consider making the stranger into a ghoul*",
         "condition": { "and": [
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
           { "not": "is_by_radio" },
@@ -53,7 +53,7 @@
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
                 "VAMP_GHOUL_REFUSED",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -83,7 +83,7 @@
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
                 "VAMP_GHOUL_REFUSED",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -115,7 +115,7 @@
               { "npc_has_any_trait": [
                 "VAMP_BLOODDOLL",
                 "VAMP_GHOUL_REFUSED",
-                "THRESH_VAMP",
+                "THRESH_REAL_VAMP",
                 "VAMP_GHOUL"
               ] }
             },
@@ -143,7 +143,7 @@
         "text": "*Forcefully make ghoul*",
         "//": "Make ghoul by force. Humans.",
         "condition": { "and": [
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } }
         ] },
@@ -270,8 +270,8 @@
       {
         "text": "We'll see who is giving orders after I enslave you!",
        "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
           { "not": "is_by_radio" },
@@ -292,8 +292,8 @@
       {
         "text": "We'll see who is giving orders after I enslave you!",
        "condition": { "and": [
-          { "u_has_trait": "THRESH_VAMP" },
-          { "not": { "npc_has_trait": "THRESH_VAMP" } },
+          { "u_has_trait": "THRESH_REAL_VAMP" },
+          { "not": { "npc_has_trait": "THRESH_REAL_VAMP" } },
           { "not": { "npc_has_trait": "VAMP_GHOUL" } },
           { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
           { "not": "is_by_radio" },
diff --git a/vamp_stuff/Modification_Files/Spells/v_spell_fields.json b/vamp_stuff/Modification_Files/Spells/v_spell_fields.json
index bf4139e..4f26ef3 100644
--- a/vamp_stuff/Modification_Files/Spells/v_spell_fields.json
+++ b/vamp_stuff/Modification_Files/Spells/v_spell_fields.json
@@ -59,7 +59,7 @@
     "underwater_age_speedup": "2 minutes",
     "decay_amount_factor": 3,
     "is_splattering": true,
-    "immunity_data": { "traits": [ "THRESH_VAMP" ] },
+    "immunity_data": { "traits": [ "THRESH_REAL_VAMP" ] },
     "half_life": "20 minutes",
     "phase": "liquid",
     "accelerated_decay": true,
@@ -87,7 +87,7 @@
     ],
     "priority": 1,
     "decay_amount_factor": 25,
-    "immunity_data": { "traits": [ "THRESH_VAMP" ] },
+    "immunity_data": { "traits": [ "THRESH_REAL_VAMP" ] },
     "half_life": "2 seconds",
     "phase": "gas",
     "accelerated_decay": true,