[CR] Hub 01 intercom dialogue update pt 2: Missions (CleverRaven#57069)

* Dialogue updates

Prevent softlock of updating players

work work

* Rip out the old mind splicer code

* elaborate more on entry/exit from the tower

* Sort all new contracts at the bottom

* Proofreading adjustments

* top 10 EPIC linting fails!!!!

* Remove a bunch of extraneous data

* fool of a took

* Missing whitespace

* u_sell_item -> u_consume_item

* and a rewording for good measure

data/json/item_actions.json

@@ -109,11 +109,6 @@
     "id": "DIRECTIONAL_HOLOGRAM",
     "name": { "str": "Create a moving hologram" }
   },
-  {
-    "type": "item_action",
-    "id": "MIND_SPLICER",
-    "name": { "str": "Extract data from memory banks" }
-  },
   {
     "type": "item_action",
     "id": "ROBOTCONTROL",

data/json/items/book/electronics.json

@@ -242,7 +242,7 @@
     "type": "BOOK",
     "category": "manuals",
     "name": { "str_sp": "trifacet handling procedures" },
-    "description": "A heavy and disparate binder detailing the deactivation, storage and transport procedures for a so called \"Trifacet\" UVG.  The pages and schematics within have been compiled from the internal reports of a vast array of governmental agencies, many of which you had never heard of before.",
+    "description": "A heavy and disparate binder detailing the deactivation, storage and transport procedures for a so called \"Trifacet\" UGV.  The pages and schematics within have been compiled from the internal reports of a vast array of governmental agencies, many of which you had never heard of before.",
     "weight": "1409 g",
     "volume": "500 ml",
     "price": 84000,

data/json/items/corpses/corpses.json

@@ -34,12 +34,12 @@
     "symbol": "%",
     "color": "white",
     "name": { "str": "desiccated corpse" },
-    "description": "A dead body, badly mangled and desiccated.  It seems whatever killed him did so with a gigantic claw.",
+    "description": "A badly mangled human body.  A giant puncture wound is visible on its upper chest, and something has drained most of the moisture from the carcass, leaving it desiccated and making it impossible to determine the body's age.",
     "category": "other",
     "material": [ "hflesh" ],
     "price": 0,
-    "volume": "7500 ml",
-    "weight": "81500 g",
+    "volume": "27 L",
+    "weight": "32 kg",
     "flags": [ "TRADER_AVOID" ]
   },
   {

data/json/items/generic.json

@@ -603,19 +603,21 @@
     "to_hit": -3
   },
   {
+    "id": "robofac_hardcase",
     "type": "GENERIC",
-    "id": "data_card",
-    "symbol": ",",
-    "color": "white",
-    "name": { "str": "data card" },
-    "description": "Some type of advanced data storage device.  Useful for storing very large amounts of information.",
-    "price": 10000,
-    "price_postapoc": 50,
-    "material": [ "plastic" ],
-    "weight": "18 g",
-    "volume": "1 ml",
-    "pocket_data": [ { "pocket_type": "SOFTWARE", "max_contains_volume": "1 L", "max_contains_weight": "1 kg" } ],
-    "to_hit": -3
+    "name": { "str": "DARPA hard case" },
+    "description": "A heavy and very durable protective case made of steel and thick plastic, locked with a six dials.  A sticker with the logo of DARPA is attached to the front, but looking at the surface, you can see that another marking - formerly stenciled into the material - was recently and hastily destroyed.",
+    "weight": "1202 g",
+    "volume": "7958 ml",
+    "longest_side": "30 cm",
+    "price": 0,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "uneven" },
+    "bashing": 4,
+    "material": [ "steel", "thermo_resin" ],
+    "symbol": "?",
+    "looks_like": "briefcase",
+    "color": "light_gray",
+    "flags": [ "DURABLE_MELEE", "TRADER_AVOID" ]
   },
   {
     "type": "GENERIC",

data/json/items/obsolete.json

@@ -1254,5 +1254,43 @@
     "volume": "250 ml",
     "bashing": 1,
     "to_hit": -3
+  },
+  {
+    "type": "GENERIC",
+    "id": "data_card",
+    "symbol": ",",
+    "color": "white",
+    "name": { "str": "data card" },
+    "description": "Some type of advanced data storage device.  Useful for storing very large amounts of information.  Didn't someone want this?",
+    "price": 10000,
+    "price_postapoc": 50,
+    "material": [ "plastic" ],
+    "weight": "18 g",
+    "volume": "1 ml",
+    "pocket_data": [ { "pocket_type": "SOFTWARE", "max_contains_volume": "1 L", "max_contains_weight": "1 kg" } ],
+    "to_hit": -3
+  },
+  {
+    "id": "mind_scan_robofac",
+    "type": "GENERIC",
+    "name": { "str_sp": "neural data" },
+    "symbol": "#",
+    "container": "data_card",
+    "description": "Data stolen from a dead scientist memory banks.  Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
+    "flags": [ "NO_DROP" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "mind_splicer",
+    "symbol": "o",
+    "color": "white",
+    "name": { "str": "mind splicer kit" },
+    "description": "Surgical forceps, cables and a modified smartphone inside a small plastic pouch.  Assembled to steal the mind of some poor man, these are tools of the creepy high-tech sandman.",
+    "material": [ "plastic" ],
+    "price": 12500,
+    "price_postapoc": 500,
+    "volume": "1 L",
+    "weight": "600 g",
+    "flags": [ "TRADER_AVOID" ]
   }
 ]

