From 82616ca226a293b81725cadd2be343af12dae777 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 6 Sep 2021 12:53:56 -0700
Subject: Prevent embracing or ghouling existing ghouls and blooddolls

---
 vamp_stuff/Modification_Files/NPC/v_npc_responds/embrace.json |  2 ++
 vamp_stuff/Modification_Files/NPC/v_npc_responds/ghoul.json   | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'vamp_stuff/Modification_Files')

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" }
-- 
cgit v1.2.1