Add effect so NPCs remember for 48h they are unwilling to give blood

Remove some invalid dialogue conditions
Clean up dialogue arrays

1 files changed, 104 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 b582334..cfcd96e 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
@@ -80,7 +80,7 @@
       {
         "text": "Would you mind sharing some of your blood?",
         "note": "blood dolls willingly give blood if they are healthy, even if they have traits that would normally refuse.",
-        "condition": { "and": [ { "npc_has_trait": "VAMP_BLOODDOLL" } ] },
+        "condition": { "npc_has_trait": "VAMP_BLOODDOLL" },
         "trial": {
           "type": "CONDITION",
           "condition": {
@@ -110,14 +110,13 @@
         "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": { "npc_has_any_trait": [
-            "VAMP_BLOODDOLL",
-            "THRESH_VAMP",
-            "VAMP_GHOUL"
-            ] } },
-          { "not": "is_by_radio" },
-          { "not": "u_driving" },
-          { "not": "npc_driving" },
+          { "not":
+            { "npc_has_any_trait": [
+              "VAMP_BLOODDOLL",
+              "THRESH_VAMP",
+              "VAMP_GHOUL"
+            ] }
+          },
           { "npc_has_any_trait": [
             "BADTEMPER",
             "KILLER",
@@ -133,109 +132,118 @@
         "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"
-          ] } },
-          { "not": "is_by_radio" },
-          { "not": "u_driving" },
-          { "not": "npc_driving" },
+          { "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": { "npc_has_trait": "vamp_given_blood" } }
-          ],
-        "not": [
+          { "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", "level": "TIRED" },
-                { "npc_need": "fatigue", "level": "DEAD_TIRED" },
-                { "npc_need": "fatigue", "level": "EXHAUSTED" },
-                { "npc_has_effect": "vamp_given_blood" }
+              { "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" }
             ] }
-          ]
-        },
+          }
+        ] },
         "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 } }
+        "failure": {
+          "topic": "TALK_BLOODDRINK_ALLY_REFUSE",
+          "opinion": { "trust": -1, "anger": 1 },
+          "effect": { "npc_add_effect": "vamp_refused_blood", "duration": 172800, "intensity": 1 }
+        }
       },
       {
         "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": "is_by_radio" },
-          { "not": "u_driving" },
-          { "not": "npc_driving" },
+          { "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": { "npc_has_trait": "vamp_given_blood" } }
-        ],
-          "not": [
+          { "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", "level": "TIRED" },
                 { "npc_need": "fatigue", "level": "DEAD_TIRED" },
                 { "npc_need": "fatigue", "level": "EXHAUSTED" },
-                { "npc_has_effect": "vamp_given_blood" }
+                { "npc_has_effect": "vamp_given_blood" },
+                { "npc_has_effect": "vamp_refused_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 } }
+        "failure": {
+          "topic": "TALK_BLOODDRINK_FRIENDLY_REFUSE",
+          "opinion": { "trust": -1, "anger": 1 },
+          "effect": { "npc_add_effect": "vamp_refused_blood", "duration": 172800, "intensity": 1 }
+        }
       },
       {
         "text": "Would you mind sharing some of your blood?",
-        "note": "allied humans need to be convinced to give 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": "is_by_radio" },
-          { "not": "u_driving" },
-          { "not": "npc_driving" },
-          { "not": { "npc_has_any_trait": [
-            "BADTEMPER",
-            "KILLER",
-            "MOODSWINGS",
-            "SPIRITUAL",
-            "THRESH_LUPINE" ] } },
+          { "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": 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_given_blood" },
+            { "npc_has_effect": "vamp_refused_blood" }
           ] }
           ]
         },
         "trial": {
           "type": "CONDITION",
-          "condition": {
-            "and": [ "npc_following" ]
-          }
+          "condition": { "and": [ "npc_following" ] }
         },
         "success": { "topic": "TALK_BLOODDRINK_ALLY_REFUSE_LATER" },
         "failure": { "topic": "TALK_BLOODDRINK_FRIENDLY_REFUSE_LATER" }
