Replace snippets p6

data/json/npcs/common_chat/TALK_COMMON_ALLY.json

@@ -60,7 +60,7 @@
         "topic": "TALK_ALLY_DEBUG"
       },
       { "text": "I'm going to go my own way for a while.", "topic": "TALK_LEAVE" },
-      { "text": "Let's go.", "topic": "TALK_DONE" }
+      { "text": "<lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -117,7 +117,7 @@
       },
       { "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
       { "text": "I changed my mind, wanted to ask you something else.", "topic": "TALK_NONE" },
-      { "text": "Let's go.", "topic": "TALK_DONE" }
+      { "text": "<lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -231,7 +231,7 @@
       { "text": "Let's talk about your current activity.", "topic": "TALK_ACTIVITIES" },
       { "text": "Let's talk about the camp.", "topic": "TALK_CAMP" },
       { "text": "Change your martial arts style.", "topic": "TALK_DONE", "effect": "pick_style" },
-      { "text": "Let's go.", "topic": "TALK_DONE" }
+      { "text": "<lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -245,8 +245,8 @@
         "success": { "topic": "TALK_TRAIN" },
         "failure": { "topic": "TALK_DENY_PERSONAL", "effect": { "npc_add_effect": "asked_to_train", "duration": 21600 } }
       },
-      { "text": "Never mind then.", "topic": "TALK_NONE" },
-      { "text": "Forget it, let's get going.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" },
+      { "text": "<end_talking_nevermind>  <lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -260,16 +260,21 @@
         "success": { "topic": "TALK_TRAIN_SEMINAR" },
         "failure": { "topic": "TALK_DENY_PERSONAL", "effect": { "npc_add_effect": "asked_to_train", "duration": 21600 } }
       },
-      { "text": "Never mind then.", "topic": "TALK_NONE" },
-      { "text": "Forget it, let's get going.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" },
+      { "text": "<end_talking_nevermind>  <lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
     "id": "TALK_LEAVE",
     "type": "talk_topic",
     "dynamic_line": "You're really leaving?",
     "responses": [
-      { "text": "Yeah, I'm sure.  Bye.", "topic": "TALK_DONE", "effect": "leave", "opinion": { "trust": -2, "anger": 1 } },
+      {
+        "text": "Yeah, I'm sure.  <end_talking_bye>",
+        "topic": "TALK_DONE",
+        "effect": "leave",
+        "opinion": { "trust": -2, "anger": 1 }
+      },
       { "text": "Nah, I'm just kidding.", "topic": "TALK_NONE" }
     ]
   },
@@ -462,7 +467,7 @@
         "effect": "basecamp_mission",
         "condition": { "npc_at_om_location": "FACTION_CAMP_ANY" }
       },
-      { "text": "Never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -471,7 +476,7 @@
     "dynamic_line": { "gendered_line": "Are you sure?", "relevant_genders": [ "u" ] },
     "responses": [
       { "text": "Yes, I'm sure.", "topic": "TALK_DONE", "effect": "abandon_camp" },
-      { "text": "Actually, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -551,7 +556,7 @@
       },
       { "text": "Train me.", "topic": "TALK_TRAIN" },
       { "text": "Do a seminar.", "topic": "TALK_TRAIN_SEMINAR" },
-      { "text": "Nevermind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   }
 ]

data/json/npcs/common_chat/TALK_COMMON_GREET.json

@@ -72,25 +72,25 @@
     "id": "TALK_STRANGER_FRIENDLY",
     "type": "talk_topic",
     "dynamic_line": "Hey there, <name_g>.",
-    "responses": [ { "text": "Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "<end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_STRANGER_NEUTRAL",
     "type": "talk_topic",
     "dynamic_line": "Hello there.",
-    "responses": [ { "text": "Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "<end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_STRANGER_WARY",
     "type": "talk_topic",
     "dynamic_line": "Okay, no sudden movements…",
-    "responses": [ { "text": "Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "<end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_STRANGER_SCARED",
     "type": "talk_topic",
     "dynamic_line": "Keep your distance!",
-    "responses": [ { "text": "Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "<end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_STRANGER_AGGRESSIVE",

data/json/npcs/common_chat/TALK_COMMON_MISSION.json

@@ -76,7 +76,7 @@
       "has_no_assigned_mission": "You're not working on anything for me now.",
       "no": { "has_many_assigned_missions": "Which job?", "no": "What about it?" }
     },
-    "responses": [ { "text": "Never mind.", "topic": "TALK_NONE" } ]
+    "responses": [ { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" } ]
   },
   {
     "id": "TALK_MISSION_OFFER",
@@ -104,7 +104,7 @@
   {
     "id": "TALK_MISSION_REJECTED",
     "type": "talk_topic",
-    "responses": [ { "text": "I'm sorry.", "topic": "TALK_NONE" }, { "text": "Whatever.  Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "I'm sorry.", "topic": "TALK_NONE" }, { "text": "Whatever.  <end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_MISSION_INQUIRE",
@@ -233,15 +233,15 @@
         "effect": "mission_success"
       },
       {
-        "text": "I found it, but I'm keeping it, and I'll find you another one.  Let's talk about something else.",
+        "text": "I found it, but I'm keeping it, and I'll find you another one.  <done_conversation_section>",
         "topic": "TALK_NONE",
         "condition": {
           "and": [ { "or": [ { "mission_goal": "MGOAL_FIND_ITEM" }, { "mission_goal": "MGOAL_FIND_ANY_ITEM" } ] }, "mission_complete" ]
         },
         "effect": { "npc_add_effect": "npc_player_still_looking", "duration": 43200 }
       },
       {
-        "text": "I found it, but I'm keeping it, and I'll find you another one.  Bye!",
+        "text": "I found it, but I'm keeping it, and I'll find you another one.  <end_talking_bye>",
         "topic": "TALK_DONE",
         "condition": {
           "and": [ { "or": [ { "mission_goal": "MGOAL_FIND_ITEM" }, { "mission_goal": "MGOAL_FIND_ANY_ITEM" } ] }, "mission_complete" ]
@@ -282,7 +282,7 @@
         "condition": { "and": [ "mission_has_generic_rewards", { "or": [ "npc_train_skills", "npc_train_styles" ] } ] }
       },
       {
-        "text": "Glad to help.  I need no payment.  Bye!",
+        "text": "Glad to help.  I need no payment.  <end_talking_bye>",
         "topic": "TALK_DONE",
         "condition": "mission_has_generic_rewards",
         "effect": "clear_mission",
@@ -298,7 +298,7 @@
         "opinion": { "fear": -1, "anger": -1 }
       },
       {
-        "text": "Glad to help.  Bye!",
+        "text": "Glad to help.  <end_talking_bye>",
         "topic": "TALK_DONE",
         "condition": { "not": "mission_has_generic_rewards" },
         "effect": "clear_mission",

data/json/npcs/common_chat/TALK_COMMON_OTHER.json

@@ -21,7 +21,7 @@
         "effect": "start_trade"
       },
       { "text": "Want to share some useful items with me?", "topic": "TALK_SHARE_EQUIPMENT" },
-      { "text": "Well, bye.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_bye>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -170,14 +170,14 @@
         },
         "failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": -4, "value": -5, "anger": 20 } }
       },
-      { "switch": true, "default": true, "text": "Nevermind.", "topic": "TALK_NONE" }
+      { "switch": true, "default": true, "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
     "id": "TALK_AGREE_FOLLOW",
     "type": "talk_topic",
     "dynamic_line": "You got it, I'm with you!",
-    "responses": [ { "text": "Awesome!", "topic": "TALK_FRIEND" }, { "text": "Okay, let's go!", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "Awesome!", "topic": "TALK_FRIEND" }, { "text": "<lets_go>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_DENY_FOLLOW",
@@ -209,17 +209,14 @@
       },
       { "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
       { "text": "Let's trade items.", "topic": "TALK_NONE", "effect": "start_trade" },
-      { "text": "Let's go.", "topic": "TALK_DONE" }
+      { "text": "<lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
     "id": "TALK_PLAYER_LEADS",
     "type": "talk_topic",
     "dynamic_line": "Alright.  You can lead now.",
-    "responses": [
-      { "text": "Good.  Something else…", "topic": "TALK_FRIEND" },
-      { "text": "Alright, let's go.", "topic": "TALK_NONE" }
-    ]
+    "responses": [ { "text": "Good.  Something else…", "topic": "TALK_FRIEND" }, { "text": "<lets_go>", "topic": "TALK_NONE" } ]
   },
   {
     "id": "TALK_LEADER_STAYS",
@@ -229,7 +226,7 @@
   {
     "id": "TALK_DESCRIBE_MISSION",
     "type": "talk_topic",
-    "responses": [ { "text": "I see.", "topic": "TALK_NONE" }, { "text": "Bye.", "topic": "TALK_DONE" } ]
+    "responses": [ { "text": "I see.", "topic": "TALK_NONE" }, { "text": "<end_talking_bye>", "topic": "TALK_DONE" } ]
   },
   {
     "id": "TALK_TRAIN_NPC_START",
@@ -251,7 +248,7 @@
         "effect": "lead_to_safety"
       },
       { "text": "No, we'll be okay here.", "topic": "TALK_TRAIN_NPC_FORCE", "switch": true, "default": true },
-      { "text": "On second thought, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -266,7 +263,7 @@
         "effect": "start_training_seminar",
         "switch": true
       },
-      { "text": "On second thought, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -289,7 +286,7 @@
         "effect": "lead_to_safety"
       },
       { "text": "No, we'll be okay here.", "topic": "TALK_TRAIN_FORCE", "switch": true, "default": true },
-      { "text": "On second thought, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -360,7 +357,7 @@
     "dynamic_line": "Alright, show me how it's done.",
     "responses": [
       { "text": "Okay, let's begin.", "topic": "TALK_DONE", "effect": "start_training_npc" },
-      { "text": "On second thought, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -369,7 +366,7 @@
     "dynamic_line": "Alright, let's begin.",
     "responses": [
       { "text": "Sounds good.", "topic": "TALK_DONE", "effect": "start_training" },
-      { "text": "On second thought, never mind.", "topic": "TALK_NONE" }
+      { "text": "<end_talking_nevermind>", "topic": "TALK_NONE" }
     ]
   },
   {
@@ -384,7 +381,7 @@
     "dynamic_line": "I'm on watch.",
     "responses": [
       { "text": "I need you to come with me.", "topic": "TALK_FRIEND", "effect": "stop_guard" },
-      { "text": "See you around.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_bye>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -470,13 +467,13 @@
         "failure": { "topic": "TALK_DENY_EQUIPMENT", "opinion": { "trust": -3, "fear": 1, "value": -3, "anger": 5 } }
       },
       {
-        "text": "Eh, never mind.",
+        "text": "<end_talking_nevermind>",
         "switch": true,
         "default": true,
         "condition": { "npc_has_effect": "asked_for_item" },
         "topic": "TALK_NONE"
       },
-      { "text": "Never mind, I'll do without.  Bye.", "topic": "TALK_DONE" }
+      { "text": "Never mind, I'll do without.  <end_talking_bye>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -575,7 +572,10 @@
     "id": "TALK_DELIVER_ASK",
     "type": "talk_topic",
     "dynamic_line": "I'm willing to pay <topic_item_price> per batch for a total of <topic_item_your_total_price>.",
-    "responses": [ { "text": "Works for me.", "topic": "TALK_DELIVER_CONFIRM" }, { "text": "Maybe later.", "topic": "TALK_DONE" } ]
+    "responses": [
+      { "text": "Works for me.", "topic": "TALK_DELIVER_CONFIRM" },
+      { "text": "<end_talking_later>", "topic": "TALK_DONE" }
+    ]
   },
   {
     "id": "TALK_DELIVER_CONFIRM",

data/json/npcs/common_chat/TALK_FRIEND_CONVERSATION.json

@@ -23,16 +23,16 @@
         "//2": "This is a stand-in for some kind of better system to add a random trait."
       },
       { "text": "Good point, let's find a more appropriate place.", "topic": "TALK_NONE" },
-      { "text": "You're right.  Forget I said anything, let's get moving.", "topic": "TALK_DONE" }
+      { "text": "You're right.  <lets_go>", "topic": "TALK_DONE" }
     ]
   },
   {
     "id": "TALK_FRIEND_CONVERSATION",
     "type": "talk_topic",
     "dynamic_line": "What did you want to talk about?",
     "responses": [
-      { "text": "Actually, never mind.", "condition": "npc_following", "topic": "TALK_FRIEND" },
-      { "text": "Actually, never mind.", "condition": { "not": "npc_following" }, "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>", "condition": "npc_following", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_nevermind>", "condition": { "not": "npc_following" }, "topic": "TALK_DONE" }
     ]
   },
   {