data/json/items/software.json

@@ -244,15 +244,6 @@
     "price": 200,
     "price_postapoc": 0
   },
-  {
-    "id": "mind_scan_robofac",
-    "type": "GENERIC",
-    "name": { "str_sp": "neural data" },
-    "symbol": "#",
-    "container": "data_card",
-    "description": "Data stolen from a dead scientist memory banks.  Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
-    "flags": [ "NO_DROP" ]
-  },
   {
     "id": "software_electronics_reference",
     "copy-from": "software",

data/json/items/tool/misc.json

@@ -368,21 +368,6 @@
     "charges_per_use": 1,
     "use_action": [ "WATER_PURIFIER" ]
   },
-  {
-    "type": "GENERIC",
-    "id": "mind_splicer",
-    "symbol": "o",
-    "color": "white",
-    "name": { "str": "mind splicer kit" },
-    "description": "Surgical forceps, cables and a modified smartphone inside a small plastic pouch.  Assembled to steal the mind of some poor man, these are tools of the creepy high-tech sandman.",
-    "material": [ "plastic" ],
-    "price": 12500,
-    "price_postapoc": 500,
-    "use_action": [ "MIND_SPLICER" ],
-    "volume": "1 L",
-    "weight": "600 g",
-    "flags": [ "TRADER_AVOID" ]
-  },
   {
     "type": "TOOL",
     "id": "gasket_plastic",

data/json/mapgen/robofaq_locs/robofac_mission_chunks.json

@@ -38,8 +38,8 @@
         { "vehicle": "humvee", "x": 16, "y": 4, "fuel": 0, "status": 1, "chance": 100 },
         { "vehicle": "aapc-mg", "x": 10, "y": 10, "fuel": 0, "status": 1, "chance": 100 }
       ],
-      "items": { "@": { "item": "lab_torso", "chance": 100 } },
-      "item": { "@": [ { "item": "rmi2_corpse" } ] },
+      "items": { "@": { "item": "mon_zombie_scientist_death_drops", "chance": 100 } },
+      "item": { "@": [ { "item": "rmi2_corpse" }, { "item": "robofac_hardcase" } ] },
       "place_loot": [ { "item": "223_casing", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 20, 60 ] } ],
       "monster": { "M": { "monster": "mon_zombie_armored" }, "A": { "monster": "mon_zombie_soldier_acid_1" } },
       "place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 1.6 } ]

data/json/monsters/yrax.json

