More Luke truck bomb stuff

CleverRaven · May 6, 2024 · 14e5c48 · 14e5c48
1 parent c70dfde
commit 14e5c48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json b/data/json/effects_on_condition/npc_eocs/isherwood_barry_rescue_eocs.json
@@ -313,5 +313,16 @@
       ]
     },
     "effect": [ { "math": [ "currently_invading_map", "=", "1" ] }, { "math": [ "is_isherwood_flee_eoc_activated", "=", "1" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_LUKE_RETRIEVE_TRUCK_END",
+    "condition": { "not": { "u_near_om_location": "trailhead_shack_z0", "range": 2 } },
+    "deactivate_condition": { "math": [ "isherwood_luke_truck_status", ">", "1" ] },
+    "effect": [
+      { "mapgen_update": "LUKE_REMOVE_TRUCK", "om_terrain": "trailhead_shack_z0" },
+      { "math": [ "isherwood_luke_truck_status", "++" ] }
+    ],
+    "false_effect": [ { "queue_eocs": "EOC_LUKE_RETRIEVE_TRUCK_END", "time_in_future": 100 } ]
   }
 ]
diff --git a/data/json/mapgen/nested/isherwood_mission_nested.json b/data/json/mapgen/nested/isherwood_mission_nested.json
@@ -234,5 +234,11 @@
     "method": "json",
     "update_mapgen_id": "truck_bomb_spawn",
     "object": { "place_item": [ { "item": "fake_dynamite_50lbs", "x": 17, "y": 18, "custom-flags": [ "ACTIVATE_ON_PLACE" ] } ] }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "LUKE_REMOVE_TRUCK",
+    "method": "json",
+    "object": { "remove_vehicles": [ { "vehicles": [ "pickup" ], "x": [ 0, 23 ], "y": [ 0, 23 ] } ] }
   }
 ]