Merge pull request CleverRaven#78949 from RenechCDDA/remove_search_ra…

…dius Remove mission search radius from most missions
arijust · Jan 6, 2025 · 9d60e47 · 9d60e47
2 parents be83dd1 + 7b04e7d
commit 9d60e47
Show file tree

Hide file tree

Showing 57 changed files with 196 additions and 578 deletions.
diff --git a/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json b/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json
@@ -223,79 +223,79 @@
       { "math": [ "u_LIXA_hallway_direction = 2" ] },
       {
         "u_location_variable": { "global_val": "LIXA_unfold_A" },
-        "target_params": { "om_terrain": "LIXA_device_unfolded_A", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_unfolded_A", "min_distance": 0, "z": 0 },
         "z_adjust": -8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_unfold_B" },
-        "target_params": { "om_terrain": "LIXA_device_unfolded_B", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_unfolded_B", "min_distance": 0, "z": 0 },
         "z_adjust": -8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_1" },
-        "target_params": { "om_terrain": "LIXA_device_1", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_1", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_2" },
-        "target_params": { "om_terrain": "LIXA_device_2", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_2", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_3" },
-        "target_params": { "om_terrain": "LIXA_device_3", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_3", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_NW" },
-        "target_params": { "om_terrain": "LIXA_workfloor_1a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_1a", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_NE" },
-        "target_params": { "om_terrain": "LIXA_workfloor_2a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_2a", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_SW" },
-        "target_params": { "om_terrain": "LIXA_workfloor_1b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_1b", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_SE" },
-        "target_params": { "om_terrain": "LIXA_workfloor_2b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_2b", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_NW" },
-        "target_params": { "om_terrain": "LIXA_surface_1a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_1a", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_NE" },
-        "target_params": { "om_terrain": "LIXA_surface_1b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_1b", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_SW" },
-        "target_params": { "om_terrain": "LIXA_surface_2a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_2a", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_SE" },
-        "target_params": { "om_terrain": "LIXA_surface_2b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_2b", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       }

diff --git a/data/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json
@@ -22,7 +22,7 @@
           "effect": [
             {
               "u_location_variable": { "global_val": "glass_place" },
-              "target_params": { "om_terrain": "nether_glass_deep", "search_range": 20, "min_distance": 3, "z": -10 }
+              "target_params": { "om_terrain": "nether_glass_deep", "min_distance": 3, "z": -10 }
             },
             {
               "u_teleport": { "global_val": "glass_place" },

diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
@@ -922,7 +922,7 @@
     "effect": [
       {
         "u_location_variable": { "global_val": "portal_dungeon" },
-        "target_params": { "om_terrain": "field", "search_range": 200, "min_distance": 3, "z": 0 }
+        "target_params": { "om_terrain": "field", "min_distance": 3, "z": 0 }
       },
       {
         "u_message": "You can feel the presence of something nearby, cracked in a way you can't put into words (check mission log for details)."

diff --git a/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/vitrification_effect_on_condition.json
@@ -74,55 +74,55 @@
       { "math": [ "u_glass_sleepiness = u_val('sleepiness')" ] },
       {
         "u_location_variable": { "global_val": "vitrified_farm_ground" },
-        "target_params": { "om_terrain": "unvitrified_farm_0", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_farm_0", "min_distance": 0, "z": 0 },
         "z_adjust": 6,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_farm_upper" },
-        "target_params": { "om_terrain": "unvitrified_farm_1", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_farm_1", "min_distance": 0, "z": 0 },
         "z_adjust": 7,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_farm_basement" },
-        "target_params": { "om_terrain": "unvitrified_farm_neg_1", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_farm_neg_1", "min_distance": 0, "z": 0 },
         "z_adjust": 5,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_farm_roof" },
-        "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_farm_2", "min_distance": 0, "z": 0 },
         "z_adjust": 8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_sky_1" },
-        "target_params": { "om_terrain": "unvitrified_farm_2", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_farm_2", "min_distance": 0, "z": 0 },
         "z_adjust": 9,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_apples" },
-        "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_orchard", "min_distance": 0, "z": 0 },
         "z_adjust": 6,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_apples_sky_lower" },
-        "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_orchard", "min_distance": 0, "z": 0 },
         "z_adjust": 7,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_apples_sky_upper" },
-        "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_orchard", "min_distance": 0, "z": 0 },
         "z_adjust": 8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "vitrified_sky_2" },
-        "target_params": { "om_terrain": "unvitrified_orchard", "search_range": 100, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "unvitrified_orchard", "min_distance": 0, "z": 0 },
         "z_adjust": 9,
         "z_override": true
       },

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
@@ -15,7 +15,7 @@
           "then": [
             {
               "u_location_variable": { "global_val": "invasion_map" },
-              "target_params": { "om_terrain": "barry_mi-go_scout_tower_1", "search_range": 500, "z": 0 }
+              "target_params": { "om_terrain": "barry_mi-go_scout_tower_1", "z": 0 }
             },
             { "u_teleport": { "global_val": "invasion_map" }, "force": true },
             { "run_eocs": [ "isherwood_mission_chris_spawn_eoc", "isherwood_mission_lisa_spawn_eoc" ] },
@@ -84,7 +84,7 @@
     "effect": [
       {
         "u_location_variable": { "global_val": "invasion_map" },
-        "target_params": { "om_terrain": "barry_mi-go_scout_tower_1", "search_range": 500, "z": 0 }
+        "target_params": { "om_terrain": "barry_mi-go_scout_tower_1", "z": 0 }
       },
       { "u_teleport": { "global_val": "invasion_map" }, "force": true },
       {
@@ -170,7 +170,7 @@
                 "effect": [
                   {
                     "u_location_variable": { "global_val": "invasion_map" },
-                    "target_params": { "om_terrain": "horse_farm_isherwood_13", "search_range": 500, "z": 0 }
+                    "target_params": { "om_terrain": "horse_farm_isherwood_13", "z": 0 }
                   },
                   { "u_teleport": { "global_val": "invasion_map" }, "force": true },
                   {
@@ -211,12 +211,7 @@
             "id": "EOC_BARRY_TRAVEL_HOME",
             "effect": [
               {
-                "u_set_goal": {
-                  "om_terrain": "horse_farm_isherwood_14",
-                  "om_special": "Isherwood Farm Mutable",
-                  "reveal_radius": 0,
-                  "search_range": 500
-                }
+                "u_set_goal": { "om_terrain": "horse_farm_isherwood_14", "om_special": "Isherwood Farm Mutable", "reveal_radius": 0 }
               }
             ]
           }
@@ -241,7 +236,7 @@
             "effect": [
               {
                 "u_location_variable": { "global_val": "barry_return_home_map" },
-                "target_params": { "om_terrain": "horse_farm_isherwood_13", "om_special": "Isherwood Farm Mutable", "search_range": 500, "z": 0 },
+                "target_params": { "om_terrain": "horse_farm_isherwood_13", "om_special": "Isherwood Farm Mutable", "z": 0 },
                 "furniture": "f_sofa",
                 "target_max_radius": 30,
                 "min_radius": 0,
@@ -342,7 +337,7 @@
       { "math": [ "is_isherwood_flee_eoc_activated = 0" ] },
       {
         "u_location_variable": { "global_val": "isherwood_mission_sucess_return_map" },
-        "target_params": { "om_terrain": "horse_farm_isherwood_13", "search_range": 500, "z": 0 },
+        "target_params": { "om_terrain": "horse_farm_isherwood_13", "z": 0 },
         "furniture": "f_chair",
         "target_max_radius": 30,
         "min_radius": 0,
@@ -401,7 +396,7 @@
       },
       {
         "u_location_variable": { "global_val": "isherwood_mission_sucess_return_map" },
-        "target_params": { "om_terrain": "horse_farm_isherwood_13", "search_range": 500, "z": 0 },
+        "target_params": { "om_terrain": "horse_farm_isherwood_13", "z": 0 },
         "furniture": "f_chair",
         "target_max_radius": 30,
         "min_radius": 0,
@@ -458,7 +453,7 @@
           { "mapgen_update": "isherwood_rescue_remove_npcs", "om_terrain": "isherwood_barry_rescue_field" },
           {
             "u_location_variable": { "global_val": "isherwood_mission_sucess_return_map" },
-            "target_params": { "om_terrain": "horse_farm_isherwood_13", "search_range": 500, "z": 0 },
+            "target_params": { "om_terrain": "horse_farm_isherwood_13", "z": 0 },
             "furniture": "f_chair",
             "target_max_radius": 30,
             "min_radius": 0,

diff --git a/data/json/effects_on_condition/scenario_specific_eocs.json b/data/json/effects_on_condition/scenario_specific_eocs.json
@@ -54,7 +54,7 @@
     "effect": [
       {
         "u_location_variable": { "u_val": "mansion_centre" },
-        "target_params": { "om_terrain": "mansion_+4d", "search_range": 2, "z": -1 },
+        "target_params": { "om_terrain": "mansion_+4d", "z": -1 },
         "min_radius": 0,
         "max_radius": 0
       },

diff --git a/data/json/monster_special_attacks/void_spider_mechanics.json b/data/json/monster_special_attacks/void_spider_mechanics.json
@@ -20,7 +20,7 @@
             { "u_message": "The world warps." },
             {
               "u_location_variable": { "global_val": "spider_map" },
-              "target_params": { "om_terrain": "void_spider_lair_entrance", "z": -5, "search_range": 400, "min_distance": 1 }
+              "target_params": { "om_terrain": "void_spider_lair_entrance", "z": -5, "min_distance": 1 }
             },
             { "u_teleport": { "global_val": "spider_map" }, "force": true }
           ]
@@ -359,7 +359,7 @@
       { "u_message": "The cavern folds itself beyond perception.", "popup": true },
       {
         "u_location_variable": { "global_val": "nether_glass" },
-        "target_params": { "om_terrain": "nether_glass_deep", "z": -10, "search_range": 400, "min_distance": 1 }
+        "target_params": { "om_terrain": "nether_glass_deep", "z": -10, "min_distance": 1 }
       },
       { "u_teleport": { "global_val": "nether_glass" }, "force": true },
       {

diff --git a/data/json/npcs/Backgrounds/OtherSurvivorStories/Brigitte_LaCroix_Background.json b/data/json/npcs/Backgrounds/OtherSurvivorStories/Brigitte_LaCroix_Background.json
@@ -36,7 +36,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "cemetery_religious", "om_terrain": "cemetery_4square_11", "reveal_radius": 5, "search_range": 400 },
+      "assign_mission_target": { "om_special": "cemetery_religious", "om_terrain": "cemetery_4square_11", "reveal_radius": 5 },
       "effect": { "u_add_var": "BOSS_mission_directions", "value": "Brigitte_LaCroix" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Backgrounds/OtherSurvivorStories/Lapin_01.json b/data/json/npcs/Backgrounds/OtherSurvivorStories/Lapin_01.json
@@ -36,7 +36,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "Cabin_Lapin", "om_terrain": "cabin_lapin", "reveal_radius": 5, "search_range": 400 },
+      "assign_mission_target": { "om_special": "Cabin_Lapin", "om_terrain": "cabin_lapin", "reveal_radius": 5 },
       "effect": { "u_add_var": "BOSS_mission_directions", "value": "lapin" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Backgrounds/OtherSurvivorStories/NC_Farmer_background.json b/data/json/npcs/Backgrounds/OtherSurvivorStories/NC_Farmer_background.json
@@ -39,7 +39,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "Farm Mutable", "om_terrain": "farm_2", "reveal_radius": 5, "search_range": 400 },
+      "assign_mission_target": { "om_special": "Farm Mutable", "om_terrain": "farm_2", "reveal_radius": 5 },
       "effect": { "u_add_var": "BOSS_mission_directions", "value": "farmer" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Backgrounds/OtherSurvivorStories/NC_SURVIVOR_CHEF_background.json b/data/json/npcs/Backgrounds/OtherSurvivorStories/NC_SURVIVOR_CHEF_background.json
@@ -39,7 +39,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_terrain": "s_restaurant", "om_special": "restraunt", "reveal_radius": 5, "search_range": 400 },
+      "assign_mission_target": { "om_terrain": "s_restaurant", "om_special": "restraunt", "reveal_radius": 5 },
       "effect": { "u_add_var": "BOSS_mission_directions", "value": "chef" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Backgrounds/hospital_2.json b/data/json/npcs/Backgrounds/hospital_2.json
@@ -187,7 +187,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "Cabin_2", "om_terrain": "cabin_2", "reveal_radius": 3, "search_range": 400 },
+      "assign_mission_target": { "om_special": "Cabin_2", "om_terrain": "cabin_2", "reveal_radius": 3 },
       "effect": { "u_add_var": "mission_BGSS_hospital_2_started_quest", "value": "yes" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json
@@ -772,7 +772,7 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "Locked LMOE Shelter", "om_terrain": "lmoe_prepperquest", "reveal_radius": 3, "search_range": 400 }
+      "assign_mission_target": { "om_special": "Locked LMOE Shelter", "om_terrain": "lmoe_prepperquest", "reveal_radius": 3 }
     },
     "end": {
       "effect": [

diff --git a/data/json/npcs/Backgrounds/rural_1.json b/data/json/npcs/Backgrounds/rural_1.json
@@ -106,7 +106,7 @@
     "difficulty": 3,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "Farm Mutable", "om_terrain": "farm_3", "reveal_radius": 3, "search_range": 400 },
+      "assign_mission_target": { "om_special": "Farm Mutable", "om_terrain": "farm_3", "reveal_radius": 3 },
       "effect": { "u_add_var": "mission_BGSS_rural_1_started_quest", "value": "yes" }
     },
     "origins": [ "ORIGIN_SECONDARY" ],

diff --git a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
@@ -289,13 +289,7 @@
     "difficulty": 0,
     "value": 5000,
     "start": {
-      "assign_mission_target": {
-        "om_terrain": "lighthouse_ground",
-        "om_special": "Lighthouse Island",
-        "reveal_radius": 10,
-        "search_range": 360,
-        "cant_see": true
-      },
+      "assign_mission_target": { "om_terrain": "lighthouse_ground", "om_special": "Lighthouse Island", "reveal_radius": 10, "cant_see": true },
       "update_mapgen": [
         {
           "om_terrain": "lighthouse_ground",