summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json2
-rw-r--r--vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json10
2 files changed, 11 insertions, 1 deletions
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 0a01509..9fe12ae 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json
@@ -9,6 +9,8 @@
"condition": { "and": [
{ "u_has_trait": "THRESH_VAMP" },
{ "not": { "npc_has_trait": "THRESH_VAMP" } },
+ { "not": { "npc_has_trait": "VAMP_GHOUL" } },
+ { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
{ "not": "is_by_radio" },
{ "not": "u_driving" },
{ "not": "npc_driving" }
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 ef9a865..d633f72 100644
--- a/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json
+++ b/vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json
@@ -9,6 +9,8 @@
"condition": { "and": [
{ "u_has_trait": "THRESH_VAMP" },
{ "not": { "npc_has_trait": "THRESH_VAMP" } },
+ { "not": { "npc_has_trait": "VAMP_GHOUL" } },
+ { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
{ "not": "is_by_radio" },
{ "not": "u_driving" },
{ "not": "npc_driving" }
@@ -25,7 +27,9 @@
{
"text": "*Consider making the stranger into a ghoul*.",
"condition": { "and": [
- { "u_has_trait": "THRESH_VAMP" },
+ { "not": { "npc_has_trait": "THRESH_VAMP" } },
+ { "not": { "npc_has_trait": "VAMP_GHOUL" } },
+ { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
{ "not": "is_by_radio" },
{ "not": "u_driving" },
{ "not": "npc_driving" }
@@ -44,6 +48,8 @@
"condition": { "and": [
{ "u_has_trait": "THRESH_VAMP" },
{ "not": { "npc_has_trait": "THRESH_VAMP" } },
+ { "not": { "npc_has_trait": "VAMP_GHOUL" } },
+ { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
{ "not": "is_by_radio" },
{ "not": "u_driving" },
{ "not": "npc_driving" }
@@ -69,6 +75,8 @@
"condition": { "and": [
{ "u_has_trait": "THRESH_VAMP" },
{ "not": { "npc_has_trait": "THRESH_VAMP" } },
+ { "not": { "npc_has_trait": "VAMP_GHOUL" } },
+ { "not": { "npc_has_trait": "VAMP_BLOODDOLL" } },
{ "not": "is_by_radio" },
{ "not": "u_driving" },
{ "not": "npc_driving" }