From d1595673c9d3668df57b617222680e0e35963d90 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sun, 25 Jul 2021 11:44:41 -0700 Subject: Fix blood drinking for reals this time -Use raw fatigue value -Debugged correct hunger, thirst, and fatigue value thresholds --- .../NPC/v_npc_responds/blood-drinking.json | 205 +++++++++++---------- 1 file changed, 103 insertions(+), 102 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 a360a44..24e6578 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 @@ -86,13 +86,12 @@ "condition": { "not": { "or": [ - { "npc_need": "thirst", "amount": 80 }, - { "npc_need": "hunger", "amount": 160 }, - { "npc_need": "fatigue", "level": "TIRED" }, - { "npc_need": "fatigue", "level": "DEAD_TIRED" }, - { "npc_need": "fatigue", "level": "EXHAUSTED" }, + { "npc_need": "thirst", "amount": 125 }, + { "npc_need": "hunger", "amount": 150 }, + { "npc_need": "fatigue", "amount": 200 }, { "npc_has_effect": "vamp_given_blood" } - ] } + ] + } } }, "success": { "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT" }, @@ -109,21 +108,24 @@ { "text": "Would you mind sharing some of your blood?", "note": "humans with vampire hostile traits will refuse and possibly attack you for merely being asked to give blood.", - "condition": { "and": [ - { "not": + "condition": { + "and": [ + { "not": + { "npc_has_any_trait": [ + "VAMP_BLOODDOLL", + "THRESH_VAMP", + "VAMP_GHOUL" + ] } + }, { "npc_has_any_trait": [ - "VAMP_BLOODDOLL", - "THRESH_VAMP", - "VAMP_GHOUL" + "BADTEMPER", + "KILLER", + "MOODSWINGS", + "SPIRITUAL", + "THRESH_LUPINE" ] } - }, - { "npc_has_any_trait": [ - "BADTEMPER", - "KILLER", - "MOODSWINGS", - "SPIRITUAL", - "THRESH_LUPINE" ] } - ] }, + ] + }, "trial": { "type": "PERSUADE", "difficulty": 15, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_BLOODDRINK_BADTRAIT_REFUSE", "opinion": { "trust": -1, "anger": 1 } }, "failure": { "topic": "TALK_BLOODDRINK_BADTRAIT_ATTACK" } @@ -131,35 +133,35 @@ { "text": "Would you mind sharing some of your blood?", "note": "allied humans need to be convinced to give blood.", - "condition": { "and": [ - { "not": - { "npc_has_any_trait": [ - "VAMP_BLOODDOLL", - "THRESH_VAMP", - "VAMP_GHOUL" - ] } - }, - "npc_following", - { "not": - { "npc_has_any_trait": [ - "BADTEMPER", - "KILLER", - "MOODSWINGS", - "SPIRITUAL", - "THRESH_LUPINE" - ] } - } - ], - "not": - { "or": [ - { "npc_need": "thirst", "amount": 80 }, - { "npc_need": "hunger", "amount": 160 }, - { "npc_need": "fatigue", "amount": "TIRED" }, - { "npc_need": "fatigue", "amount": "DEAD_TIRED" }, - { "npc_need": "fatigue", "amount": "EXHAUSTED" }, - { "npc_has_effect": "vamp_given_blood" }, - { "npc_has_effect": "vamp_refused_blood" } - ] } + "condition": { + "and": [ + { "not": + { "npc_has_any_trait": [ + "VAMP_BLOODDOLL", + "THRESH_VAMP", + "VAMP_GHOUL" + ] } + }, + { "not": + { "npc_has_any_trait": [ + "BADTEMPER", + "KILLER", + "MOODSWINGS", + "SPIRITUAL", + "THRESH_LUPINE" + ] } + }, + "npc_following", + { "not": + { "or": [ + { "npc_need": "thirst", "amount": 125 }, + { "npc_need": "hunger", "amount": 150 }, + { "npc_need": "fatigue", "amount": 200 }, + { "npc_has_effect": "vamp_given_blood" }, + { "npc_has_effect": "vamp_refused_blood" } + ] } + } + ] }, "trial": { "type": "PERSUADE", "difficulty": 15, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_BLOODDRINK_ALLY_ACCEPT" }, @@ -172,35 +174,35 @@ { "text": "Would you mind sharing some of your blood?", "note": "non-allied humans need to be convinced to give blood.", - "condition": { "and": [ - { "not": - { "npc_has_any_trait": [ - "VAMP_BLOODDOLL", - "THRESH_VAMP", - "VAMP_GHOUL" - ] } - }, - { "not": "npc_following" }, - { "not": - { "npc_has_any_trait": [ - "BADTEMPER", - "KILLER", - "MOODSWINGS", - "SPIRITUAL", - "THRESH_LUPINE" - ] } - } - ], - "not": - { "or": [ - { "npc_need": "thirst", "amount": 80 }, - { "npc_need": "hunger", "amount": 160 }, - { "npc_need": "fatigue", "amount": "TIRED" }, - { "npc_need": "fatigue", "amount": "DEAD_TIRED" }, - { "npc_need": "fatigue", "amount": "EXHAUSTED" }, - { "npc_has_effect": "vamp_given_blood" }, - { "npc_has_effect": "vamp_refused_blood" } - ] } + "condition": { + "and": [ + { "not": + { "npc_has_any_trait": [ + "VAMP_BLOODDOLL", + "THRESH_VAMP", + "VAMP_GHOUL" + ] } + }, + { "not": + { "npc_has_any_trait": [ + "BADTEMPER", + "KILLER", + "MOODSWINGS", + "SPIRITUAL", + "THRESH_LUPINE" + ] } + }, + { "not": + { "or": [ + { "npc_need": "thirst", "amount": 125 }, + { "npc_need": "hunger", "amount": 150 }, + { "npc_need": "fatigue", "amount": 200 }, + { "npc_has_effect": "vamp_given_blood" }, + { "npc_has_effect": "vamp_refused_blood" } + ] } + }, + { "not": "npc_following" } + ] }, "trial": { "type": "PERSUADE", "difficulty": 20, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_BLOODDRINK_FRIENDLY_ACCEPT" }, @@ -213,32 +215,31 @@ { "text": "Would you mind sharing some of your blood?", "note": "humans aren't willing to give blood when they are not healthy enough.", - "condition": { "and": [ - { "not": - { "npc_has_any_trait": [ - "VAMP_BLOODDOLL", - "THRESH_VAMP", - "VAMP_GHOUL" - ] } - }, - { "not": - { "npc_has_any_trait": [ - "BADTEMPER", - "KILLER", - "MOODSWINGS", - "SPIRITUAL", - "THRESH_LUPINE" + "condition": { + "and": [ + { "not": + { "npc_has_any_trait": [ + "VAMP_BLOODDOLL", + "THRESH_VAMP", + "VAMP_GHOUL" + ] } + }, + { "not": + { "npc_has_any_trait": [ + "BADTEMPER", + "KILLER", + "MOODSWINGS", + "SPIRITUAL", + "THRESH_LUPINE" + ] } + }, + { "or": [ + { "npc_need": "thirst", "amount": 125 }, + { "npc_need": "hunger", "amount": 150 }, + { "npc_need": "fatigue", "amount": 200 }, + { "npc_has_effect": "vamp_given_blood" }, + { "npc_has_effect": "vamp_refused_blood" } ] } - }, - { "or": [ - { "npc_need": "thirst", "amount": 80 }, - { "npc_need": "hunger", "amount": 160 }, - { "npc_need": "fatigue", "level": "TIRED" }, - { "npc_need": "fatigue", "level": "DEAD_TIRED" }, - { "npc_need": "fatigue", "level": "EXHAUSTED" }, - { "npc_has_effect": "vamp_given_blood" }, - { "npc_has_effect": "vamp_refused_blood" } - ] } ] }, "trial": { -- cgit v1.2.1