Merge pull request #77305 from Kamejeir/talk-loops

less NPC conversation option that go only into itself

data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json

@@ -226,7 +226,7 @@
       },
       {
         "text": "Ah, that's nothing new to me.  Thanks anyway though.",
-        "topic": "TALK_NONE",
+        "topic": "TALK_DONE",
         "switch": true,
         "default": true
       },

data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json

@@ -174,7 +174,7 @@
     "dynamic_line": "Other than those people with the hard drive, none that I know of.  Scavengers share some odd things, but we can't exactly go check for ourselves.  The teamster in the back bay might have some pointers, though, if you really want to know."
   },
   {
-    "id": [ "TALK_FREE_MERCHANTS_MERCHANT_Plans", "TALK_FREE_MERCHANTS_MERCHANT_Plans2" ],
+    "id": [ "TALK_FREE_MERCHANTS_MERCHANT_Plans" ],
     "type": "talk_topic",
     "dynamic_line": "Things were rough at first, and our policy of taking everyone we could caused a lot of strife later on.  Right now, we just want to get enough trade going keep ourselves afloat.  We might have to turn people away, but we've found that they're usually willing to trade with us, which is our only real source of food right now.  We're trying to turn that into a business model.  Doesn't matter who you are, we'll trade with you as long as you don't bring trouble.",
     "responses": [
@@ -188,7 +188,8 @@
   {
     "id": "TALK_FREE_MERCHANTS_MERCHANT_Plans2",
     "type": "talk_topic",
-    "dynamic_line": "Right now, it's the best way we have to make sure that everyone gets what they need.  Long-term viability of business models is what people in suits used to do back before all this, and we see where that got them.  Barter is the only thing keeping us from starving, so we're going to keep doing it as long as it works or until we can start producing our own food."
+    "dynamic_line": "Right now, it's the best way we have to make sure that everyone gets what they need.  Long-term viability of business models is what people in suits used to do back before all this, and we see where that got them.  Barter is the only thing keeping us from starving, so we're going to keep doing it as long as it works or until we can start producing our own food.",
+    "responses": [ { "text": "Here's hoping it works out.", "topic": "TALK_FREE_MERCHANTS_MERCHANT_Talk" } ]
   },
   {
     "id": "TALK_FREE_MERCHANTS_MERCHANT_WhosInCharge",

data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json

@@ -1135,7 +1135,7 @@
     "dynamic_line": "Have you, now?  We are pleased to hear.  However, we still believe that approaching with an excess of wariness is a wise choice.  We feel that it would behoove us to understand more about this group before we approach directly, and so for the time being, understanding more about their general-use technology is our preferred course of action."
   },
   {
-    "id": [ "TALK_ROBOFAC_INTERCOM_HWP_EXODII_STARTED", "TALK_ROBOFAC_INTERCOM_HWP_EXODII_STARTED_1" ],
+    "id": [ "TALK_ROBOFAC_INTERCOM_HWP_EXODII_STARTED" ],
     "//": "creating EXODII barrel",
     "type": "talk_topic",
     "dynamic_line": "Brilliant!!  Just brilliant.  Thank you very much.  Please contact us again in three days.  Thank you!\"\n\nThe voice abruptly disconnects.  When the intercom comes back on, it's the original voice again.  \"Was there anything else?",
@@ -1158,7 +1158,11 @@
     "id": "TALK_ROBOFAC_INTERCOM_HWP_EXODII_STARTED_1",
     "//": "this is a half-truth. while the Hub does have an interest in understanding or reversing the Cataclysm, their primary intent here is specifically to understand the Exodii better.",
     "type": "talk_topic",
-    "dynamic_line": "The Cataclysm has illuminated hitherto unknown facts about our universe.  The opportunity to research - and perhaps understand - technology from not only another world, but another dimension entirely, is an exceptionally promising field of study.  Now more than ever is our continued delving into this field of study paramount; while our focus has shifted rather abruptly, we believe that if there is ever any chance of understanding or even reversing <the_cataclysm>, it would come from studies like this."
+    "dynamic_line": "The Cataclysm has illuminated hitherto unknown facts about our universe.  The opportunity to research - and perhaps understand - technology from not only another world, but another dimension entirely, is an exceptionally promising field of study.  Now more than ever is our continued delving into this field of study paramount; while our focus has shifted rather abruptly, we believe that if there is ever any chance of understanding or even reversing <the_cataclysm>, it would come from studies like this.",
+    "responses": [
+      { "text": "<done_conversation_section>", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" },
+      { "text": "I'll check in later.", "topic": "TALK_DONE" }
+    ]
   },
   {
     "id": "TALK_ROBOFAC_INTERCOM_HWP_EXODII_COMPLETE",