Port back a number of fixes and cleanups from my attempt to port the mod to DDA.

1 files changed, 38 insertions, 38 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 a67eb45..0e01110 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
@@ -1,7 +1,7 @@
 [
   {
     "id": [ "TALK_FRIEND", "TALK_GIVE_ITEM", "TALK_USE_ITEM", "TALK_RADIO" ],
-    "note": "Check if the player is a vampire, not busy, and in person with a follower.",
+    "//": "Check if the player is a vampire, not busy, and in person with a follower.",
     "type": "talk_topic",
     "responses": [
       {
@@ -19,7 +19,7 @@
   },
   {
     "id": [ "TALK_STRANGER_FRIENDLY", "TALK_STRANGER_NEUTRAL" ],
-    "note": "Check if the player is a vampire, not busy, and in person with a friendly or neutral npc.",
+    "//": "Check if the player is a vampire, not busy, and in person with a friendly or neutral npc.",
     "type": "talk_topic",
     "responses": [
       {
@@ -37,7 +37,7 @@
   },
   {
     "id": [ "TALK_STRANGER_WARY", "TALK_STRANGER_SCARED" ],
-    "note": "Check if the player is a vampire, not busy, and in person with a wary or scared npc.",
+    "//": "Check if the player is a vampire, not busy, and in person with a wary or scared npc.",
     "type": "talk_topic",
     "responses": [
       {
@@ -56,7 +56,7 @@
   },
   {
     "id": [ "TALK_STRANGER_AGGRESSIVE" ],
-    "note": "Check if the player is a vampire, not busy, and in person with a near-hostile npc.",
+    "//": "Check if the player is a vampire, not busy, and in person with a near-hostile npc.",
     "type": "talk_topic",
     "responses": [
       {
@@ -75,11 +75,11 @@
     "id": [ "TALK_BLOODDRINK_MENU_ALLY", "TALK_BLOODDRINK_MENU_FRIENDLY" ],
     "type": "talk_topic",
     "dynamic_line": "What is it?",
-    "note": "The mutually-exclusive trait queries look identical on purpose for role-playing reasons.",
+    "//": "The mutually-exclusive trait queries look identical on purpose for role-playing reasons.",
     "responses": [
       {
         "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.",
+        "//": "blood dolls willingly give blood if they are healthy, even if they have traits that would normally refuse.",
         "condition": { "npc_has_trait": "VAMP_BLOODDOLL" },
         "trial": {
           "type": "CONDITION",
@@ -99,7 +99,7 @@
       },
       {
         "text": "Would you mind sharing some of your blood?",
-        "note": "vampires will refuse and possibly attack you for merely being asked to give blood.",
+        "//": "vampires will refuse and possibly attack you for merely being asked to give blood.",
         "condition": { "npc_has_trait": "THRESH_VAMP" },
         "trial": { "type": "PERSUADE", "difficulty": 15, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] },
         "success": { "topic": "TALK_BLOODDRINK_VAMPIRE_REFUSE", "opinion": { "trust": -2, "anger": 2 } },
@@ -107,7 +107,7 @@
       },
       {
         "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.",
+        "//": "humans with vampire hostile traits will refuse and possibly attack you for merely being asked to give blood.",
         "condition": {
           "and": [
             { "not":
@@ -137,7 +137,7 @@
       },
       {
         "text": "Would you mind sharing some of your blood?",
-        "note": "allied humans need to be convinced to give blood.",
+        "//": "allied humans need to be convinced to give blood.",
         "condition": {
           "and": [
             { "not":
@@ -177,7 +177,7 @@
       },
       {
         "text": "Would you mind sharing some of your blood?",
-        "note": "non-allied humans need to be convinced to give blood.",
+        "//": "non-allied humans need to be convinced to give blood.",
         "condition": {
           "and": [
             { "not":
@@ -218,7 +218,7 @@
       },
       {
         "text": "Would you mind sharing some of your blood?",
-        "note": "humans aren't willing to give blood when they are not healthy enough.",
+        "//": "humans aren't willing to give blood when they are not healthy enough.",
         "condition": {
           "and": [
             { "not":
@@ -255,13 +255,13 @@
       },
       {
         "text": "*Forcefully take blood*",
-        "note": "Take blood by force. Vampires.",
+        "//": "Take blood by force. Vampires.",
         "condition": { "npc_has_trait": "THRESH_VAMP" },
         "topic": "TALK_BLOODDRINK_BY_FORCE_VAMP"
       },
       {
         "text": "*Forcefully take blood*",
-        "note": "Take blood by force. Mutants with traits that make biting them a bad idea. Cut/Stab Armour 5 or higher, acid, spines, but not poison.",
+        "//": "Take blood by force. Mutants with traits that make biting them a bad idea. Cut/Stab Armour 5 or higher, acid, spines, but not poison.",
         "condition": { "and": [
           { "not": { "npc_has_trait": "THRESH_VAMP" } },
           { "npc_has_any_trait": [
@@ -286,7 +286,7 @@
       },
       {
         "text": "*Forcefully take blood*",
-        "note": "Take blood by force. Humans.",
+        "//": "Take blood by force. Humans.",
         "condition": { "and": [
           { "not": { "npc_has_trait": "THRESH_VAMP" } },
           { "not": { "npc_has_any_trait": [
@@ -317,7 +317,7 @@
     "id": [ "TALK_BLOODDRINK_BLOODDOLL_ACCEPT" ],
     "type": "talk_topic",
     "dynamic_line": "I would love to. Mmmm~",
-    "note": "A blood doll is happy to provide blood. Recover hunger and thirst and heal damage. blood doll takes damage or dies.",
+    "//": "A blood doll is happy to provide blood. Recover hunger and thirst and heal damage. blood doll takes damage and gain morale or dies.",
     "responses": [
       { "text": "*You bite their neck, careful not to cause permanent damage*", "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE" },
       { "text": "*You bite their neck, losing yourself to the hunger*", "topic": "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_DIE" }
@@ -351,7 +351,7 @@
   {
     "id": [ "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_LIVE_JOIN_OFFER" ],
     "type": "talk_topic",
-    "note": "Non-allied blood dolls desire to join any vampire that indulges their twisted pleasure.",
+    "//": "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.",
@@ -382,7 +382,7 @@
     "id": [ "TALK_BLOODDRINK_BLOODDOLL_ACCEPT_DIE" ],
     "type": "talk_topic",
     "dynamic_line": "Ah...Ahn♪ Oh Mistress, that feels so...good...st-stop, you're h-hurting...m...",
-    "note": "The npc dies, and player should receive a large morale and player faction reputation nerf for murdering a follower.",
+    "//": "The npc dies, and player should receive a large morale and player faction reputation nerf for murdering a follower.",
     "speaker_effect": {
       "effect": [
         { "u_buy_item": "blood", "count": 2, "container": "bag_iv" },
@@ -406,7 +406,7 @@
     "id": [ "TALK_BLOODDRINK_BLOODDOLL_REFUSE" ],
     "type": "talk_topic",
     "dynamic_line": "I long for your kiss but I am too weary right now.",
-    "note": "a blood doll will refuse to give blood if they are not healthy enough.",
+    "//": "a blood doll will refuse to give blood if they are not healthy enough.",
     "responses": [
       { "text": "Another time then.", "topic": "TALK_NONE" }
     ]
@@ -415,7 +415,7 @@
     "id": [ "TALK_BLOODDRINK_VAMPIRE_REFUSE" ],
     "type": "talk_topic",
     "dynamic_line": "I am not some kine you can feed on! I have half a mind to show you the seriousness of your mistake.",
-    "note": "The vampire is very annoyed. You can grovel for a reduced reputation hit if they are your sire.",
+    "//": "The vampire is very annoyed. You can grovel for a reduced reputation hit if they are your sire.",
     "responses": [
       {
         "text": "I'm sorry Sire! I shouldn't have asked!",
@@ -431,7 +431,7 @@
     "id": [ "TALK_BLOODDRINK_VAMPIRE_ATTACK" ],
     "type": "talk_topic",
     "dynamic_line": "You arrogant whelp! You think you can drink my blood! I shall kill you for your insolence!",
-    "note": "The vampire is very angry. You can grovel for your life if they are your sire.",
+    "//": "The vampire is very angry. You can grovel for your life if they are your sire.",
     "responses": [
       {
         "text": "I'm sorry Sire! I shouldn't have asked!",
@@ -450,7 +450,7 @@
     "id": [ "TALK_BLOODDRINK_BADTRAIT_REFUSE" ],
     "type": "talk_topic",
     "dynamic_line": "Not a chance, vampire.",
-    "note": "The human is very annoyed.",
+    "//": "The human is very annoyed.",
     "responses": [
       { "text": "I shouldn't have asked...", "topic": "TALK_DONE" }
     ]
@@ -459,7 +459,7 @@
     "id": [ "TALK_BLOODDRINK_BADTRAIT_ATTACK" ],
     "type": "talk_topic",
     "dynamic_line": "I'll never let some monster have my blood. I'll kill you, vampire!",
-    "note": "The human is very angry.",
+    "//": "The human is very angry.",
     "responses": [
       { "text": "Not if I kill you first!", "topic": "TALK_DONE", "effect": "hostile" }
     ]
@@ -468,7 +468,7 @@
     "id": [ "TALK_BLOODDRINK_ALLY_ACCEPT", "TALK_BLOODDRINK_FRIENDLY_ACCEPT" ],
     "type": "talk_topic",
     "dynamic_line": "Hmmm, alright. Just make certain to only take a little.",
-    "note": "a human was convinced to provide blood. Recover hunger and thirst and heal damage. human takes damage or dies.",
+    "//": "a human was convinced to provide blood. Recover hunger and thirst and heal damage. human takes damage or dies.",
     "responses": [
       { "text": "*You bite their neck, careful not to cause permanent damage*", "topic": "TALK_BLOODDRINK_ALLY_ACCEPT_LIVE" },
       { "text": "*You bite their neck, losing yourself to the hunger*",
@@ -538,7 +538,7 @@
         "no": "Ah..Nnnng...st-stop, you're h-hurting...m...",
         "yes": "Ah...Ahn♪ Oh that feels so...good...st-stop, you're h-hurting...m..."
     },
-    "note": "The npc dies, and player should receive a large morale nerf for murdering a follower/friend. And a large player faction reputation nerf for murdering a follower.",
+    "//": "The npc dies, and player should receive a large morale nerf for murdering a follower/friend. And a large player faction reputation nerf for murdering a follower.",
     "speaker_effect": {
       "effect": [
         { "u_buy_item": "blood", "count": 2, "container": "bag_iv" },
@@ -569,7 +569,7 @@
     "id": [ "TALK_BLOODDRINK_ALLY_REFUSE", "TALK_BLOODDRINK_FRIENDLY_REFUSE" ],
     "type": "talk_topic",
     "dynamic_line": "I'd rather not.",
-    "note": "The human is unwilling.",
+    "//": "The human is unwilling.",
     "responses": [
       { "text": "Nevermind.", "topic": "TALK_DONE" }
     ]
@@ -578,7 +578,7 @@
     "id": [ "TALK_BLOODDRINK_ALLY_REFUSE_LATER", "TALK_BLOODDRINK_FRIENDLY_REFUSE_LATER" ],
     "type": "talk_topic",
     "dynamic_line": "I'm not feeling well enough to consider giving blood right now.",
-    "note": "The human has recently given blood and will refuse to give more until recovered.",
+    "//": "The human has recently given blood and will refuse to give more until recovered.",
     "responses": [
       { "text": "Another time then.", "topic": "TALK_DONE" }
     ]
@@ -587,7 +587,7 @@
     "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.",
+    "//": "The human has recently refused to give blood and will refuse until more time has passed.",
     "responses": [
       { "text": "Another time then.", "topic": "TALK_DONE" }
     ]
@@ -596,7 +596,7 @@
     "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!",
-    "note": "The vampire is very angry. You might be able to grovel if they are your sire.",
+    "//": "The vampire is very angry. You might be able to grovel if they are your sire.",
     "responses": [
       {
         "text": "I'm sorry Sire!  I shouldn't have tried that!",
@@ -623,7 +623,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_VAMP_GROVEL" ],
     "type": "talk_topic",
     "dynamic_line": "I'll give you this one chance, my ungrateful progeny. Next time I won't be so forgiving!",
-    "note": "The sire has decided to forgive you. This one time.",
+    "//": "The sire has decided to forgive you. This one time.",
     "speaker_effect": {
       "effect": [
         { "npc_add_trait": "VAMP_SIRE_FORGIVEN" }
@@ -637,7 +637,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_VAMP_GROVEL_TWICE" ],
     "type": "talk_topic",
     "dynamic_line": "You had your chance! Now you will die!",
-    "note": "This was your second chance.",
+    "//": "This was your second chance.",
     "responses": [
       { "text": "Not if I kill you first!", "topic": "TALK_DONE", "effect": "hostile" }
     ]
@@ -646,7 +646,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_MUTANT" ],
     "type": "talk_topic",
     "dynamic_line": "Wh-what are you...",
-    "note": "You caught your mutant companion off-guard. The vampire will get a nasty surprise for biting a mutant with biological defences. They might be able to avoid you if strong, fast, or hard to grab.",
+    "//": "You caught your mutant companion off-guard. The vampire will get a nasty surprise for biting a mutant with biological defences. They might be able to avoid you if strong, fast, or hard to grab.",
     "responses": [
       {
         "text": "*Attempt to bite*",
@@ -675,7 +675,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_MUTANT_SUCCESS" ],
     "type": "talk_topic",
     "dynamic_line": "Got more with that bite than you bargained for, eh vampire? I won't let you live to try a second time!",
-    "note": "The mutant npc repels the player with natural defences. The player should receive an injury, plus a large morale and player faction reputation nerf for attempting to murder a follower. Yes even if they were a xeno.",
+    "//": "The mutant npc repels the player with natural defences. The player should receive an injury, plus a large morale and player faction reputation nerf for attempting to murder a follower. Yes even if they were a xeno.",
     "responses": [
       { "text": "Dammit, then I'll kill you the old fashioned way!", "topic": "TALK_DONE", "effect": [ "hostile", { "u_faction_rep": -50 } ] }
     ]
@@ -684,7 +684,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_MUTANT_FAILURE" ],
     "type": "talk_topic",
     "dynamic_line": "Oh no you don't! I'll never let some monster have my blood. I'll kill you, vampire!",
-    "note": "The player should receive a large morale and player faction reputation nerf for attempting to murder a follower. Yes even if they were a xeno.",
+    "//": "The player should receive a large morale and player faction reputation nerf for attempting to murder a follower. Yes even if they were a xeno.",
     "responses": [
       { "text": "Not if I kill you first!", "topic": "TALK_DONE", "effect": [ "hostile", { "u_faction_rep": -50 } ] }
     ]
@@ -693,7 +693,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_HUMAN" ],
     "type": "talk_topic",
     "dynamic_line": "Wh-what are you...",
-    "note": "You caught your human companion off-guard. Attempt to drink them dry, though they might be able to avoid you if strong, fast, or hard to grab.",
+    "//": "You caught your human companion off-guard. Attempt to drink them dry, though they might be able to avoid you if strong, fast, or hard to grab.",
     "responses": [
       {
         "text": "*Attempt to bite*",
@@ -730,7 +730,7 @@
         "no": "Ah..Nnnng...st-stop, you're h-hurting...m...",
         "yes": "Ah...Ahn♪ Oh that feels so...good...st-stop, you're h-hurting...m..."
     },
-    "note": "The npc dies, and player should receive a large morale and player faction reputation nerf for murdering a follower.",
+    "//": "The npc dies, and player should receive a large morale and player faction reputation nerf for murdering a follower.",
     "speaker_effect": {
       "effect": [
         { "u_buy_item": "blood", "count": 2, "container": "bag_iv" },
@@ -754,7 +754,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_HUMAN_FAILURE" ],
     "type": "talk_topic",
     "dynamic_line": "Oh no you don't! I'll never let some monster have my blood. I'll kill you, vampire!",
-    "note": "The player should receive a large morale and player faction reputation nerf for attempting to murder a follower.",
+    "//": "The player should receive a large morale and player faction reputation nerf for attempting to murder a follower.",
     "responses": [
       { "text": "Not if I kill you first!", "topic": "TALK_DONE", "effect": [ "hostile", { "u_faction_rep": -50 } ] }
     ]
@@ -763,7 +763,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_FRIENDLY_1" ],
     "type": "talk_topic",
     "dynamic_line": "Wh-what are you...",
-    "note": "You caught the human off-guard. Drink them dry, though they might be able to avoid you if strong or fast.",
+    "//": "You caught the human off-guard. Drink them dry, though they might be able to avoid you if strong or fast.",
     "responses": [
       {
         "text": "*Attempt to bite*",
@@ -779,7 +779,7 @@
     "id": [ "TALK_BLOODDRINK_BY_FORCE_FRIENDLY_2" ],
     "type": "talk_topic",
     "dynamic_line": "Wh-what are you...",
-    "note": "You caught the human off-guard. Drink them dry, though they might be able to avoid you if strong or fast.",
+    "//": "You caught the human off-guard. Drink them dry, though they might be able to avoid you if strong or fast.",
     "responses": [
       {
         "text": "*Attempt to bite*",