summaryrefslogtreecommitdiff
path: root/vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-27 09:44:05 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-07-27 09:44:05 -0700
commit7e19e13ad67a1f8c55f337fb59365d087de32f1a (patch)
treef5f4867d6da32d830d9037ecad0e56be1f8c2ecd /vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json
parentFix human forced blood drinking appearing on mutants (diff)
downloadcataclysm-dda-mod_vampire-stuff-redone-7e19e13ad67a1f8c55f337fb59365d087de32f1a.tar.xz
Fix NPCs saying they are too unwell to give blood when they have actually refused.
Diffstat (limited to 'vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json')
-rw-r--r--vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json13
1 files changed, 11 insertions, 2 deletions
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*",
@@ -579,6 +579,15 @@
]
},
{
+ "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",
"dynamic_line": "You arrogant whelp! You think you can steal my blood! I shall kill you for your insolence!",