From 7e19e13ad67a1f8c55f337fb59365d087de32f1a Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 27 Jul 2021 09:44:05 -0700
Subject: Fix NPCs saying they are too unwell to give blood when they have
 actually refused.

---
 .../NPC/v_npc_responds/blood-drinking.json                  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'vamp_stuff/Modification_Files/NPC/v_npc_responds')

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 a45eadd..5bad09b 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
@@ -243,10 +243,10 @@
         },
         "trial": {
           "type": "CONDITION",
-          "condition": { "and": [ "npc_following" ] }
+          "condition": { "not": { "npc_has_effect": "vamp_refused_blood" } }
         },
         "success": { "topic": "TALK_BLOODDRINK_ALLY_REFUSE_LATER" },
-        "failure": { "topic": "TALK_BLOODDRINK_FRIENDLY_REFUSE_LATER" }
+        "failure": { "topic": "TALK_BLOODDRINK_ALLY_REFUSE_ASKLATER" }
       },
       {
         "text": "*Forcefully take blood*",
@@ -578,6 +578,15 @@
       { "text": "Another time then.", "topic": "TALK_DONE" }
     ]
   },
+  {
+    "id": [ "TALK_BLOODDRINK_ALLY_REFUSE_ASKLATER", "TALK_BLOODDRINK_FRIENDLY_REFUSE_ASKLATER" ],
+    "type": "talk_topic",
+    "dynamic_line": "No. Maybe another time I'll consider it.",
+    "note": "The human has recently refused to give blood and will refuse until more time has passed.",
+    "responses": [
+      { "text": "Another time then.", "topic": "TALK_DONE" }
+    ]
+  },
   {
     "id": [ "TALK_BLOODDRINK_BY_FORCE_VAMP" ],
     "type": "talk_topic",
-- 
cgit v1.2.1