@@ -243,10 +251,6 @@
       {
         "text": "*Forcefully take blood*",
         "note": "take blood by force. humans attack you afterwards. vampires avoid and just attack you.",
-        "condition": { "and": [
-          { "not": "is_by_radio" },
-          { "not": "u_driving" },
-          { "not": "npc_driving" } ] },
         "trial": {
           "type": "CONDITION",
           "condition": {
@@ -288,9 +292,7 @@
         "text": "*You drink of their blood until you are both sated*",
         "trial": {
           "type": "CONDITION",
-          "condition": {
-            "not": "npc_following"
-          }
+          "condition": { "not": "npc_following" }
         },
         "success": { "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE_JOIN_OFFER" },
         "failure": { "topic": "TALK_DONE" }
@@ -303,7 +305,11 @@
     "note": "Non-allied blood dolls desire to join any vampire that indulges their twisted pleasure.",
     "dynamic_line": "Dark one, would you accept me into your care? I will obey your commands and happily give my blood myself whenever I am able.",
         "responses": [
-          { "text": "Very well, you shall belong to me from now on.", "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE_JOIN_ACCEPT", "effect": "follow", "opinion": { "trust": 5, "value": 10 } },
+          { "text": "Very well, you shall belong to me from now on.",
+            "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE_JOIN_ACCEPT",
+            "effect": "follow",
+            "opinion": { "trust": 5, "value": 10 }
+          },
           { "text": "A tempting offer, but I must decline.", "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE_JOIN_REFUSE" }
     ]
   },
@@ -419,10 +425,7 @@
       { "text": "*You bite their neck, losing yourself to the hunger*",
         "trial": {
           "type": "CONDITION",
-          "condition": { "and": [
-            "npc_following"
-            ]
-          }
+          "condition": { "and": [ "npc_following" ] }
         },
         "success": { "topic": "TALK_BLOODDRINK_ALLY_ACCEPT_DIE" },
         "failure": { "topic": "TALK_BLOODDRINK_FRIENDLY_ACCEPT_DIE" }
@@ -449,11 +452,13 @@
     },
     "responses": [
       { "text": "*You drink of their blood until you are sated*",
-        "condition": { "not": { "npc_has_any_trait": [
-          "MASOCHIST",
-          "MASOCHIST_MED",
-          "CENOBITE"
-        ] } },
+        "condition": { "not":
+          { "npc_has_any_trait": [
+            "MASOCHIST",
+            "MASOCHIST_MED",
+            "CENOBITE"
+          ] }
+        },
         "topic": "TALK_DONE" },
       { "text": "*You drink of their blood until you are both sated*",
         "condition": { "npc_has_any_trait": [
@@ -504,10 +509,7 @@
       { "text": "*You drink of their blood until their heart stops*",
               "trial": {
           "type": "CONDITION",
-          "condition": { "and": [
-            "npc_following"
-            ]
-          }
+          "condition": { "and": [ "npc_following" ] }
         },
         "success": { "topic": "TALK_DONE", "effect": { "u_faction_rep": -75 } },
         "failure": { "topic": "TALK_DONE" }
@@ -542,15 +544,15 @@
         "text": "*Attempt to bite*",
         "trial": {
           "type": "CONDITION",
-          "condition": { "not": {
-            "npc_has_any_trait": [
+          "condition": { "not":
+            { "npc_has_any_trait": [
               "BADTEMPER",
               "KILLER",
               "MOODSWINGS",
               "SPIRITUAL",
               "THRESH_LUPINE"
-            ]
-          } }
+            ] }
+          }
         },
         "success": { "topic": "TALK_BLOODDRINK_BY_FORCE_ALLY_SUCCESS", "opinion": { "trust": -1, "anger": 1 } },
         "failure": { "topic": "TALK_BLOODDRINK_BY_FORCE_ALLY_FAILURE" }