Fix EOC_Nunez_Travel's mapgen_updates searches

CleverRaven · Nov 7, 2024 · e3e324d · e3e324d
1 parent 582f33f
commit e3e324d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
@@ -241,8 +241,17 @@
     "speaker_effect": {
       "effect": [
         { "finish_mission": "MISSION_TACOMA_Nunez", "success": true },
-        { "math": [ "nunez_travel_timer", "=", "time_since('cataclysm', 'unit': 'days') + 2" ] },
-        { "math": [ "nunez_travel_stage", "=", "1" ] }
+        { "npc_location_variable": { "context_val": "refcenter_nunez_departure" } },
+        { "math": [ "_travel_time", "=", "time_since('cataclysm', 'unit': 'days') + 2" ] },
+        {
+          "run_eocs": [ "EOC_Nunez_Travel" ],
+          "time_in_future": { "context_val": "travel_time" },
+          "variables": {
+            "refcenter_nunez_departure": { "context_val": "refcenter_nunez_departure" },
+            "tacoma_nunez_trailer_arrive": { "u_val": "tacoma_nunez_trailer_arrive" }
+          }
+        },
+        { "u_lose_var": "tacoma_nunez_trailer_arrive" }
       ]
     }
   },

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
@@ -64,7 +64,8 @@
             { "u_has_mission": "MISSION_TACOMA_Nunez" },
             { "compare_string": [ "phase_1", { "u_val": "recruit_general_Nunez_Tacoma" } ] }
           ]
-        }
+        },
+        "effect": { "u_location_variable": { "u_val": "tacoma_nunez_trailer_arrive" } }
       },
       {
         "text": "Hey, are you looking for workers here?",

diff --git a/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json b/data/json/npcs/tacoma_ranch/Nunez/Arrival_code.json
@@ -2,19 +2,18 @@
   {
     "id": "EOC_Nunez_Travel",
     "type": "effect_on_condition",
-    "recurrence": 1000,
-    "condition": {
-      "and": [
-        { "math": [ "nunez_travel_stage", "==", "1" ] },
-        { "math": [ "nunez_travel_timer", "<", "time_since('cataclysm', 'unit': 'days')" ] }
-      ]
-    },
-    "deactivate_condition": { "math": [ "nunez_travel_stage", "==", "2" ] },
     "effect": [
       { "math": [ "u_counter_refugee_center_refugee_happiness", "++" ] },
-      { "mapgen_update": "tacoma_nunez_trailer_arrive", "om_terrain": "ranch_camp_55" },
-      { "mapgen_update": "refcenter_nunez_departure", "om_terrain": "evac_center_7" },
-      { "math": [ "nunez_travel_stage", "++" ] }
+      {
+        "mapgen_update": "tacoma_nunez_trailer_arrive",
+        "om_terrain": "ranch_camp_55",
+        "target_var": { "context_val": "tacoma_nunez_trailer_arrive" }
+      },
+      {
+        "mapgen_update": "refcenter_nunez_departure",
+        "om_terrain": "evac_center_7",
+        "target_var": { "context_val": "refcenter_nunez_departure" }
+      }
     ]
   },
   {

diff --git a/doc/MAPGEN.md b/doc/MAPGEN.md
@@ -1524,7 +1524,7 @@ update_mapgen updates an existing overmap tile.  These fields provide a way to s
 ### "assign_mission_target"
 
 assign_mission_target assigns an overmap tile as the target of a mission.  Any update_mapgen in the same scope will
-update that overmap tile.  The closet overmap terrain with the required terrain ID will be used, and if there is no
+update that overmap tile.  The closest overmap terrain with the required terrain ID will be used, and if there is no
 matching terrain, an overmap special of om_special type will be created and then the om_terrain within that special will
 be used.