Overhaul and Flesh Out Barry Isherwood's Rescue Mission, part 2

data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json

@@ -379,5 +379,29 @@
         "else": { "set_string_var": "blames_you", "target_var": { "global_val": "isherwood_barry_death_opinion" } }
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "eoc_type": "OM_MOVE",
+    "id": "EOC_HAVE_U_BEEN_TO_MIGOS",
+    "condition": {
+      "or": [
+        { "u_near_om_location": "mi-go_portal", "range": 3 },
+        { "u_near_om_location": "mi-go_camp1", "range": 3 },
+        { "u_near_om_location": "mi-go_camp2", "range": 3 },
+        { "u_near_om_location": "mi-go_camp2-1", "range": 3 },
+        { "u_near_om_location": "mi-go_camp2-2", "range": 3 },
+        { "u_near_om_location": "mi-go_scout_tower_1", "range": 3 },
+        { "u_near_om_location": "mi-go_scout_tower_2", "range": 3 },
+        { "u_near_om_location": "mi-go_scout_tower_3", "range": 3 },
+        { "u_near_om_location": "mi-go_scout_tower_4", "range": 3 },
+        { "u_near_om_location": "barry_mi-go_scout_tower_1", "range": 3 },
+        { "u_near_om_location": "barry_mi-go_scout_tower_2", "range": 3 },
+        { "u_near_om_location": "barry_mi-go_scout_tower_3", "range": 3 },
+        { "u_near_om_location": "barry_mi-go_scout_tower_4", "range": 3 }
+      ]
+    },
+    "deactivate_condition": { "u_has_var": "u_been_to_migos", "value": "yes" },
+    "effect": [ { "u_add_var": "u_been_to_migos", "value": "yes" } ]
   }
 ]

data/json/itemgroups/tools.json

@@ -1065,5 +1065,11 @@
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bottle_plastic_small",
     "entries": [ { "item": "pur_tablets", "count": [ 75, 100 ] } ]
+  },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "dynamite_shipment",
+    "items": [ { "item": "dynamite", "count": [ 2, 3 ] } ]
   }
 ]

data/json/npcs/exodii/exodii_merchant_missions.json

@@ -509,5 +509,30 @@
         "topic": "TALK_DONE"
       }
     ]
+  },
+  {
+    "id": "MISSION_EXODII_PAY_BACK_RIOT_GEAR",
+    "type": "mission_definition",
+    "name": { "str": "Pay Back The Riot Gear to Rubik" },
+    "goal": "MGOAL_NULL",
+    "difficulty": 1,
+    "value": 0,
+    "fail": { "effect": { "math": [ "faction_trust('exodii')", "-=", "20" ] } },
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
+    "deadline_low": 20,
+    "deadline_high": 20,
+    "//": "Dialogue for this mission is handled externally.",
+    "dialogue": {
+      "describe": ".",
+      "offer": ".",
+      "accepted": ".",
+      "rejected": ".",
+      "advice": ".",
+      "inquire": ".",
+      "success": ".",
+      "success_lie": ".",
+      "failure": "."
+    }
   }
 ]

data/json/npcs/exodii/exodii_merchant_talk.json

@@ -82,6 +82,25 @@
           ]
         },
         "topic": "TALK_EXODII_MERCHANT_Talk_Intro2a"
+      },
+      {
+        "text": "Any chance I can buy some riot armor?  I need five complete sets.",
+        "condition": {
+          "and": [
+            { "u_has_faction_trust": 2 },
+            { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1_GET_GEAR" },
+            { "math": [ "isherwood_gear_status", "<", "1" ] },
+            {
+              "not": { "npc_has_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" }
+            }
+          ]
+        },
+        "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear"
+      },
+      {
+        "text": "Remember that riot gear you gave me?",
+        "condition": { "u_has_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR" },
+        "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback"
       }
     ]
   },
@@ -1297,5 +1316,80 @@
       { "text": "I've got some stuff I'd like to install.", "topic": "TALK_DONE", "effect": "bionic_install" },
       { "text": "Would you be able to take out one of my implants?", "topic": "TALK_DONE", "effect": "bionic_remove" }
     ]