@@ -2,7 +2,7 @@
   {
     "id": "mon_yrax_trifacet",
     "type": "MONSTER",
-    "name": { "str": "Yrax Trifacet" },
+    "name": { "str": "Yrax trifacet" },
     "description": "Three dual leg modules join with each lower vertex of a pyramidal body, in a abstract configuration that vaguely recalls an alien arthropod.  Devoid of any exterior signs that betray its artificial origin, it looks like it could fold itself into a perfectly featureless quartz pyramid.  It crawls with a gait like none you've seen before, its minute movements too fast for your eyes to track.",
     "default_faction": "berserk_bot",
     "volume": "50 L",

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

@@ -153,28 +153,8 @@
     },
     "speaker_effect": { "effect": { "npc_add_effect": "npc_said", "duration": 600 } },
     "responses": [
-      { "text": "About that contract…", "topic": "TALK_MISSION_INQUIRE", "condition": "has_assigned_mission" },
-      {
-        "text": "About those contracts…",
-        "topic": "TALK_MISSION_LIST_ASSIGNED",
-        "condition": "has_many_assigned_missions"
-      },
-      {
-        "text": "Any jobs you need done?",
-        "condition": {
-          "and": [
-            { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" },
-            { "and": [ { "not": "has_assigned_mission" }, { "not": "has_many_assigned_missions" } ] }
-          ]
-        },
-        "topic": "TALK_MISSION_LIST"
-      },
-      {
-        "text": "Let's trade.",
-        "condition": { "npc_has_var": "npc_intercom_trade", "type": "dialogue", "context": "intercom", "value": "yes" },
-        "topic": "TALK_ROBOFAC_INTERCOM_SERVICES",
-        "effect": "start_trade"
-      },
+      { "text": "Let's discuss contracts.", "topic": "TALK_ROBOFAC_INTERCOM_CONTRACTS" },
+      { "text": "Let's trade.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES", "effect": "start_trade" },
       {
         "text": "The traders at the refugee center asked me to deliver this drive of FEMA data…",
         "condition": {
@@ -188,7 +168,7 @@
         "topic": "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_MERCENARY"
       },
       {
-        "text": "You mentioned \"portal storms?\"  What are those?",
+        "text": "You mentioned portal storms.  What are those?",
         "condition": {
           "and": [
             { "u_has_var": "u_heard_of_portal_storms", "type": "global", "context": "portal_storms", "value": "yes" },
@@ -203,7 +183,7 @@
         "topic": "TALK_ROBOFAC_INTERCOM_PORTAL_STORMS"
       },
       {
-        "text": "Listen, something happened earlier.  The world got… bad.  Things felt very wrong.  Do you know anything about that?",
+        "text": "Listen, something happened earlier.  The world got… bad.  Things felt very wrong.  Do you know anything about what that was?",
         "condition": {
           "and": [
             { "u_has_var": "u_witnessed_portal_storm", "type": "global", "context": "portal_storms", "value": "yes" },
@@ -215,7 +195,7 @@
         "topic": "TALK_ROBOFAC_INTERCOM_PORTAL_STORMS"
       },
       {
-        "text": "I have some of the portal storm data you wanted.",
+        "text": "I have some portal storm recordings.",
         "condition": {
           "or": [
             { "u_has_items": { "item": "large_printout_portal_storm_data", "count": 1 } },
@@ -265,7 +245,7 @@
         "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_MENU"
       },
       {
-        "text": "I saw your mercs have specialty rifles.  Would I be able to get one of those?",
+        "text": "I saw that your mercs have specialty rifles.  Would I be able to get one of those?",
         "condition": {
           "and": [
             { "u_has_var": "robofac_merc_1_HWP", "type": "dialogue", "context": "robofac_merc_1", "value": "yes" },
@@ -314,7 +294,6 @@
     ]
   },
   {
-    "//": "This file contains dialogue for the whole intro sequence to Hub 01, including initial conversations and dialogue introducing the first mission.  Check robofac_intercom_missions.json for a complete definition of the intro mission, as well as some related dialogue calls.",
     "id": "TALK_ROBOFAC_INTERCOM_INTRO",
     "type": "talk_topic",
     "dynamic_line": {
@@ -588,10 +567,7 @@
     "type": "talk_topic",
     "dynamic_line": "Understand that I'm not an expert about this.\"  The voice sighs.  You hear the person on the other side typing on a keyboard for several seconds.  \"I will explain it as best I can, but again, I'm not a professional.  Whatever caused the apocalypse, it… broke something about the way our world works.  I'm sure you've noticed that 'normal' physics don't always apply anymore.  We are, as of right now, uncertain if our models were wrong, or if this is something fundamentally different to our reality.\"\n\n\"From what we've observed, these events are what happen at the peak of a cyclical effect.  This is gross oversimplification, and I don't know the science behind it, but… I guess the simplest way to think of it is that 'our' reality is moving closer and further from this other place, or model, or so on.  Like a yo-yo.  When these two things are closest together, we get portal storms.  Otherwise, things are… I wouldn't say normal, not anymore, but they are as close to normal as we get now.\"\n\n\"It also looks like research needs an external agent to take a few portal storm measurements.  I'll add that one to the list of available contracts, in case you are interested.",
     "speaker_effect": {
-      "effect": [
-        { "npc_add_var": "told_about_portal_storms", "type": "dialogue", "context": "intercom", "value": "yes" },
-        { "offer_mission": "MISSION_ROBOFAC_INTERCOM_PORTAL_SM_1" }
-      ],
+      "effect": [ { "npc_add_var": "told_about_portal_storms", "type": "dialogue", "context": "intercom", "value": "yes" } ],
       "sentinel": "told_about_portal_storms"
     },
     "responses": [
@@ -637,7 +613,7 @@
     "responses": [
       { "text": "…", "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_NEUTRAL" },
       {
-        "text": "[INT 10] The armor seemed warped.  Whatever you're using to reinforce the core of the pieces isn't strong enough.",
+        "text": "[INT 10] The pieces seemed warped.  Whatever you're using to reinforce the armor isn't strong enough.",
         "condition": { "u_has_intelligence": 10 },
         "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_POSITIVE"
       }