Merge pull request #77471 from Uwuewsky/refactor-robofac

Refactoring Hub01's prototype menu
CleverRaven · Nov 3, 2024 · 1f0daba · 1f0daba
2 parents c825d95 + adb355e
commit 1f0daba
Show file tree

Hide file tree

Showing 4 changed files with 379 additions and 666 deletions.
diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom.json
@@ -223,13 +223,7 @@
       "TALK_ROBOFAC_INTERCOM_SERVICES",
       "TALK_ROBOFAC_INTERCOM_SERVICES_FIRST",
       "TALK_ROBOFAC_INTERCOM_PORTAL_STORMS_END",
-      "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_MERCENARY_END",
-      "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH_END",
-      "TALK_ROBOFAC_INTERCOM_RIFLE_STARTED",
-      "TALK_ROBOFAC_INTERCOM_REPAIR_STARTED_SHORT",
-      "TALK_ROBOFAC_INTERCOM_REPAIR_STARTED_LONG",
-      "TALK_ROBOFAC_INTERCOM_ANCHOR_PT_1_STARTED",
-      "TALK_ROBOFAC_INTERCOM_ANCHOR_PT_2_STARTED"
+      "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_MERCENARY_END"
     ],
     "type": "talk_topic",
     "dynamic_line": {
@@ -238,7 +232,6 @@
         "So, do you need something?",
         "Yes, mercenary?",
         "Mercenary.",
-        "Mercenary.",
         "Well?",
         "Say it.",
         "Get with it.",
@@ -594,20 +587,12 @@
     "dynamic_line": "Thank you.  This might be of use benefit to us, but we will need at least a day to read the contents of the template.  Please speak with us again once we've had time.",
     "speaker_effect": {
       "effect": [
-        {
-          "u_sell_item": "template_armor",
-          "count": 1,
-          "true_eocs": {
-            "id": "EOC_nano_ask",
-            "effect": [
-              { "u_add_faction_trust": 2 },
-              { "math": [ "u_timer_hub_rnd_u_waiting_on_armor", "=", "time('now')" ] },
-              { "u_add_var": "dialogue_hub_rnd_u_gave_armor_disk", "value": "yes" },
-              { "u_add_var": "dialogue_hub_rnd_u_project_ongoing", "value": "yes" },
-              { "u_add_var": "dialogue_intercom_u_hub_prototypes", "value": "yes" }
-            ]
-          }
-        }
+        { "u_consume_item": "template_armor", "count": 1, "popup": true },
+        { "u_add_faction_trust": 2 },
+        { "math": [ "u_timer_hub_rnd_u_waiting_on_armor", "=", "time('now')" ] },
+        { "u_add_var": "dialogue_hub_rnd_u_gave_armor_disk", "value": "yes" },
+        { "u_add_var": "dialogue_hub_rnd_u_project_ongoing", "value": "yes" },
+        { "u_add_var": "dialogue_intercom_u_hub_prototypes", "value": "yes" }
       ],
       "sentinel": "gave_armor_template"
     },
@@ -616,11 +601,6 @@
       { "text": "I'll see you then.", "topic": "TALK_DONE" }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_fema_data",
-    "effect": { "u_add_var": "dialogue_intercom_completed_free_merchants_hub_delivery_1", "value": "yes" }
-  },
   {
     "//": "These are all dialogues related to the breadcrumb quest from the refugee center to deliver a hard drive.",
     "id": [
@@ -642,7 +622,10 @@
       {
         "text": "[Hand over the FEMA data.]",
         "condition": { "u_has_items": { "item": "fema_data", "count": 1 } },
-        "effect": [ { "u_sell_item": "fema_data", "count": 1, "true_eocs": "EOC_fema_data" } ],
+        "effect": [
+          { "u_consume_item": "fema_data", "count": 1, "popup": true },
+          { "u_add_var": "dialogue_intercom_completed_free_merchants_hub_delivery_1", "value": "yes" }
+        ],
         "topic": "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_END"
       },
       {
@@ -678,7 +661,10 @@
       {
         "text": "[Hand over the FEMA data.]",
         "condition": { "u_has_items": { "item": "fema_data", "count": 1 } },
-        "effect": [ { "u_sell_item": "fema_data", "count": 1, "true_eocs": "EOC_fema_data" } ],
+        "effect": [
+          { "u_consume_item": "fema_data", "count": 1, "popup": true },
+          { "u_add_var": "dialogue_intercom_completed_free_merchants_hub_delivery_1", "value": "yes" }
+        ],
         "topic": "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_MERCENARY_END"
       },
       {

diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json
@@ -1109,7 +1109,7 @@
       {
         "text": "I appreciate the credit.  I've got your payment now.",
         "effect": [
-          { "u_sell_item": "RobofacCoin", "count": 8 },
+          { "u_consume_item": "RobofacCoin", "count": 8, "popup": true },
           { "finish_mission": "MISSION_HUB01_PAY_BACK_RIOT_GEAR", "success": true }
         ],
         "topic": "TALK_ROBOFAC_INTERCOM_SERVICES"