+  },
+  {
+    "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear",
+    "type": "talk_topic",
+    "dynamic_line": "Mayhaps this gear will do you better than it did the scuffers wot trained with it. [$400]",
+    "responses": [
+      {
+        "text": "I'll buy it.",
+        "effect": [
+          {
+            "u_spend_cash": 40000,
+            "true_eocs": {
+              "id": "exodii_buy_riot_gear_success",
+              "effect": [
+                { "u_spawn_item": "armor_riot", "count": 5 },
+                { "u_spawn_item": "helmet_riot", "count": 5 },
+                { "u_spawn_item": "armor_riot_arm", "count": 5 },
+                { "u_spawn_item": "armor_riot_leg", "count": 5 },
+                { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" }
+              ]
+            }
+          }
+        ],
+        "topic": "TALK_EXODII_MERCHANT_Talk"
+      },
+      {
+        "text": "Any chance I can buy gear this on layaway?",
+        "topic": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit"
+      },
+      { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" },
+      { "text": "I've gotta go.  See you later, Rubik.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_On_Credit",
+    "type": "talk_topic",
+    "dynamic_line": "If'n you survive, we can give you a fortnight and six odd days to pay us'n back.",
+    "responses": [
+      {
+        "text": "Thanks Rubik, I'll be back with your payment soon.",
+        "effect": [
+          { "u_spawn_item": "armor_riot", "count": 5 },
+          { "u_spawn_item": "helmet_riot", "count": 5 },
+          { "u_spawn_item": "armor_riot_arm", "count": 5 },
+          { "u_spawn_item": "armor_riot_leg", "count": 5 },
+          { "assign_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR" },
+          { "npc_add_var": "npc_bought_riot_gear", "type": "dialogue", "context": "exodii", "value": "yes" }
+        ],
+        "topic": "TALK_EXODII_MERCHANT_Talk"
+      },
+      { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" },
+      { "text": "I've gotta go.  See you later, Rubik.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "TALK_EXODII_MERCHANT_You_Buy_Riot_Gear_Payback",
+    "type": "talk_topic",
+    "dynamic_line": "Right and done, don't let whatever you are going after turn you into a pork loin well done.  I's expectin' you back.",
+    "responses": [
+      {
+        "text": "Here's the money to pay off that debt.",
+        "effect": [
+          {
+            "u_spend_cash": 40000,
+            "true_eocs": {
+              "id": "exodii_pay_back_riot_gear_success",
+              "effect": [ { "finish_mission": "MISSION_EXODII_PAY_BACK_RIOT_GEAR", "success": true } ]
+            }
+          }
+        ],
+        "topic": "TALK_EXODII_MERCHANT_Talk"
+      },
+      { "text": "Can we talk about something else?", "topic": "TALK_EXODII_MERCHANT_Talk" },
+      { "text": "I've gotta go.  See you later, Rubik.", "topic": "TALK_DONE" }
+    ]
   }
 ]

data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json

@@ -484,6 +484,16 @@
         },
         "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Wall"
       },
+      {
+        "text": "We're going to need some way to breach the tower itself, possibly some form of explosives.  Do you know anyone who could help us with that?",
+        "condition": {
+          "and": [
+            { "u_has_var": "u_been_to_migos", "value": "yes" },
+            { "not": { "u_has_var": "chris_planned_for_bomb", "value": "yes" } }
+          ]
+        },
+        "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb"
+      },
       { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
       { "text": "I'd better get going.", "topic": "TALK_DONE" }
     ]
@@ -530,6 +540,16 @@
         },
         "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Wall"
       },
+      {
+        "text": "We're going to need some way to breach the tower itself, possibly some form of explosives.  Do you know anyone who could help us with that?",
+        "condition": {
+          "and": [
+            { "u_has_var": "u_been_to_migos", "value": "yes" },
+            { "not": { "u_has_var": "chris_planned_for_bomb", "value": "yes" } }
+          ]
+        },
+        "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb"
+      },
       { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
       { "text": "I'd better get going.", "topic": "TALK_DONE" }
     ]
@@ -648,6 +668,36 @@
       { "text": "I'll let you get on that, I've got my own preparations to take care of.", "topic": "TALK_DONE" }
     ]
   },
+  {
+    "type": "talk_topic",
+    "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb",
+    "dynamic_line": "* looks thoughtful for a moment, then becomes a bit nervous.  \"Wait, won't that run the risk of injuring Barry, or possibly collapsing the tower?  I don't want him hurt during this, or anyone else if this bomb sends back a bunch of shrapnel.  What do you think about it?\"",
+    "responses": [
+      {
+        "text": "Don't worry, I know what I'm doing.  I've taken a look at these sorts of towers before, and I know that the structure itself is pretty solid.  If we tune it right, then the tower won't fall over.",
+        "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb_Luke"
+      },
+      { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" },
+      { "text": "I'd better get going.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Bomb_Luke",
+    "dynamic_line": "Well, I trust you on this.  If you need a good hand with chemistry, go see Luke about it.  He knows a lot, you'd be surprised.  \" He pauses for a moment, and thinks as if trying to recall something.  \"Luke should be over in the old outbuilding near the dairy, that's on the other end of the property.",
+    "responses": [
+      {
+        "text": "That sounds great, I'll go talk to him about it.  Let's talk about something else first, though.",
+        "effect": { "u_add_var": "chris_planned_for_bomb", "value": "yes" },
+        "topic": "TALK_ISHERWOOD_CHRIS_TOPICS"
+      },
+      {
+        "text": "That sounds great, I'll go talk to him about it.",
+        "effect": { "u_add_var": "chris_planned_for_bomb", "value": "yes" },
+        "topic": "TALK_DONE"
+      }
+    ]
+  },
   {
     "type": "talk_topic",
     "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_CHRIS_TRY_AGAIN",