Merge pull request #69565 from MNG-cataclysm/old_guard_mission_fix

Fix the Old Guard representative mission
CleverRaven · Nov 21, 2023 · 7b4938f · 7b4938f
2 parents 19e210f + 980dc95
commit 7b4938f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json b/data/json/effects_on_condition/npc_eocs/generic_npc_eocs.json
@@ -397,5 +397,19 @@
       { "u_lose_effect": "boomered" },
       { "u_lose_effect": "corroding" }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_MISSION_OLD_GUARD_REP_3_CHECK",
+    "global": true,
+    "eoc_type": "EVENT",
+    "required_event": "avatar_enters_omt",
+    "condition": {
+      "and": [ { "math": [ "old_guard_rep_scouting", "==", "1" ] }, { "u_near_om_location": "exodii_base_x0y3z0", "range": 0 } ]
+    },
+    "effect": [
+      { "math": [ "old_guard_rep_scouting", "=", "0" ] },
+      { "u_add_var": "u_scouted_exodii", "type": "missions", "context": "old_guard", "value": "yes" }
+    ]
   }
 ]
diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json b/data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json
@@ -243,11 +243,13 @@
     "type": "mission_definition",
     "name": { "str": "Find Source of Robots" },
     "description": "I don't usually hear much from command, but we got a message by radio recently.  You might be the right choice to look into it for me.  There've been reports of weird robots and things wandering around since things went south.  Dunno how, but apparently command tracked down what they think is the source.  They want someone to go check out who is making these, and if we can get any tech or assistance from them.  This is strictly recon, you understand: could be a hostile entity, so do not engage directly.",
-    "goal": "MGOAL_GO_TO",
+    "goal": "MGOAL_CONDITION",
+    "goal_condition": { "u_has_var": "u_scouted_exodii", "type": "missions", "context": "old_guard", "value": "yes" },
     "difficulty": 2,
     "value": 10000,
     "start": {
-      "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5, "search_range": 400 }
+      "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5, "search_range": 400 },
+      "effect": [ { "math": [ "old_guard_rep_scouting", "=", "1" ] } ]
     },
     "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_OLD_GUARD_REP_4",