diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-21 03:55:20 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-07-21 03:55:20 -0700 |
| commit | b48720a6e37712ee8d75d9b01bc9c37a6c4409ff (patch) | |
| tree | 372e3d82c5502d0123255a543a1add680f1fa63f | |
| parent | Typo (diff) | |
| download | cataclysm-bn-mod_vampire-stuff-redone-b48720a6e37712ee8d75d9b01bc9c37a6c4409ff.tar.xz | |
Fix multiple blood drink options occuring at the same time.
| -rw-r--r-- | vamp_stuff/Modification_Files/NPC/v_npc_responds/blood-drinking.json | 46 |
1 files changed, 33 insertions, 13 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 e164b72..a0fb198 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 @@ -150,7 +150,18 @@ "THRESH_LUPINE" ] } }, { "not": { "npc_has_trait": "vamp_given_blood" } } - ] }, + ], + "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_has_effect": "vamp_given_blood" } + ] } + ] + }, "trial": { "type": "PERSUADE", "difficulty": 15, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_BLOODDRINK_ALLY_ACCEPT" }, "failure": { "topic": "TALK_BLOODDRINK_ALLY_REFUSE" }, "opinion": { "trust": -1, "anger": 1 } @@ -176,7 +187,18 @@ "THRESH_LUPINE" ] } }, { "not": { "npc_has_trait": "vamp_given_blood" } } - ] }, + ], + "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_has_effect": "vamp_given_blood" } + ] } + ] + }, "trial": { "type": "PERSUADE", "difficulty": 20, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_BLOODDRINK_FRIENDLY_ACCEPT" }, "failure": { "topic": "TALK_BLOODDRINK_FRIENDLY_REFUSE" }, "opinion": { "trust": -1, "anger": 1 } @@ -198,17 +220,15 @@ "KILLER", "MOODSWINGS", "SPIRITUAL", - "THRESH_LUPINE" ] } } - ], - "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_has_effect": "vamp_given_blood" } - ] } + "THRESH_LUPINE" ] } }, + { "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" } + ] } ] }, "trial": { |