From 199f51cb192ecc7c60ea85cf7bcc40e347d47862 Mon Sep 17 00:00:00 2001 From: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com> Date: Sat, 4 Jan 2025 18:35:31 -0500 Subject: [PATCH 1/4] Remove mission search radius from most missions --- .../nether_eocs/LIXA_EOCs_spells_traps.json | 26 +-- .../nether_glass_effect_on_condition.json | 2 +- .../portal_storm_effect_on_condition.json | 2 +- .../vitrification_effect_on_condition.json | 18 +- .../npc_eocs/isherwood_barry_rescue_eocs.json | 21 +- .../scenario_specific_eocs.json | 2 +- .../void_spider_mechanics.json | 4 +- .../Brigitte_LaCroix_Background.json | 2 +- .../OtherSurvivorStories/Lapin_01.json | 2 +- .../NC_Farmer_background.json | 2 +- .../NC_SURVIVOR_CHEF_background.json | 2 +- data/json/npcs/Backgrounds/hospital_2.json | 2 +- data/json/npcs/Backgrounds/prepper_1.json | 2 +- data/json/npcs/Backgrounds/rural_1.json | 2 +- .../Lighthouse_Family/NPC_lighthouse_man.json | 8 +- data/json/npcs/exodii/common_talk.json | 17 +- .../npcs/exodii/exodii_merchant_missions.json | 8 +- data/json/npcs/exodii/non-NPC_missions.json | 4 +- data/json/npcs/godco/godco_missions.json | 25 +-- data/json/npcs/holdouts/Mr_Lapin.json | 2 +- .../Isherwood_Rescue_NPC_Duplicates.json | 4 +- .../isherwood_farm/NPC_Barry_Isherwood.json | 7 +- .../isherwood_farm/NPC_Carlos_Isherwood.json | 1 - .../isherwood_farm/NPC_Claire_Isherwood.json | 1 - .../isherwood_farm/NPC_Jesse_Isherwood.json | 4 +- .../isherwood_farm/NPC_Luke_Isherwood.json | 4 +- .../isolated_road/isolated_road_missions.json | 6 +- data/json/npcs/missiondef.json | 67 +----- data/json/npcs/other/NPC_pizzaiolo.json | 9 +- .../group_camp/group_camp_missions.json | 4 +- data/json/npcs/other/meteorologist.json | 2 +- .../camper_van_traveler.json | 10 +- .../random_encounters/refugee_caravans.json | 4 +- .../surface_refugees/NPC_Alonso_Lautrec.json | 2 +- .../NPC_Boris_Borichenko.json | 8 +- .../surface_refugees/NPC_Dana_Nunez.json | 2 +- .../NPC_free_merchant_teamster.json | 13 +- .../surface_staff/NPC_old_guard_doctor.json | 3 +- .../free_merchant_shopkeep_missions.json | 12 +- .../NPC_old_guard_representative.json | 14 +- .../npcs/robofac/NPC_Cranberry_Foster.json | 4 +- .../BEM_human_sample.json | 2 +- .../BEM_jabberwock.json | 1 - .../robofac_intercom_missions.json | 8 +- .../robofac_intercom_trades.json | 2 +- .../liam_starting_follower.json | 2 +- data/json/starting_missions.json | 37 +--- .../Aftershock/EOC/agustmoon_travel_eocs.json | 33 ++- .../mods/Aftershock/effects_on_condition.json | 4 +- .../missions/bounty_hunter_missions.json | 1 - .../npcs/milly_whately_dialogue.json | 3 +- data/mods/Aftershock/npcs/sadie.json | 2 +- .../Defense_Mode/dialogue/menu_screen.json | 4 +- data/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json | 4 +- data/mods/DinoMod/NPC/NC_Red.json | 8 +- data/mods/DinoMod/NPC/NC_Yoshimi.json | 18 +- .../Isolation-Protocol/EOC/elevator_eoc.json | 6 +- data/mods/Magiclysm/items/currency.json | 7 +- .../Magiclysm/npc/forge_diviner_missions.json | 190 ++++-------------- .../No_Hope/NPC/NPC_Old_Guard_Captain.json | 4 +- data/mods/Sky_Island/EOCs.json | 40 +--- data/mods/Sky_Island/island_upgrades.json | 72 +------ data/mods/Sky_Island/missions_and_mapgen.json | 9 - data/mods/Sky_Island/obelisk_selector.json | 5 - .../eocs/elemental_eruptions.json | 2 +- data/mods/Xedra_Evolved/missions.json | 8 +- .../defense_mode/main_menu.json | 2 +- data/mods/Xedra_Evolved/npc/boann_quests.json | 26 +-- data/mods/Xedra_Evolved/npc/draco_dune.json | 4 +- data/mods/innawood/npcs/missiondef.json | 10 +- doc/EFFECT_ON_CONDITION.md | 10 +- doc/MISSIONS_JSON.md | 2 +- src/mission_util.cpp | 9 +- 73 files changed, 227 insertions(+), 642 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 index e69e0a0f35467..2b2a955cc3954 100644 --- 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 index 838191e528947..4167b2c98abfe 100644 --- 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 index 15fefe7721797..b25f357224dda 100644 --- 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 index f649fbb841435..954b4d507e4ff 100644 --- 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 index cb4e0006d6180..bcd21778a2837 100644 --- 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 index ca9d29afc30c6..a574f7b14de13 100644 --- 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 index 4c7af7e69b912..f07a785906518 100644 --- 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 index e02f96516942a..d3d3f07e3a5cf 100644 --- 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 index dc602170462f4..da0ede769f4a2 100644 --- 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 index 801438c1d7eda..3f6dc3de45b22 100644 --- 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 index ac1f75c002cd0..8982eee777ba3 100644 --- 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 index b63c6db639088..2cda652f5dc77 100644 --- 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 index 252173e5d32ef..ad440209162a9 100644 --- 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 index ebb1f88330dcf..2d6e466d3c647 100644 --- 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 index 55a34c85ca94e..a75e913e11382 100644 --- 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", diff --git a/data/json/npcs/exodii/common_talk.json b/data/json/npcs/exodii/common_talk.json index f0ab64fd3a466..381ebd6862bbd 100644 --- a/data/json/npcs/exodii/common_talk.json +++ b/data/json/npcs/exodii/common_talk.json @@ -107,9 +107,7 @@ "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, - "start": { - "assign_mission_target": { "om_special": "Strange warehouse", "om_terrain": "exo_warehouse_1", "reveal_radius": 2, "search_range": 1000 } - }, + "start": { "assign_mission_target": { "om_special": "Strange warehouse", "om_terrain": "exo_warehouse_1", "reveal_radius": 2 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": ".", @@ -132,12 +130,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { - "om_special": "Out-of-place Stone Barn", - "om_terrain": "exo_safehouse_stone_0", - "reveal_radius": 2, - "search_range": 1000 - } + "assign_mission_target": { "om_special": "Out-of-place Stone Barn", "om_terrain": "exo_safehouse_stone_0", "reveal_radius": 2 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -161,7 +154,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_special": "Mi-Go Scout Tower", "om_terrain": "mi-go_scout_tower_3", "reveal_radius": 2, "search_range": 1000 } + "assign_mission_target": { "om_special": "Mi-Go Scout Tower", "om_terrain": "mi-go_scout_tower_3", "reveal_radius": 2 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -184,9 +177,7 @@ "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, - "start": { - "assign_mission_target": { "om_special": "desolate barn", "om_terrain": "desolatebarn", "reveal_radius": 2, "search_range": 1000 } - }, + "start": { "assign_mission_target": { "om_special": "desolate barn", "om_terrain": "desolatebarn", "reveal_radius": 2 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": ".", diff --git a/data/json/npcs/exodii/exodii_merchant_missions.json b/data/json/npcs/exodii/exodii_merchant_missions.json index 7fce7996afc74..bd4e750d83d1f 100644 --- a/data/json/npcs/exodii/exodii_merchant_missions.json +++ b/data/json/npcs/exodii/exodii_merchant_missions.json @@ -27,13 +27,7 @@ "goal": "MGOAL_GO_TO_TYPE", "destination": "robofachq_surface_entrance", "start": { - "assign_mission_target": { - "om_terrain": "robofachq_surface_entrance", - "om_special": "hub_01", - "reveal_radius": 1, - "random": false, - "search_range": 2400 - } + "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1, "random": false } }, "end": { "effect": [ { "u_add_var": "mission_completed_u_scouted_bunker", "value": "yes" } ] }, "difficulty": 2, diff --git a/data/json/npcs/exodii/non-NPC_missions.json b/data/json/npcs/exodii/non-NPC_missions.json index 7dfca2c5bd6c0..34d5a5a67576d 100644 --- a/data/json/npcs/exodii/non-NPC_missions.json +++ b/data/json/npcs/exodii/non-NPC_missions.json @@ -7,9 +7,7 @@ "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5, "search_range": 540 } - }, + "start": { "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "I found a weird pictographic sign that seemed to point towards someone willing to trade.", diff --git a/data/json/npcs/godco/godco_missions.json b/data/json/npcs/godco/godco_missions.json index b8d43e605e077..40d9bf49b8b57 100644 --- a/data/json/npcs/godco/godco_missions.json +++ b/data/json/npcs/godco/godco_missions.json @@ -338,9 +338,7 @@ "goal": "MGOAL_FIND_ITEM", "difficulty": 1, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "slimepit_z0", "om_special": "Slime Pit", "reveal_radius": 3, "search_range": 280 } - }, + "start": { "assign_mission_target": { "om_terrain": "slimepit_z0", "om_special": "Slime Pit", "reveal_radius": 3 } }, "item": "slime_scrap", "count": 3, "origins": [ "ORIGIN_SECONDARY" ], @@ -420,7 +418,7 @@ "goal": "MGOAL_FIND_ITEM", "difficulty": 3, "value": 0, - "start": { "assign_mission_target": { "om_terrain": "hive", "om_special": "Bee Hive", "reveal_radius": 3, "search_range": 280 } }, + "start": { "assign_mission_target": { "om_terrain": "hive", "om_special": "Bee Hive", "reveal_radius": 3 } }, "item": "bee_sting", "count": 1, "origins": [ "ORIGIN_SECONDARY" ], @@ -455,7 +453,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 1, "random": false, "search_range": 20, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 1, "random": false, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_zombie_screecher", "x": 11, "y": 11, "target": true } ] } }, "end": { @@ -490,7 +488,7 @@ "difficulty": 4, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 60, "min_distance": 20 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 20 }, "update_mapgen": { "rows": [ " .............. ", @@ -574,7 +572,7 @@ "value": 0, "item": "small_relic", "start": { - "assign_mission_target": { "om_terrain": "cathedral_1_SE", "om_special": "cathedral", "reveal_radius": 1, "random": false, "search_range": 100 } + "assign_mission_target": { "om_terrain": "cathedral_1_SE", "om_special": "cathedral", "reveal_radius": 1, "random": false } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_GODCO_GREENWOOD_3", @@ -603,7 +601,7 @@ "item": "holybook_bible1", "count": 20, "start": { - "assign_mission_target": { "om_terrain": "s_bookstore", "om_special": "s_bookstore", "reveal_radius": 1, "random": false, "search_range": 100 } + "assign_mission_target": { "om_terrain": "s_bookstore", "om_special": "s_bookstore", "reveal_radius": 1, "random": false } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -685,14 +683,7 @@ "difficulty": 1, "value": 0, "start": { - "assign_mission_target": { - "om_terrain": "s_pharm", - "om_special": "s_pharm", - "reveal_radius": 1, - "random": false, - "search_range": 1000, - "min_distance": 3 - }, + "assign_mission_target": { "om_terrain": "s_pharm", "om_special": "s_pharm", "reveal_radius": 1, "random": false, "min_distance": 3 }, "update_mapgen": { "place_items": [ { "item": "fertility_supplements", "x": 15, "y": 15 } ] } }, "end": { @@ -1302,7 +1293,7 @@ "difficulty": 13, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "church", "om_special": "church", "reveal_radius": 1, "random": true, "search_range": 50 }, + "assign_mission_target": { "om_terrain": "church", "om_special": "church", "reveal_radius": 1, "random": true }, "update_mapgen": { "place_npcs": [ { "class": "bandit", "x": 15, "y": 8, "target": true }, diff --git a/data/json/npcs/holdouts/Mr_Lapin.json b/data/json/npcs/holdouts/Mr_Lapin.json index 536edb41e1e75..a6d3e0337d513 100644 --- a/data/json/npcs/holdouts/Mr_Lapin.json +++ b/data/json/npcs/holdouts/Mr_Lapin.json @@ -239,7 +239,7 @@ "goal": "MGOAL_CONDITION", "difficulty": 3, "start": { - "assign_mission_target": { "om_terrain": "farm_isherwood_2", "om_special": "Isherwood Farm Mutable", "reveal_radius": 3, "search_range": 360 } + "assign_mission_target": { "om_terrain": "farm_isherwood_2", "om_special": "Isherwood Farm Mutable", "reveal_radius": 3 } }, "goal_condition": { "compare_string": [ "yes", { "u_val": "u_met_an_isherwood" } ] }, "value": 5000, diff --git a/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json b/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json index 4d44ff2a8b0eb..f04b279d3727d 100644 --- a/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json +++ b/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json @@ -46,7 +46,7 @@ "effect": [ { "u_location_variable": { "global_val": "barry_return_home_map" }, - "target_params": { "om_terrain": "horse_farm_isherwood_14", "om_special": "Isherwood Farm Mutable", "search_range": 500, "z": 0 }, + "target_params": { "om_terrain": "horse_farm_isherwood_14", "om_special": "Isherwood Farm Mutable", "z": 0 }, "terrain": "t_dirt", "target_max_radius": 30, "min_radius": 0, @@ -60,7 +60,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, diff --git a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json index fa5caf6a5c489..1b445bf84fdcb 100644 --- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json @@ -570,12 +570,7 @@ "value": 20000, "destination": "dairy_farm_isherwood_W", "start": { - "assign_mission_target": { - "om_terrain": "dairy_farm_isherwood_W", - "om_special": "Isherwood Farm Mutable", - "reveal_radius": 3, - "search_range": 240 - } + "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farm Mutable", "reveal_radius": 3 } }, "end": { "effect": [ diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json index 47f918cbc889b..84a372c1d9a78 100644 --- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json @@ -390,7 +390,6 @@ "om_terrain": "cabin_isherwood", "reveal_radius": 1, "random": true, - "search_range": 20, "min_distance": 2 }, "update_mapgen": { "place_npcs": [ { "class": "isherwood_chris", "x": 8, "y": 17, "target": true } ] } diff --git a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json index 38218b05f46d1..f8de42c0e5976 100644 --- a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json @@ -362,7 +362,6 @@ "om_terrain": "cabin_isherwood", "reveal_radius": 1, "random": true, - "search_range": 20, "min_distance": 8 }, "update_mapgen": { "place_monster": [ { "monster": "mon_cat_isherwood", "pack_size": [ 3, 6 ], "x": 20, "y": 22, "target": true } ] }, diff --git a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json index 02e6bb8abc0a4..39cc8b6fc0988 100644 --- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json @@ -197,7 +197,7 @@ "value": 50000, "followup": "MISSION_ISHERWOOD_JESSE_2", "start": { - "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 8 }, + "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "min_distance": 8 }, "update_mapgen": { "place_monster": [ { "monster": "mon_wolf", "pack_size": [ 4, 8 ], "x": 3, "y": 9, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -223,7 +223,7 @@ "difficulty": 8, "value": 80000, "start": { - "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 15 }, + "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "min_distance": 15 }, "update_mapgen": { "place_monster": [ { "monster": "mon_flying_polyp", "pack_size": [ 3, 6 ], "x": 11, "y": 11, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json index 8a21e7a0ceb8c..c5ea70edb8cde 100644 --- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json @@ -511,7 +511,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "trailhead_shack_z0", "om_special": "trailhead_shack", "reveal_radius": 1, "search_range": 100 }, + "assign_mission_target": { "om_terrain": "trailhead_shack_z0", "om_special": "trailhead_shack", "reveal_radius": 1 }, "update_mapgen": { "place_npcs": [ { "class": "bandit", "x": 5, "y": 8, "target": true }, { "class": "bandit", "x": 5, "y": 9, "target": true } ], "place_vehicles": [ @@ -543,7 +543,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "mine_entrance_loading_zone", "om_special": "Generic mine", "reveal_radius": 1, "search_range": 200 }, + "assign_mission_target": { "om_terrain": "mine_entrance_loading_zone", "om_special": "Generic mine", "reveal_radius": 1 }, "update_mapgen": { "place_vehicles": [ { "vehicle": "truck_trailer_explosives", "chance": 100, "rotation": 270, "x": [ 7 ], "y": [ 7 ] } ] } diff --git a/data/json/npcs/isolated_road/isolated_road_missions.json b/data/json/npcs/isolated_road/isolated_road_missions.json index 230cb1df90dc0..b5bec43307f7d 100644 --- a/data/json/npcs/isolated_road/isolated_road_missions.json +++ b/data/json/npcs/isolated_road/isolated_road_missions.json @@ -9,9 +9,7 @@ "difficulty": 5, "item": "broken_kord", "value": 1000, - "start": { - "assign_mission_target": { "om_special": "gun_show", "om_terrain": "gunshow_0", "reveal_radius": 2, "random": true, "search_range": 800 } - }, + "start": { "assign_mission_target": { "om_special": "gun_show", "om_terrain": "gunshow_0", "reveal_radius": 2, "random": true } }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { @@ -37,7 +35,7 @@ "item": "usb_drive_nano", "value": 1000, "start": { - "assign_mission_target": { "om_terrain": "house_garage", "reveal_radius": 2, "random": true, "search_range": 200 }, + "assign_mission_target": { "om_terrain": "house_garage", "reveal_radius": 2, "random": true }, "update_mapgen": { "rows": [ " ", diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json index ed830413f0e7f..a44c964de1d58 100644 --- a/data/json/npcs/missiondef.json +++ b/data/json/npcs/missiondef.json @@ -8,13 +8,7 @@ "value": 50000, "start": { "effect": [ "follow", { "u_spawn_item": "sarcophagus_access_code" } ], - "assign_mission_target": { - "om_terrain": "haz_sar_b_4", - "om_special": "Hazardous Waste Sarcophagus", - "reveal_radius": 1, - "search_range": 240, - "min_distance": 60 - } + "assign_mission_target": { "om_terrain": "haz_sar_b_4", "om_special": "Hazardous Waste Sarcophagus", "reveal_radius": 1, "min_distance": 60 } }, "origins": [ "ORIGIN_SECONDARY" ], "destination": "haz_sar_b_4", @@ -144,7 +138,7 @@ "item": "black_box_transcript", "start": { "effect": { "u_spawn_item": "black_box" }, - "assign_mission_target": { "om_terrain": "lab_stairs", "om_special": "Lab", "reveal_radius": 3, "random": true, "search_range": 240, "z": 0 } + "assign_mission_target": { "om_terrain": "lab_stairs", "om_special": "Lab", "reveal_radius": 3, "random": true, "z": 0 } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_EXPLORE_SARCOPHAGUS", @@ -330,14 +324,7 @@ "start": { "update_mapgen": { "place_item": [ { "item": "safe_box", "x": [ 18, 21 ], "y": [ 4, 6 ], "amount": 1 } ] }, "effect": "follow_only", - "assign_mission_target": { - "om_terrain": "bank", - "om_terrain_match_type": "PREFIX", - "om_special": "bank", - "search_range": 120, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "bank", "om_terrain_match_type": "PREFIX", "om_special": "bank", "random": true, "z": 0 } }, "end": { "effect": [ @@ -392,7 +379,7 @@ "item": "software_blood_data", "start": { "effect": [ { "u_spawn_item": "vacutainer" }, { "u_spawn_item": "usb_drive" } ], - "assign_mission_target": { "om_terrain": "hospital_2", "om_special": "hospital", "reveal_radius": 3, "search_range": 120 } + "assign_mission_target": { "om_terrain": "hospital_2", "om_special": "hospital", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -416,9 +403,7 @@ "difficulty": 2, "value": 150000, "item": "etched_skull", - "start": { - "assign_mission_target": { "om_terrain": "cabin_strange", "om_special": "Strange Cabin", "reveal_radius": 3, "search_range": 120 } - }, + "start": { "assign_mission_target": { "om_terrain": "cabin_strange", "om_special": "Strange Cabin", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_INVESTIGATE_PRISON_VISIONARY", "dialogue": { @@ -442,7 +427,7 @@ "value": 150000, "item": "visions_solitude", "start": { - "assign_mission_target": { "om_terrain": "prison_1_4", "om_special": "Prison", "reveal_radius": 3, "search_range": 180 }, + "assign_mission_target": { "om_terrain": "prison_1_4", "om_special": "Prison", "reveal_radius": 3 }, "update_mapgen": { "om_terrain": "prison_1_4", "place_item": [ { "item": "visions_solitude", "x": 15, "y": 22 } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -522,14 +507,7 @@ ] }, "effect": "follow_only", - "assign_mission_target": { - "om_terrain": "house", - "om_terrain_match_type": "CONTAINS", - "search_range": 80, - "min_distance": 10, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", "min_distance": 10, "random": true, "z": 0 } }, "end": { "effect": "stop_following" }, "origins": [ "ORIGIN_SECONDARY" ], @@ -560,7 +538,6 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, - "search_range": 60, "min_distance": 5, "z": 0 }, @@ -595,7 +572,6 @@ "om_terrain_match_type": "PREFIX", "reveal_radius": 1, "random": true, - "search_range": 60, "min_distance": 5, "z": 0 }, @@ -691,14 +667,7 @@ "item": "priest_diary", "start": { "update_mapgen": { "place_item": [ { "item": "priest_diary", "x": [ 3, 21 ], "y": [ 6, 21 ], "amount": 1 } ] }, - "assign_mission_target": { - "om_terrain": "house", - "om_terrain_match_type": "PREFIX", - "search_range": 80, - "min_distance": 5, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "house", "om_terrain_match_type": "PREFIX", "min_distance": 5, "random": true, "z": 0 } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_INVESTIGATE_CULT", @@ -723,7 +692,7 @@ "difficulty": 5, "value": 70000, "start": { - "assign_mission_target": { "om_terrain": "cabin", "om_special": "Cabin", "reveal_radius": 2, "search_range": 60 }, + "assign_mission_target": { "om_terrain": "cabin", "om_special": "Cabin", "reveal_radius": 2 }, "effect": "follow", "update_mapgen": { "place_npcs": [ { "class": "tracker_gunslinger", "x": 11, "y": 11, "target": true } ] } }, @@ -750,14 +719,7 @@ "start": { "update_mapgen": { "place_monster": [ { "monster": "mon_dog", "x": [ 3, 21 ], "y": [ 6, 21 ], "friendly": true, "target": true } ] }, "effect": [ { "u_spawn_item": "dog_whistle" } ], - "assign_mission_target": { - "om_terrain": "house", - "om_terrain_replace": "field", - "om_terrain_match_type": "PREFIX", - "search_range": 43, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "house", "om_terrain_replace": "field", "om_terrain_match_type": "PREFIX", "random": true, "z": 0 } }, "origins": [ "ORIGIN_OPENER_NPC" ], "dialogue": { @@ -902,14 +864,7 @@ "has_generic_rewards": false, "start": { "effect": [ "follow_only", { "npc_first_topic": "MISSION_PYROMANIAC" } ], - "assign_mission_target": { - "om_terrain": "house", - "om_terrain_replace": "forest", - "om_terrain_match_type": "PREFIX", - "search_range": 75, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "house", "om_terrain_replace": "forest", "om_terrain_match_type": "PREFIX", "random": true, "z": 0 } }, "end": { "effect": [ "follow", { "u_consume_item": "gasoline", "count": 200 }, { "mapgen_update": "MISSION_PYROMANIAC_BURN" } ] diff --git a/data/json/npcs/other/NPC_pizzaiolo.json b/data/json/npcs/other/NPC_pizzaiolo.json index 2fc7e26def965..c6f649367ae0a 100644 --- a/data/json/npcs/other/NPC_pizzaiolo.json +++ b/data/json/npcs/other/NPC_pizzaiolo.json @@ -200,14 +200,7 @@ "goal": "MGOAL_GO_TO", "start": { "effect": [ { "u_learn_recipe": "cake2" }, { "u_message": "You learn how to craft cake.", "popup": true } ], - "assign_mission_target": { - "om_terrain": "house", - "om_terrain_match_type": "PREFIX", - "random": true, - "search_range": 75, - "min_distance": 5, - "z": 0 - } + "assign_mission_target": { "om_terrain": "house", "om_terrain_match_type": "PREFIX", "random": true, "min_distance": 5, "z": 0 } }, "fail": { "effect": "end_conversation" }, "difficulty": 0, diff --git a/data/json/npcs/other/homeless/group_camp/group_camp_missions.json b/data/json/npcs/other/homeless/group_camp/group_camp_missions.json index 5cf57c4922373..a162c0b0a420b 100644 --- a/data/json/npcs/other/homeless/group_camp/group_camp_missions.json +++ b/data/json/npcs/other/homeless/group_camp/group_camp_missions.json @@ -12,7 +12,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_HUNT_ANTS", "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 15, "min_distance": 10 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 10 }, "update_mapgen": { "place_monster": [ { "monster": "mon_blob", "pack_size": [ 6, 6 ], "x": 8, "y": 8, "target": true } ] } }, "has_generic_rewards": true, @@ -41,7 +41,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_BUILD_CAMP_1", "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 15 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true }, "update_mapgen": { "place_monster": [ { "monster": "mon_ant", "pack_size": [ 2, 2 ], "x": 8, "y": 8, "target": true } ] } }, "end": { "effect": [ { "npc_add_var": "dialogue_trade_ant_meat_tradeable", "value": "yes" } ] }, diff --git a/data/json/npcs/other/meteorologist.json b/data/json/npcs/other/meteorologist.json index 8c6b5a8fff473..fd82da5cc04ae 100644 --- a/data/json/npcs/other/meteorologist.json +++ b/data/json/npcs/other/meteorologist.json @@ -275,7 +275,7 @@ "difficulty": 0, "value": 100, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "search_range": 50, "min_distance": 15, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "min_distance": 15, "random": true }, "update_mapgen": { "place_item": [ { "item": "module_meteorologist", "x": [ 5, 15 ], "y": [ 5, 15 ] }, diff --git a/data/json/npcs/random_encounters/camper_van_traveler.json b/data/json/npcs/random_encounters/camper_van_traveler.json index d91882700241d..5e128c5956305 100644 --- a/data/json/npcs/random_encounters/camper_van_traveler.json +++ b/data/json/npcs/random_encounters/camper_van_traveler.json @@ -323,7 +323,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_special": "Isherwood Farm Mutable", "om_terrain": "farm_isherwood_1", "reveal_radius": 5, "search_range": 400 } + "assign_mission_target": { "om_special": "Isherwood Farm Mutable", "om_terrain": "farm_isherwood_1", "reveal_radius": 5 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -345,9 +345,7 @@ "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "chemical_lab_ocu", "om_special": "Occupied Chem Lab", "reveal_radius": 5, "search_range": 400 } - }, + "start": { "assign_mission_target": { "om_terrain": "chemical_lab_ocu", "om_special": "Occupied Chem Lab", "reveal_radius": 5 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": ".", @@ -368,9 +366,7 @@ "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "desolatebarn", "om_special": "desolate barn", "reveal_radius": 5, "search_range": 400 } - }, + "start": { "assign_mission_target": { "om_terrain": "desolatebarn", "om_special": "desolate barn", "reveal_radius": 5 } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": ".", diff --git a/data/json/npcs/random_encounters/refugee_caravans.json b/data/json/npcs/random_encounters/refugee_caravans.json index 8edc57b487494..eba5b91567ff3 100644 --- a/data/json/npcs/random_encounters/refugee_caravans.json +++ b/data/json/npcs/random_encounters/refugee_caravans.json @@ -167,9 +167,7 @@ "goal": "MGOAL_GO_TO_TYPE", "difficulty": 2, "value": 60000, - "start": { - "assign_mission_target": { "om_terrain": "fema", "reveal_radius": 5, "om_special": "FEMA Camp", "search_range": 120 } - }, + "start": { "assign_mission_target": { "om_terrain": "fema", "reveal_radius": 5, "om_special": "FEMA Camp" } }, "origins": [ "ORIGIN_SECONDARY" ], "destination": "fema", "dialogue": { diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json index cfc43f1b48a96..928df3c1c091c 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json @@ -345,7 +345,7 @@ "value": 1000, "item": "pants_leather", "start": { - "assign_mission_target": { "om_terrain": "cs_sex_shop", "reveal_radius": 1, "random": true, "search_range": 120 }, + "assign_mission_target": { "om_terrain": "cs_sex_shop", "reveal_radius": 1, "random": true }, "update_mapgen": { "om_terrain": "cs_sex_shop", "place_item": [ { "item": "pants_leather", "x": 19, "y": 20 } ] }, "effect": { "u_add_var": "mission_flag_Alonso_pants", "value": "in_progress" } }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index abca854b8bea2..b8597b3c82958 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -579,13 +579,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "start": { - "assign_mission_target": { - "om_terrain": "shelter_2_vandal", - "om_special": "Evac Shelter Vandalized 3", - "reveal_radius": 1, - "random": true, - "search_range": 120 - }, + "assign_mission_target": { "om_terrain": "shelter_2_vandal", "om_special": "Evac Shelter Vandalized 3", "reveal_radius": 1, "random": true }, "update_mapgen": { "place_item": [ { "item": "laptop_boris", "x": 15, "y": 12 }, { "item": "mbag", "x": 15, "y": 12 } ] } }, "dialogue": { diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index 5c2d18c5be550..e847316186f7e 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -543,7 +543,7 @@ "value": 1000, "item": "landough_calrisean", "start": { - "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true, "search_range": 800 }, + "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true }, "update_mapgen": { "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, "effect": { "u_add_var": "mission_flag_Dana_Sourdough", "value": "in_progress" } }, diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json index 32b426f9f56d8..ca60bb97be7bd 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json @@ -447,7 +447,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_special": "Isherwood Farm Mutable", "om_terrain": "farm_isherwood_1", "reveal_radius": 5, "search_range": 1000 }, + "assign_mission_target": { "om_special": "Isherwood Farm Mutable", "om_terrain": "farm_isherwood_1", "reveal_radius": 5 }, "effect": { "u_add_var": "teamster_mission_directions", "value": "isherwood" } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -472,7 +472,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_special": "hub_01", "om_terrain": "robofachq_surface_entrance", "reveal_radius": 5, "search_range": 1000 }, + "assign_mission_target": { "om_special": "hub_01", "om_terrain": "robofachq_surface_entrance", "reveal_radius": 5 }, "effect": { "u_add_var": "teamster_mission_directions", "value": "hub01" } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -497,7 +497,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5, "search_range": 1000 }, + "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5 }, "effect": { "u_add_var": "teamster_mission_directions", "value": "exodii" } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -522,12 +522,7 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { - "om_special": "isolated_road", - "om_terrain": "isolated_house_farm_gunsmith", - "reveal_radius": 2, - "search_range": 1000 - }, + "assign_mission_target": { "om_special": "isolated_road", "om_terrain": "isolated_house_farm_gunsmith", "reveal_radius": 2 }, "effect": { "u_add_var": "teamster_mission_directions", "value": "artisans" } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json index f88f31486226b..5aabeed3dd6ef 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json @@ -97,7 +97,7 @@ "item": "software_blood_data", "start": { "effect": [ { "u_spawn_item": "vacutainer" }, { "u_spawn_item": "usb_drive" } ], - "assign_mission_target": { "om_terrain": "hospital_2", "search_range": 540, "reveal_radius": 3 } + "assign_mission_target": { "om_terrain": "hospital_2", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, @@ -203,7 +203,6 @@ "om_special": "Lab_CORE_2x1x3", "reveal_radius": 1, "random": false, - "search_range": 200, "z": -4 }, "effect": [ { "u_spawn_item": "usb_drive_nano" } ] diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json index 9f1be85582a29..caae6576264bc 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json @@ -9,13 +9,7 @@ "difficulty": 5, "start": { "effect": [ { "u_spawn_item": "fema_data", "count": 1 } ], - "assign_mission_target": { - "om_terrain": "robofachq_surface_entrance", - "om_special": "hub_01", - "reveal_radius": 1, - "random": true, - "search_range": 1000 - } + "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1, "random": true } }, "end": { "effect": { "math": [ "free_merchants_hub_trade_route = 1" ] } }, "goal_condition": { "compare_string": [ "yes", { "u_val": "dialogue_intercom_completed_free_merchants_hub_delivery_1" } ] }, @@ -105,7 +99,7 @@ "difficulty": 5, "value": 5000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 80 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true }, "update_mapgen": { "rows": [ " ", @@ -198,7 +192,7 @@ "value": 50000, "item": "commune_prospectus", "start": { - "assign_mission_target": { "om_terrain": "ranch_camp_67", "om_special": "ranch_camp", "reveal_radius": 1, "search_range": 540 }, + "assign_mission_target": { "om_terrain": "ranch_camp_67", "om_special": "ranch_camp", "reveal_radius": 1 }, "update_mapgen": { "place_npcs": [ { "class": "ranch_foreman", "x": 16, "y": 15, "target": true, "add_trait": "NPC_MISSION_LEV_1" }, 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 index e95e42f240b4e..62949a57dfd14 100644 --- 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 @@ -178,7 +178,7 @@ "difficulty": 5, "value": 50000, "start": { - "assign_mission_target": { "om_terrain": "bandit_cabin", "om_special": "bandit_cabin", "reveal_radius": 1, "search_range": 60 }, + "assign_mission_target": { "om_terrain": "bandit_cabin", "om_special": "bandit_cabin", "reveal_radius": 1 }, "update_mapgen": { "set": [ { "point": "trap", "id": "tr_beartrap_buried", "x": 7, "y": 6 }, @@ -246,7 +246,7 @@ "difficulty": 2, "value": 10000, "start": { - "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5, "search_range": 800 }, + "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 5 }, "effect": [ { "math": [ "old_guard_rep_scouting = 1" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], @@ -274,7 +274,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, "update_mapgen": { "place_monster": [ { "monster": "mon_spider_trapdoor_small", "x": 12, "y": 12, "target": true, "repeat": [ 3, 5 ] } ] } @@ -303,13 +303,7 @@ "difficulty": 10, "value": 300000, "start": { - "assign_mission_target": { - "om_terrain": "bandit_camp_1", - "om_special": "bandit_camp", - "reveal_radius": 1, - "min_distance": 10, - "search_range": 120 - }, + "assign_mission_target": { "om_terrain": "bandit_camp_1", "om_special": "bandit_camp", "reveal_radius": 1, "min_distance": 10 }, "update_mapgen": { "place_npcs": [ { "class": "bandit", "x": 17, "y": 9, "target": true } ] }, "effect": [ { "u_spawn_item": "sw629" }, diff --git a/data/json/npcs/robofac/NPC_Cranberry_Foster.json b/data/json/npcs/robofac/NPC_Cranberry_Foster.json index 3cc9e0970b017..1f1214966b28c 100644 --- a/data/json/npcs/robofac/NPC_Cranberry_Foster.json +++ b/data/json/npcs/robofac/NPC_Cranberry_Foster.json @@ -732,7 +732,7 @@ "value": 0, "start": { "effect": [ "follow_only", { "npc_add_var": "general_robofac_merc_1_temporal_follower", "value": "yes" } ], - "assign_mission_target": { "om_terrain": "radio_tower_1", "om_special": "hub_01", "reveal_radius": 1, "random": true, "search_range": 10 }, + "assign_mission_target": { "om_terrain": "radio_tower_1", "om_special": "hub_01", "reveal_radius": 1, "random": true }, "update_mapgen": [ { "place_monster": [ { "monster": "mon_leech_radio", "x": 12, "y": 10, "target": true } ] }, { "place_nested": [ { "chunks": [ "robofac_radio_leech" ], "x": 0, "y": 0 } ] } @@ -763,7 +763,7 @@ "difficulty": 0, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1, "search_range": 360, "z": 0 } + "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1, "z": 0 } }, "end": { "effect": [ diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json index 1e82eb6fa1e1d..8c023e88194de 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json @@ -9,7 +9,7 @@ "difficulty": 1, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "search_range": 40, "z": 0 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "z": 0 }, "update_mapgen": { "place_terrain": [ { "ter": "t_pit_BEM_human_sample", "x": 9, "y": 3 } ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json index c8eb6bcacbb46..fffec443a1be6 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json @@ -14,7 +14,6 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, - "search_range": 60, "min_distance": 15, "z": 0 }, diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index 761a861cbc6a4..befe4c965912b 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -210,7 +210,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 2, "random": true, "search_range": 10 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 2, "random": true }, "update_mapgen": { "rows": [ " ", @@ -353,7 +353,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "road_ew", "om_terrain_match_type": "EXACT", "reveal_radius": 2, "random": true, "search_range": 80 }, + "assign_mission_target": { "om_terrain": "road_ew", "om_terrain_match_type": "EXACT", "reveal_radius": 2, "random": true }, "update_mapgen": { "place_nested": [ { "chunks": [ "robofac_mi2_convoy_ambush_chunk" ], "x": 0, "y": 0 } ] }, "effect": [ { "u_add_var": "global_portal_storms_u_heard_of_portal_storms", "value": "yes" } ] }, @@ -455,7 +455,6 @@ "om_special": "office_tower_collapsed", "reveal_radius": 1, "random": true, - "search_range": 180, "z": -1 }, "update_mapgen": [ { "place_nested": [ { "chunks": [ "robofac_mi3_photonics_chunk" ], "x": 10, "y": 22 } ] } ] @@ -673,7 +672,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "search_range": 70 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true }, "update_mapgen": { "rows": [ " ", @@ -911,7 +910,6 @@ "om_special": "physics_lab_LIXA", "reveal_radius": 1, "random": true, - "search_range": 800, "z": 0 } }, diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 304ee0f28cb0c..2c51b569ab982 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -35,7 +35,7 @@ "condition": { "u_has_items": { "item": "RobofacCoin", "count": 1 } }, "effect": [ { "u_consume_item": "RobofacCoin", "count": 1, "popup": true }, - { "mapgen_update": "robofachq_surface_entrance", "reveal_radius": 40, "random": true, "search_range": 70 }, + { "mapgen_update": "robofachq_surface_entrance", "reveal_radius": 40, "random": true }, { "npc_add_var": "dialogue_intercom_sold_local_map", "value": "yes" } ], "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" diff --git a/data/json/npcs/your_followers/liam_starting_follower.json b/data/json/npcs/your_followers/liam_starting_follower.json index b29b2d6c73973..3958935f897a5 100644 --- a/data/json/npcs/your_followers/liam_starting_follower.json +++ b/data/json/npcs/your_followers/liam_starting_follower.json @@ -170,7 +170,7 @@ "goal": "MGOAL_CONDITION", "goal_condition": { "compare_string": [ "yes", { "u_val": "talked_liam" } ] }, "start": { - "assign_mission_target": { "om_terrain": "cabin_liam", "om_special": "cabin_liam", "reveal_radius": 1, "random": false, "search_range": 10 } + "assign_mission_target": { "om_terrain": "cabin_liam", "om_special": "cabin_liam", "reveal_radius": 1, "random": false } }, "difficulty": 0, "value": 0, diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json index 8133b2ee27b6a..b880cc75d251e 100644 --- a/data/json/starting_missions.json +++ b/data/json/starting_missions.json @@ -12,7 +12,6 @@ "om_special": "o_airport", "reveal_radius": 6, "random": true, - "search_range": 90, "min_distance": 15, "z": 0 }, @@ -48,7 +47,7 @@ "goal": "MGOAL_KILL_MONSTER", "difficulty": 3, "start": { - "assign_mission_target": { "om_terrain": "prison_1_3", "om_special": "Prison", "reveal_radius": 1, "search_range": 6, "min_distance": 1, "z": 0 }, + "assign_mission_target": { "om_terrain": "prison_1_3", "om_special": "Prison", "reveal_radius": 1, "min_distance": 1, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_zombie_prisoner_brute", "name": "The Target", "x": 18, "y": 23, "target": true } ] } @@ -75,14 +74,7 @@ "goal": "MGOAL_KILL_MONSTER", "difficulty": 3, "start": { - "assign_mission_target": { - "om_terrain": "prison_alcatraz_9", - "om_special": "Alcatraz Prison", - "reveal_radius": 1, - "search_range": 6, - "min_distance": 1, - "z": 0 - }, + "assign_mission_target": { "om_terrain": "prison_alcatraz_9", "om_special": "Alcatraz Prison", "reveal_radius": 1, "min_distance": 1, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_zombie_prisoner_brute", "name": "The Target", "x": 18, "y": 15, "target": true } ] } @@ -109,14 +101,7 @@ "goal": "MGOAL_KILL_MONSTER", "difficulty": 3, "start": { - "assign_mission_target": { - "om_terrain": "prison_island_1_8", - "om_special": "Island prison", - "reveal_radius": 1, - "search_range": 6, - "min_distance": 1, - "z": 0 - }, + "assign_mission_target": { "om_terrain": "prison_island_1_8", "om_special": "Island prison", "reveal_radius": 1, "min_distance": 1, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_zombie_prisoner_brute", "name": "The Target", "x": 18, "y": 10, "target": true } ] } @@ -646,9 +631,7 @@ "destination": "s_air_hangars", "difficulty": 1, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "s_air_hangars", "reveal_radius": 5, "om_special": "o_airport", "search_range": 120 } - }, + "start": { "assign_mission_target": { "om_terrain": "s_air_hangars", "reveal_radius": 5, "om_special": "o_airport" } }, "origins": [ "ORIGIN_GAME_START" ] }, { @@ -661,14 +644,7 @@ "difficulty": 4, "value": 0, "start": { - "assign_mission_target": { - "om_terrain": "helipad_nw", - "reveal_radius": 10, - "om_special": "military helipad", - "search_range": 70, - "min_distance": 25, - "z": 0 - } + "assign_mission_target": { "om_terrain": "helipad_nw", "reveal_radius": 10, "om_special": "military helipad", "min_distance": 25, "z": 0 } }, "origins": [ "ORIGIN_GAME_START" ] }, @@ -685,7 +661,6 @@ "om_special": "o_airport", "reveal_radius": 6, "random": true, - "search_range": 65, "min_distance": 15, "z": 0 }, @@ -722,7 +697,7 @@ "destination": "mansion_c3", "difficulty": 1, "value": 0, - "start": { "assign_mission_target": { "om_terrain": "mansion_c3", "om_special": "Mansion_Road", "search_range": 200 } }, + "start": { "assign_mission_target": { "om_terrain": "mansion_c3", "om_special": "Mansion_Road" } }, "origins": [ "ORIGIN_GAME_START" ] }, { diff --git a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json index 20f8b62ed67a4..c50e5561e13da 100644 --- a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json +++ b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json @@ -19,23 +19,23 @@ "effect": [ { "u_location_variable": { "global_val": "Port_augustmoon" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 380 }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, "zone": "ZONE_START_POINT", "target_max_radius": 30 }, { "u_location_variable": { "global_val": "Port_augustmoon_cargo" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 380 }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "augustmoon_main_concourse1" }, - "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true, "search_range": 380 } + "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true } }, { "u_location_variable": { "global_val": "augustmoon_main_concourse2" }, - "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true, "search_range": 380 } + "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true } }, { "math": [ "searched_port_augustmoon = 1" ] } ] @@ -49,13 +49,13 @@ "effect": [ { "u_location_variable": { "global_val": "landing_pad" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, "zone": "ZONE_START_POINT", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "landing_pad_cargo" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, @@ -81,14 +81,7 @@ "effect": [ { "u_location_variable": { "global_val": "landing_site" }, - "target_params": { - "om_terrain": "afs_landed_shuttle", - "om_terrain_replace": "field", - "z": 0, - "random": true, - "min_distance": 4, - "search_range": 10 - } + "target_params": { "om_terrain": "afs_landed_shuttle", "om_terrain_replace": "field", "z": 0, "random": true, "min_distance": 4 } }, { "u_message": "You see the engine plume of your landing drone shuttle in the distance. You'll have about four hours to reach it before it leaves.", @@ -213,23 +206,23 @@ { "u_message": "MANUALLY FINDING PORT AUGUSTMOON AS A FALLBACK. (PRESS SPACE).", "popup": true }, { "u_location_variable": { "global_val": "Port_augustmoon" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 1380 }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, "zone": "ZONE_START_POINT", "target_max_radius": 30 }, { "u_location_variable": { "global_val": "Port_augustmoon_cargo" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true, "search_range": 1380 }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "augustmoon_main_concourse1" }, - "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true, "search_range": 1380 } + "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true } }, { "u_location_variable": { "global_val": "augustmoon_main_concourse2" }, - "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true, "search_range": 1380 } + "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true } } ] }, @@ -241,13 +234,13 @@ { "u_message": "MANUALLY FINDING THE LANDING PAD AS A FALLBACK. (PRESS SPACE).", "popup": true }, { "u_location_variable": { "global_val": "landing_pad" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, "zone": "ZONE_START_POINT", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "landing_pad_cargo" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 } diff --git a/data/mods/Aftershock/effects_on_condition.json b/data/mods/Aftershock/effects_on_condition.json index d6572d643574d..6ab4fa5c232a6 100644 --- a/data/mods/Aftershock/effects_on_condition.json +++ b/data/mods/Aftershock/effects_on_condition.json @@ -53,7 +53,7 @@ "effect": [ { "u_location_variable": { "context_val": "escape_pod_crate" }, - "target_params": { "om_terrain": "crashing_ship_4", "search_range": 10, "z": -10 }, + "target_params": { "om_terrain": "crashing_ship_4", "z": -10 }, "terrain": "t_escape_pod_floor", "target_max_radius": 24 }, @@ -78,7 +78,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "afs_crashed_escape_pod", "search_range": 500, "z": 0 }, + "target_params": { "om_terrain": "afs_crashed_escape_pod", "z": 0 }, "terrain": "t_metal_floor", "target_max_radius": 30, "min_radius": 0, diff --git a/data/mods/Aftershock/missions/bounty_hunter_missions.json b/data/mods/Aftershock/missions/bounty_hunter_missions.json index cc539614e28e6..2d0e18673d303 100644 --- a/data/mods/Aftershock/missions/bounty_hunter_missions.json +++ b/data/mods/Aftershock/missions/bounty_hunter_missions.json @@ -12,7 +12,6 @@ "om_special": "afs_augmentation_clinic_1", "reveal_radius": 6, "random": true, - "search_range": 90, "min_distance": 15, "z": 0 }, diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 212224fa83a04..911c4b0a1d1ac 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -216,8 +216,7 @@ "z": 0, "reveal_radius": 3, "must_see": false, - "random": true, - "search_range": 180 + "random": true }, "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } }, diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index e3a73929d7dc5..504aade79d4f4 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -182,7 +182,7 @@ "item": "flesh_golem_heart", "count": 1, "start": { - "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem_afs", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/Defense_Mode/dialogue/menu_screen.json b/data/mods/Defense_Mode/dialogue/menu_screen.json index bc8f56535766f..f12302e551c7f 100644 --- a/data/mods/Defense_Mode/dialogue/menu_screen.json +++ b/data/mods/Defense_Mode/dialogue/menu_screen.json @@ -291,7 +291,7 @@ { "math": [ "subspace_allowed = 0" ] }, { "u_location_variable": { "global_val": "your_spawnpoint" }, - "target_params": { "om_terrain": "bar", "search_range": 500, "z": 0 } + "target_params": { "om_terrain": "bar", "z": 0 } }, { "u_teleport": { "global_val": "your_spawnpoint" } }, { "mapgen_update": "shaun_of_the_dead_spawns" }, @@ -336,7 +336,7 @@ { "math": [ "subspace_allowed = 0" ] }, { "u_location_variable": { "global_val": "your_spawnpoint" }, - "target_params": { "om_terrain": "dm_mansion_e2", "search_range": 500, "z": 0 } + "target_params": { "om_terrain": "dm_mansion_e2", "z": 0 } }, { "u_teleport": { "global_val": "your_spawnpoint" } }, { "run_eocs": "defense_mode_game_start_final_setup" } diff --git a/data/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json b/data/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json index ad888fc3a7f9b..1b7962b316cda 100644 --- a/data/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json +++ b/data/mods/DinoMod/NPC/BEGGAR_2_Dino_Dave.json @@ -48,9 +48,7 @@ "goal": "MGOAL_GO_TO_TYPE", "difficulty": 2, "value": 60000, - "start": { - "assign_mission_target": { "om_terrain": "hunter_shack", "reveal_radius": 5, "om_special": "Swamp Shack", "search_range": 120 } - }, + "start": { "assign_mission_target": { "om_terrain": "hunter_shack", "reveal_radius": 5, "om_special": "Swamp Shack" } }, "origins": [ "ORIGIN_SECONDARY" ], "destination": "hunter_shack", "dialogue": { diff --git a/data/mods/DinoMod/NPC/NC_Red.json b/data/mods/DinoMod/NPC/NC_Red.json index c322f7f1a70bd..512113f1ea87c 100644 --- a/data/mods/DinoMod/NPC/NC_Red.json +++ b/data/mods/DinoMod/NPC/NC_Red.json @@ -62,7 +62,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_DANGEROUS", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -89,7 +89,7 @@ "difficulty": 7, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 5, "random": true, "search_range": 40 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 5, "random": true }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_MEGA_CARNIVORE", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -116,7 +116,7 @@ "difficulty": 9, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "forest_water", "reveal_radius": 5, "random": true, "search_range": 50 }, + "assign_mission_target": { "om_terrain": "forest_water", "reveal_radius": 5, "random": true }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_ZOMBIE", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -174,7 +174,7 @@ "difficulty": 9, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 60 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, "update_mapgen": { "place_monster": [ { "monster": "mon_tyrannosaurus", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/DinoMod/NPC/NC_Yoshimi.json b/data/mods/DinoMod/NPC/NC_Yoshimi.json index 1e1ea3d78e3a0..ae8c804edd7f9 100644 --- a/data/mods/DinoMod/NPC/NC_Yoshimi.json +++ b/data/mods/DinoMod/NPC/NC_Yoshimi.json @@ -127,13 +127,7 @@ "value": 1000, "item": "chemistry_set", "start": { - "assign_mission_target": { - "om_special": "4x4_DinoLab_surface", - "om_terrain": "microlab_DinoLab_surface", - "reveal_radius": 1, - "random": true, - "search_range": 200 - }, + "assign_mission_target": { "om_special": "4x4_DinoLab_surface", "om_terrain": "microlab_DinoLab_surface", "reveal_radius": 1, "random": true }, "update_mapgen": [ { "om_terrain": "microlab_DinoLab_surface", @@ -172,13 +166,7 @@ "value": 1000, "item": "kiernans_notes", "start": { - "assign_mission_target": { - "om_special": "dinosaur exhibit", - "om_terrain": "dinoexhibit", - "reveal_radius": 1, - "random": true, - "search_range": 120 - }, + "assign_mission_target": { "om_special": "dinosaur exhibit", "om_terrain": "dinoexhibit", "reveal_radius": 1, "random": true }, "update_mapgen": [ { "om_terrain": "dinoexhibit", @@ -212,7 +200,7 @@ "monster_type": "DINOSAUR", "monster_kill_goal": 5, "start": { - "assign_mission_target": { "om_terrain": "dinozoo_1_1", "om_terrain_replace": "land", "reveal_radius": 1, "random": true, "search_range": 220 } + "assign_mission_target": { "om_terrain": "dinozoo_1_1", "om_terrain_replace": "land", "reveal_radius": 1, "random": true } }, "end": { "effect": [ { "u_spawn_item": "mutagen_raptor" }, { "math": [ "u_counter_DinoLab_DinoLab_power", "+=", "2" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json index ece5dc784edfb..04f8062418554 100644 --- a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json +++ b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json @@ -38,7 +38,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, + "target_params": { "om_terrain": "iso_elevator", "z": -1, "random": true, "cant_see": true }, "terrain": "t_elevator", "target_max_radius": 30 }, @@ -51,7 +51,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator_microlab_embed", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, + "target_params": { "om_terrain": "iso_elevator_microlab_embed", "z": -1, "random": true, "cant_see": true }, "terrain": "t_elevator", "target_max_radius": 30 }, @@ -64,7 +64,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator_safe", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, + "target_params": { "om_terrain": "iso_elevator_safe", "z": -1, "random": true, "cant_see": true }, "terrain": "t_elevator", "target_max_radius": 30 }, diff --git a/data/mods/Magiclysm/items/currency.json b/data/mods/Magiclysm/items/currency.json index 62052908648c1..f20153ee6f8fe 100644 --- a/data/mods/Magiclysm/items/currency.json +++ b/data/mods/Magiclysm/items/currency.json @@ -23,14 +23,11 @@ "//": "We must start our search from a road, otherwise the route reveal will fail. For whatever reason.", "condition": { "u_near_om_location": "road" }, "effect": [ - { - "u_location_variable": { "context_val": "forge_location" }, - "target_params": { "om_terrain": "forge_x2y2z1", "search_range": 2000, "z": 0 } - }, + { "u_location_variable": { "context_val": "forge_location" }, "target_params": { "om_terrain": "forge_3B", "z": 0 } }, { "reveal_map": { "context_val": "forge_location" }, "radius": 4 }, { "u_location_variable": { "context_val": "current_location_nearest_road" }, - "target_params": { "om_terrain": "road", "search_range": 3, "z": 0 } + "target_params": { "om_terrain": "road", "z": 0 } }, { "u_message": "You scratch your nails against the coin like so many before you, and feel Valzain's tears. He longingly cries for somewhere that is not here, and now you know where.", diff --git a/data/mods/Magiclysm/npc/forge_diviner_missions.json b/data/mods/Magiclysm/npc/forge_diviner_missions.json index e182c786da3a3..71bbc5615bdb3 100644 --- a/data/mods/Magiclysm/npc/forge_diviner_missions.json +++ b/data/mods/Magiclysm/npc/forge_diviner_missions.json @@ -8,9 +8,7 @@ "value": 0, "description": "The diviner told you there would be giant ants here.", "destination": "anthill", - "start": { - "assign_mission_target": { "om_terrain": "anthill", "om_special": "anthill", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "anthill", "om_special": "anthill", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_ACID_ANTS", @@ -21,7 +19,7 @@ "value": 0, "description": "The diviner told you there would be giant acid ants here.", "destination": "acid_anthill", - "start": { "assign_mission_target": { "om_terrain": "acid_anthill", "reveal_radius": 3, "cant_see": true, "search_range": 180 } } + "start": { "assign_mission_target": { "om_terrain": "acid_anthill", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_DERMATIK", @@ -33,13 +31,7 @@ "description": "The diviner told you there would be dermatiks here.", "destination": "nest_dermatik", "start": { - "assign_mission_target": { - "om_terrain": "nest_dermatik", - "om_special": "Large Dermatik Nest", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "nest_dermatik", "om_special": "Large Dermatik Nest", "reveal_radius": 3, "cant_see": true } } }, { @@ -50,9 +42,7 @@ "difficulty": 0, "value": 0, "description": "The diviner told you there would be a spider web here.", - "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3, "om_special": "mx_spider", "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3, "om_special": "mx_spider", "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_SPIDER_PIT", @@ -64,7 +54,7 @@ "description": "The diviner told you there would be a pit full of spiders here.", "destination": "spider_pit", "start": { - "assign_mission_target": { "om_terrain": "spider_pit", "om_special": "Spider Pit", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "spider_pit", "om_special": "Spider Pit", "reveal_radius": 3, "cant_see": true } } }, { @@ -77,13 +67,7 @@ "description": "The diviner told you there would be demon spiders here.", "destination": "demon_spider_lair", "start": { - "assign_mission_target": { - "om_terrain": "demon_spider_lair", - "om_special": "demon_spider_lair", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "demon_spider_lair", "om_special": "demon_spider_lair", "reveal_radius": 3, "cant_see": true } } }, { @@ -96,13 +80,7 @@ "description": "The diviner told you there would be a fungal bloom here.", "destination": "fungal_bloom", "start": { - "assign_mission_target": { - "om_terrain": "fungal_bloom", - "om_special": "Fungal Bloom", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "fungal_bloom", "om_special": "Fungal Bloom", "reveal_radius": 3, "cant_see": true } } }, { @@ -115,13 +93,7 @@ "description": "The diviner told you there would be a fungal tower here.", "destination": "fungal_tower", "start": { - "assign_mission_target": { - "om_terrain": "fungal_tower", - "om_special": "Fungal Tower", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "fungal_tower", "om_special": "Fungal Tower", "reveal_radius": 3, "cant_see": true } } }, { @@ -134,13 +106,7 @@ "description": "The diviner told you there would be fungal flowers here.", "destination": "fungal_flowers", "start": { - "assign_mission_target": { - "om_terrain": "fungal_flowers", - "om_special": "Fungal Flowers", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "fungal_flowers", "om_special": "Fungal Flowers", "reveal_radius": 3, "cant_see": true } } }, { @@ -153,13 +119,7 @@ "description": "The diviner told you there would be a mi-go encampment here.", "destination": "mi-go_camp1", "start": { - "assign_mission_target": { - "om_terrain": "mi-go_camp1", - "om_special": "Mi-Go Encampment", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "mi-go_camp1", "om_special": "Mi-Go Encampment", "reveal_radius": 3, "cant_see": true } } }, { @@ -172,13 +132,7 @@ "description": "The diviner told you there would be a mi-go tower here.", "destination": "mi-go_scout_tower_1", "start": { - "assign_mission_target": { - "om_terrain": "mi-go_scout_tower_1", - "om_special": "Mi-Go Scout Tower", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "mi-go_scout_tower_1", "om_special": "Mi-Go Scout Tower", "reveal_radius": 3, "cant_see": true } } }, { @@ -191,13 +145,7 @@ "description": "The diviner told you there would be triffids here.", "destination": "triffid_grove", "start": { - "assign_mission_target": { - "om_terrain": "triffid_grove", - "om_special": "Triffid Grove", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "triffid_grove", "om_special": "Triffid Grove", "reveal_radius": 3, "cant_see": true } } }, { @@ -209,7 +157,7 @@ "value": 0, "description": "The diviner told you there would be a kraken cave here.", "destination": "river_cave", - "start": { "assign_mission_target": { "om_terrain": "river_cave", "reveal_radius": 3, "cant_see": true, "search_range": 180 } } + "start": { "assign_mission_target": { "om_terrain": "river_cave", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_SLIME", @@ -221,7 +169,7 @@ "description": "The diviner told you there would be a slime pit here.", "destination": "slimepit_z0", "start": { - "assign_mission_target": { "om_terrain": "slimepit_z0", "om_special": "Slime Pit", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "slimepit_z0", "om_special": "Slime Pit", "reveal_radius": 3, "cant_see": true } } }, { @@ -234,13 +182,7 @@ "description": "The diviner told you there would be a goblin encampment here.", "destination": "goblin_1A", "start": { - "assign_mission_target": { - "om_terrain": "goblin_1A", - "om_special": "goblin_encampment", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "goblin_1A", "om_special": "goblin_encampment", "reveal_radius": 3, "cant_see": true } } }, { @@ -253,7 +195,7 @@ "description": "The diviner told you there would be a goblin outpost here.", "destination": "orc_village", "start": { - "assign_mission_target": { "om_terrain": "orc_village", "om_special": "orc_village", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "orc_village", "om_special": "orc_village", "reveal_radius": 3, "cant_see": true } } }, { @@ -266,13 +208,7 @@ "description": "The diviner told you that here be swamp dragons.", "destination": "black_dragon_lair_z-0_NW", "start": { - "assign_mission_target": { - "om_terrain": "black_dragon_lair_z-0_NW", - "om_special": "black_dragon_lair", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "black_dragon_lair_z-0_NW", "om_special": "black_dragon_lair", "reveal_radius": 3, "cant_see": true } } }, { @@ -285,13 +221,7 @@ "description": "The diviner told you that there would be a balrog here.", "destination": "mine_balrog_central", "start": { - "assign_mission_target": { - "om_terrain": "mine_balrog_central", - "om_special": "Balrog mine", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "mine_balrog_central", "om_special": "Balrog mine", "reveal_radius": 3, "cant_see": true } } }, { @@ -303,9 +233,7 @@ "value": 0, "description": "The diviner told you that there would be a lab here.", "destination": "lab_stairs", - "start": { - "assign_mission_target": { "om_terrain": "lab_stairs", "om_special": "Lab", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "lab_stairs", "om_special": "Lab", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_LAB_CENTRAL", @@ -317,13 +245,7 @@ "description": "The diviner told you that there would be a central lab here.", "destination": "central_lab_entrance", "start": { - "assign_mission_target": { - "om_terrain": "central_lab_entrance", - "om_special": "Central Lab", - "reveal_radius": 3, - "cant_see": true, - "search_range": 400 - } + "assign_mission_target": { "om_terrain": "central_lab_entrance", "om_special": "Central Lab", "reveal_radius": 3, "cant_see": true } } }, { @@ -336,7 +258,7 @@ "description": "The diviner told you that there would be an ice lab here.", "destination": "ice_lab_stairs", "start": { - "assign_mission_target": { "om_terrain": "ice_lab_stairs", "om_special": "Ice Lab", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "ice_lab_stairs", "om_special": "Ice Lab", "reveal_radius": 3, "cant_see": true } } }, { @@ -348,9 +270,7 @@ "value": 0, "description": "The diviner told you that there would be a nether lab here.", "destination": "nether_elevator_above", - "start": { - "assign_mission_target": { "om_terrain": "nether_elevator_above", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "nether_elevator_above", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_EXODII", @@ -362,13 +282,7 @@ "description": "The diviner told you that there would be Exodii here.", "destination": "exodii_base_x0y0z0", "start": { - "assign_mission_target": { - "om_terrain": "exodii_base_x0y3z0", - "om_special": "exodii_base", - "reveal_radius": 3, - "cant_see": true, - "search_range": 400 - } + "assign_mission_target": { "om_terrain": "exodii_base_x0y3z0", "om_special": "exodii_base", "reveal_radius": 3, "cant_see": true } } }, { @@ -381,13 +295,7 @@ "description": "The diviner told you that there would be a strange temple.", "destination": "temple_stairs", "start": { - "assign_mission_target": { - "om_terrain": "temple_stairs", - "om_special": "Strangle Temple", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "temple_stairs", "om_special": "Strangle Temple", "reveal_radius": 3, "cant_see": true } } }, { @@ -400,13 +308,7 @@ "description": "The diviner told you that there would be an attunement altar here.", "destination": "attunement_altar_NW", "start": { - "assign_mission_target": { - "om_terrain": "attunement_altar_NW", - "om_special": "attunement altar", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "attunement_altar_NW", "om_special": "attunement altar", "reveal_radius": 3, "cant_see": true } } }, { @@ -418,9 +320,7 @@ "value": 0, "description": "The diviner told you that there would be a magic academy here.", "destination": "magic_academy_ground", - "start": { - "assign_mission_target": { "om_terrain": "magic_academy_ground", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "magic_academy_ground", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_TOWER1", @@ -431,9 +331,7 @@ "value": 0, "description": "The diviner told you that there would be a wizard tower here.", "destination": "wizardtower1_ground", - "start": { - "assign_mission_target": { "om_terrain": "wizardtower1_ground", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "wizardtower1_ground", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_TOWER2", @@ -444,9 +342,7 @@ "value": 0, "description": "The diviner told you that there would be a wizard tower with an altar here.", "destination": "wizardtower2_ground", - "start": { - "assign_mission_target": { "om_terrain": "wizardtower2_ground", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "wizardtower2_ground", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_DRUID_TOWER", @@ -458,13 +354,7 @@ "description": "The diviner told you that there would be a druid tower here.", "destination": "druid_ritual_home_z0", "start": { - "assign_mission_target": { - "om_terrain": "druid_ritual_home_z0", - "om_special": "druid_tower", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "druid_ritual_home_z0", "om_special": "druid_tower", "reveal_radius": 3, "cant_see": true } } }, { @@ -476,7 +366,7 @@ "value": 0, "description": "The diviner told you that there would be a river here.", "destination": "river_center", - "start": { "assign_mission_target": { "om_terrain": "river_center", "reveal_radius": 3, "cant_see": true, "search_range": 180 } } + "start": { "assign_mission_target": { "om_terrain": "river_center", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_CLAY", @@ -487,7 +377,7 @@ "value": 0, "description": "The diviner told you there would be a clay deposit here.", "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3, "om_special": "mx_clay_deposit", "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3, "om_special": "mx_clay_deposit", "cant_see": true } } }, { @@ -499,7 +389,7 @@ "value": 0, "description": "The diviner told you there would be a sand patch here.", "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 3, "om_special": "mx_sand_patch", "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 3, "om_special": "mx_sand_patch", "cant_see": true } } }, { @@ -512,7 +402,7 @@ "description": "The diviner told you that there would be a hot spring here.", "destination": "hot_springs", "start": { - "assign_mission_target": { "om_terrain": "hot_springs", "om_special": "Hot Springs", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "hot_springs", "om_special": "Hot Springs", "reveal_radius": 3, "cant_see": true } } }, { @@ -524,9 +414,7 @@ "value": 0, "description": "The diviner told you that there would be a cave here.", "destination": "cave", - "start": { - "assign_mission_target": { "om_terrain": "cave", "om_special": "Cave", "reveal_radius": 3, "cant_see": true, "search_range": 180 } - } + "start": { "assign_mission_target": { "om_terrain": "cave", "om_special": "Cave", "reveal_radius": 3, "cant_see": true } } }, { "id": "MISSION_FORGE_DIVINER_CAVE_INNAWOOD", @@ -539,7 +427,7 @@ "description": "The diviner told you that there would be a cave here.", "destination": "cave_innawood", "start": { - "assign_mission_target": { "om_terrain": "cave_innawood", "om_special": "Cave", "reveal_radius": 3, "cant_see": true, "search_range": 180 } + "assign_mission_target": { "om_terrain": "cave_innawood", "om_special": "Cave", "reveal_radius": 3, "cant_see": true } } }, { @@ -552,13 +440,7 @@ "description": "The diviner told you that there would be a field of magical flowers here.", "destination": "magic_field_a1", "start": { - "assign_mission_target": { - "om_terrain": "magic_field_a1", - "om_special": "magic_field", - "reveal_radius": 3, - "cant_see": true, - "search_range": 180 - } + "assign_mission_target": { "om_terrain": "magic_field_a1", "om_special": "magic_field", "reveal_radius": 3, "cant_see": true } } } ] diff --git a/data/mods/No_Hope/NPC/NPC_Old_Guard_Captain.json b/data/mods/No_Hope/NPC/NPC_Old_Guard_Captain.json index 8f2b23298344d..8fab9a6b54ea2 100644 --- a/data/mods/No_Hope/NPC/NPC_Old_Guard_Captain.json +++ b/data/mods/No_Hope/NPC/NPC_Old_Guard_Captain.json @@ -93,9 +93,7 @@ "difficulty": 5, "value": 250000, "monster_type": "mon_charred_nightmare", - "start": { - "assign_mission_target": { "om_terrain": "necropolis_c_44", "om_special": "Necropolis", "z": -2, "search_range": 240 } - }, + "start": { "assign_mission_target": { "om_terrain": "necropolis_c_44", "om_special": "Necropolis", "z": -2 } }, "monster_kill_goal": 20, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { diff --git a/data/mods/Sky_Island/EOCs.json b/data/mods/Sky_Island/EOCs.json index 217be1c331ca4..c2bcce2757256 100644 --- a/data/mods/Sky_Island/EOCs.json +++ b/data/mods/Sky_Island/EOCs.json @@ -981,53 +981,21 @@ { "type": "effect_on_condition", "id": "EOC_WARPED_POND_CREATION_NW", - "effect": [ - { - "mapgen_update": "mx_skyisland_pond", - "om_terrain": "sky_island_core", - "search_range": 4, - "offset_x": -1, - "offset_y": -1 - } - ] + "effect": [ { "mapgen_update": "mx_skyisland_pond", "om_terrain": "sky_island_core", "offset_x": -1, "offset_y": -1 } ] }, { "type": "effect_on_condition", "id": "EOC_WARPED_POND_CREATION_NE", - "effect": [ - { - "mapgen_update": "mx_skyisland_pond", - "om_terrain": "sky_island_core", - "search_range": 4, - "offset_x": 1, - "offset_y": -1 - } - ] + "effect": [ { "mapgen_update": "mx_skyisland_pond", "om_terrain": "sky_island_core", "offset_x": 1, "offset_y": -1 } ] }, { "type": "effect_on_condition", "id": "EOC_WARPED_POND_CREATION_SW", - "effect": [ - { - "mapgen_update": "mx_skyisland_pond", - "om_terrain": "sky_island_core", - "search_range": 4, - "offset_x": -1, - "offset_y": 1 - } - ] + "effect": [ { "mapgen_update": "mx_skyisland_pond", "om_terrain": "sky_island_core", "offset_x": -1, "offset_y": 1 } ] }, { "type": "effect_on_condition", "id": "EOC_WARPED_POND_CREATION_SE", - "effect": [ - { - "mapgen_update": "mx_skyisland_pond", - "om_terrain": "sky_island_core", - "search_range": 4, - "offset_x": 1, - "offset_y": 1 - } - ] + "effect": [ { "mapgen_update": "mx_skyisland_pond", "om_terrain": "sky_island_core", "offset_x": 1, "offset_y": 1 } ] } ] diff --git a/data/mods/Sky_Island/island_upgrades.json b/data/mods/Sky_Island/island_upgrades.json index 79001f0820ec9..f0a07739794b0 100644 --- a/data/mods/Sky_Island/island_upgrades.json +++ b/data/mods/Sky_Island/island_upgrades.json @@ -134,95 +134,43 @@ { "u_message": "Mapping island for future construction…" }, { "u_location_variable": { "global_val": "OM_island_center" }, - "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "search_range": 4 } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS" } }, { "u_location_variable": { "global_val": "OM_island_subcenter" }, - "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "search_range": 4, "offset_z": -1 } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1 } }, { "u_location_variable": { "global_val": "OM_island_subnw" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": -1, - "offset_y": -1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": -1, "offset_y": -1 } }, { "u_location_variable": { "global_val": "OM_island_subn" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_y": -1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_y": -1 } }, { "u_location_variable": { "global_val": "OM_island_subne" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": 1, - "offset_y": -1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": 1, "offset_y": -1 } }, { "u_location_variable": { "global_val": "OM_island_subw" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": -1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": -1 } }, { "u_location_variable": { "global_val": "OM_island_sube" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": 1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": 1 } }, { "u_location_variable": { "global_val": "OM_island_subsw" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": -1, - "offset_y": 1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": -1, "offset_y": 1 } }, { "u_location_variable": { "global_val": "OM_island_subs" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_y": 1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_y": 1 } }, { "u_location_variable": { "global_val": "OM_island_subse" }, - "target_params": { - "om_terrain": "sky_island_core", - "om_terrain_match_type": "CONTAINS", - "search_range": 4, - "offset_z": -1, - "offset_x": 1, - "offset_y": 1 - } + "target_params": { "om_terrain": "sky_island_core", "om_terrain_match_type": "CONTAINS", "offset_z": -1, "offset_x": 1, "offset_y": 1 } } ] }, diff --git a/data/mods/Sky_Island/missions_and_mapgen.json b/data/mods/Sky_Island/missions_and_mapgen.json index 10280d0494fd6..0478b5885b2b3 100644 --- a/data/mods/Sky_Island/missions_and_mapgen.json +++ b/data/mods/Sky_Island/missions_and_mapgen.json @@ -271,7 +271,6 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -290,7 +289,6 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -309,7 +307,6 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -328,7 +325,6 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -347,7 +343,6 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -366,7 +361,6 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -385,7 +379,6 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -405,7 +398,6 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -425,7 +417,6 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", - "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, diff --git a/data/mods/Sky_Island/obelisk_selector.json b/data/mods/Sky_Island/obelisk_selector.json index 40b1c7b8e1004..39b1695701bb2 100644 --- a/data/mods/Sky_Island/obelisk_selector.json +++ b/data/mods/Sky_Island/obelisk_selector.json @@ -96,7 +96,6 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -116,7 +115,6 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -137,7 +135,6 @@ "target_params": { "om_terrain": "basement", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": -1, @@ -160,7 +157,6 @@ "target_params": { "om_terrain": "roof", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 1, @@ -183,7 +179,6 @@ "target_params": { "om_terrain": "lab_stairs", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": -2, diff --git a/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json b/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json index b363db08c9f14..248c0d5d23357 100644 --- a/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json +++ b/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json @@ -8,7 +8,7 @@ "effect": [ { "u_location_variable": { "global_val": "undine_pool_lake_port" }, - "target_params": { "om_terrain": "lake", "om_terrain_match_type": "PREFIX", "search_range": 400, "z": 0, "random": true } + "target_params": { "om_terrain": "lake", "om_terrain_match_type": "PREFIX", "z": 0, "random": true } }, { "u_message": "You swim down and down, further and further, until you're no longer sure which way is up. You're in total darkness, still swimming, when you see a light up ahead. With a goal at last in reach, you swim toward it as the light broadens and expands and, finally, you breach the water's surface.", diff --git a/data/mods/Xedra_Evolved/missions.json b/data/mods/Xedra_Evolved/missions.json index 93d2034942f07..1933bd1264d8a 100644 --- a/data/mods/Xedra_Evolved/missions.json +++ b/data/mods/Xedra_Evolved/missions.json @@ -7,7 +7,7 @@ "destination": "safe_house", "difficulty": 1, "value": 0, - "start": { "assign_mission_target": { "om_terrain": "safe_house", "om_special": "safe_house", "search_range": 200 } }, + "start": { "assign_mission_target": { "om_terrain": "safe_house", "om_special": "safe_house" } }, "origins": [ "ORIGIN_GAME_START" ] }, { @@ -68,7 +68,7 @@ "destination": "cabin_sevenoclock", "difficulty": 1, "value": 0, - "start": { "assign_mission_target": { "om_terrain": "cabin_sevenoclock", "om_special": "old cabin", "search_range": 1800 } }, + "start": { "assign_mission_target": { "om_terrain": "cabin_sevenoclock", "om_special": "old cabin" } }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { @@ -91,9 +91,7 @@ "destination": "field_deathworm", "difficulty": 1, "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "field_deathworm", "om_special": "acid-scarred field", "search_range": 1800 } - }, + "start": { "assign_mission_target": { "om_terrain": "field_deathworm", "om_special": "acid-scarred field" } }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { diff --git a/data/mods/Xedra_Evolved/mod_interactions/defense_mode/main_menu.json b/data/mods/Xedra_Evolved/mod_interactions/defense_mode/main_menu.json index 911fd2000067b..89c5b527033f6 100644 --- a/data/mods/Xedra_Evolved/mod_interactions/defense_mode/main_menu.json +++ b/data/mods/Xedra_Evolved/mod_interactions/defense_mode/main_menu.json @@ -15,7 +15,7 @@ { "math": [ "exodii_allowed = 1" ] }, { "u_location_variable": { "global_val": "your_spawnpoint" }, - "target_params": { "om_terrain": "dm_field_office_8", "search_range": 500, "z": 0 } + "target_params": { "om_terrain": "dm_field_office_8", "z": 0 } }, { "u_teleport": { "global_val": "your_spawnpoint" } }, { "mapgen_update": "precinct_13_spawns" } diff --git a/data/mods/Xedra_Evolved/npc/boann_quests.json b/data/mods/Xedra_Evolved/npc/boann_quests.json index 8b8aa02ecf792..4376b97437d1d 100644 --- a/data/mods/Xedra_Evolved/npc/boann_quests.json +++ b/data/mods/Xedra_Evolved/npc/boann_quests.json @@ -13,7 +13,6 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, - "search_range": 90, "min_distance": 5, "z": 0 }, @@ -74,7 +73,6 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, - "search_range": 90, "min_distance": 5, "z": 0 }, @@ -105,13 +103,7 @@ "monster_type": "mon_mi_go_guard", "monster_kill_goal": 5, "start": { - "assign_mission_target": { - "om_terrain": "mi-go_camp1", - "om_special": "Mi-Go Encampment", - "reveal_radius": 3, - "cant_see": true, - "search_range": 200 - } + "assign_mission_target": { "om_terrain": "mi-go_camp1", "om_special": "Mi-Go Encampment", "reveal_radius": 3, "cant_see": true } }, "end": { "opinion": { "trust": 2, "value": 2 }, @@ -141,7 +133,7 @@ "monster_type": "mon_centipede_mega", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_centipede_mega", "x": 11, "y": 11, "target": true } ] } }, "end": { @@ -172,7 +164,7 @@ "monster_type": "mon_dreamforged_automaton", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_dreamforged_automaton", "x": 11, "y": 11, "target": true } ] } }, "end": { "opinion": { "trust": 2, "value": 2 }, "effect": { "u_add_var": "killed_automaton_for_boann", "value": "yes" } }, @@ -199,13 +191,7 @@ "value": 0, "item": "triffid_heart_chunk", "start": { - "assign_mission_target": { - "om_terrain": "triffid_grove", - "om_special": "Triffid Grove", - "reveal_radius": 3, - "cant_see": true, - "search_range": 580 - } + "assign_mission_target": { "om_terrain": "triffid_grove", "om_special": "Triffid Grove", "reveal_radius": 3, "cant_see": true } }, "end": { "opinion": { "trust": 2, "value": 2 } }, "has_generic_rewards": false, @@ -232,7 +218,7 @@ "monster_type": "mon_stag_beetle_mega", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_stag_beetle_mega", "x": 11, "y": 11, "target": true } ] } }, "end": { "opinion": { "trust": 2, "value": 2 }, "effect": { "u_add_var": "killed_titan_beetle_for_boann", "value": "yes" } }, @@ -283,7 +269,7 @@ "monster_type": "mon_tindalos", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_tindalos", "x": 11, "y": 11, "target": true } ] } }, "end": { diff --git a/data/mods/Xedra_Evolved/npc/draco_dune.json b/data/mods/Xedra_Evolved/npc/draco_dune.json index 698a3d3c28fe8..44d65c026b787 100644 --- a/data/mods/Xedra_Evolved/npc/draco_dune.json +++ b/data/mods/Xedra_Evolved/npc/draco_dune.json @@ -33,9 +33,7 @@ "description": "This is where the island I agreed to a strange deal is. I wonder if they're still there.", "goal": "MGOAL_CONDITION", "difficulty": 3, - "start": { - "assign_mission_target": { "om_terrain": "boann_sidhe_island", "om_special": "Boann's Island", "reveal_radius": 6, "search_range": 360 } - }, + "start": { "assign_mission_target": { "om_terrain": "boann_sidhe_island", "om_special": "Boann's Island", "reveal_radius": 6 } }, "goal_condition": { "compare_string": [ "yes", { "u_val": "general_meeting_u_met_boann_sidhe" } ] }, "value": 5000, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/innawood/npcs/missiondef.json b/data/mods/innawood/npcs/missiondef.json index 157c0717fa838..95a244e8e57ac 100644 --- a/data/mods/innawood/npcs/missiondef.json +++ b/data/mods/innawood/npcs/missiondef.json @@ -188,7 +188,6 @@ "om_terrain": "standing_stones", "om_terrain_match_type": "PREFIX", "om_special": "Standing stones", - "search_range": 80, "min_distance": 5, "random": true, "z": 0 @@ -218,7 +217,7 @@ "item": "etched_skull", "start": { "update_mapgen": { "place_item": [ { "item": "etched_skull", "x": [ 3, 21 ], "y": [ 6, 21 ], "amount": 1 } ] }, - "assign_mission_target": { "om_terrain": "cave_rat", "om_special": "Rat Cave", "reveal_radius": 3, "search_range": 120 } + "assign_mission_target": { "om_terrain": "cave_rat", "om_special": "Rat Cave", "reveal_radius": 3 } }, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_INVESTIGATE_PRISON_VISIONARY", @@ -243,7 +242,7 @@ "value": 150000, "item": "visions_solitude", "start": { - "assign_mission_target": { "om_terrain": "island_forest_thick", "om_special": "Island", "reveal_radius": 3, "search_range": 180 }, + "assign_mission_target": { "om_terrain": "island_forest_thick", "om_special": "Island", "reveal_radius": 3 }, "update_mapgen": { "om_terrain": "prison_1_4", "place_item": [ { "item": "visions_solitude", "x": 15, "y": 22 } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -289,7 +288,7 @@ "value": 250000, "item": "veggy_tainted", "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3, "search_range": 120 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 3 }, "update_mapgen": { "place_item": [ { "item": "veggy_tainted", "x": 14, "y": 15, "amount": [ 10, 20 ], "repeat": [ 1, 3 ] } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -319,7 +318,6 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, - "search_range": 60, "min_distance": 5, "z": 0 }, @@ -470,7 +468,7 @@ "has_generic_rewards": false, "start": { "effect": [ "follow_only", { "npc_first_topic": "MISSION_PYROMANIAC" } ], - "assign_mission_target": { "om_terrain": "forest", "om_terrain_match_type": "PREFIX", "search_range": 75, "random": true, "z": 0 } + "assign_mission_target": { "om_terrain": "forest", "om_terrain_match_type": "PREFIX", "random": true, "z": 0 } }, "end": { "effect": [ "follow", { "u_consume_item": "tinder" }, { "mapgen_update": "MISSION_PYROMANIAC_BURN_INNAWOOD" } ] }, "origins": [ "ORIGIN_OPENER_NPC" ], diff --git a/doc/EFFECT_ON_CONDITION.md b/doc/EFFECT_ON_CONDITION.md index 386ab6ee07bed..dfab1c1dcc3e3 100644 --- a/doc/EFFECT_ON_CONDITION.md +++ b/doc/EFFECT_ON_CONDITION.md @@ -2528,7 +2528,7 @@ Teleport player to `new_map` "effect": [ { "u_location_variable": { "context_val": "escape_pod_crate" }, - "target_params": { "om_terrain": "crashing_ship_4", "search_range": 10, "z": -10 }, + "target_params": { "om_terrain": "crashing_ship_4", "z": -10 }, "terrain": "t_escape_pod_floor", "target_max_radius": 24 }, @@ -2590,7 +2590,7 @@ Find overmap tile using `target_params`, store coordinates in `loc`, and reveal "effect": [ { "u_location_variable": { "context_val": "loc" }, - "target_params": { "om_terrain": "house_02", "search_range": 100, "z": 0 } + "target_params": { "om_terrain": "house_02", "z": 0 } }, { "reveal_map": { "context_val": "loc" }, "radius": 20 } ] @@ -2630,7 +2630,7 @@ Reveal the route between you and `house_02` "effect": [ { "u_location_variable": { "context_val": "loc" }, - "target_params": { "om_terrain": "house_02", "search_range": 100, "z": 0 } + "target_params": { "om_terrain": "house_02", "z": 0 } }, { "reveal_route": { "mutator": "u_loc_relative", "target": "(0,0,0)" }, @@ -3396,7 +3396,7 @@ Search overmap terrain `afs_crashed_escape_pod` on z-level 0, range 500 overmap ```json { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "afs_crashed_escape_pod", "search_range": 500, "z": 0 }, + "target_params": { "om_terrain": "afs_crashed_escape_pod", "z": 0 }, "terrain": "t_metal_floor", "target_max_radius": 30, "min_radius": 0, @@ -3411,8 +3411,8 @@ Search the map, that contain `house` in it's id on a range 200-1200 overmap tile "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", - "search_range": 1200, "min_distance": 200, + "search_range": 1200, "random": true } } diff --git a/doc/MISSIONS_JSON.md b/doc/MISSIONS_JSON.md index 3cb9eebc8b825..15be0296fd9c3 100644 --- a/doc/MISSIONS_JSON.md +++ b/doc/MISSIONS_JSON.md @@ -186,7 +186,7 @@ Identifier | Description `must_see` | If true, the `om_terrain` must have been seen already. `cant_see` | If true, the `om_terrain` must not have been seen already. `random` | If true, a random matching `om_terrain` is used. If false, the closest is used. -`search_range` | Range in overmap terrain coordinates to look for a matching `om_terrain`. Int or or [variable object](#variable-object) +`search_range` | Maximum range in overmap terrain coordinates to look for a matching `om_terrain`. Int or or [variable object](#variable-object). Default 2520. Should only be used to limit maximum range when multiple valid destinations are possible, and only works to do that when random is also set to true. `min_distance` | Range in overmap terrain coordinates. Instances of `om_terrain` in this range will be ignored. Int or or [variable object](#variable-object) `origin_npc` | Start the search at the NPC's, rather than the player's, current position. `z` | If specified, will be used rather than the player or NPC's z when searching. Int or or [variable object](#variable-object) diff --git a/src/mission_util.cpp b/src/mission_util.cpp index e16df397be46a..ba7f0fa690b83 100644 --- a/src/mission_util.cpp +++ b/src/mission_util.cpp @@ -255,7 +255,8 @@ static std::optional find_or_create_om_terrain( // If we got here and this is still invalid, it means that we couldn't find it nor create it // on any overmap (new or existing) within the allowed search range. if( target_pos.is_invalid() ) { - debugmsg( "Unable to find and assign mission target %s.", params.overmap_terrain.evaluate( d ) ); + debugmsg( "Unable to find and assign mission target %s within %d tiles.", + params.overmap_terrain.evaluate( d ), find_params.search_range ); return std::nullopt; } return target_pos; @@ -411,7 +412,11 @@ mission_target_params mission_util::parse_mission_om_target( const JsonObject &j if( jo.has_member( "random" ) ) { p.random = jo.get_bool( "random" ); } - p.search_range = get_dbl_or_var( jo, "search_range", false, OMAPX ); + if( !p.random && jo.has_member( "search_range" ) ) { + jo.throw_error_at( "search_range", + "There's no reason to change max search range if your search isn't random." ); + } + p.search_range = get_dbl_or_var( jo, "search_range", false, OMAPX * 14 ); p.min_distance = get_dbl_or_var( jo, "min_distance", false ); if( jo.has_member( "offset_x" ) || jo.has_member( "offset_y" ) || jo.has_member( "offset_z" ) ) { From fefb98332aa4de3badd1246b72af8790cc335410 Mon Sep 17 00:00:00 2001 From: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:53:28 -0500 Subject: [PATCH 2/4] Re-add search ranges to some missions that actually were using the random range function -Remove random from those that clearly should never have had it applied (and don't return their search range either) --- .../isolated_road/isolated_road_missions.json | 6 ++-- data/json/npcs/other/NPC_pizzaiolo.json | 9 ++++- .../group_camp/group_camp_missions.json | 4 +-- data/json/npcs/other/meteorologist.json | 2 +- .../surface_refugees/NPC_Alonso_Lautrec.json | 2 +- .../NPC_Boris_Borichenko.json | 8 ++++- .../surface_refugees/NPC_Dana_Nunez.json | 2 +- .../free_merchant_shopkeep_missions.json | 4 +-- .../NPC_old_guard_representative.json | 2 +- .../npcs/robofac/NPC_Cranberry_Foster.json | 2 +- .../BEM_human_sample.json | 2 +- .../BEM_jabberwock.json | 1 + .../robofac_intercom_missions.json | 15 +++------ .../robofac_intercom_trades.json | 2 +- data/json/starting_missions.json | 18 ++-------- .../Aftershock/EOC/agustmoon_travel_eocs.json | 33 +++++++++++-------- .../missions/bounty_hunter_missions.json | 1 + .../npcs/milly_whately_dialogue.json | 3 +- data/mods/Aftershock/npcs/sadie.json | 2 +- data/mods/DinoMod/NPC/NC_Red.json | 8 ++--- data/mods/DinoMod/NPC/NC_Yoshimi.json | 12 +++++-- .../Isolation-Protocol/EOC/elevator_eoc.json | 6 ++-- data/mods/Magiclysm/items/currency.json | 2 +- data/mods/Sky_Island/missions_and_mapgen.json | 9 +++++ data/mods/Sky_Island/obelisk_selector.json | 5 +++ .../eocs/elemental_eruptions.json | 2 +- data/mods/Xedra_Evolved/npc/boann_quests.json | 10 +++--- data/mods/innawood/npcs/missiondef.json | 4 ++- 28 files changed, 103 insertions(+), 73 deletions(-) diff --git a/data/json/npcs/isolated_road/isolated_road_missions.json b/data/json/npcs/isolated_road/isolated_road_missions.json index b5bec43307f7d..230cb1df90dc0 100644 --- a/data/json/npcs/isolated_road/isolated_road_missions.json +++ b/data/json/npcs/isolated_road/isolated_road_missions.json @@ -9,7 +9,9 @@ "difficulty": 5, "item": "broken_kord", "value": 1000, - "start": { "assign_mission_target": { "om_special": "gun_show", "om_terrain": "gunshow_0", "reveal_radius": 2, "random": true } }, + "start": { + "assign_mission_target": { "om_special": "gun_show", "om_terrain": "gunshow_0", "reveal_radius": 2, "random": true, "search_range": 800 } + }, "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "dialogue": { @@ -35,7 +37,7 @@ "item": "usb_drive_nano", "value": 1000, "start": { - "assign_mission_target": { "om_terrain": "house_garage", "reveal_radius": 2, "random": true }, + "assign_mission_target": { "om_terrain": "house_garage", "reveal_radius": 2, "random": true, "search_range": 200 }, "update_mapgen": { "rows": [ " ", diff --git a/data/json/npcs/other/NPC_pizzaiolo.json b/data/json/npcs/other/NPC_pizzaiolo.json index c6f649367ae0a..2fc7e26def965 100644 --- a/data/json/npcs/other/NPC_pizzaiolo.json +++ b/data/json/npcs/other/NPC_pizzaiolo.json @@ -200,7 +200,14 @@ "goal": "MGOAL_GO_TO", "start": { "effect": [ { "u_learn_recipe": "cake2" }, { "u_message": "You learn how to craft cake.", "popup": true } ], - "assign_mission_target": { "om_terrain": "house", "om_terrain_match_type": "PREFIX", "random": true, "min_distance": 5, "z": 0 } + "assign_mission_target": { + "om_terrain": "house", + "om_terrain_match_type": "PREFIX", + "random": true, + "search_range": 75, + "min_distance": 5, + "z": 0 + } }, "fail": { "effect": "end_conversation" }, "difficulty": 0, diff --git a/data/json/npcs/other/homeless/group_camp/group_camp_missions.json b/data/json/npcs/other/homeless/group_camp/group_camp_missions.json index a162c0b0a420b..5cf57c4922373 100644 --- a/data/json/npcs/other/homeless/group_camp/group_camp_missions.json +++ b/data/json/npcs/other/homeless/group_camp/group_camp_missions.json @@ -12,7 +12,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_HUNT_ANTS", "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 10 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 15, "min_distance": 10 }, "update_mapgen": { "place_monster": [ { "monster": "mon_blob", "pack_size": [ 6, 6 ], "x": 8, "y": 8, "target": true } ] } }, "has_generic_rewards": true, @@ -41,7 +41,7 @@ "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_BUILD_CAMP_1", "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 15 }, "update_mapgen": { "place_monster": [ { "monster": "mon_ant", "pack_size": [ 2, 2 ], "x": 8, "y": 8, "target": true } ] } }, "end": { "effect": [ { "npc_add_var": "dialogue_trade_ant_meat_tradeable", "value": "yes" } ] }, diff --git a/data/json/npcs/other/meteorologist.json b/data/json/npcs/other/meteorologist.json index fd82da5cc04ae..8c6b5a8fff473 100644 --- a/data/json/npcs/other/meteorologist.json +++ b/data/json/npcs/other/meteorologist.json @@ -275,7 +275,7 @@ "difficulty": 0, "value": 100, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "min_distance": 15, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "search_range": 50, "min_distance": 15, "random": true }, "update_mapgen": { "place_item": [ { "item": "module_meteorologist", "x": [ 5, 15 ], "y": [ 5, 15 ] }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json index 928df3c1c091c..cfc43f1b48a96 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json @@ -345,7 +345,7 @@ "value": 1000, "item": "pants_leather", "start": { - "assign_mission_target": { "om_terrain": "cs_sex_shop", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_terrain": "cs_sex_shop", "reveal_radius": 1, "random": true, "search_range": 120 }, "update_mapgen": { "om_terrain": "cs_sex_shop", "place_item": [ { "item": "pants_leather", "x": 19, "y": 20 } ] }, "effect": { "u_add_var": "mission_flag_Alonso_pants", "value": "in_progress" } }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index b8597b3c82958..abca854b8bea2 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -579,7 +579,13 @@ "origins": [ "ORIGIN_SECONDARY" ], "has_generic_rewards": false, "start": { - "assign_mission_target": { "om_terrain": "shelter_2_vandal", "om_special": "Evac Shelter Vandalized 3", "reveal_radius": 1, "random": true }, + "assign_mission_target": { + "om_terrain": "shelter_2_vandal", + "om_special": "Evac Shelter Vandalized 3", + "reveal_radius": 1, + "random": true, + "search_range": 120 + }, "update_mapgen": { "place_item": [ { "item": "laptop_boris", "x": 15, "y": 12 }, { "item": "mbag", "x": 15, "y": 12 } ] } }, "dialogue": { diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index e847316186f7e..5c2d18c5be550 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -543,7 +543,7 @@ "value": 1000, "item": "landough_calrisean", "start": { - "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_terrain": "bakery", "reveal_radius": 1, "random": true, "search_range": 800 }, "update_mapgen": { "place_item": [ { "item": "landough_calrisean", "x": 5, "y": 16 } ] }, "effect": { "u_add_var": "mission_flag_Dana_Sourdough", "value": "in_progress" } }, diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json index caae6576264bc..93a7429ef36f0 100644 --- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json +++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json @@ -9,7 +9,7 @@ "difficulty": 5, "start": { "effect": [ { "u_spawn_item": "fema_data", "count": 1 } ], - "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1, "random": true } + "assign_mission_target": { "om_terrain": "robofachq_surface_entrance", "om_special": "hub_01", "reveal_radius": 1 } }, "end": { "effect": { "math": [ "free_merchants_hub_trade_route = 1" ] } }, "goal_condition": { "compare_string": [ "yes", { "u_val": "dialogue_intercom_completed_free_merchants_hub_delivery_1" } ] }, @@ -99,7 +99,7 @@ "difficulty": 5, "value": 5000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 80 }, "update_mapgen": { "rows": [ " ", 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 index 62949a57dfd14..e23982a114e4c 100644 --- 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 @@ -274,7 +274,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, "update_mapgen": { "place_monster": [ { "monster": "mon_spider_trapdoor_small", "x": 12, "y": 12, "target": true, "repeat": [ 3, 5 ] } ] } diff --git a/data/json/npcs/robofac/NPC_Cranberry_Foster.json b/data/json/npcs/robofac/NPC_Cranberry_Foster.json index 1f1214966b28c..4b5993eca160a 100644 --- a/data/json/npcs/robofac/NPC_Cranberry_Foster.json +++ b/data/json/npcs/robofac/NPC_Cranberry_Foster.json @@ -732,7 +732,7 @@ "value": 0, "start": { "effect": [ "follow_only", { "npc_add_var": "general_robofac_merc_1_temporal_follower", "value": "yes" } ], - "assign_mission_target": { "om_terrain": "radio_tower_1", "om_special": "hub_01", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_terrain": "radio_tower_1", "om_special": "hub_01", "reveal_radius": 1 }, "update_mapgen": [ { "place_monster": [ { "monster": "mon_leech_radio", "x": 12, "y": 10, "target": true } ] }, { "place_nested": [ { "chunks": [ "robofac_radio_leech" ], "x": 0, "y": 0 } ] } diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json index 8c023e88194de..1e82eb6fa1e1d 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_human_sample.json @@ -9,7 +9,7 @@ "difficulty": 1, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "z": 0 }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "search_range": 40, "z": 0 }, "update_mapgen": { "place_terrain": [ { "ter": "t_pit_BEM_human_sample", "x": 9, "y": 3 } ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] diff --git a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json index fffec443a1be6..c8eb6bcacbb46 100644 --- a/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json +++ b/data/json/npcs/robofac/robofac_ancilla_npcs/BAR_ENCOUNTER_MERCENARIES/BEM_jabberwock.json @@ -14,6 +14,7 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, + "search_range": 60, "min_distance": 15, "z": 0 }, diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json index befe4c965912b..39220427e8bf3 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json @@ -210,7 +210,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 2, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 2, "random": true, "search_range": 10 }, "update_mapgen": { "rows": [ " ", @@ -353,7 +353,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "road_ew", "om_terrain_match_type": "EXACT", "reveal_radius": 2, "random": true }, + "assign_mission_target": { "om_terrain": "road_ew", "om_terrain_match_type": "EXACT", "reveal_radius": 2, "random": true, "search_range": 80 }, "update_mapgen": { "place_nested": [ { "chunks": [ "robofac_mi2_convoy_ambush_chunk" ], "x": 0, "y": 0 } ] }, "effect": [ { "u_add_var": "global_portal_storms_u_heard_of_portal_storms", "value": "yes" } ] }, @@ -455,6 +455,7 @@ "om_special": "office_tower_collapsed", "reveal_radius": 1, "random": true, + "search_range": 180, "z": -1 }, "update_mapgen": [ { "place_nested": [ { "chunks": [ "robofac_mi3_photonics_chunk" ], "x": 10, "y": 22 } ] } ] @@ -672,7 +673,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 2, "random": true, "search_range": 70 }, "update_mapgen": { "rows": [ " ", @@ -905,13 +906,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { - "om_terrain": "LIXA_road_guard", - "om_special": "physics_lab_LIXA", - "reveal_radius": 1, - "random": true, - "z": 0 - } + "assign_mission_target": { "om_terrain": "LIXA_road_guard", "om_special": "physics_lab_LIXA", "reveal_radius": 1, "z": 0 } }, "end": { "effect": [ diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json index 2c51b569ab982..d8e415552107f 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json @@ -35,7 +35,7 @@ "condition": { "u_has_items": { "item": "RobofacCoin", "count": 1 } }, "effect": [ { "u_consume_item": "RobofacCoin", "count": 1, "popup": true }, - { "mapgen_update": "robofachq_surface_entrance", "reveal_radius": 40, "random": true }, + { "mapgen_update": "robofachq_surface_entrance", "reveal_radius": 40 }, { "npc_add_var": "dialogue_intercom_sold_local_map", "value": "yes" } ], "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json index b880cc75d251e..92e88a5dfb7e8 100644 --- a/data/json/starting_missions.json +++ b/data/json/starting_missions.json @@ -7,14 +7,7 @@ "goal": "MGOAL_KILL_MONSTER", "difficulty": 4, "start": { - "assign_mission_target": { - "om_terrain": "s_air_term", - "om_special": "o_airport", - "reveal_radius": 6, - "random": true, - "min_distance": 15, - "z": 0 - }, + "assign_mission_target": { "om_terrain": "s_air_term", "om_special": "o_airport", "reveal_radius": 6, "min_distance": 15, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_feral_scientist_scalpel", "name": "The Target", "x": 11, "y": 11, "target": true }, @@ -656,14 +649,7 @@ "goal": "MGOAL_GO_TO_TYPE", "difficulty": 3, "start": { - "assign_mission_target": { - "om_terrain": "s_air_helicopter_pad", - "om_special": "o_airport", - "reveal_radius": 6, - "random": true, - "min_distance": 15, - "z": 0 - }, + "assign_mission_target": { "om_terrain": "s_air_helicopter_pad", "om_special": "o_airport", "reveal_radius": 6, "min_distance": 15, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_zombie_military_pilot", "x": 1, "y": 1 }, diff --git a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json index c50e5561e13da..b50ad3ae5eb48 100644 --- a/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json +++ b/data/mods/Aftershock/EOC/agustmoon_travel_eocs.json @@ -19,23 +19,23 @@ "effect": [ { "u_location_variable": { "global_val": "Port_augustmoon" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9 }, "zone": "ZONE_START_POINT", "target_max_radius": 30 }, { "u_location_variable": { "global_val": "Port_augustmoon_cargo" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9 }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "augustmoon_main_concourse1" }, - "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true } + "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9 } }, { "u_location_variable": { "global_val": "augustmoon_main_concourse2" }, - "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true } + "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9 } }, { "math": [ "searched_port_augustmoon = 1" ] } ] @@ -49,13 +49,13 @@ "effect": [ { "u_location_variable": { "global_val": "landing_pad" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 }, "zone": "ZONE_START_POINT", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "landing_pad_cargo" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 380 }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, @@ -81,7 +81,14 @@ "effect": [ { "u_location_variable": { "global_val": "landing_site" }, - "target_params": { "om_terrain": "afs_landed_shuttle", "om_terrain_replace": "field", "z": 0, "random": true, "min_distance": 4 } + "target_params": { + "om_terrain": "afs_landed_shuttle", + "om_terrain_replace": "field", + "z": 0, + "random": true, + "min_distance": 4, + "search_range": 10 + } }, { "u_message": "You see the engine plume of your landing drone shuttle in the distance. You'll have about four hours to reach it before it leaves.", @@ -206,23 +213,23 @@ { "u_message": "MANUALLY FINDING PORT AUGUSTMOON AS A FALLBACK. (PRESS SPACE).", "popup": true }, { "u_location_variable": { "global_val": "Port_augustmoon" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9 }, "zone": "ZONE_START_POINT", "target_max_radius": 30 }, { "u_location_variable": { "global_val": "Port_augustmoon_cargo" }, - "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9, "random": true }, + "target_params": { "om_terrain": "augustmoon_docking_arm", "z": -9 }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "augustmoon_main_concourse1" }, - "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9, "random": true } + "target_params": { "om_terrain": "augustmoon_main_concourse1", "z": -9 } }, { "u_location_variable": { "global_val": "augustmoon_main_concourse2" }, - "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9, "random": true } + "target_params": { "om_terrain": "augustmoon_main_concourse2", "z": -9 } } ] }, @@ -234,13 +241,13 @@ { "u_message": "MANUALLY FINDING THE LANDING PAD AS A FALLBACK. (PRESS SPACE).", "popup": true }, { "u_location_variable": { "global_val": "landing_pad" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 }, "zone": "ZONE_START_POINT", "target_max_radius": 26 }, { "u_location_variable": { "global_val": "landing_pad_cargo" }, - "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true }, + "target_params": { "om_terrain": "land_pad_outpost_a1", "z": 0, "random": true, "search_range": 1380 }, "terrain": "t_intermodal_crate_scripted_destination", "target_max_radius": 26 } diff --git a/data/mods/Aftershock/missions/bounty_hunter_missions.json b/data/mods/Aftershock/missions/bounty_hunter_missions.json index 2d0e18673d303..cc539614e28e6 100644 --- a/data/mods/Aftershock/missions/bounty_hunter_missions.json +++ b/data/mods/Aftershock/missions/bounty_hunter_missions.json @@ -12,6 +12,7 @@ "om_special": "afs_augmentation_clinic_1", "reveal_radius": 6, "random": true, + "search_range": 90, "min_distance": 15, "z": 0 }, diff --git a/data/mods/Aftershock/npcs/milly_whately_dialogue.json b/data/mods/Aftershock/npcs/milly_whately_dialogue.json index 911c4b0a1d1ac..212224fa83a04 100644 --- a/data/mods/Aftershock/npcs/milly_whately_dialogue.json +++ b/data/mods/Aftershock/npcs/milly_whately_dialogue.json @@ -216,7 +216,8 @@ "z": 0, "reveal_radius": 3, "must_see": false, - "random": true + "random": true, + "search_range": 180 }, "update_mapgen": { "place_npcs": [ { "class": "cyrus_whately", "x": 11, "y": 10, "target": true } ] } }, diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 504aade79d4f4..e3a73929d7dc5 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -182,7 +182,7 @@ "item": "flesh_golem_heart", "count": 1, "start": { - "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem_afs", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/DinoMod/NPC/NC_Red.json b/data/mods/DinoMod/NPC/NC_Red.json index 512113f1ea87c..c322f7f1a70bd 100644 --- a/data/mods/DinoMod/NPC/NC_Red.json +++ b/data/mods/DinoMod/NPC/NC_Red.json @@ -62,7 +62,7 @@ "difficulty": 5, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 30 }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_DANGEROUS", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -89,7 +89,7 @@ "difficulty": 7, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 5, "random": true }, + "assign_mission_target": { "om_terrain": "forest", "reveal_radius": 5, "random": true, "search_range": 40 }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_MEGA_CARNIVORE", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -116,7 +116,7 @@ "difficulty": 9, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "forest_water", "reveal_radius": 5, "random": true }, + "assign_mission_target": { "om_terrain": "forest_water", "reveal_radius": 5, "random": true, "search_range": 50 }, "update_mapgen": { "place_monster": [ { "group": "GROUP_DINOSAUR_ZOMBIE", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], @@ -174,7 +174,7 @@ "difficulty": 9, "value": 100000, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 5, "random": true, "search_range": 60 }, "update_mapgen": { "place_monster": [ { "monster": "mon_tyrannosaurus", "x": 12, "y": 12, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/DinoMod/NPC/NC_Yoshimi.json b/data/mods/DinoMod/NPC/NC_Yoshimi.json index ae8c804edd7f9..6a15445ef2b6f 100644 --- a/data/mods/DinoMod/NPC/NC_Yoshimi.json +++ b/data/mods/DinoMod/NPC/NC_Yoshimi.json @@ -127,7 +127,7 @@ "value": 1000, "item": "chemistry_set", "start": { - "assign_mission_target": { "om_special": "4x4_DinoLab_surface", "om_terrain": "microlab_DinoLab_surface", "reveal_radius": 1, "random": true }, + "assign_mission_target": { "om_special": "4x4_DinoLab_surface", "om_terrain": "microlab_DinoLab_surface", "reveal_radius": 1 }, "update_mapgen": [ { "om_terrain": "microlab_DinoLab_surface", @@ -166,7 +166,13 @@ "value": 1000, "item": "kiernans_notes", "start": { - "assign_mission_target": { "om_special": "dinosaur exhibit", "om_terrain": "dinoexhibit", "reveal_radius": 1, "random": true }, + "assign_mission_target": { + "om_special": "dinosaur exhibit", + "om_terrain": "dinoexhibit", + "reveal_radius": 1, + "random": true, + "search_range": 120 + }, "update_mapgen": [ { "om_terrain": "dinoexhibit", @@ -200,7 +206,7 @@ "monster_type": "DINOSAUR", "monster_kill_goal": 5, "start": { - "assign_mission_target": { "om_terrain": "dinozoo_1_1", "om_terrain_replace": "land", "reveal_radius": 1, "random": true } + "assign_mission_target": { "om_terrain": "dinozoo_1_1", "om_terrain_replace": "land", "reveal_radius": 1, "random": true, "search_range": 220 } }, "end": { "effect": [ { "u_spawn_item": "mutagen_raptor" }, { "math": [ "u_counter_DinoLab_DinoLab_power", "+=", "2" ] } ] }, "origins": [ "ORIGIN_SECONDARY" ], diff --git a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json index 04f8062418554..ece5dc784edfb 100644 --- a/data/mods/Isolation-Protocol/EOC/elevator_eoc.json +++ b/data/mods/Isolation-Protocol/EOC/elevator_eoc.json @@ -38,7 +38,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator", "z": -1, "random": true, "cant_see": true }, + "target_params": { "om_terrain": "iso_elevator", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, "terrain": "t_elevator", "target_max_radius": 30 }, @@ -51,7 +51,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator_microlab_embed", "z": -1, "random": true, "cant_see": true }, + "target_params": { "om_terrain": "iso_elevator_microlab_embed", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, "terrain": "t_elevator", "target_max_radius": 30 }, @@ -64,7 +64,7 @@ "effect": [ { "u_location_variable": { "global_val": "new_map" }, - "target_params": { "om_terrain": "iso_elevator_safe", "z": -1, "random": true, "cant_see": true }, + "target_params": { "om_terrain": "iso_elevator_safe", "z": -1, "random": true, "cant_see": true, "search_range": 180 }, "terrain": "t_elevator", "target_max_radius": 30 }, diff --git a/data/mods/Magiclysm/items/currency.json b/data/mods/Magiclysm/items/currency.json index f20153ee6f8fe..7de1704d645e5 100644 --- a/data/mods/Magiclysm/items/currency.json +++ b/data/mods/Magiclysm/items/currency.json @@ -27,7 +27,7 @@ { "reveal_map": { "context_val": "forge_location" }, "radius": 4 }, { "u_location_variable": { "context_val": "current_location_nearest_road" }, - "target_params": { "om_terrain": "road", "z": 0 } + "target_params": { "om_terrain": "road", "search_range": 3, "random": true, "z": 0 } }, { "u_message": "You scratch your nails against the coin like so many before you, and feel Valzain's tears. He longingly cries for somewhere that is not here, and now you know where.", diff --git a/data/mods/Sky_Island/missions_and_mapgen.json b/data/mods/Sky_Island/missions_and_mapgen.json index 0478b5885b2b3..10280d0494fd6 100644 --- a/data/mods/Sky_Island/missions_and_mapgen.json +++ b/data/mods/Sky_Island/missions_and_mapgen.json @@ -271,6 +271,7 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -289,6 +290,7 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -307,6 +309,7 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -325,6 +328,7 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -343,6 +347,7 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -361,6 +366,7 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "exfildistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "exfildistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -379,6 +385,7 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -398,6 +405,7 @@ "target_params": { "om_terrain": "forest", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, @@ -417,6 +425,7 @@ "target_params": { "om_terrain": "house", "om_terrain_match_type": "CONTAINS", + "search_range": { "global_val": "var", "var_name": "missiondistancemax", "default": 30 }, "min_distance": { "global_val": "var", "var_name": "missiondistancemin", "default": 5 }, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancetargets", "default": 0 }, "z": 0, diff --git a/data/mods/Sky_Island/obelisk_selector.json b/data/mods/Sky_Island/obelisk_selector.json index 39b1695701bb2..40b1c7b8e1004 100644 --- a/data/mods/Sky_Island/obelisk_selector.json +++ b/data/mods/Sky_Island/obelisk_selector.json @@ -96,6 +96,7 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -115,6 +116,7 @@ "target_params": { "om_terrain": "field", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 0, @@ -135,6 +137,7 @@ "target_params": { "om_terrain": "basement", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": -1, @@ -157,6 +160,7 @@ "target_params": { "om_terrain": "roof", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": 1, @@ -179,6 +183,7 @@ "target_params": { "om_terrain": "lab_stairs", "om_terrain_match_type": "CONTAINS", + "search_range": 1200, "min_distance": 200, "reveal_radius": { "global_val": "var", "var_name": "scoutingdistancelanding", "default": 0 }, "z": -2, diff --git a/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json b/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json index 248c0d5d23357..b363db08c9f14 100644 --- a/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json +++ b/data/mods/Xedra_Evolved/eocs/elemental_eruptions.json @@ -8,7 +8,7 @@ "effect": [ { "u_location_variable": { "global_val": "undine_pool_lake_port" }, - "target_params": { "om_terrain": "lake", "om_terrain_match_type": "PREFIX", "z": 0, "random": true } + "target_params": { "om_terrain": "lake", "om_terrain_match_type": "PREFIX", "search_range": 400, "z": 0, "random": true } }, { "u_message": "You swim down and down, further and further, until you're no longer sure which way is up. You're in total darkness, still swimming, when you see a light up ahead. With a goal at last in reach, you swim toward it as the light broadens and expands and, finally, you breach the water's surface.", diff --git a/data/mods/Xedra_Evolved/npc/boann_quests.json b/data/mods/Xedra_Evolved/npc/boann_quests.json index 4376b97437d1d..69a48920bc7c8 100644 --- a/data/mods/Xedra_Evolved/npc/boann_quests.json +++ b/data/mods/Xedra_Evolved/npc/boann_quests.json @@ -13,6 +13,7 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, + "search_range": 90, "min_distance": 5, "z": 0 }, @@ -73,6 +74,7 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, + "search_range": 90, "min_distance": 5, "z": 0 }, @@ -133,7 +135,7 @@ "monster_type": "mon_centipede_mega", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_centipede_mega", "x": 11, "y": 11, "target": true } ] } }, "end": { @@ -164,7 +166,7 @@ "monster_type": "mon_dreamforged_automaton", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_dreamforged_automaton", "x": 11, "y": 11, "target": true } ] } }, "end": { "opinion": { "trust": 2, "value": 2 }, "effect": { "u_add_var": "killed_automaton_for_boann", "value": "yes" } }, @@ -218,7 +220,7 @@ "monster_type": "mon_stag_beetle_mega", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_stag_beetle_mega", "x": 11, "y": 11, "target": true } ] } }, "end": { "opinion": { "trust": 2, "value": 2 }, "effect": { "u_add_var": "killed_titan_beetle_for_boann", "value": "yes" } }, @@ -269,7 +271,7 @@ "monster_type": "mon_tindalos", "monster_kill_goal": 1, "start": { - "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "min_distance": 5, "z": 0 }, + "assign_mission_target": { "om_terrain": "field", "reveal_radius": 1, "random": true, "search_range": 90, "min_distance": 5, "z": 0 }, "update_mapgen": { "place_monster": [ { "monster": "mon_tindalos", "x": 11, "y": 11, "target": true } ] } }, "end": { diff --git a/data/mods/innawood/npcs/missiondef.json b/data/mods/innawood/npcs/missiondef.json index 95a244e8e57ac..2669b139ba894 100644 --- a/data/mods/innawood/npcs/missiondef.json +++ b/data/mods/innawood/npcs/missiondef.json @@ -189,6 +189,7 @@ "om_terrain_match_type": "PREFIX", "om_special": "Standing stones", "min_distance": 5, + "search_range": 80, "random": true, "z": 0 } @@ -318,6 +319,7 @@ "om_terrain_replace": "forest", "reveal_radius": 1, "random": true, + "search_range": 60, "min_distance": 5, "z": 0 }, @@ -468,7 +470,7 @@ "has_generic_rewards": false, "start": { "effect": [ "follow_only", { "npc_first_topic": "MISSION_PYROMANIAC" } ], - "assign_mission_target": { "om_terrain": "forest", "om_terrain_match_type": "PREFIX", "random": true, "z": 0 } + "assign_mission_target": { "om_terrain": "forest", "om_terrain_match_type": "PREFIX", "search_range": 75, "random": true, "z": 0 } }, "end": { "effect": [ "follow", { "u_consume_item": "tinder" }, { "mapgen_update": "MISSION_PYROMANIAC_BURN_INNAWOOD" } ] }, "origins": [ "ORIGIN_OPENER_NPC" ], From 7e4ea7d66afe3d585ff48e6896162e6c8fc6b164 Mon Sep 17 00:00:00 2001 From: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com> Date: Sat, 4 Jan 2025 21:27:45 -0500 Subject: [PATCH 3/4] Update data/mods/Magiclysm/items/currency.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/items/currency.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/currency.json b/data/mods/Magiclysm/items/currency.json index 7de1704d645e5..01eda68e5c16a 100644 --- a/data/mods/Magiclysm/items/currency.json +++ b/data/mods/Magiclysm/items/currency.json @@ -23,7 +23,10 @@ "//": "We must start our search from a road, otherwise the route reveal will fail. For whatever reason.", "condition": { "u_near_om_location": "road" }, "effect": [ - { "u_location_variable": { "context_val": "forge_location" }, "target_params": { "om_terrain": "forge_3B", "z": 0 } }, + { + "u_location_variable": { "context_val": "forge_location" }, + "target_params": { "om_terrain": "forge_x2y2z1", "z": 0 } + }, { "reveal_map": { "context_val": "forge_location" }, "radius": 4 }, { "u_location_variable": { "context_val": "current_location_nearest_road" }, From 7b04e7dcf26357436181417b1d80562ca53b394a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 5 Jan 2025 16:34:52 -0600 Subject: [PATCH 4/4] Update forge_of_wonders.json --- .../mods/Magiclysm/effect_on_conditions/forge_of_wonders.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/effect_on_conditions/forge_of_wonders.json b/data/mods/Magiclysm/effect_on_conditions/forge_of_wonders.json index cbd4bb4d45bc2..db1d4bc82aca6 100644 --- a/data/mods/Magiclysm/effect_on_conditions/forge_of_wonders.json +++ b/data/mods/Magiclysm/effect_on_conditions/forge_of_wonders.json @@ -108,7 +108,7 @@ "effect": [ { "u_location_variable": { "global_val": "loc_forge_of_wonders" }, - "target_params": { "om_terrain": "forge_x2y2z1", "z": 0, "search_range": 20 }, + "target_params": { "om_terrain": "forge_x2y2z1", "z": 0 }, "furniture": "f_magiclysm_translocator_gate", "target_max_radius": 26 }, @@ -123,7 +123,7 @@ { "u_message": "MANUALLY FINDING THE FORGE AS A FALLBACK (PRESS SPACE).", "popup": true }, { "u_location_variable": { "global_val": "loc_forge_of_wonders" }, - "target_params": { "om_terrain": "forge_x2y2z1", "z": 0, "random": true, "search_range": 2000 }, + "target_params": { "om_terrain": "forge_x2y2z1", "z": 0 }, "furniture": "f_magiclysm_translocator_gate", "target_max_radius": 26 }