Merge pull request #37222 from John-Candlebury/intercom-dialogue

Minor tweaks to the intercom's speech
CleverRaven · Jan 19, 2020 · b4b677b · b4b677b
2 parents 8681b75 + b4ca61e
commit b4b677b
Showing 1 changed file with 54 additions and 18 deletions.
diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json
@@ -9,7 +9,6 @@
     "attitude": 0,
     "mission": 3,
     "chat": "TALK_ROBOFAC_INTERCOM",
-    "mission_offered": "MISSION_ROBOFAC_INTERCOM_1",
     "faction": "robofac"
   },
   {
@@ -189,7 +188,29 @@
       "type": "dialogue",
       "context": "intercom",
       "value": "yes",
-      "yes": "So, do you need something?",
+      "yes": [
+        "So, do you need something?",
+        "Yes, mercenary?",
+        "Mercenary.",
+        "Mercenary.",
+        "Don't you have a mission to do?",
+        "Well?",
+        "Say it.",
+        "Get with it.",
+        "Make it quick.",
+        "Don't loiter.",
+        "Don't do anything stupid.",
+        "Ugh I hate intercom duty…  Wait is the speaker still on?",
+        "Please don't bother us senselessly.",
+        "[Silence]",
+        "[Crackles On]",
+        "[A red LED blinks on]",
+        "[Unintelligible]",
+        "Whats up with the interference in this thing?",
+        "Speak slowly and clearly.  Please.",
+        "Say again?",
+        "If/you speak to/understand… you/me. Yes?"
+      ],
       "no": {
         "u_has_var": "u_met_robofac_intercom",
         "type": "dialogue",
@@ -205,7 +226,16 @@
     },
     "responses": [
       {
-        "text": "So how's it down there?",
+        "text": "Wait! What??",
+        "condition": {
+          "and": [
+            { "not": { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" } },
+            { "not": { "u_has_mission": "MISSION_ROBOFAC_INTERCOM_1" } }
+          ]
+        }
+      },
+      {
+        "text": "You do realize that the front door is just open?",
         "condition": {
           "and": [
             { "not": { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" } },
@@ -221,7 +251,17 @@
         "effect": "start_trade"
       },
       {
-        "text": "I came looking for valuables, maybe I can trade with you instead?",
+        "text": "It's the apocalypse out here!  Please let me in!",
+        "condition": {
+          "and": [
+            { "not": { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" } },
+            { "not": { "u_has_mission": "MISSION_ROBOFAC_INTERCOM_1" } }
+          ]
+        },
+        "topic": "TALK_ROBOFAC_INTERCOM_PLEAD"
+      },
+      {
+        "text": "I was just looking for valuables, maybe I can trade with you instead?",
         "condition": {
           "and": [
             { "not": { "npc_has_var": "npc_failed_intercom_trade", "type": "dialogue", "context": "intercom", "value": "yes" } },
@@ -234,16 +274,6 @@
         "success": { "topic": "TALK_ROBOFAC_INTERCOM_TRADE" },
         "failure": { "topic": "TALK_ROBOFAC_INTERCOM_NO_TRADE" }
       },
-      {
-        "text": "It's the apocalypse out here!  Please let me in!",
-        "condition": {
-          "and": [
-            { "not": { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" } },
-            { "not": { "u_has_mission": "MISSION_ROBOFAC_INTERCOM_1" } }
-          ]
-        },
-        "topic": "TALK_ROBOFAC_INTERCOM_PLEAD"
-      },
       {
         "text": "Any jobs you need done?",
         "condition": { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" },
@@ -299,7 +329,7 @@
   {
     "id": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK",
     "type": "talk_topic",
-    "dynamic_line": "It was a modified Wraitheon chassis, with a custom AI.  We hoped it would interact with the outside world for us, but you know how well it went…  Shame about what happened, with the evisceration and all...",
+    "dynamic_line": "It was a modified Wraitheon chassis, with a custom AI.  We hoped it would interact with the outside world for us, but you know how well it went…  Shame about what happened, with the evisceration and all…",
     "responses": [ { "text": "…", "topic": "TALK_ROBOFAC_INTERCOM" } ]
   },
   {
@@ -309,7 +339,7 @@
     "responses": [
       {
         "text": "[ 2 HGC ] Deal!",
-        "condition": { "u_has_item": "RobofacCoin" },
+        "condition": { "u_has_item": "RobofacCoin", "count": 2 },
         "effect": [
           { "u_sell_item": "RobofacCoin", "count": 2 },
           { "u_buy_item": "mask_gas" },
@@ -360,10 +390,16 @@
   {
     "id": "MISSION_ROBOFAC_INTERCOM_1_ACCEPTED",
     "type": "talk_topic",
-    "dynamic_line": "We appreciate your help, good luck.",
+    "dynamic_line": "You know the deal, good luck.",
     "responses": [
-      { "text": "Got any advice?", "topic": "TALK_MISSION_ADVICE" },
+      { "text": "Got any advice?", "topic": "MISSION_ROBOFAC_INTERCOM_1_ADVICE" },
       { "text": "I'll be back soon!", "topic": "TALK_DONE" }
     ]
+  },
+  {
+    "id": "MISSION_ROBOFAC_INTERCOM_1_ADVICE",
+    "type": "talk_topic",
+    "dynamic_line": "If the robot remains operational don’t try to fight it head on, because it WILL kill you.  Dr. Prado left the Hub with a handful of EMP grenades, use those to disable the robot.",
+    "responses": [ { "text": "Got it.", "topic": "TALK_DONE" } ]
   }
 ]