Replace snippets p5

CleverRaven · Sep 23, 2024 · 8ffe6c0 · 8ffe6c0
1 parent 0a77471
commit 8ffe6c0
Show file tree

Hide file tree

Showing 24 changed files with 124 additions and 121 deletions.
diff --git a/data/json/npcs/TALK_ALLY_TUTORIAL.json b/data/json/npcs/TALK_ALLY_TUTORIAL.json
@@ -4,8 +4,8 @@
     "type": "talk_topic",
     "dynamic_line": "I'm my own person, but I'm mostly willing to follow your lead.  I can do a lot of things for you: I can fight, I can train you or you can train me, I can carry stuff, I can bandage your wounds, I can build faction camps, I can do some other activities, I can ride horses, I can go places, I can guard things, I can use some bionics, I can even chit-chat with you or give you tips or talk about my background.  You can give me instructions in conversation or by radio or shout commands at me.\n  What do you want to know more about?",
     "responses": [
-      { "text": "Forget I asked.", "topic": "TALK_FRIEND" },
-      { "text": "Skip it, let's get going.", "topic": "TALK_DONE" },
+      { "text": "<end_talking_nevermind>", "topic": "TALK_FRIEND" },
+      { "text": "Skip it.  <lets_go>", "topic": "TALK_DONE" },
       {
         "text": "Any hints about the world we now live in?",
         "trial": {
@@ -242,7 +242,7 @@
     "responses": [
       { "text": "Thanks for the explanation.  I wanted to know more about something else.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Thanks.  I have some things for you to do.", "topic": "TALK_FRIEND" },
-      { "text": "Skip it, let's get going.", "topic": "TALK_DONE" }
+      { "text": "Skip it.  <lets_go>", "topic": "TALK_DONE" }
     ]
   }
 ]
diff --git a/data/json/npcs/TALK_CITY_COP.json b/data/json/npcs/TALK_CITY_COP.json
@@ -19,7 +19,7 @@
       { "text": "Wanna get outta here?", "topic": "TALK_SUGGEST_FOLLOW" },
       { "text": "Let's trade items.", "topic": "TALK_CITY_COP", "effect": "start_trade" },
       { "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
-      { "text": "I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -32,7 +32,7 @@
     "responses": [
       { "text": "Why don't you go somewhere else?", "topic": "TALK_CITY_COP_LEAVE" },
       { "text": "Let's trade then.", "effect": "start_trade", "topic": "TALK_CITY_COP" },
-      { "text": "I'm sorry, I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -47,7 +47,7 @@
       { "text": "You've seen other survivors?", "topic": "TALK_CITY_COP_NEWS" },
       { "text": "Wanna get outta here?", "topic": "TALK_SUGGEST_FOLLOW" },
       { "text": "What can you sell me?", "topic": "TALK_CITY_COP", "effect": "start_trade" },
-      { "text": "I'm sorry, I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -59,7 +59,7 @@
       { "text": "You've seen other survivors?", "topic": "TALK_CITY_COP_NEWS" },
       { "text": "Wanna get outta here?", "topic": "TALK_SUGGEST_FOLLOW" },
       { "text": "Well, let me check out some of that stuff.", "topic": "TALK_CITY_COP", "effect": "start_trade" },
-      { "text": "I'm sorry, I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -70,7 +70,7 @@
       { "text": "Why don't you go somewhere else?", "topic": "TALK_CITY_COP_LEAVE" },
       { "text": "Wanna get outta here?", "topic": "TALK_SUGGEST_FOLLOW" },
       { "text": "Well, let me check out some of that stuff.", "topic": "TALK_CITY_COP", "effect": "start_trade" },
-      { "text": "I'm sorry, I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   }
 ]
diff --git a/data/json/npcs/TALK_CYBORG_1.json b/data/json/npcs/TALK_CYBORG_1.json
@@ -124,7 +124,7 @@
   {
     "id": "TALK_CYBORG_LEAVES",
     "type": "talk_topic",
-    "dynamic_line": "Yeah, *beeeeep* I don't think so.  Bye.",
+    "dynamic_line": "Yeah, *beeeeep* I don't think so.  <end_talking_bye>",
     "responses": [ { "text": "Suit yourself.", "topic": "TALK_DONE" } ]
   }
 ]
diff --git a/data/json/npcs/TALK_FACTION_CAMP.json b/data/json/npcs/TALK_FACTION_CAMP.json
@@ -38,7 +38,7 @@
         "effect": "basecamp_mission",
         "condition": { "npc_at_om_location": "FACTION_CAMP_ANY" }
       },
-      { "text": "Nothing.  Let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Nothing.  <done_conversation_section>", "topic": "TALK_FRIEND" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
       { "text": "Nothing.  Let's get back to work.", "topic": "TALK_DONE" }
     ]
@@ -48,7 +48,7 @@
     "type": "talk_topic",
     "dynamic_line": { "list_faction_camp_sites": true },
     "responses": [
-      { "text": "Interesting.  Let's talk about something else.", "topic": "TALK_FRIEND" },
+      { "text": "Interesting.  <done_conversation_section>", "topic": "TALK_FRIEND" },
       { "text": "Well, until we go there, let's talk about camps more.", "topic": "TALK_NONE" },
       { "text": "Well, then.  Let's get back to work.", "topic": "TALK_DONE" }
     ]
@@ -66,8 +66,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -83,8 +83,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -98,8 +98,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -114,8 +114,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -141,8 +141,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -157,8 +157,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -173,8 +173,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -189,8 +189,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -205,8 +205,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -221,8 +221,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -237,8 +237,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -253,8 +253,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -269,8 +269,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -285,8 +285,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -301,8 +301,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -317,8 +317,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -333,8 +333,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -349,8 +349,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -362,8 +362,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -378,8 +378,8 @@
       { "text": "I know the basics.  Just tell me what changed.", "topic": "TALK_CAMP_TUTORIAL_CHANGES" },
       { "text": "Never mind, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
       { "text": "Never mind, let's talk about other things you can do.", "topic": "TALK_ALLY_TUTORIAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -395,8 +395,8 @@
       { "text": "Tell me about evac shelter camps.", "topic": "TALK_CAMP_TUTORIAL_EVAC_SHELTER" },
       { "text": "Tell me about expansions.", "topic": "TALK_CAMP_TUTORIAL_EXPANSIONS" },
       { "text": "Thanks, let's go back to talking about camps.", "topic": "TALK_CAMP_GENERAL" },
-      { "text": "Never mind, let's talk about something else.", "topic": "TALK_FRIEND" },
-      { "text": "Forget it.  Let's go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_nevermind>  <done_conversation_section>", "topic": "TALK_FRIEND" },
+      { "text": "<end_talking_later_follower>", "topic": "TALK_DONE" }
     ]
   },
   {

diff --git a/data/json/npcs/TALK_MARLOSS_VOICE.json b/data/json/npcs/TALK_MARLOSS_VOICE.json
@@ -35,7 +35,7 @@
         "effect": { "u_add_effect": "u_offered_marloss_meal", "duration": 25920 }
       },
       { "text": "Who are you?", "topic": "TALK_MARLOSS_VOICE_A_PRIEST" },
-      { "text": "I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {
@@ -63,7 +63,7 @@
         "topic": "TALK_MARLOSS_VOICE_OFFER_BERRY",
         "condition": { "and": [ { "not": { "u_has_flag": "mycus" } }, { "not": { "u_has_effect": "u_given_berry" } } ] }
       },
-      { "text": "Well, I gotta go.", "topic": "TALK_DONE" }
+      { "text": "<end_talking_leave>", "topic": "TALK_DONE" }
     ]
   },
   {