From 05134581bce39ef649c3f12d7625b06185cb294c Mon Sep 17 00:00:00 2001 From: ehughsbaird <44244083+ehughsbaird@users.noreply.github.com> Date: Sun, 4 Aug 2024 15:34:05 +0000 Subject: [PATCH 1/2] Stop revealing overmap tiles without sight points Accidentally removed in e44c61fd57905cf3b5edb3e92689ee1e51407320 --- src/game.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/game.cpp b/src/game.cpp index 0076bcab24048..2bd6dbfce321d 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -12523,6 +12523,9 @@ void game::update_overmap_seen() const oter_id &ter = overmap_buffer.ter( *it ); sight_points -= static_cast( ter->get_see_cost() ) * multiplier; } + if( sight_points < 0 ) { + continue; + } const auto set_seen = []( const tripoint_abs_omt & p, om_vision_level level ) { tripoint_abs_omt seen( p ); do { From 700bbd76fdb96fbd9a598170f77f01ad45c0ba1d Mon Sep 17 00:00:00 2001 From: ehughsbaird <44244083+ehughsbaird@users.noreply.github.com> Date: Sun, 4 Aug 2024 15:34:07 +0000 Subject: [PATCH 2/2] Replace see_cost number with enum Using an enum makes it easier to tweak and tune the system, as the categories correspond to physical characteristics of the overmap terrains and what numeric values they correspond to can be swiftly tweaked. --- data/json/mapgen/debug.json | 1 + .../overmap_terrain/overmap_terrain.json | 186 +++++++++--------- .../overmap_terrain/overmap_terrain_LIXA.json | 18 +- .../overmap_terrain_abstract.json | 33 ++++ .../overmap_terrain_agricultural.json | 8 +- .../overmap_terrain_aircraft_carrier.json | 4 +- .../overmap_terrain_alien.json | 12 +- .../overmap_terrain/overmap_terrain_ants.json | 10 +- .../overmap_terrain_campus.json | 12 +- .../overmap_terrain_commercial.json | 30 +-- .../overmap_terrain_deserter_city.json | 2 +- .../overmap_terrain_evac_center.json | 7 +- .../overmap_terrain_faction_base.json | 21 +- .../overmap_terrain_fungal.json | 6 +- .../overmap_terrain_hardcoded.json | 37 ++-- .../overmap_terrain_industrial.json | 36 ++-- .../overmap_terrain_isolated_road.json | 7 +- .../overmap_terrain/overmap_terrain_lab.json | 82 ++++---- .../overmap_terrain/overmap_terrain_mall.json | 3 +- .../overmap_terrain_mansion.json | 2 +- .../overmap_terrain_mi-go.json | 5 + .../overmap_terrain_microlab.json | 30 +-- .../overmap_terrain_military.json | 60 +++--- .../overmap_terrain_militia.json | 2 +- .../overmap_terrain_nether.json | 4 +- ...overmap_terrain_nether_monster_corpse.json | 4 +- .../overmap_terrain_nuclear_plant.json | 2 +- .../overmap_terrain_oil_platform.json | 6 +- .../overmap_terrain_private_resort.json | 2 +- .../overmap_terrain_public_institutional.json | 39 ++-- .../overmap_terrain_ranch_camp.json | 38 ++-- .../overmap_terrain_ravines.json | 2 +- .../overmap_terrain_recreational.json | 28 +-- .../overmap_terrain_residential.json | 18 +- .../overmap_terrain_retirement_community.json | 18 ++ .../overmap_terrain_river.json | 2 +- .../overmap_terrain_robofachq.json | 15 +- .../overmap_terrain_special.json | 13 +- .../overmap_terrain_speedway.json | 2 +- .../overmap_terrain_transportation.json | 53 ++--- .../overmap_terrain_triffid.json | 12 +- .../overmap_terrain_waste_junk.json | 20 +- .../overmap_terrain_waterbody.json | 4 +- .../overmap_vitrified_terrain.json | 4 +- .../overmap/overmap_terrain/river_cave.json | 6 +- .../mods/Aftershock/maps/overmap_terrain.json | 88 ++++----- .../overmap_terrain_habitats.json | 12 +- .../overmap_terrain_port_augustmoon.json | 10 +- .../overmap_terrain_tunnels.json | 14 +- data/mods/Backrooms/overmap_terrain.json | 4 +- data/mods/Defense_Mode/mapgen/megastore.json | 8 +- data/mods/Defense_Mode/overmap.json | 12 +- data/mods/DinoMod/obsolete/fieldoffice.json | 2 +- .../mods/DinoMod/overmap/overmap_terrain.json | 9 +- data/mods/Isolation-Protocol/Map/overmap.json | 6 +- .../mods/Magiclysm/worldgen/elf_workshop.json | 2 +- .../Magiclysm/worldgen/forge_of_wonders.json | 2 +- .../goblin_locations/goblin_encampment.json | 2 +- .../goblin_locations/orc_village.json | 2 +- .../Magiclysm/worldgen/overmap_terrain.json | 66 +++---- .../overmap/overmap_overrides.json | 2 +- .../overmap/overmap_terrain.json | 14 +- .../sweet_mapgen/sweet_overmap_terrain.json | 2 +- .../mods/No_Hope/overmap/overmap_terrain.json | 2 +- .../overmap/overmap_terrain_necropolis.json | 4 +- data/mods/Sky_Island/island_mapgen.json | 2 +- data/mods/TEST_DATA/mapgen-test.json | 1 + .../nest_conditional_placement_test.json | 1 + data/mods/TEST_DATA/regions.json | 2 +- .../overmap_terrain_nether.json | 2 +- .../overmap_terrain_termites.json | 8 +- .../overmap_terrain_triffid.json | 4 +- .../tropical_overmap_terrain.json | 2 +- .../Xedra_Evolved/mapgen/overmap_terrain.json | 18 +- .../Map/overmap_terrain/ice_fields.json | 10 +- .../overmap_terrain_transportation.json | 2 +- .../overmap/desert_overmap_terrain.json | 22 +-- .../innawood/overmap/terrain_hardcoded.json | 8 +- .../overmap_terrain_transportation.json | 6 +- doc/OVERMAP.md | 16 +- src/omdata.h | 33 +++- src/overmap.cpp | 45 ++++- 82 files changed, 768 insertions(+), 583 deletions(-) diff --git a/data/json/mapgen/debug.json b/data/json/mapgen/debug.json index c1317c8609029..f6c899a7b6600 100644 --- a/data/json/mapgen/debug.json +++ b/data/json/mapgen/debug.json @@ -11,6 +11,7 @@ "name": "debug_item_group_test", "sym": "T", "color": "light_red", + "see_cost": "none", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index d702647b44e95..1a00dec294eae 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -6,6 +6,7 @@ "sym": "%", "color": "white", "vision_levels": "always_full", + "see_cost": "none", "flags": [ "NO_ROTATE" ] }, { @@ -15,6 +16,7 @@ "sym": "#", "color": "dark_gray", "vision_levels": "always_full", + "see_cost": "opaque", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { @@ -25,6 +27,7 @@ "sym": "%", "color": "dark_gray", "vision_levels": "always_full", + "see_cost": "none", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { @@ -32,10 +35,10 @@ "abstract": "generic_city_building_no_sidewalk", "name": "city building", "sym": "^", - "see_cost": 5, "vision_levels": "city_building", "extras": "build", "mondensity": 2, + "see_cost": "high", "flags": [ "RISK_HIGH", "GENERIC_LOOT" ] }, { @@ -51,7 +54,7 @@ "sym": "#", "color": "brown", "vision_levels": "always_full", - "see_cost": 5, + "see_cost": "opaque", "travel_cost_type": "impassable", "flags": [ "NO_ROTATE" ] }, @@ -64,7 +67,7 @@ "sym": "%", "color": "dark_gray", "vision_levels": "always_full", - "see_cost": 5, + "see_cost": "opaque", "travel_cost_type": "impassable", "flags": [ "NO_ROTATE" ] }, @@ -92,58 +95,50 @@ "sym": "#", "color": "white", "vision_levels": "isolated_building", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 1, "flags": [ "SOURCE_VEHICLES", "SOURCE_FABRICATION" ] }, { "type": "overmap_terrain", - "id": "lighthouse_ground", + "abstract": "lighthouse_abstract", "name": "lighthouse", "sym": "0", "color": "yellow", "vision_levels": "isolated_tower", - "see_cost": 5, + "see_cost": "high" + }, + { + "type": "overmap_terrain", + "id": "lighthouse_ground", + "copy-from": "lighthouse_abstract", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { "type": "overmap_terrain", "id": [ "lighthouse_z1", "lighthouse_z2", "lighthouse_z4", "lighthouse_z5", "lighthouse_roof" ], - "name": "lighthouse", - "sym": "0", - "color": "yellow", - "vision_levels": "isolated_tower", - "see_cost": 5 + "copy-from": "lighthouse_abstract" }, { "type": "overmap_terrain", "id": "lighthouse_z3", - "name": "lighthouse", "sym": "&", - "color": "yellow", - "see_cost": 5, - "vision_levels": "isolated_tower", + "copy-from": "lighthouse_abstract", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { "type": "overmap_terrain", "id": "lighthouse_small_ground", "name": "small lighthouse", - "sym": "0", - "color": "yellow", - "see_cost": 5, - "vision_levels": "isolated_tower", + "copy-from": "lighthouse_abstract", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { "type": "overmap_terrain", "id": [ "lighthouse_small_z1", "lighthouse_small_z2", "lighthouse_small_z3", "lighthouse_small_z4", "lighthouse_small_roof" ], "name": "small lighthouse", - "sym": "0", - "color": "yellow", - "vision_levels": "isolated_tower", - "see_cost": 5 + "copy-from": "lighthouse_abstract" }, { "type": "overmap_terrain", @@ -152,7 +147,7 @@ "vision_levels": "island", "sym": ".", "color": "yellow", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -162,7 +157,7 @@ "vision_levels": "island", "color": "green", "looks_like": "forest", - "see_cost": 1 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -172,7 +167,7 @@ "vision_levels": "island", "color": "cyan", "looks_like": "forest_water", - "see_cost": 1 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -182,7 +177,7 @@ "sym": ".", "color": "brown", "looks_like": "field", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -191,7 +186,7 @@ "vision_levels": "isolated_building", "sym": "C", "color": "i_green", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -209,7 +204,7 @@ "vision_levels": "isolated_building", "sym": "+", "color": "i_yellow", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 1, "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] @@ -221,7 +216,7 @@ "name": "cabin", "sym": "C", "color": "i_green", - "see_cost": 5, + "see_cost": "high", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -229,9 +224,10 @@ "id": [ "lake_cabin_water" ], "vision_levels": "water_body", "name": "lake", + "looks_like": "lake_surface", "sym": "#", "color": "blue", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -240,7 +236,7 @@ "name": "cabin roof", "sym": "C", "color": "i_green", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -249,7 +245,7 @@ "name": "cabin basement", "sym": "C", "color": "i_green", - "see_cost": 5, + "see_cost": "full_high", "extras": "build" }, { @@ -259,7 +255,7 @@ "name": "cabin roof", "sym": "C", "color": "i_green", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -280,7 +276,7 @@ "sym": "C", "color": "i_green", "vision_levels": "isolated_building", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] @@ -292,7 +288,7 @@ "vision_levels": "isolated_building", "sym": "C", "color": "i_green", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] @@ -315,7 +311,7 @@ "name": "cabin roof", "sym": "C", "color": "i_green", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -345,7 +341,7 @@ "vision_levels": "isolated_building", "copy-from": "generic_forest", "color": "light_green", - "see_cost": 4, + "see_cost": "high", "extend": { "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] } }, { @@ -356,7 +352,7 @@ "vision_levels": "isolated_building", "copy-from": "generic_forest", "color": "light_green", - "see_cost": 4, + "see_cost": "high", "extend": { "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] } }, { @@ -366,7 +362,7 @@ "vision_levels": "isolated_building", "copy-from": "generic_forest", "sym": "L", - "see_cost": 4, + "see_cost": "high", "color": "light_green" }, { @@ -376,7 +372,7 @@ "vision_levels": "roof_or_air", "copy-from": "generic_forest", "sym": "L", - "see_cost": 4, + "see_cost": "none", "color": "light_green" }, { @@ -391,7 +387,7 @@ "vision_levels": "underground_dirt", "copy-from": "generic_forest", "sym": "L", - "see_cost": 4, + "see_cost": "full_high", "color": "light_green" }, { @@ -407,7 +403,7 @@ "vision_levels": "forested", "sym": "F", "color": "green", - "see_cost": 4 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -416,7 +412,7 @@ "name": "forest", "sym": "F", "color": "green", - "see_cost": 4 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -425,7 +421,7 @@ "name": "ruined cabin", "sym": "F", "color": "green", - "see_cost": 4, + "see_cost": "high", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -435,7 +431,7 @@ "name": "barn", "sym": "F", "color": "green", - "see_cost": 4, + "see_cost": "high", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -445,7 +441,7 @@ "name": "car corner", "sym": "F", "color": "green", - "see_cost": 4 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -454,7 +450,7 @@ "name": "shipwreck", "sym": "w", "color": "red", - "see_cost": 4, + "see_cost": "spaced_high", "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -464,7 +460,7 @@ "name": "crater", "sym": "o", "color": "red", - "see_cost": 2, + "see_cost": "all_clear", "flags": [ "NO_ROTATE", "REQUIRES_PREDECESSOR" ] }, { @@ -488,7 +484,7 @@ "name": "radio tower", "sym": "X", "color": "light_gray", - "see_cost": 2 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -506,7 +502,7 @@ "name": "radio tower", "sym": "X", "color": "light_gray", - "see_cost": 2, + "see_cost": "high", "mondensity": 2, "spawns": { "group": "GROUP_WASP_GUARD", "population": [ 3, 8 ], "chance": 100 } }, @@ -516,12 +512,14 @@ "vision_levels": "isolated_tower", "name": "wind turbine", "sym": "o", + "see_cost": "medium", "color": "light_gray" }, { "type": "overmap_terrain", "id": [ "wind_turbine_nacelle" ], "vision_levels": "isolated_tower", + "see_cost": "medium", "name": "wind turbine", "sym": "Y", "color": "white" @@ -542,7 +540,7 @@ "name": "wooden fort", "sym": "+", "color": "brown", - "see_cost": 5, + "see_cost": "high", "//": "RISK_LOW due to risk and safety being based on NPCs perception of what the area may contain", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, @@ -565,7 +563,7 @@ "name": "farm", "sym": "#", "color": "brown", - "see_cost": 5, + "see_cost": "high", "//": "RISK_LOW due to risk and safety being based on NPCs perception of what the area may contain", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, @@ -573,6 +571,7 @@ "type": "overmap_terrain", "id": "debug_ramps", "name": "ramp testing area", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -582,6 +581,7 @@ "//": "Pseudo terrain used for Tacoma companion raids", "id": "looted_house", "name": "looted house", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -591,6 +591,7 @@ "//": "Pseudo terrain used for Tacoma companion raids", "id": "looted_house_roof", "name": "looted house roof", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -600,6 +601,7 @@ "//": "Pseudo terrain used for Tacoma companion raids", "id": "looted_house_basement", "name": "looted house basement", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -609,6 +611,7 @@ "//": "Pseudo terrain used for Tacoma companion raids", "id": "looted_hospital", "name": "looted hospital", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -618,6 +621,7 @@ "//": "Pseudo terrain used for Tacoma companion raids", "id": "looted_hospital_roof", "name": "looted hospital roof", + "see_cost": "none", "sym": "%", "color": "white", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] @@ -629,7 +633,7 @@ "name": "campsite", "sym": "+", "color": "green", - "see_cost": 5, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -640,7 +644,7 @@ "vision_levels": "isolated_building", "sym": "+", "color": "light_green", - "see_cost": 5, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, @@ -651,7 +655,7 @@ "name": "incomplete cabin roof", "sym": "+", "color": "light_green", - "see_cost": 5, + "see_cost": "none", "flags": [ "RISK_LOW", "SOURCE_SAFETY" ] }, { @@ -661,7 +665,7 @@ "name": "field campsite", "sym": "+", "color": "light_green", - "see_cost": 5, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -672,7 +676,7 @@ "vision_levels": "single_water", "sym": ".", "color": "blue", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -682,7 +686,7 @@ "vision_levels": "single_water", "sym": ".", "color": "light_blue", - "see_cost": 5, + "see_cost": "none", "mondensity": 1 }, { @@ -692,7 +696,7 @@ "name": "swamp shack", "sym": "+", "color": "i_cyan", - "see_cost": 5, + "see_cost": "high", "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -702,7 +706,7 @@ "vision_levels": "blends_till_details", "sym": "+", "color": "green", - "see_cost": 5, + "see_cost": "spaced_high", "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -712,7 +716,7 @@ "name": "swamp shack roof", "sym": "+", "color": "i_cyan", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -721,7 +725,7 @@ "name": "drug lab", "sym": "^", "color": "brown", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -730,7 +734,7 @@ "name": "drug lab roof", "sym": "^", "color": "brown", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -739,7 +743,7 @@ "vision_levels": "blends_till_details", "sym": "+", "color": "i_green", - "see_cost": 5, + "see_cost": "spaced_high", "mondensity": 2, "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, @@ -750,7 +754,7 @@ "name": "campground roof", "sym": "+", "color": "i_green", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -760,7 +764,7 @@ "vision_levels": "isolated_building", "sym": "+", "color": "i_green", - "see_cost": 5, + "see_cost": "high", "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -783,7 +787,7 @@ "name": "church retreat roof", "sym": "+", "color": "i_green", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -802,7 +806,7 @@ "name": "garage", "sym": "O", "color": "white", - "see_cost": 5, + "see_cost": "high", "flags": [ "SOURCE_SAFETY", "SOURCE_FOOD" ] }, { @@ -811,6 +815,7 @@ "vision_levels": "natural_depression", "sym": "O", "color": "brown", + "see_cost": "all_clear", "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -849,7 +854,7 @@ "name": "irradiation plant", "sym": "i", "color": "light_green", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -858,7 +863,7 @@ "name": "irradiation plant", "sym": "I", "color": "light_green", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SIDEWALK" ] }, { @@ -877,7 +882,7 @@ "vision_levels": "roof_or_air", "sym": "i", "color": "light_green", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -886,7 +891,7 @@ "name": "irradiation plant", "sym": "I", "color": "light_green", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -913,7 +918,7 @@ "sym": ".", "color": "brown", "vision_levels": "open_land", - "see_cost": 1 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -931,7 +936,7 @@ "vision_levels": "wreckage", "sym": "A", "color": "red", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -940,7 +945,7 @@ "name": "wreckage", "sym": "A", "color": "light_gray", - "see_cost": 4 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -958,7 +963,7 @@ "sym": ",", "color": "brown", "vision_levels": "open_land", - "see_cost": 2 + "see_cost": "low" }, { "type": "overmap_terrain", @@ -967,7 +972,7 @@ "name": "open air", "sym": ".", "color": "blue", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -976,7 +981,7 @@ "vision_levels": "underground_dirt", "sym": "#", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -986,7 +991,7 @@ "name": "ventilation shaft", "sym": "%", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -994,6 +999,7 @@ "abstract": "generic_bastion_fort", "vision_levels": "large_building", "name": "bastion fort", + "see_cost": "full_high", "sym": "F", "color": "red" }, @@ -1014,7 +1020,6 @@ "fort_4c" ], "copy-from": "generic_bastion_fort", - "see_cost": 5, "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -1034,7 +1039,7 @@ "fort_4c_1" ], "copy-from": "generic_bastion_fort", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -1043,7 +1048,7 @@ "name": "mound of dirt", "sym": "O", "color": "brown", - "see_cost": 2 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -1053,7 +1058,7 @@ "sym": "#", "color": "white", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "opaque" }, { "type": "overmap_terrain", @@ -1062,7 +1067,7 @@ "vision_levels": "blends_till_details", "sym": "S", "color": "white", - "see_cost": 3, + "see_cost": "medium", "flags": [ "RISK_EXTREME" ] }, { @@ -1073,12 +1078,13 @@ "looks_like": "cave_underground", "sym": "0", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", "id": [ "chemical_lab_ocu", "chemical_lab_roof_ocu" ], "vision_levels": "isolated_building", + "see_cost": "high", "name": "small cabin", "sym": "C", "color": "i_green", @@ -1088,6 +1094,7 @@ "type": "overmap_terrain", "id": [ "smallscrapyard_ocu" ], "vision_levels": "isolated_building", + "see_cost": "high", "name": "scrap yard", "sym": "s", "color": "red" @@ -1096,6 +1103,7 @@ "type": "overmap_terrain", "id": [ "smallscrapyard_ocu_roof" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "scrap yard roof", "sym": "s", "color": "red" @@ -1104,6 +1112,7 @@ "type": "overmap_terrain", "id": [ "lumbermill_0_0_ocu", "lumbermill_0_1_ocu", "lumbermill_1_0_ocu", "lumbermill_1_1_ocu" ], "vision_levels": "isolated_building", + "see_cost": "high", "name": "lumbermill", "sym": "L", "color": "i_green", @@ -1135,7 +1144,7 @@ "name": "bee hive", "sym": "8", "color": "yellow", - "see_cost": 3, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -1146,7 +1155,7 @@ "name": "field", "sym": ".", "color": "brown", - "see_cost": 2, + "see_cost": "none", "extras": "field", "travel_cost_type": "field", "flags": [ "NO_ROTATE" ] @@ -1177,6 +1186,7 @@ "sym": "#", "color": "yellow", "vision_levels": "blends_till_outlines", + "see_cost": "low", "flags": [ "REQUIRES_PREDECESSOR" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json b/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json index 21982a1668ba2..cd56f7eaf03ee 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json @@ -6,7 +6,7 @@ "vision_levels": "large_building", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -15,7 +15,7 @@ "name": "research facility roof", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -24,7 +24,7 @@ "vision_levels": "large_building", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -33,7 +33,7 @@ "name": "research facility access road", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -42,7 +42,7 @@ "vision_levels": "large_building", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -60,7 +60,7 @@ "vision_levels": "underground_stone", "sym": "l", "color": "light_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -69,7 +69,7 @@ "name": "LIXA research floor", "sym": "L", "color": "light_blue", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -78,7 +78,7 @@ "vision_levels": "underground_stone", "sym": "L", "color": "light_blue", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -87,6 +87,6 @@ "name": "unfolded space", "sym": "!", "color": "white", - "see_cost": 5 + "see_cost": "full_high" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json b/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json index 81226bde738a3..911280ca86548 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json @@ -3,6 +3,7 @@ "type": "overmap_terrain", "abstract": "generic_cropland", "vision_levels": "open_land", + "see_cost": "low", "name": "generic_cropland", "land_use_code": "cropland" }, @@ -10,6 +11,7 @@ "type": "overmap_terrain", "abstract": "generic_pasture", "vision_levels": "open_land", + "see_cost": "none", "name": "generic_pasture", "land_use_code": "pasture" }, @@ -18,6 +20,7 @@ "abstract": "generic_forest", "name": "generic_forest", "vision_levels": "forested", + "see_cost": "spaced_high", "land_use_code": "forest", "connect_group": "forest" }, @@ -25,18 +28,21 @@ "type": "overmap_terrain", "abstract": "generic_wetland", "vision_levels": "forested_swampy", + "see_cost": "spaced_high", "name": "generic_wetland", "land_use_code": "wetland" }, { "type": "overmap_terrain", "abstract": "generic_mining", + "see_cost": "high", "name": "generic_mining", "land_use_code": "mining" }, { "type": "overmap_terrain", "abstract": "generic_open_land", + "see_cost": "none", "vision_levels": "open_land", "name": "generic_open_land", "land_use_code": "open_land" @@ -44,66 +50,77 @@ { "type": "overmap_terrain", "abstract": "generic_recreation_participation", + "see_cost": "low", "name": "generic_recreation_participation", "land_use_code": "recreation_participation" }, { "type": "overmap_terrain", "abstract": "generic_recreation_spectator", + "see_cost": "low", "name": "generic_recreation_spectator", "land_use_code": "recreation_spectator" }, { "type": "overmap_terrain", "abstract": "generic_recreation_water", + "see_cost": "none", "name": "generic_recreation_water", "land_use_code": "recreation_water" }, { "type": "overmap_terrain", "abstract": "generic_residential_multi", + "see_cost": "high", "name": "generic_residential_multi", "land_use_code": "residential_multi" }, { "type": "overmap_terrain", "abstract": "generic_residential_high", + "see_cost": "high", "name": "generic_residential_high", "land_use_code": "residential_high" }, { "type": "overmap_terrain", "abstract": "generic_residential_medium", + "see_cost": "high", "name": "generic_residential_medium", "land_use_code": "residential_medium" }, { "type": "overmap_terrain", "abstract": "generic_residential_low", + "see_cost": "high", "name": "generic_residential_low", "land_use_code": "residential_low" }, { "type": "overmap_terrain", "abstract": "generic_wetland_saltwater", + "see_cost": "spaced_high", "name": "generic_wetland_saltwater", "land_use_code": "wetland_saltwater" }, { "type": "overmap_terrain", "abstract": "generic_commercial", + "see_cost": "high", "name": "generic_commercial", "land_use_code": "commercial" }, { "type": "overmap_terrain", "abstract": "generic_industrial", + "see_cost": "high", "name": "generic_industrial", "land_use_code": "industrial" }, { "type": "overmap_terrain", "abstract": "generic_transitional", + "see_cost": "high", "vision_levels": "blends_till_details", "name": "generic_transitional", "land_use_code": "transitional" @@ -111,6 +128,7 @@ { "type": "overmap_terrain", "abstract": "generic_transportation", + "see_cost": "none", "vision_levels": "blends_till_outlines", "name": "generic_transportation", "land_use_code": "transportation" @@ -118,54 +136,63 @@ { "type": "overmap_terrain", "abstract": "generic_waste_disposal", + "see_cost": "medium", "name": "generic_waste_disposal", "land_use_code": "waste_disposal" }, { "type": "overmap_terrain", "abstract": "generic_water", + "see_cost": "none", "name": "generic_water", "land_use_code": "water" }, { "type": "overmap_terrain", "abstract": "generic_cranberry_bog", + "see_cost": "none", "name": "generic_cranberry_bog", "land_use_code": "cranberry_bog" }, { "type": "overmap_terrain", "abstract": "generic_powerline_utility", + "see_cost": "low", "name": "generic_powerline_utility", "land_use_code": "powerline_utility" }, { "type": "overmap_terrain", "abstract": "generic_saltwater_sandy_beach", + "see_cost": "none", "name": "generic_saltwater_sandy_beach", "land_use_code": "saltwater_sandy_beach" }, { "type": "overmap_terrain", "abstract": "generic_golf_course", + "see_cost": "none", "name": "generic_golf_course", "land_use_code": "golf_course" }, { "type": "overmap_terrain", "abstract": "generic_marina", + "see_cost": "high", "name": "generic_marina", "land_use_code": "marina" }, { "type": "overmap_terrain", "abstract": "generic_urban_public_institutional", + "see_cost": "high", "name": "generic_urban_public_institutional", "land_use_code": "urban_public_institutional" }, { "type": "overmap_terrain", "abstract": "generic_cemetery", + "see_cost": "medium", "copy-from": "generic_city_building", "name": "cemetery", "land_use_code": "cemetery", @@ -175,36 +202,42 @@ { "type": "overmap_terrain", "abstract": "generic_orchard", + "see_cost": "spaced_high", "name": "generic_orchard", "land_use_code": "orchard" }, { "type": "overmap_terrain", "abstract": "generic_nursery", + "see_cost": "spaced_high", "name": "generic_nursery", "land_use_code": "nursery" }, { "type": "overmap_terrain", "abstract": "generic_wetland_forest", + "see_cost": "spaced_high", "name": "generic_wetland_forest", "land_use_code": "wetland_forest" }, { "type": "overmap_terrain", "abstract": "generic_residential_very_low", + "see_cost": "high", "name": "generic_residential_very_low", "land_use_code": "residential_very_low" }, { "type": "overmap_terrain", "abstract": "generic_junkyard", + "see_cost": "high", "name": "generic_junkyard", "land_use_code": "junkyard" }, { "type": "overmap_terrain", "abstract": "generic_brushland", + "see_cost": "low", "name": "generic_brushland", "land_use_code": "brushland" } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json index ed1accf76fbb1..ef283a07d6b3a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json @@ -6,7 +6,7 @@ "color": "brown", "vision_levels": "blends_till_details", "travel_cost_type": "dirt_road", - "see_cost": 2, + "see_cost": "none", "mondensity": 2, "extras": "agricultural" }, @@ -142,7 +142,7 @@ "copy-from": "generic_rural_building", "name": "farm field", "vision_levels": "farm_field", - "see_cost": 2, + "see_cost": "none", "extras": "agricultural", "looks_like": "farm_5", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 2 ], "chance": 15 } @@ -154,7 +154,7 @@ "name": "hay field", "color": "brown", "vision_levels": "farm_field", - "see_cost": 2, + "see_cost": "none", "extras": "agricultural", "looks_like": "ranch_camp_76", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 2 ], "chance": 15 } @@ -312,7 +312,7 @@ "name": "dairy farm", "sym": "w", "color": "brown", - "see_cost": 1, + "see_cost": "low", "extend": { "flags": [ "SOURCE_DRINK", "SOURCE_ANIMALS" ] } }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json b/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json index 79c78473cdc7d..e5f3821371c30 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json @@ -128,7 +128,7 @@ "name": "aircraft carrier", "sym": "A", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_AIRCRAFT_CARRIER", "population": [ 20, 40 ], "chance": 100 }, "flags": [ "RISK_EXTREME", "LAKE" ] }, @@ -179,7 +179,7 @@ "name": "aircraft carrier", "sym": "A", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_AIRCRAFT_CARRIER_TECHNICIANS", "population": [ 20, 35 ], "chance": 100 }, "flags": [ "RISK_EXTREME", "LAKE" ] } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_alien.json b/data/json/overmap/overmap_terrain/overmap_terrain_alien.json index 09e2426387aef..58b99047c537d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_alien.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_alien.json @@ -6,7 +6,7 @@ "name": "unusual stone barn", "sym": "^", "color": "brown", - "see_cost": 2, + "see_cost": "high", "flags": [ "KNOWN_UP" ] }, { @@ -30,7 +30,7 @@ "name": "strange warehouse", "sym": "#", "color": "light_gray", - "see_cost": 2, + "see_cost": "high", "flags": [ "KNOWN_UP" ] }, { @@ -46,7 +46,7 @@ "name": "slime pit", "sym": "~", "color": "light_green", - "see_cost": 2, + "see_cost": "all_clear", "flags": [ "KNOWN_DOWN", "NO_ROTATE" ] }, { @@ -63,7 +63,7 @@ "name": "rocky butte", "sym": "%", "color": "light_gray", - "see_cost": 4, + "see_cost": "full_high", "mondensity": 2 }, { @@ -73,7 +73,7 @@ "name": "ground-level entrance", "sym": "?", "color": "white", - "see_cost": 4, + "see_cost": "full_high", "mondensity": 2 }, { @@ -103,7 +103,7 @@ "name": "scrap metal encampment", "sym": "%", "color": "light_gray", - "see_cost": 2, + "see_cost": "full_high", "mondensity": 2 }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_ants.json b/data/json/overmap/overmap_terrain/overmap_terrain_ants.json index 277b75df3c22c..c80abb0b1845c 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_ants.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_ants.json @@ -6,7 +6,7 @@ "vision_levels": "natural_outcropping", "sym": "%", "color": "brown", - "see_cost": 2, + "see_cost": "none", "flags": [ "KNOWN_DOWN", "RISK_EXTREME", "REQUIRES_PREDECESSOR" ] }, { @@ -16,7 +16,7 @@ "name": "ant food storage", "sym": "O", "color": "green", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_ANT", "population": [ 6, 10 ], "chance": 100 } }, { @@ -26,7 +26,7 @@ "name": "ant food storage", "sym": "O", "color": "green", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_ACID_ANT", "population": [ 6, 10 ], "chance": 100 } }, { @@ -77,7 +77,7 @@ "vision_levels": "underground_dirt", "name": "ant tunnel", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_ANT", "population": [ 4, 6 ], "chance": 100 }, "flags": [ "LINEAR" ] }, @@ -87,7 +87,7 @@ "vision_levels": "underground_dirt", "name": "ant tunnel", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_ACID_ANT", "population": [ 4, 6 ], "chance": 100 }, "flags": [ "LINEAR" ] } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_campus.json b/data/json/overmap/overmap_terrain/overmap_terrain_campus.json index 69fc6cdfe501e..2c39b828d0b0a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_campus.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_campus.json @@ -19,7 +19,7 @@ "name": "campus admin building", "sym": "A", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SOURCE_CHEMISTRY", "RISK_HIGH", "SHOULD_NOT_SPAWN" ] }, { @@ -54,7 +54,7 @@ "name": "campus commons building", "sym": "C", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SHOULD_NOT_SPAWN" ] }, { @@ -98,7 +98,7 @@ "name": "campus media building", "sym": "C", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SHOULD_NOT_SPAWN" ] }, { @@ -126,7 +126,7 @@ "name": "campus health building", "sym": "C", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SHOULD_NOT_SPAWN" ] }, { @@ -156,7 +156,7 @@ "vision_levels": "large_building", "sym": "C", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SHOULD_NOT_SPAWN" ] }, { @@ -195,7 +195,7 @@ "name": "campus pedestrian area", "sym": ".", "color": "light_green", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SHOULD_NOT_SPAWN" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json index 55ae43a705cda..53f98c4433ab8 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_commercial.json @@ -165,7 +165,7 @@ "vision_levels": "large_city_building", "sym": "t", "color": "i_light_gray", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -176,7 +176,7 @@ "vision_levels": "large_pavement", "sym": "O", "color": "light_gray", - "see_cost": 5, + "see_cost": "low", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -196,7 +196,7 @@ "vision_levels": "wreckage", "sym": "t", "color": "i_light_gray", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -207,7 +207,7 @@ "name": "collapsed tower", "sym": "O", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -218,7 +218,7 @@ "vision_levels": "wreckage", "sym": "t", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -226,6 +226,7 @@ "type": "overmap_terrain", "id": "office_tower_open_air_corner", "vision_levels": "roof_or_air", + "see_cost": "none", "name": "open air", "sym": ".", "color": "blue" @@ -620,7 +621,7 @@ "name": "bank", "sym": "$", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_LUXURY" ] }, @@ -632,7 +633,7 @@ "looks_like": "bank_roof", "sym": "$", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -785,7 +786,7 @@ "sym": "M", "color": "blue", "extras": "build", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -804,7 +805,7 @@ "sym": "M", "color": "blue", "extras": "build", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -959,7 +960,7 @@ "name": "home improvement superstore", "sym": "H", "color": "light_green_yellow", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SIDEWALK" ] }, { @@ -977,7 +978,7 @@ "name": "home improvement superstore roof", "sym": "H", "color": "light_green_yellow", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -1322,6 +1323,7 @@ "type": "overmap_terrain", "abstract": "generic_large_office_tower", "vision_levels": "large_city_building", + "see_cost": "full_high", "name": "office tower", "copy-from": "generic_city_building", "sym": "T", @@ -1381,6 +1383,7 @@ "type": "overmap_terrain", "id": [ "loffice_tower_17", "loffice_tower_18", "loffice_tower_19", "loffice_tower_20" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "open air", "sym": ".", "color": "blue" @@ -1421,6 +1424,7 @@ "type": "overmap_terrain", "id": [ "office_skyscraper_17", "office_skyscraper_18", "office_skyscraper_19", "office_skyscraper_20" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "open air", "sym": ".", "color": "blue" @@ -1706,7 +1710,7 @@ "name": "radio tower", "sym": "X", "color": "light_gray", - "see_cost": 2 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -1887,7 +1891,7 @@ "copy-from": "generic_city_house", "name": "dense urban", "color": "i_white", - "see_cost": 40 + "see_cost": "full_high" }, { "type": "overmap_terrain", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_deserter_city.json b/data/json/overmap/overmap_terrain/overmap_terrain_deserter_city.json index 5d951755df19c..10c0034f33ed4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_deserter_city.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_deserter_city.json @@ -17,7 +17,7 @@ "name": "deserter outpost", "sym": "D", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SIDEWALK" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_evac_center.json b/data/json/overmap/overmap_terrain/overmap_terrain_evac_center.json index 77e910ca7b644..7f1f5b5039488 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_evac_center.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_evac_center.json @@ -4,13 +4,14 @@ "abstract": "generic_evac_center", "vision_levels": "large_building", "name": "refugee center", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SOURCE_PEOPLE" ] }, { "type": "overmap_terrain", "abstract": "generic_fence", "vision_levels": "open_land", + "see_cost": "low", "name": "fence", "color": "light_gray" }, @@ -51,12 +52,12 @@ "vision_levels": "roof_or_air", "sym": "┼", "color": "white", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", "id": "refctr_field", - "see_cost": 2, + "see_cost": "none", "name": "field", "looks_like": "field", "vision_levels": "open_land", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json index 9a1ec7001ab70..6deac0555700b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_faction_base.json @@ -6,7 +6,7 @@ "name": "camp survey", "sym": "+", "color": "white", - "see_cost": 5, + "see_cost": "none", "flags": [ "NO_ROTATE", "SOURCE_PEOPLE", "SHOULD_NOT_SPAWN" ] }, { @@ -258,6 +258,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_e1", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base entrance", "sym": "M", "color": "white", @@ -266,16 +267,13 @@ { "type": "overmap_terrain", "id": "faction_base_mansion_e2", - "vision_levels": "always_full", - "name": "mansion base entrance", - "sym": "M", - "color": "white", - "flags": [ "SOURCE_PEOPLE", "NO_ROTATE" ] + "copy-from": "faction_base_mansion_e1" }, { "type": "overmap_terrain", "id": "faction_base_mansion_t1", "vision_levels": "always_full", + "see_cost": "none", "name": "mansion base swimming pool", "sym": "M", "color": "blue", @@ -285,6 +283,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t2", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base bedrooms", "sym": "M", "color": "light_green", @@ -294,6 +293,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t3", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base???", "sym": "M", "color": "white", @@ -303,6 +303,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t4", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base kitchen", "sym": "M", "color": "pink", @@ -312,6 +313,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t5", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base library", "sym": "M", "color": "brown", @@ -321,6 +323,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t6", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base bedroom", "sym": "M", "color": "light_green", @@ -330,6 +333,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_t7", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base living rooms", "sym": "M", "color": "green", @@ -339,6 +343,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_c1", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base swimming pool", "sym": "M", "color": "blue", @@ -348,6 +353,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_c2", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base bar", "sym": "M", "color": "magenta", @@ -357,6 +363,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_c3", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base living rooms", "sym": "M", "color": "green", @@ -366,6 +373,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_c4", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base bedroom", "sym": "M", "color": "light_green", @@ -375,6 +383,7 @@ "type": "overmap_terrain", "id": "faction_base_mansion_c5", "vision_levels": "always_full", + "see_cost": "full_high", "name": "mansion base kitchen", "sym": "M", "color": "pink", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json b/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json index 126b8d5b86d08..50210b5d74e8d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_fungal.json @@ -6,7 +6,7 @@ "name": "fungal tower", "sym": "T", "color": "yellow", - "see_cost": 3, + "see_cost": "spaced_high", "extras": "marloss", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, @@ -17,7 +17,7 @@ "name": "fungal bloom", "sym": "T", "color": "light_gray", - "see_cost": 2, + "see_cost": "spaced_high", "extras": "marloss", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, @@ -28,7 +28,7 @@ "name": "fungal flowers", "sym": "T", "color": "cyan", - "see_cost": 5, + "see_cost": "spaced_high", "extras": "marloss", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json index bf6b07ca0ade9..6dfd9c5a6d771 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json @@ -5,6 +5,7 @@ "name": "open air", "sym": ".", "color": "blue", + "see_cost": "all_clear", "vision_levels": "roof_or_air", "travel_cost_type": "air", "flags": [ "NO_ROTATE" ] @@ -17,7 +18,7 @@ "sym": ".", "color": "brown", "vision_levels": "always_full", - "see_cost": 2, + "see_cost": "none", "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "travel_cost_type": "field", @@ -30,7 +31,7 @@ "name": "forest", "sym": "F", "color": "green", - "see_cost": 3, + "see_cost": "spaced_high", "extras": "forest", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 3 ], "chance": 13 }, "travel_cost_type": "forest", @@ -43,7 +44,7 @@ "name": "forest", "sym": "F", "color": "green", - "see_cost": 4, + "see_cost": "spaced_high", "extras": "forest_thick", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 6 ], "chance": 15 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], @@ -57,7 +58,7 @@ "sym": "F", "color": "cyan", "vision_levels": "forested_swampy", - "see_cost": 4, + "see_cost": "spaced_high", "extras": "forest_water", "spawns": { "group": "GROUP_SWAMP", "population": [ 2, 6 ], "chance": 50 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], @@ -71,7 +72,7 @@ "sym": "O", "color": "dark_gray", "vision_levels": "open_land", - "see_cost": 3, + "see_cost": "medium", "spawns": { "group": "GROUP_STANDING_STONES", "population": [ 1, 4 ], "chance": 100 }, "flags": [ "NO_ROTATE" ] }, @@ -83,7 +84,7 @@ "vision_levels": "open_land", "sym": "T", "color": "pink", - "see_cost": 5, + "see_cost": "none", "flags": [ "KNOWN_DOWN" ] }, { @@ -93,7 +94,7 @@ "name": "strange temple", "sym": "T", "color": "yellow", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN" ] }, { @@ -103,7 +104,7 @@ "name": "cave", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -113,7 +114,7 @@ "name": "cave", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -124,7 +125,7 @@ "vision_levels": "underground_dirt", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -135,7 +136,7 @@ "looks_like": "cave", "sym": "C", "color": "dark_gray", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -145,7 +146,7 @@ "name": "slime pit", "sym": "~", "color": "light_green", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_HIGH" ] }, { @@ -155,7 +156,7 @@ "name": "slime pit", "sym": "~", "color": "light_green", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "NO_ROTATE" ] }, { @@ -167,7 +168,7 @@ "looks_like": "empty_rock", "sym": "%", "color": "dark_gray", - "see_cost": 5, + "see_cost": "opaque", "flags": [ "NO_ROTATE" ] }, { @@ -177,7 +178,7 @@ "vision_levels": "always_full", "sym": "%", "color": "dark_gray", - "see_cost": 5, + "see_cost": "opaque", "travel_cost_type": "impassable", "flags": [ "NO_ROTATE" ] }, @@ -187,7 +188,7 @@ "name": "tutorial room", "sym": "O", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { @@ -196,7 +197,7 @@ "name": "tutorial room", "sym": "O", "color": "cyan", - "see_cost": 5, + "see_cost": "none", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { @@ -205,7 +206,7 @@ "name": "tutorial room", "sym": "O", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json index baf080f6d3840..d23cd4fb78548 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_industrial.json @@ -6,7 +6,7 @@ "vision_levels": "city_building", "sym": "w", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_VEHICLES", "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION" ] }, @@ -23,7 +23,7 @@ "name": "public works roof", "sym": "w", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -39,7 +39,7 @@ "sym": "0", "color": "i_magenta", "vision_levels": "isolated_building", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -48,7 +48,7 @@ "name": "solar farm", "sym": "#", "color": "i_yellow", - "see_cost": 5 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -57,7 +57,7 @@ "sym": "H", "color": "light_cyan", "vision_levels": "isolated_building", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -66,7 +66,7 @@ "sym": "H", "color": "light_cyan", "vision_levels": "isolated_building", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -75,7 +75,7 @@ "vision_levels": "isolated_building", "sym": "H", "color": "cyan", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -84,7 +84,7 @@ "vision_levels": "roof_or_air", "sym": "H", "color": "cyan", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -331,7 +331,7 @@ "sym": "I", "color": "light_blue", "vision_levels": "isolated_building", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2 }, @@ -342,7 +342,7 @@ "name": "mine entrance", "sym": "M", "color": "magenta", - "see_cost": 5, + "see_cost": "high", "flags": [ "KNOWN_DOWN" ] }, { @@ -352,7 +352,7 @@ "name": "mine entrance roof", "sym": "M", "color": "magenta", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -361,7 +361,7 @@ "name": "mine shaft", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "KNOWN_DOWN" ] }, { @@ -371,7 +371,7 @@ "name": "mine shaft", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "KNOWN_UP" ] }, { @@ -410,7 +410,7 @@ "name": "mine tunnels", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "KNOWN_UP" ] }, { @@ -419,7 +419,7 @@ "vision_levels": "underground_stone", "name": "mine tunnels", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_MINERS", "population": [ 1, 2 ], "chance": 100 }, "flags": [ "LINEAR" ] }, @@ -430,7 +430,7 @@ "name": "mine", "sym": "M", "color": "brown", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -438,7 +438,7 @@ "name": "light industry", "copy-from": "road_abstract", "sym": "─", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2 }, @@ -458,7 +458,7 @@ "sym": "I", "color": "light_blue", "vision_levels": "isolated_building", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2 } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json b/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json index 328427e4e450b..130af1229293a 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json @@ -3,6 +3,7 @@ "type": "overmap_terrain", "id": [ "isolated_road_field_0", "isolated_road_field_1", "isolated_road_field_1_roof" ], "vision_levels": "open_land", + "see_cost": "none", "name": "yard", "sym": ".", "color": "green", @@ -16,7 +17,7 @@ "sym": "v", "color": "red", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -26,7 +27,7 @@ "sym": "^", "color": "cyan", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -35,6 +36,6 @@ "name": "gun show", "sym": "G", "color": "red", - "see_cost": 5 + "see_cost": "high" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_lab.json b/data/json/overmap/overmap_terrain/overmap_terrain_lab.json index 71a688739d59c..a3e03b00c9611 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_lab.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_lab.json @@ -7,7 +7,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -17,7 +17,7 @@ "name": "science lab", "sym": "L", "color": "blue", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "KNOWN_DOWN", "NO_ROTATE", "RISK_EXTREME" ] }, @@ -29,7 +29,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 8 ], "chance": 30 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -39,7 +39,7 @@ "name": "science lab", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -50,7 +50,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -61,7 +61,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -71,7 +71,7 @@ "name": "science lab", "sym": "L", "color": "blue", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "KNOWN_DOWN", "NO_ROTATE" ] }, @@ -83,7 +83,7 @@ "sym": "L", "color": "cyan", "spawns": { "group": "GROUP_LAB", "population": [ 4, 12 ], "chance": 90 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -94,7 +94,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -104,7 +104,7 @@ "name": "science lab", "sym": "L", "color": "blue", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "KNOWN_DOWN", "NO_ROTATE" ] }, @@ -116,7 +116,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_LAB", "population": [ 0, 8 ], "chance": 30 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -127,7 +127,7 @@ "sym": "L", "color": "cyan", "spawns": { "group": "GROUP_LAB", "population": [ 4, 12 ], "chance": 90 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -137,7 +137,7 @@ "name": "science lab tower", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, @@ -148,7 +148,7 @@ "name": "science lab tower", "sym": "L", "color": "blue", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "NO_ROTATE" ] }, @@ -159,7 +159,7 @@ "name": "science lab tower", "sym": "L", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -176,7 +176,7 @@ "name": "science lab tower roof", "sym": "L", "color": "cyan", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -186,7 +186,7 @@ "name": "science train depot", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "extras": "subway", "spawns": { "group": "GROUP_LAB", "population": [ 0, 5 ], "chance": 20 }, "flags": [ "NO_ROTATE", "RISK_EXTREME" ] @@ -208,7 +208,7 @@ "land_use_code": "forest", "sym": "F", "color": "green", - "see_cost": 3, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -218,7 +218,7 @@ "name": "access shaft", "sym": "0", "color": "light_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -228,7 +228,7 @@ "name": "central lab", "sym": "L", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ], "spawns": { "group": "GROUP_CENTRAL_LAB", "population": [ 0, 5 ], "chance": 20 } }, @@ -254,7 +254,7 @@ "name": "central lab", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ], "spawns": { "group": "GROUP_CENTRAL_LAB", "population": [ 0, 7 ], "chance": 40 } }, @@ -265,7 +265,7 @@ "name": "central lab", "sym": "L", "color": "blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ], "spawns": { "group": "GROUP_CENTRAL_LAB", "population": [ 0, 7 ], "chance": 40 } }, @@ -276,7 +276,7 @@ "name": "central lab", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ], "spawns": { "group": "GROUP_CENTRAL_LAB", "population": [ 0, 7 ], "chance": 40 } }, @@ -287,7 +287,7 @@ "name": "central lab", "sym": "L", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ], "spawns": { "group": "GROUP_CENTRAL_LAB", "population": [ 0, 5 ], "chance": 20 } }, @@ -299,7 +299,7 @@ "sym": "L", "color": "white", "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 1, 5 ], "chance": 50 }, - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 }, { @@ -324,7 +324,7 @@ "color": "dark_gray", "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 5, 20 ], "chance": 50 }, "extras": "research_facility_lot", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 }, { @@ -352,7 +352,7 @@ "sym": "_", "color": "dark_gray", "spawns": { "group": "GROUP_VANILLA", "population": [ 5, 20 ], "chance": 30 }, - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 }, { @@ -378,7 +378,7 @@ "color": "light_gray", "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 10, 25 ], "chance": 60 }, "extras": "research_facility_interior", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 }, { @@ -390,7 +390,7 @@ "color": "white", "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 8, 25 ], "chance": 50 }, "extras": "research_facility_interior", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "RISK_EXTREME" ] }, @@ -446,7 +446,7 @@ "name": "open air", "sym": ".", "color": "blue", - "see_cost": 1 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -533,7 +533,7 @@ "vision_levels": "roof_or_air", "sym": "l", "color": "dark_gray", - "see_cost": 2 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -551,7 +551,7 @@ "name": "Lab Research Zone", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -561,7 +561,7 @@ "vision_levels": "underground_stone", "sym": "X", "color": "white", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -579,7 +579,7 @@ "sym": "S", "//": "6 underground levels for a modular security tower.", "color": "yellow", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_VANILLA", "population": [ 1, 4 ], "chance": 30 }, "flags": [ "RISK_EXTREME" ] }, @@ -605,7 +605,7 @@ "vision_levels": "underground_stone", "sym": "C", "color": "white", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_VANILLA", "population": [ 3, 15 ], "chance": 70 }, "flags": [ "RISK_EXTREME" ] }, @@ -631,7 +631,7 @@ "vision_levels": "underground_stone", "sym": "R", "color": "green", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -656,7 +656,7 @@ "sym": "F", "//": "Front/Fake company entrance for a lab. Includes main and auxiliary entrances including the start of the security tower.", "color": "light_gray", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_VANILLA", "population": [ 5, 15 ], "chance": 30 }, "flags": [ "RISK_EXTREME" ] }, @@ -667,7 +667,7 @@ "vision_levels": "roof_or_air", "sym": "F", "color": "light_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -677,7 +677,7 @@ "vision_levels": "underground_stone", "sym": "M", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB_HOSPITAL", "population": [ 7, 15 ], "chance": 100 }, "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, @@ -688,7 +688,7 @@ "vision_levels": "underground_stone", "sym": "M", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -698,7 +698,7 @@ "vision_levels": "underground_stone", "sym": "M", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_LAB_MAINTENANCE", "population": [ 5, 10 ], "chance": 100 }, "flags": [ "RISK_EXTREME" ] } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_mall.json b/data/json/overmap/overmap_terrain/overmap_terrain_mall.json index 62c8d47411af7..3a04a157959fe 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_mall.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_mall.json @@ -6,7 +6,7 @@ "color": "i_red", "vision_levels": "large_city_building", "sym": "M", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK", "RISK_EXTREME", "SOURCE_FOOD", "SOURCE_DRINK", "SOURCE_MEDICINE", "SOURCE_FABRICATION" ] }, @@ -310,6 +310,7 @@ "mall_a_71_basement" ], "vision_levels": "underground_dirt", + "see_cost": "full_high", "name": "solid earth", "color": "brown", "sym": "#" diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_mansion.json b/data/json/overmap/overmap_terrain/overmap_terrain_mansion.json index 794012cbda566..bee951dafae31 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_mansion.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_mansion.json @@ -6,7 +6,7 @@ "name": "mansion", "sym": "M", "color": "light_green", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "RISK_HIGH", "SOURCE_FOOD", "SOURCE_DRINK", "SOURCE_LUXURY", "SOURCE_BOOKS" ] }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_mi-go.json b/data/json/overmap/overmap_terrain/overmap_terrain_mi-go.json index 9ae5f0ca8d060..0b92cb8d6534b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_mi-go.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_mi-go.json @@ -3,6 +3,7 @@ "type": "overmap_terrain", "id": [ "mi-go_camp1", "mi-go_camp1-1" ], "vision_levels": "isolated_tower", + "see_cost": "high", "name": "mi-go encampment", "sym": "<", "color": "dark_gray", @@ -28,6 +29,7 @@ "type": "overmap_terrain", "id": "mi-go_camp2-2", "name": "mi-go landing platform", + "see_cost": "none", "sym": "_", "color": "light_gray", "copy-from": "mi-go_camp1" @@ -36,6 +38,7 @@ "type": "overmap_terrain", "id": "mi-go_camp2-3", "name": "mi-go landing roof", + "see_cost": "none", "sym": "_", "color": "light_gray", "copy-from": "mi-go_camp1" @@ -61,6 +64,7 @@ "name": "mi-go structure", "sym": "=", "vision_levels": "blends_till_details", + "see_cost": "high", "color": "dark_gray", "mondensity": 2, "flags": [ "RISK_EXTREME" ] @@ -70,6 +74,7 @@ "id": "mi-go_portal_roof", "name": "mi-go structure roof", "vision_levels": "roof_or_air", + "see_cost": "none", "sym": "=", "color": "dark_gray", "mondensity": 2, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json b/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json index 7a1b91cb52527..f884b908262b1 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_microlab.json @@ -6,7 +6,7 @@ "name": "science lab", "sym": "L", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -31,7 +31,7 @@ "name": "subway station?", "sym": "S", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -62,7 +62,7 @@ "name": "science lab", "sym": "L", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -83,7 +83,7 @@ "name": "physics lab", "sym": "L", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -92,7 +92,7 @@ "vision_levels": "underground_stone", "name": "lab hallway", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "LINEAR" ] }, { @@ -102,7 +102,7 @@ "name": "science lab reactor", "sym": "L", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -118,7 +118,7 @@ "vision_levels": "underground_stone", "name": "distorted hallway", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "LINEAR" ] }, { @@ -128,7 +128,7 @@ "name": "physics department elevator", "color": "light_red", "sym": "L", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -137,7 +137,7 @@ "name": "Hub 14 elevator", "color": "cyan", "sym": "L", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -146,7 +146,7 @@ "name": "Hub 14", "sym": "L", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -156,7 +156,7 @@ "name": "lost level", "color": "black", "sym": " ", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -165,7 +165,7 @@ "name": "lab", "sym": "L", "color": "blue", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -180,7 +180,7 @@ "sym": "L", "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -208,7 +208,7 @@ "sym": "P", "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -219,7 +219,7 @@ "sym": "L", "color": "green", "spawns": { "group": "GROUP_RATKIN_LAB", "population": [ 12, 25 ], "chance": 80 }, - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json index 25deed3aeb081..0db47d600a575 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json @@ -6,7 +6,7 @@ "name": "FEMA camp", "sym": "+", "color": "blue", - "see_cost": 5, + "see_cost": "high", "extras": "build", "flags": [ "RISK_EXTREME", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, @@ -28,7 +28,7 @@ "name": "FEMA camp", "sym": "F", "color": "i_blue", - "see_cost": 5, + "see_cost": "spaced_high", "extras": "build", "flags": [ "RISK_EXTREME", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, @@ -40,7 +40,7 @@ "sym": "F", "color": "i_blue", "extras": "build", - "see_cost": 2, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_VANILLA", "population": [ 4, 12 ], "chance": 90 } }, { @@ -51,7 +51,7 @@ "sym": "+", "color": "blue", "extras": "build", - "see_cost": 2, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_VANILLA", "population": [ 4, 12 ], "chance": 90 } }, { @@ -60,7 +60,7 @@ "sym": "+", "color": "white", "vision_levels": "isolated_building", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -173,7 +173,7 @@ "sym": "+", "color": "red", "vision_levels": "natural_outcropping", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -183,7 +183,7 @@ "sym": "+", "color": "red", "vision_levels": "natural_outcropping", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -193,7 +193,7 @@ "vision_levels": "roof_or_air", "sym": ".", "color": "brown", - "see_cost": 2, + "see_cost": "none", "flags": [ "KNOWN_DOWN" ] }, { @@ -203,7 +203,7 @@ "vision_levels": "underground_dirt", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SHOULD_NOT_SPAWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -213,7 +213,7 @@ "vision_levels": "underground_dirt", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -223,7 +223,7 @@ "vision_levels": "underground_dirt", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -233,7 +233,7 @@ "vision_levels": "natural_outcropping", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "KNOWN_DOWN", "RISK_HIGH", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -243,7 +243,7 @@ "vision_levels": "underground_dirt", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "RISK_HIGH", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -253,7 +253,7 @@ "vision_levels": "underground_dirt", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "RISK_HIGH", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -263,7 +263,7 @@ "sym": "B", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "RISK_EXTREME", "SOURCE_WEAPON", "SOURCE_AMMO" ] }, { @@ -273,7 +273,7 @@ "sym": "B", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "high", "flags": [ "KNOWN_UP", "RISK_EXTREME", "SOURCE_WEAPON", "SOURCE_AMMO" ] }, { @@ -283,7 +283,7 @@ "sym": "B", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "none", "flags": [ "RISK_EXTREME", "SOURCE_WEAPON", "SOURCE_AMMO" ] }, { @@ -293,7 +293,7 @@ "sym": "M", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "high", "extras": "build", "flags": [ "RISK_EXTREME", "SOURCE_WEAPON", "SOURCE_AMMO" ] }, @@ -304,7 +304,7 @@ "sym": "M", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "high", "extras": "build", "flags": [ "RISK_EXTREME", "SOURCE_WEAPON", "SOURCE_AMMO" ] }, @@ -315,7 +315,7 @@ "sym": "M", "color": "red", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "none", "extras": "build" }, { @@ -325,7 +325,7 @@ "sym": "0", "color": "red", "vision_levels": "open_land", - "see_cost": 2, + "see_cost": "medium", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -385,7 +385,7 @@ "vision_levels": "large_building", "sym": "H", "color": "red", - "see_cost": 5, + "see_cost": "high", "flags": [ "SOURCE_FUEL", "SOURCE_GUN", "SOURCE_VEHICLES", "RISK_EXTREME" ] }, { @@ -420,7 +420,7 @@ "vision_levels": "large_building", "sym": "M", "color": "red", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -459,7 +459,7 @@ "vision_levels": "open_land", "sym": ",", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -510,7 +510,7 @@ "sym": "M", "vision_levels": "roof_or_air", "color": "red", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -529,7 +529,7 @@ "vision_levels": "underground_dirt", "sym": "M", "color": "red", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -557,7 +557,7 @@ "vision_levels": "isolated_tower", "sym": "W", "color": "dark_gray", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -566,7 +566,7 @@ "vision_levels": "isolated_tower", "sym": "X", "color": "light_gray", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -585,7 +585,7 @@ "sym": "_", "vision_levels": "large_pavement", "color": "dark_gray", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -593,7 +593,7 @@ "name": "military base minefield", "vision_levels": "open_land", "color": "light_gray", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_militia.json b/data/json/overmap/overmap_terrain/overmap_terrain_militia.json index f3b6cd099704d..c2e79bbee5adc 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_militia.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_militia.json @@ -31,6 +31,6 @@ "vision_levels": "isolated_building", "sym": "L", "color": "brown", - "see_cost": 5 + "see_cost": "high" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_nether.json b/data/json/overmap/overmap_terrain/overmap_terrain_nether.json index bf5ad2009341b..e35b009c4873e 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_nether.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_nether.json @@ -6,7 +6,7 @@ "name": "abyss", "sym": " ", "color": "black", - "see_cost": 10, + "see_cost": "opaque", "flags": [ "RISK_EXTREME" ] }, { @@ -16,7 +16,7 @@ "name": "abyss", "sym": " ", "color": "black", - "see_cost": 10, + "see_cost": "opaque", "flags": [ "RISK_EXTREME" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json b/data/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json index ffd0d567abc03..a1ebc72bab145 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_nether_monster_corpse.json @@ -22,7 +22,7 @@ "name": "monster corpse bowels", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_HIGH" ] }, { @@ -32,7 +32,7 @@ "name": "monster corpse bowels", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_HIGH", "NO_ROTATE" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json b/data/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json index 334558a274384..e57990a34269c 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_nuclear_plant.json @@ -516,6 +516,6 @@ "name": "nuclear plant", "sym": "N", "color": "red", - "see_cost": 5 + "see_cost": "full_high" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_oil_platform.json b/data/json/overmap/overmap_terrain/overmap_terrain_oil_platform.json index b1882dddb50f3..7f2eabb470531 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_oil_platform.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_oil_platform.json @@ -40,7 +40,7 @@ "name": "oil platform", "sym": "O", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_OIL_PLATFORM", "population": [ 15, 20 ], "chance": 100 }, "flags": [ "RISK_HIGH", "OCEAN", "SOURCE_FUEL", "GENERIC_LOOT" ] }, @@ -59,7 +59,7 @@ "name": "oil platform", "sym": "O", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_OIL_PLATFORM", "population": [ 25, 35 ], "chance": 100 }, "flags": [ "RISK_HIGH", "OCEAN", "SOURCE_FUEL", "GENERIC_LOOT" ] }, @@ -165,7 +165,7 @@ "name": "oil platform", "sym": "O", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_HIGH", "OCEAN", "SOURCE_FUEL", "GENERIC_LOOT" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json b/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json index a994b6a956792..7604986f8f060 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_private_resort.json @@ -6,7 +6,7 @@ "sym": "p", "color": "yellow", "vision_levels": "large_building", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 1, "flags": [ "RISK_EXTREME", "SOURCE_DRINK", "SOURCE_LUXURY" ] }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json b/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json index c5cad9ab9ec7a..0f3ad93b9fc8b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_public_institutional.json @@ -32,7 +32,7 @@ "name": "rural church", "sym": "C", "color": "light_red", - "see_cost": 4 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -41,7 +41,7 @@ "name": "rural church steeple", "sym": "C", "color": "light_red", - "see_cost": 4 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -50,12 +50,13 @@ "name": "rural church steeple roof", "sym": "C", "color": "light_red", - "see_cost": 4 + "see_cost": "none" }, { "type": "overmap_terrain", "id": [ "rural_church_basement" ], "vision_levels": "underground_dirt", + "see_cost": "full_high", "name": "church basement", "sym": "B", "color": "light_red" @@ -96,7 +97,7 @@ "vision_levels": "large_city_building", "sym": "C", "color": "i_light_red", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -292,7 +293,7 @@ "name": "regional school", "sym": "s", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK", "RISK_EXTREME", "SOURCE_BOOKS" ] }, @@ -303,7 +304,7 @@ "name": "regional school", "sym": "S", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK", "RISK_EXTREME", "SOURCE_BOOKS" ] }, @@ -340,7 +341,7 @@ "vision_levels": "large_city_building", "sym": "s", "color": "light_blue", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SOURCE_BOOKS", "RISK_EXTREME" ] }, @@ -361,7 +362,7 @@ "name": "prison", "sym": "p", "color": "i_light_blue", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "RISK_EXTREME" ] }, { @@ -488,7 +489,7 @@ "name": "prison", "sym": "p", "color": "i_light_blue", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -545,7 +546,7 @@ "vision_levels": "city_building", "sym": "H", "color": "green", - "see_cost": 2, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -564,7 +565,7 @@ "vision_levels": "city_building", "sym": "H", "color": "green", - "see_cost": 2, + "see_cost": "high", "mondensity": 2 }, { @@ -574,7 +575,7 @@ "vision_levels": "city_building", "sym": "^", "color": "i_black", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "SIDEWALK" ] }, { @@ -584,7 +585,7 @@ "vision_levels": "city_building", "sym": "^", "color": "i_black", - "see_cost": 2, + "see_cost": "full_high", "mondensity": 2 }, { @@ -594,7 +595,7 @@ "vision_levels": "roof_or_air", "sym": "^", "color": "i_black", - "see_cost": 2, + "see_cost": "none", "mondensity": 1 }, { @@ -612,7 +613,7 @@ "name": "freshwater research station", "sym": "~", "color": "yellow", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -625,6 +626,7 @@ "nursing_home_sh7" ], "vision_levels": "large_building", + "see_cost": "full_high", "name": "nursing home", "sym": "N", "color": "white" @@ -633,6 +635,7 @@ "type": "overmap_terrain", "id": [ "nursing_home_sh9", "nursing_home_sh10", "nursing_home_sh11" ], "vision_levels": "large_pavement", + "see_cost": "none", "name": "parking lot", "sym": "O", "color": "dark_gray" @@ -659,6 +662,7 @@ "type": "overmap_terrain", "id": [ "nursing_home_1", "nursing_home_2", "nursing_home_3", "nursing_home_5", "nursing_home_6", "nursing_home_7" ], "vision_levels": "large_building", + "see_cost": "full_high", "name": "nursing home", "sym": "N", "color": "white" @@ -667,6 +671,7 @@ "type": "overmap_terrain", "id": [ "nursing_home_9", "nursing_home_10", "nursing_home_11" ], "vision_levels": "large_building", + "see_cost": "none", "name": "parking lot", "sym": "O", "color": "dark_gray" @@ -700,6 +705,7 @@ "nursing_home_6_roof" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "nursing home roof", "sym": "N", "color": "white" @@ -721,6 +727,7 @@ "nursing_home_b12" ], "vision_levels": "underground_dirt", + "see_cost": "full_high", "name": "nursing home basement", "sym": "N", "color": "light_gray" @@ -742,6 +749,7 @@ "nursing_home_bb12" ], "vision_levels": "underground_dirt", + "see_cost": "full_high", "name": "nursing home basement", "sym": "N", "color": "light_gray" @@ -763,6 +771,7 @@ "nursing_home_lab12" ], "vision_levels": "underground_stone", + "see_cost": "full_high", "name": "nursing home lab", "sym": "N", "color": "dark_gray" diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json b/data/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json index 1a3785e4ca254..a27248162e4ef 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_ranch_camp.json @@ -6,7 +6,7 @@ "name": "ranch field", "sym": "┌", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -27,7 +27,7 @@ "sym": "─", "vision_levels": "open_land", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -36,7 +36,7 @@ "vision_levels": "open_land", "sym": "┐", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -61,7 +61,7 @@ "vision_levels": "open_land", "sym": "│", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -114,7 +114,7 @@ "vision_levels": "open_land", "sym": "#", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -123,7 +123,7 @@ "name": "pond", "sym": "P", "color": "blue", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -132,7 +132,7 @@ "name": "silo", "sym": "#", "color": "i_brown", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -141,7 +141,7 @@ "name": "silo", "sym": "│", "color": "brown", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -150,7 +150,7 @@ "name": "silo cap", "sym": "│", "color": "brown", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -159,7 +159,7 @@ "name": "barn roof", "sym": "#", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -168,7 +168,7 @@ "name": "barn", "sym": "#", "color": "i_brown", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -177,7 +177,7 @@ "name": "barn roof", "sym": "#", "color": "i_brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -186,7 +186,7 @@ "name": "garage", "sym": "O", "color": "white", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -195,7 +195,7 @@ "name": "garage roof", "sym": "O", "color": "white", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -204,7 +204,7 @@ "name": "ranch", "sym": "v", "color": "light_green", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -213,7 +213,7 @@ "name": "ranch roof", "sym": "v", "color": "light_green", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -222,7 +222,7 @@ "name": "ranch field", "sym": "┘", "color": "brown", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -231,7 +231,7 @@ "name": "lot", "sym": "O", "color": "dark_gray", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -247,6 +247,6 @@ "name": "ranch field", "sym": "└", "color": "brown", - "see_cost": 2 + "see_cost": "none" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_ravines.json b/data/json/overmap/overmap_terrain/overmap_terrain_ravines.json index aa58fa6a9706d..b803122fa405d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_ravines.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_ravines.json @@ -6,7 +6,7 @@ "name": "ravine", "sym": ".", "color": "blue", - "see_cost": 1 + "see_cost": "all_clear" }, { "type": "overmap_terrain", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json index 2e0cf65c2e3a1..9564ca72d7604 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json @@ -71,7 +71,7 @@ "sym": "O", "color": "blue", "vision_levels": "single_water", - "see_cost": 2, + "see_cost": "none", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_DRINK" ] }, @@ -156,7 +156,7 @@ "sym": "H", "color": "i_green", "vision_levels": "blends_till_details", - "see_cost": 5, + "see_cost": "medium", "mondensity": 2 }, { @@ -184,7 +184,7 @@ "sym": "g", "color": "yellow", "vision_levels": "blends_till_details", - "see_cost": 5, + "see_cost": "low", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_FARMING" ], "extras": "park" @@ -206,7 +206,7 @@ "sym": "g", "color": "i_green", "vision_levels": "city_building", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK", "SOURCE_FARMING" ] }, @@ -217,7 +217,7 @@ "name": "botanical garden", "sym": "g", "color": "i_green", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -227,7 +227,7 @@ "name": "tree farm", "sym": "T", "color": "i_green", - "see_cost": 5, + "see_cost": "spaced_high", "mondensity": 2 }, { @@ -237,7 +237,7 @@ "name": "tree farm", "sym": "T", "color": "i_green", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -246,7 +246,7 @@ "sym": "S", "color": "red", "vision_levels": "open_land", - "see_cost": 5, + "see_cost": "low", "mondensity": 2, "flags": [ "SOURCE_GUN", "SOURCE_AMMO" ] }, @@ -257,7 +257,7 @@ "vision_levels": "roof_or_air", "sym": "S", "color": "red", - "see_cost": 5, + "see_cost": "none", "mondensity": 2 }, { @@ -485,7 +485,7 @@ "name": "football field", "sym": "O", "color": "light_green", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -664,7 +664,7 @@ "vision_levels": "roof_or_air", "sym": ".", "color": "blue", - "see_cost": 1 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -672,7 +672,7 @@ "vision_levels": "large_pavement", "name": "stadium parking", "color": "dark_gray", - "see_cost": 5, + "see_cost": "none", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -1073,7 +1073,7 @@ "name": "dock", "sym": "d", "color": "white", - "see_cost": 1, + "see_cost": "none", "flags": [ "LAKE" ] }, { @@ -1084,7 +1084,7 @@ "name": "dock", "sym": "d", "color": "white", - "see_cost": 1, + "see_cost": "none", "flags": [ "LAKE_SHORE" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json index b0f8c11a1d968..b38bd0ae78d15 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_residential.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_residential.json @@ -14,7 +14,7 @@ "copy-from": "generic_city_building", "name": "house", "color": "light_green", - "see_cost": 2, + "see_cost": "high", "spawns": { "group": "GROUP_VANILLA", "population": [ 1, 4 ], "chance": 80 }, "extend": { "flags": [ "GENERIC_LOOT" ] } }, @@ -225,7 +225,7 @@ "urban_22_2_roof" ], "copy-from": "generic_city_house", - "see_cost": 10 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -252,7 +252,7 @@ ], "copy-from": "generic_city_house", "sym": "v", - "see_cost": 10 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -298,7 +298,7 @@ "urban_18_10" ], "copy-from": "generic_city_house_no_sidewalk", - "see_cost": 10 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -338,7 +338,7 @@ ], "copy-from": "generic_city_house_no_sidewalk", "sym": "v", - "see_cost": 10 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -358,7 +358,7 @@ "name": "dense urban", "sym": "v", "color": "i_white", - "see_cost": 40 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -601,7 +601,7 @@ "sym": "A", "color": "light_green", "vision_levels": "large_city_building", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "extras": "build", "spawns": { "group": "GROUP_VANILLA", "population": [ 4, 10 ], "chance": 80 }, @@ -614,7 +614,7 @@ "name": "apartment tower roof", "sym": "A", "color": "light_green", - "see_cost": 5, + "see_cost": "none", "mondensity": 2, "extras": "build" }, @@ -779,7 +779,7 @@ "vision_levels": "roof_or_air", "sym": ".", "color": "i_brown", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json b/data/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json index c3117369eac8d..b0e3ace4fc40b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_retirement_community.json @@ -18,6 +18,7 @@ "retirement_community_2f_7" ], "vision_levels": "city_building", + "see_cost": "high", "name": "retirement home", "sym": "v", "color": "light_green" @@ -34,6 +35,7 @@ "retirement_community_3f_7" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "retirement home roof", "sym": "v", "color": "light_green" @@ -58,6 +60,7 @@ "retirement_community_2f_37" ], "vision_levels": "always_full", + "see_cost": "all_clear", "name": "open air", "sym": ".", "color": "blue" @@ -80,6 +83,7 @@ "retirement_community_b_26" ], "vision_levels": "always_full", + "see_cost": "full_high", "name": "basement", "sym": "O", "color": "dark_gray" @@ -95,6 +99,7 @@ "retirement_community_2f_23" ], "vision_levels": "city_building", + "see_cost": "high", "name": "retirement home", "sym": ">", "color": "light_green" @@ -103,6 +108,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_3f_15", "retirement_community_3f_19", "retirement_community_3f_23" ], "vision_levels": "city_building", + "see_cost": "none", "name": "retirement home roof", "sym": ">", "color": "light_green" @@ -139,6 +145,7 @@ "retirement_community_2f_26" ], "vision_levels": "city_building", + "see_cost": "high", "name": "retirement home", "sym": "<", "color": "light_green" @@ -147,6 +154,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_3f_18", "retirement_community_3f_22", "retirement_community_3f_26" ], "vision_levels": "roof_or_air", + "see_cost": "none", "name": "retirement home roof", "sym": "<", "color": "light_green" @@ -155,6 +163,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_8", "retirement_community_14", "retirement_community_27", "retirement_community_33" ], "vision_levels": "large_pavement", + "see_cost": "none", "name": "parking lot", "sym": "O", "color": "dark_gray" @@ -187,6 +196,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_34", "retirement_community_35", "retirement_community_36" ], "vision_levels": "city_building", + "see_cost": "high", "name": "community building", "sym": "C", "color": "pink" @@ -195,6 +205,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_38", "retirement_community_39", "retirement_community_40" ], "vision_levels": "city_building", + "see_cost": "high", "name": "administration building", "sym": "A", "color": "light_gray" @@ -203,6 +214,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_b_37", "retirement_community_b_38" ], "vision_levels": "city_building", + "see_cost": "full_high", "name": "administration building basement", "sym": "A", "color": "light_gray" @@ -211,6 +223,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_2f_34", "retirement_community_2f_35", "retirement_community_2f_36" ], "vision_levels": "city_building", + "see_cost": "none", "name": "community building roof", "sym": "C", "color": "pink" @@ -219,6 +232,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_2f_38", "retirement_community_2f_39", "retirement_community_2f_40" ], "vision_levels": "city_building", + "see_cost": "none", "name": "administration building roof", "sym": "A", "color": "light_gray" @@ -237,6 +251,7 @@ "retirement_community_park_9" ], "vision_levels": "forested", + "see_cost": "spaced_high", "name": "retirement community park", "sym": "┼", "color": "green" @@ -245,6 +260,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_park_2f_2", "retirement_community_park_2f_5" ], "vision_levels": "always_full", + "see_cost": "all_clear", "name": "open air", "sym": ".", "color": "blue" @@ -263,6 +279,7 @@ "retirement_community_park_b_9" ], "vision_levels": "city_building", + "see_cost": "full_high", "name": "retirement community park underground", "sym": "┼", "color": "brown" @@ -271,6 +288,7 @@ "type": "overmap_terrain", "id": [ "retirement_community_sewer" ], "vision_levels": "city_building", + "see_cost": "full_high", "name": "sewer", "sym": "┐", "color": "green" diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_river.json b/data/json/overmap/overmap_terrain/overmap_terrain_river.json index 3ac3ee8a2c734..227a215094b37 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_river.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_river.json @@ -7,7 +7,7 @@ "name": "river", "sym": "R", "color": "blue", - "see_cost": 1, + "see_cost": "none", "flags": [ "RIVER", "NO_ROTATE", "SOURCE_DRINK", "WATER" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json b/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json index c0d32e24898d6..eeaac1e3cb53b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_robofachq.json @@ -3,6 +3,7 @@ "type": "overmap_terrain", "id": [ "robofachq_roof_a0", "robofachq_roof_a3" ], "vision_levels": "roof_or_air", + "see_cost": "all_clear", "name": "open air", "sym": ".", "color": "blue" @@ -23,7 +24,7 @@ "name": "meteorology station", "sym": "m", "color": "yellow", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -31,7 +32,7 @@ "copy-from": "road_abstract", "name": "meteorology station", "sym": "─", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -41,7 +42,7 @@ "looks_like": "empty_rock", "sym": "%", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { @@ -108,7 +109,7 @@ "name": "hub 01", "sym": "0", "color": "light_blue", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -117,7 +118,7 @@ "name": "hub 01 parking space", "sym": "0", "color": "light_blue", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -126,7 +127,7 @@ "name": "subway C&C", "sym": "S", "color": "yellow", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -135,6 +136,6 @@ "name": "hidden terminal", "sym": "s", "color": "light_blue", - "see_cost": 5 + "see_cost": "full_high" } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_special.json b/data/json/overmap/overmap_terrain/overmap_terrain_special.json index 65c3b2a20a330..435e91ea1a90e 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_special.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_special.json @@ -8,7 +8,7 @@ "looks_like": "deep_rock", "sym": "%", "color": "dark_gray", - "see_cost": 5, + "see_cost": "opaque", "flags": [ "NO_ROTATE" ] }, { @@ -19,7 +19,7 @@ "sym": "%", "color": "dark_gray", "looks_like": "empty_rock", - "see_cost": 5, + "see_cost": "opaque", "flags": [ "NO_ROTATE" ] }, { @@ -30,7 +30,7 @@ "sym": "#", "color": "brown", "looks_like": "solid_earth", - "see_cost": 5, + "see_cost": "opaque", "flags": [ "NO_ROTATE" ] }, { @@ -42,7 +42,7 @@ "sym": ".", "color": "brown", "looks_like": "field", - "see_cost": 2, + "see_cost": "none", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "travel_cost_type": "field", "flags": [ "NO_ROTATE" ] @@ -55,7 +55,7 @@ "sym": "F", "color": "green", "looks_like": "forest", - "see_cost": 3, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 3 ], "chance": 13 }, "flags": [ "NO_ROTATE", "SOURCE_FORAGE" ] }, @@ -67,7 +67,7 @@ "sym": "F", "color": "green", "looks_like": "forest_thick", - "see_cost": 4, + "see_cost": "spaced_high", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 6 ], "chance": 15 }, "flags": [ "NO_ROTATE", "SOURCE_FORAGE" ] }, @@ -75,6 +75,7 @@ "type": "overmap_terrain", "abstract": "generic_air", "vision_levels": "roof_or_air", + "see_cost": "all_clear", "name": "open air", "sym": ".", "color": "blue", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_speedway.json b/data/json/overmap/overmap_terrain/overmap_terrain_speedway.json index 1da4a88b64865..ad8b841e4dd9b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_speedway.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_speedway.json @@ -154,7 +154,7 @@ "abstract": "speedway_road_abstract", "copy-from": "road_abstract", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2, "flags": [ "RISK_HIGH", "GENERIC_LOOT" ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json b/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json index dc1020feff78b..1506135d87fc9 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json @@ -5,7 +5,7 @@ "name": "road", "copy-from": "generic_transportation", "color": "dark_gray", - "see_cost": 2, + "see_cost": "none", "travel_cost_type": "road", "looks_like": "road", "vision_levels": "blends_till_outlines" @@ -34,7 +34,7 @@ "name": "bridge", "sym": "│", "color": "white", - "see_cost": 2, + "see_cost": "none", "flags": [ "BRIDGE" ] }, { @@ -81,6 +81,7 @@ "type": "overmap_terrain", "id": [ "roadstop", "roadstop_roof" ], "vision_levels": "isolated_building", + "see_cost": "high", "name": "roadstop", "sym": "^", "color": "light_blue", @@ -90,6 +91,7 @@ "type": "overmap_terrain", "id": [ "roadstop_a", "roadstop_a_roof" ], "vision_levels": "isolated_building", + "see_cost": "spaced_high", "name": "public washroom", "sym": "^", "color": "light_blue", @@ -99,6 +101,7 @@ "type": "overmap_terrain", "id": [ "roadstop_b", "roadstop_b_roof" ], "vision_levels": "isolated_building", + "see_cost": "high", "name": "roadside foodcart", "sym": "^", "color": "magenta", @@ -110,6 +113,7 @@ "name": "forest trail", "color": "green", "vision_levels": "forested", + "see_cost": "spaced_high", "flags": [ "LINEAR", "REQUIRES_PREDECESSOR" ], "land_use_code": "forest" }, @@ -118,6 +122,7 @@ "id": [ "trailhead", "trailhead_shack_z0", "trailhead_outhouse_z0" ], "name": "trailhead", "vision_levels": "blends_till_details", + "see_cost": "none", "sym": "T", "color": "brown" }, @@ -134,7 +139,7 @@ "vision_levels": "city_building", "sym": "S", "color": "yellow", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "flags": [ "KNOWN_DOWN", "SIDEWALK" ] @@ -146,7 +151,7 @@ "vision_levels": "roof_or_air", "sym": "S", "color": "yellow", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2, "flags": [ "KNOWN_DOWN", "SIDEWALK" ] @@ -158,7 +163,7 @@ "vision_levels": "underground_dirt", "sym": "S", "color": "yellow", - "see_cost": 5, + "see_cost": "full_high", "extras": "subway", "flags": [ "KNOWN_UP", "KNOWN_DOWN", "NO_ROTATE" ] }, @@ -169,7 +174,7 @@ "vision_levels": "underground_stone", "sym": "S", "color": "yellow", - "see_cost": 5, + "see_cost": "full_high", "extras": "subway", "flags": [ "KNOWN_UP", "NO_ROTATE" ] }, @@ -179,7 +184,7 @@ "name": "subway", "vision_levels": "underground_stone", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "extras": "subway", "mapgen_straight": [ { "method": "builtin", "name": "subway_straight" } ], "mapgen_curved": [ { "method": "builtin", "name": "subway_curved" } ], @@ -196,7 +201,7 @@ "name": "subway", "vision_levels": "underground_stone", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "extras": "lab_subway", "mapgen_straight": [ { "method": "builtin", "name": "subway_straight" } ], "mapgen_curved": [ { "method": "builtin", "name": "subway_curved" } ], @@ -214,7 +219,7 @@ "vision_levels": "underground_stone", "sym": "S", "color": "dark_gray", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -250,7 +255,7 @@ "name": "control tower", "sym": "X", "color": "i_light_gray", - "see_cost": 5, + "see_cost": "high", "extras": "build" }, { @@ -260,7 +265,7 @@ "vision_levels": "roof_or_air", "sym": "X", "color": "i_light_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -284,7 +289,7 @@ "vision_levels": "blends_till_outlines", "sym": "─", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -294,7 +299,7 @@ "name": "runway", "sym": "─", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "extras": "road", "flags": [ "SOURCE_FUEL" ] }, @@ -305,7 +310,7 @@ "name": "fuel station", "sym": ".", "color": "dark_gray", - "see_cost": 5, + "see_cost": "spaced_high", "extras": "build", "flags": [ "SOURCE_FUEL" ] }, @@ -316,7 +321,7 @@ "name": "fuel station roof", "sym": ".", "color": "dark_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -326,7 +331,7 @@ "name": "parking lot", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -336,7 +341,7 @@ "name": "small hangar", "sym": "O", "color": "white", - "see_cost": 5, + "see_cost": "high", "extras": "build" }, { @@ -346,7 +351,7 @@ "name": "small hangar roof", "sym": "O", "color": "white", - "see_cost": 5, + "see_cost": "none", "extras": "build" }, { @@ -356,7 +361,7 @@ "name": "private airport terminal", "sym": "A", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2 }, @@ -367,7 +372,7 @@ "name": "private airport terminal roof", "sym": "A", "color": "light_gray", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2 }, @@ -390,7 +395,7 @@ "name": "helicopter pad", "sym": "H", "color": "white", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2 }, @@ -401,7 +406,7 @@ "vision_levels": "large_pavement", "sym": "B", "color": "i_light_cyan", - "see_cost": 2, + "see_cost": "none", "extras": "build", "flags": [ "SIDEWALK" ] }, @@ -412,7 +417,7 @@ "name": "bus station roof", "sym": "B", "color": "i_light_cyan", - "see_cost": 2, + "see_cost": "none", "extras": "build" }, { @@ -450,7 +455,7 @@ "vision_levels": "city_building", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "full_high", "extras": "build", "flags": [ "SIDEWALK" ] }, diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json b/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json index d061f9738678c..be62f9aaf6952 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_triffid.json @@ -7,7 +7,7 @@ "vision_levels": "unusual_structure", "sym": "T", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_EXTREME", "REQUIRES_PREDECESSOR" ] }, @@ -28,7 +28,7 @@ "name": "triffid roots", "sym": "T", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "spawns": { "group": "GROUP_TRIFFID", "population": [ 40, 45 ], "chance": 80 }, "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_EXTREME" ] @@ -40,7 +40,7 @@ "name": "triffid heart", "sym": "T", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "spawns": { "group": "GROUP_TRIFFID_HEARTGUARDS", "population": [ 50, 60 ], "chance": 80 }, "flags": [ "KNOWN_UP", "RISK_EXTREME" ] @@ -52,7 +52,7 @@ "name": "triffid grove trunk", "sym": "T", "color": "light_red", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_EXTREME" ] }, { @@ -62,7 +62,7 @@ "name": "triffid grove roof", "sym": "T", "color": "light_red", - "see_cost": 5, + "see_cost": "none", "flags": [ "KNOWN_DOWN", "RISK_EXTREME" ] }, { @@ -73,7 +73,7 @@ "copy-from": "generic_forest", "sym": ".", "color": "green", - "see_cost": 5, + "see_cost": "spaced_high", "mondensity": 2, "flags": [ "REQUIRES_PREDECESSOR" ] } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json index 0ada5ca83ce9a..692ba1e708938 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json @@ -5,7 +5,7 @@ "vision_levels": "underground_dirt", "name": "sewer", "color": "green", - "see_cost": 5, + "see_cost": "full_high", "extras": "sewer" }, { @@ -34,7 +34,7 @@ "vision_levels": "isolated_building", "sym": "P", "color": "red", - "see_cost": 5, + "see_cost": "high", "flags": [ "KNOWN_DOWN" ] }, { @@ -44,7 +44,7 @@ "name": "open air", "sym": ".", "color": "blue", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -53,7 +53,7 @@ "vision_levels": "isolated_building", "sym": "P", "color": "red", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -62,7 +62,7 @@ "sym": "O", "color": "blue", "vision_levels": "single_water", - "see_cost": 5, + "see_cost": "none", "flags": [ "KNOWN_DOWN" ] }, { @@ -72,7 +72,7 @@ "sym": "O", "color": "blue", "vision_levels": "roof_or_air", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -88,7 +88,7 @@ "sym": "P", "color": "green", "vision_levels": "underground_dirt", - "see_cost": 5, + "see_cost": "full_high", "extras": "build", "flags": [ "KNOWN_UP" ] }, @@ -99,7 +99,7 @@ "sym": "D", "color": "pink", "vision_levels": "isolated_building", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "RISK_HIGH" ] }, { @@ -122,7 +122,7 @@ "sym": "X", "color": "pink", "vision_levels": "isolated_building", - "see_cost": 5, + "see_cost": "high", "flags": [ "RISK_HIGH" ] }, { @@ -162,7 +162,7 @@ "vision_levels": "isolated_building", "sym": "P", "color": "green", - "see_cost": 999, + "see_cost": "high", "mondensity": 2 }, { diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_waterbody.json b/data/json/overmap/overmap_terrain/overmap_terrain_waterbody.json index 5c679dae2bbcd..10a53cb93dbb1 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_waterbody.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_waterbody.json @@ -7,7 +7,7 @@ "name": "lake", "sym": "#", "color": "blue", - "see_cost": 1, + "see_cost": "none", "flags": [ "NO_ROTATE", "LAKE", "SOURCE_DRINK", "WATER" ] }, { @@ -48,7 +48,7 @@ "name": "ocean", "sym": "#", "color": "blue", - "see_cost": 1, + "see_cost": "none", "flags": [ "NO_ROTATE", "OCEAN" ] }, { diff --git a/data/json/overmap/overmap_terrain/overmap_vitrified_terrain.json b/data/json/overmap/overmap_terrain/overmap_vitrified_terrain.json index a26d6daa1bf5e..9774ce1bbf1c1 100644 --- a/data/json/overmap/overmap_terrain/overmap_vitrified_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_vitrified_terrain.json @@ -7,7 +7,7 @@ "sym": "G", "color": "i_light_gray", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -17,6 +17,6 @@ "sym": "G", "color": "i_light_gray", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "spaced_high" } ] diff --git a/data/json/overmap/overmap_terrain/river_cave.json b/data/json/overmap/overmap_terrain/river_cave.json index faa9e8ae3094c..a11a9ea1da5fd 100644 --- a/data/json/overmap/overmap_terrain/river_cave.json +++ b/data/json/overmap/overmap_terrain/river_cave.json @@ -6,7 +6,7 @@ "vision_levels": "natural_outcropping", "sym": "O", "color": "light_cyan", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "KNOWN_DOWN", "RISK_HIGH", "REQUIRES_PREDECESSOR", "RIVER", "LAKE_SHORE" ] }, { @@ -16,7 +16,7 @@ "vision_levels": "underground_dirt", "sym": "O", "color": "cyan_green", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_KRAKEN", "population": [ 6, 10 ], "chance": 100 } }, { @@ -39,7 +39,7 @@ "name": "river cave tunnel", "vision_levels": "underground_dirt", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "spawns": { "group": "GROUP_KRAKEN", "population": [ 4, 6 ], "chance": 100 }, "flags": [ "LINEAR" ] } diff --git a/data/mods/Aftershock/maps/overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json index de586a27b8274..b8953695e5dc6 100644 --- a/data/mods/Aftershock/maps/overmap_terrain.json +++ b/data/mods/Aftershock/maps/overmap_terrain.json @@ -11,7 +11,7 @@ "name": "municipal reactor", "sym": "O", "color": "light_green", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -30,7 +30,7 @@ "name": "crashed escape pod", "sym": "+", "color": "i_red", - "see_cost": 2, + "see_cost": "medium", "flags": [ "SOURCE_FOOD", "SOURCE_GUN", "SOURCE_AMMO" ] }, { @@ -39,7 +39,7 @@ "name": "drone shuttle landing site", "sym": "^", "color": "yellow", - "see_cost": 2, + "see_cost": "low", "flags": [ "SOURCE_SAFETY", "NO_ROTATE" ] }, { @@ -48,7 +48,7 @@ "name": "warehouse", "sym": "w", "color": "pink", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -58,7 +58,7 @@ "name": "waste storage", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -67,7 +67,7 @@ "name": "waste storage", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -76,7 +76,7 @@ "name": "reactor control", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -85,7 +85,7 @@ "name": "reactor room", "sym": "O", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -94,7 +94,7 @@ "name": "fungal tower", "sym": "T", "color": "pink", - "see_cost": 3, + "see_cost": "spaced_high", "extras": "marloss", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, @@ -104,7 +104,7 @@ "name": "crashed cargo droneship", "sym": "s", "color": "i_red", - "see_cost": 2, + "see_cost": "medium", "flags": [ "RISK_HIGH" ] }, { @@ -113,7 +113,7 @@ "name": "crashed military droneship", "sym": "s", "color": "light_green", - "see_cost": 2, + "see_cost": "medium", "flags": [ "RISK_EXTREME", "SOURCE_GUN", "SOURCE_AMMO" ] }, { @@ -124,7 +124,7 @@ "sym": "r", "color": "light_gray", "flags": [ "SIDEWALK" ], - "see_cost": 3 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -139,7 +139,7 @@ "sym": "P", "color": "yellow", "flags": [ "SIDEWALK" ], - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -157,7 +157,7 @@ "sym": "i", "color": "cyan", "flags": [ "SOURCE_FABRICATION", "SOURCE_ELECTRONICS", "SOURCE_CONSTRUCTION" ], - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -167,7 +167,7 @@ "sym": "Q", "color": "cyan", "flags": [ "SIDEWALK", "SOURCE_FOOD" ], - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -176,7 +176,7 @@ "sym": "t", "color": "yellow", "flags": [ "SIDEWALK" ], - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -186,7 +186,7 @@ "sym": "L", "color": "light_green", "flags": [ "SIDEWALK", "SOURCE_FOOD" ], - "see_cost": 3, + "see_cost": "high", "mondensity": 3 }, { @@ -195,7 +195,7 @@ "name": "county mortuary", "sym": "M", "color": "light_green", - "see_cost": 3, + "see_cost": "high", "flags": [ "SIDEWALK" ] }, { @@ -204,7 +204,7 @@ "name": "county mortuary basement", "sym": "M", "color": "white", - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -212,7 +212,7 @@ "name": "county mortuary second floor", "sym": "M", "color": "light_green", - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -220,7 +220,7 @@ "name": "county mortuary roof", "sym": "M", "color": "light_green", - "see_cost": 3 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -228,7 +228,7 @@ "name": "LMOE shelter", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "spaced_high", "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -237,7 +237,7 @@ "name": "LMOE shelter", "sym": ".", "color": "brown", - "see_cost": 2, + "see_cost": "none", "flags": [ "KNOWN_DOWN" ] }, { @@ -246,7 +246,7 @@ "name": "LMOE shelter", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -255,7 +255,7 @@ "name": "LMOE shelter", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, { @@ -264,7 +264,7 @@ "name": "robot dispatch center", "sym": "R", "color": "i_pink", - "see_cost": 2, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -274,7 +274,7 @@ "name": "robot dispatch center", "sym": "R", "color": "i_pink", - "see_cost": 2, + "see_cost": "high", "mondensity": 2 }, { @@ -283,7 +283,7 @@ "name": "landing pad outpost", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "low", "flags": [ "SOURCE_PEOPLE", "SOURCE_SAFETY" ] }, { @@ -305,7 +305,7 @@ "name": "landing pad", "sym": "#", "color": "light_gray", - "see_cost": 2, + "see_cost": "high", "flags": [ "SOURCE_PEOPLE", "SOURCE_SAFETY" ] }, { @@ -316,7 +316,7 @@ "color": "green", "spawns": { "group": "GROUP_ZOMBIE", "population": [ 1, 4 ], "chance": 50 }, "flags": [ "SIDEWALK" ], - "see_cost": 3 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -324,7 +324,7 @@ "name": "house roof", "sym": "<", "color": "green", - "see_cost": 3 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -354,7 +354,7 @@ "name": "Desolate Arcology - Ground Level", "sym": "A", "color": "light_blue", - "see_cost": 2, + "see_cost": "full_high", "mondensity": 2, "flags": [ "RISK_HIGH" ] }, @@ -386,7 +386,7 @@ "name": "Arcology - Ground Level", "sym": "A", "color": "light_blue", - "see_cost": 2, + "see_cost": "full_high", "mondensity": 2, "flags": [ "RISK_HIGH" ] }, @@ -406,7 +406,7 @@ ], "sym": "+", "color": "i_red", - "see_cost": 2, + "see_cost": "high", "flags": [ "SOURCE_FOOD", "SOURCE_GUN", "SOURCE_AMMO" ] }, { @@ -416,7 +416,7 @@ "id": [ "afs_shuttle_pad_a1", "afs_shuttle_pad_a2", "afs_shuttle_pad_a1_roof", "afs_shuttle_pad_a2_roof" ], "sym": "-", "color": "light_blue", - "see_cost": 3, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -426,7 +426,7 @@ "id": [ "afs_solar_arrary_a1", "afs_solar_array_a2", "afs_solar_arrary_a1_roof", "afs_solar_array_a2_roof" ], "sym": "S", "color": "light_blue", - "see_cost": 3, + "see_cost": "medium", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -442,7 +442,7 @@ ], "sym": "M", "color": "light_gray", - "see_cost": 3, + "see_cost": "medium", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -486,7 +486,7 @@ ], "sym": "H", "color": "light_green", - "see_cost": 4, + "see_cost": "full_high", "mondensity": 3, "flags": [ "SIDEWALK" ] }, @@ -497,7 +497,7 @@ "id": [ "afs_general_store_n1", "afs_general_store_n2", "afs_general_store_n3" ], "sym": "g", "color": "light_green", - "see_cost": 3, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -507,7 +507,7 @@ "id": [ "afs_park_dome_ground_floor", "afs_park_dome_2nd_floor", "afs_park_dome_roof" ], "sym": "P", "color": "green", - "see_cost": 3, + "see_cost": "spaced_high", "mondensity": 1, "flags": [ "SIDEWALK" ] }, @@ -517,7 +517,7 @@ "id": [ "afs_enforcer_station_a1", "afs_enforcer_station_a1_floor2", "afs_enforcer_station_a1_roof" ], "sym": "E", "color": "blue", - "see_cost": 3, + "see_cost": "high", "mondensity": 3, "flags": [ "SIDEWALK" ] }, @@ -527,7 +527,7 @@ "name": "small power substation", "sym": "H", "color": "light_cyan", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -542,7 +542,7 @@ "name": "large power substation", "sym": "H", "color": "cyan", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -550,7 +550,7 @@ "id": [ "afs_exosuit_garage_a1", "afs_exosuit_garage_a1_roof", "afs_exosuit_garage_2_a1", "afs_exosuit_garage_2_a1_roof" ], "sym": "e", "color": "yellow", - "see_cost": 3, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] } diff --git a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_habitats.json b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_habitats.json index bb72874aa71dd..412731e9b43f3 100644 --- a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_habitats.json +++ b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_habitats.json @@ -5,7 +5,7 @@ "name": "habitat entrance", "sym": "H", "color": "light_blue", - "see_cost": 2, + "see_cost": "high", "flags": [ "SIDEWALK" ] }, { @@ -18,7 +18,7 @@ "name": "habitat superstructure", "sym": "+", "color": "light_gray", - "see_cost": 2 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -26,7 +26,7 @@ "name": "habitat maintenance level", "sym": "+", "color": "yellow", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -34,7 +34,7 @@ "name": "urban farm", "sym": "f", "color": "light_green", - "see_cost": 2 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -42,7 +42,7 @@ "name": "urban farm roof", "sym": "f", "color": "light_green", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -50,6 +50,6 @@ "name": "farm control room", "sym": "o", "color": "light_green", - "see_cost": 2 + "see_cost": "high" } ] diff --git a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_port_augustmoon.json b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_port_augustmoon.json index da3fe8bd974c4..8a77be7fdb56b 100644 --- a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_port_augustmoon.json +++ b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_port_augustmoon.json @@ -5,7 +5,7 @@ "name": "Port Augustmoon's orbit", "sym": " ", "color": "black", - "see_cost": 2, + "see_cost": "all_clear", "flags": [ "NO_ROTATE" ] }, { @@ -14,7 +14,7 @@ "name": "Port Augustmoon", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "high", "flags": [ "SOURCE_SAFETY" ] }, { @@ -23,7 +23,7 @@ "name": "Docking Arm Strbd. 2", "sym": "i", "color": "red", - "see_cost": 2, + "see_cost": "high", "flags": [ "SOURCE_SAFETY" ] }, { @@ -32,7 +32,7 @@ "name": "Artificial Feel", "sym": "-", "color": "red", - "see_cost": 2, + "see_cost": "high", "flags": [ "SOURCE_SAFETY" ] }, { @@ -41,6 +41,6 @@ "name": "solar array", "sym": "+", "color": "red", - "see_cost": 2 + "see_cost": "low" } ] diff --git a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json index 4a6694a6bc053..738d751066a19 100644 --- a/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json +++ b/data/mods/Aftershock/maps/overmap_terrain/overmap_terrain_tunnels.json @@ -4,7 +4,7 @@ "id": "afs_tunnel", "name": "cavern", "color": "light_blue", - "see_cost": 5, + "see_cost": "spaced_high", "spawns": { "group": "AFS_GROUP_FAUNA_TUNNELS", "population": [ 4, 10 ], "chance": 30 }, "flags": [ "LINEAR" ] }, @@ -15,7 +15,7 @@ "sym": "v", "color": "light_blue", "flags": [ "REQUIRES_PREDECESSOR" ], - "see_cost": 2 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -24,7 +24,7 @@ "sym": "^", "color": "light_blue", "spawns": { "group": "AFS_GROUP_FAUNA_TUNNELS", "population": [ 4, 10 ], "chance": 20 }, - "see_cost": 2 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -32,7 +32,7 @@ "name": "cavern", "color": "light_blue", "sym": "v", - "see_cost": 5, + "see_cost": "all_clear", "flags": [ "RAVINE_EDGE" ] }, { @@ -40,7 +40,7 @@ "id": "afs_tunnel_river", "name": "underground river", "color": "blue", - "see_cost": 5, + "see_cost": "spaced_high", "spawns": { "group": "AFS_GROUP_FAUNA_TUNNELS", "population": [ 4, 10 ], "chance": 30 }, "flags": [ "LINEAR" ] }, @@ -50,7 +50,7 @@ "name": "underground river", "color": "light_blue", "sym": "o", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -66,6 +66,6 @@ "sym": "#", "color": "cyan", "spawns": { "group": "AFS_GROUP_FAUNA_TUNNELS", "population": [ 4, 10 ], "chance": 80 }, - "see_cost": 5 + "see_cost": "none" } ] diff --git a/data/mods/Backrooms/overmap_terrain.json b/data/mods/Backrooms/overmap_terrain.json index 0d7b7d7db3efe..60b9fc42d7ebf 100644 --- a/data/mods/Backrooms/overmap_terrain.json +++ b/data/mods/Backrooms/overmap_terrain.json @@ -10,7 +10,7 @@ "name": "backroom chamber", "sym": ".", "color": "white", - "see_cost": 20, + "see_cost": "full_high", "spawns": { "group": "GROUP_BACKROOMS", "population": [ 2, 15 ], "chance": 40 }, "extras": "backrooms" }, @@ -20,7 +20,7 @@ "name": "", "sym": ".", "color": "white", - "see_cost": 20, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { diff --git a/data/mods/Defense_Mode/mapgen/megastore.json b/data/mods/Defense_Mode/mapgen/megastore.json index 99cb64030db0d..f9f2ea1db37ba 100644 --- a/data/mods/Defense_Mode/mapgen/megastore.json +++ b/data/mods/Defense_Mode/mapgen/megastore.json @@ -15,7 +15,7 @@ "sym": "M", "color": "blue", "extras": "build", - "see_cost": 2 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -24,7 +24,7 @@ "sym": "+", "color": "light_blue", "extras": "build", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SIDEWALK", "RISK_EXTREME", @@ -61,7 +61,7 @@ "sym": "M", "color": "blue", "extras": "build", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -79,7 +79,7 @@ "sym": "M", "color": "blue", "extras": "build", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", diff --git a/data/mods/Defense_Mode/overmap.json b/data/mods/Defense_Mode/overmap.json index 2fb02b6c6a955..de403ebc6ad3a 100644 --- a/data/mods/Defense_Mode/overmap.json +++ b/data/mods/Defense_Mode/overmap.json @@ -34,7 +34,7 @@ "name": "mansion", "sym": "M", "color": "light_green", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "SOURCE_FOOD", "SOURCE_DRINK", "SOURCE_LUXURY", "SOURCE_BOOKS" ] }, { @@ -104,7 +104,7 @@ "name": "public works", "sym": "w", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "flags": [ "SIDEWALK", "SOURCE_VEHICLES", "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION" ] }, { @@ -113,7 +113,7 @@ "name": "public works", "sym": "W", "color": "light_gray", - "see_cost": 5, + "see_cost": "high", "flags": [ "SIDEWALK", "SOURCE_VEHICLES", "SOURCE_FABRICATION", "SOURCE_CONSTRUCTION" ] }, { @@ -122,7 +122,7 @@ "name": "public works roof", "sym": "w", "color": "light_gray", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -130,7 +130,7 @@ "name": "public works roof", "sym": "W", "color": "light_gray", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -138,7 +138,7 @@ "name": "survivor forest camp", "sym": "+", "color": "green", - "see_cost": 5, + "see_cost": "spaced_high", "flags": [ "REQUIRES_PREDECESSOR" ] } ] diff --git a/data/mods/DinoMod/obsolete/fieldoffice.json b/data/mods/DinoMod/obsolete/fieldoffice.json index 3830cd3a1f982..6545a311d4600 100644 --- a/data/mods/DinoMod/obsolete/fieldoffice.json +++ b/data/mods/DinoMod/obsolete/fieldoffice.json @@ -6,7 +6,7 @@ "sym": "^", "name": "wildlife field office", "color": "brown", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "mapgen": [ diff --git a/data/mods/DinoMod/overmap/overmap_terrain.json b/data/mods/DinoMod/overmap/overmap_terrain.json index 112e5313a9970..2f21e57814d30 100644 --- a/data/mods/DinoMod/overmap/overmap_terrain.json +++ b/data/mods/DinoMod/overmap/overmap_terrain.json @@ -4,7 +4,7 @@ "id": "dinoexhibit", "mondensity": 2, "name": "Dinosaur Exhibit", - "see_cost": 5, + "see_cost": "high", "sym": "^", "type": "overmap_terrain" }, @@ -13,7 +13,7 @@ "id": "dinoexhibit_roof", "mondensity": 2, "name": "Dinosaur Exhibit roof", - "see_cost": 5, + "see_cost": "none", "sym": "^", "type": "overmap_terrain" }, @@ -24,7 +24,7 @@ "sym": "L", "color": "light_blue", "spawns": { "group": "GROUP_DINOLAB", "population": [ 40, 45 ], "chance": 80 }, - "see_cost": 5, + "see_cost": "high", "flags": [ "NO_ROTATE", "RISK_EXTREME", "SOURCE_CHEMISTRY", "SOURCE_MEDICINE" ] }, { @@ -50,7 +50,7 @@ "name": "lab", "sym": "L", "color": "blue", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -64,6 +64,7 @@ "sym": ">", "color": "light_gray", "mondensity": 2, + "see_cost": "high", "flags": [ "RISK_EXTREME" ] } ] diff --git a/data/mods/Isolation-Protocol/Map/overmap.json b/data/mods/Isolation-Protocol/Map/overmap.json index 32a7efc3308ff..4df9585732dff 100644 --- a/data/mods/Isolation-Protocol/Map/overmap.json +++ b/data/mods/Isolation-Protocol/Map/overmap.json @@ -5,7 +5,7 @@ "name": "lab elevator", "color": "light_red", "sym": "L", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -13,7 +13,7 @@ "name": "lab entrance hallway", "sym": "L", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "flags": [ "RISK_EXTREME" ] }, { @@ -22,7 +22,7 @@ "name": "lab safepoint", "sym": "L", "color": "light_red", - "see_cost": 5, + "see_cost": "high", "flags": [ "SOURCE_SAFETY" ] } ] diff --git a/data/mods/Magiclysm/worldgen/elf_workshop.json b/data/mods/Magiclysm/worldgen/elf_workshop.json index 59f65379638be..bd0ef241d9321 100644 --- a/data/mods/Magiclysm/worldgen/elf_workshop.json +++ b/data/mods/Magiclysm/worldgen/elf_workshop.json @@ -83,7 +83,7 @@ "name": "elf workshop", "sym": "W", "color": "red", - "see_cost": 6, + "see_cost": "high", "flags": [ "RISK_HIGH" ] } ] diff --git a/data/mods/Magiclysm/worldgen/forge_of_wonders.json b/data/mods/Magiclysm/worldgen/forge_of_wonders.json index 41120931309e2..fa9082e93e580 100644 --- a/data/mods/Magiclysm/worldgen/forge_of_wonders.json +++ b/data/mods/Magiclysm/worldgen/forge_of_wonders.json @@ -235,7 +235,7 @@ "name": "forge of wonders", "sym": "$", "color": "red", - "see_cost": 5, + "see_cost": "full_high", "entry_eoc": "EOC_FIND_FORGE_GATE" }, { diff --git a/data/mods/Magiclysm/worldgen/goblin_locations/goblin_encampment.json b/data/mods/Magiclysm/worldgen/goblin_locations/goblin_encampment.json index ca0eb67403188..c4401746db165 100644 --- a/data/mods/Magiclysm/worldgen/goblin_locations/goblin_encampment.json +++ b/data/mods/Magiclysm/worldgen/goblin_locations/goblin_encampment.json @@ -234,7 +234,7 @@ "name": "goblin encampment", "sym": "#", "color": "red", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "mapgen", diff --git a/data/mods/Magiclysm/worldgen/goblin_locations/orc_village.json b/data/mods/Magiclysm/worldgen/goblin_locations/orc_village.json index fc416b7ae9e6a..8792f66954400 100644 --- a/data/mods/Magiclysm/worldgen/goblin_locations/orc_village.json +++ b/data/mods/Magiclysm/worldgen/goblin_locations/orc_village.json @@ -136,7 +136,7 @@ "name": "goblin outpost", "sym": "G", "color": "green", - "see_cost": 6, + "see_cost": "high", "flags": [ "RISK_HIGH" ] } ] diff --git a/data/mods/Magiclysm/worldgen/overmap_terrain.json b/data/mods/Magiclysm/worldgen/overmap_terrain.json index 7696cbde348bf..51ce6ae00789c 100644 --- a/data/mods/Magiclysm/worldgen/overmap_terrain.json +++ b/data/mods/Magiclysm/worldgen/overmap_terrain.json @@ -6,7 +6,7 @@ "sym": "M", "color": "red", "looks_like": "s_shoppingplaza_b1", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "flags": [ "SIDEWALK" ] @@ -18,7 +18,7 @@ "sym": "M", "color": "red", "looks_like": "s_shoppingplaza_b2", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2 }, @@ -29,7 +29,7 @@ "sym": "M", "color": "red", "looks_like": "s_shoppingplaza_b6", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2 }, @@ -39,7 +39,7 @@ "name": "cabin", "sym": "F", "color": "green", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2 }, @@ -49,7 +49,7 @@ "name": "cabin", "sym": "F", "color": "green", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 2 }, @@ -60,7 +60,7 @@ "sym": "F", "color": "light_gray", "looks_like": "spider_pit", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -69,7 +69,7 @@ "sym": "B", "color": "white", "looks_like": "s_bookstore", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 1, "flags": [ "SIDEWALK" ] @@ -81,7 +81,7 @@ "sym": "B", "color": "white", "looks_like": "s_bookstore_roof", - "see_cost": 5, + "see_cost": "none", "extras": "build", "mondensity": 1 }, @@ -114,7 +114,7 @@ "sym": "F", "color": "c_light_cyan", "looks_like": "forest_water", - "see_cost": 5, + "see_cost": "spaced_high", "flags": [ "SOURCE_FORAGE", "RISK_EXTREME" ] }, { @@ -139,7 +139,7 @@ "sym": "#", "color": "brown", "looks_like": "solid_earth", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -163,7 +163,7 @@ "sym": "%", "color": "dark_gray", "looks_like": "empty_rock", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -187,7 +187,7 @@ "sym": "%", "color": "dark_gray", "looks_like": "deep_rock", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -211,7 +211,7 @@ "sym": "%", "color": "dark_gray", "looks_like": "deep_rock", - "see_cost": 5 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -235,7 +235,7 @@ "sym": "F", "color": "c_light_green", "looks_like": "forest", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -244,7 +244,7 @@ "sym": "O", "color": "dark_gray", "looks_like": "forest_water", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -252,7 +252,7 @@ "name": "ogre lair roof", "sym": "O", "color": "dark_gray", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -261,7 +261,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -270,7 +270,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -279,7 +279,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -288,7 +288,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -297,7 +297,7 @@ "sym": "#", "color": "light_blue", "looks_like": "lake_shore", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -306,7 +306,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -369,7 +369,7 @@ "sym": "F", "color": "brown", "looks_like": "cemetery_small", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -388,7 +388,7 @@ "sym": "#", "color": "light_blue", "looks_like": "campus_lecture_0_0_0", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -400,7 +400,7 @@ "color": "light_blue", "looks_like": "campus_lecture_0_0_1", "mondensity": 2, - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -444,7 +444,7 @@ "sym": "#", "color": "light_blue", "looks_like": "campus_lecture_0_0_3", - "see_cost": 5 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -462,7 +462,7 @@ "sym": "O", "color": "light_green", "looks_like": "standing_stones", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -486,7 +486,7 @@ "name": "mine tunnels", "sym": "O", "color": "dark_gray", - "see_cost": 5, + "see_cost": "high", "flags": [ "KNOWN_UP" ] }, { @@ -496,7 +496,7 @@ "sym": "*", "color": "blue", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "low" }, { "type": "overmap_terrain", @@ -505,7 +505,7 @@ "sym": "*", "color": "blue", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "low" }, { "type": "overmap_terrain", @@ -514,7 +514,7 @@ "sym": "O", "color": "dark_gray", "flags": [ "NO_ROTATE", "REQUIRES_PREDECESSOR" ], - "see_cost": 5 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -522,7 +522,7 @@ "name": "druid tower", "sym": "F", "color": "green", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -540,7 +540,7 @@ "name": "druid tower crown", "sym": "F", "color": "green", - "see_cost": 5 + "see_cost": "high" }, { "type": "overmap_terrain", diff --git a/data/mods/MindOverMatter/overmap/overmap_overrides.json b/data/mods/MindOverMatter/overmap/overmap_overrides.json index 8aa4280dc8a35..c6adeca6ef8b7 100644 --- a/data/mods/MindOverMatter/overmap/overmap_overrides.json +++ b/data/mods/MindOverMatter/overmap/overmap_overrides.json @@ -21,7 +21,7 @@ "color": "light_gray", "spawns": { "group": "GROUP_LAB_RESEARCH", "population": [ 10, 25 ], "chance": 60 }, "extras": "research_facility_interior", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 } ] diff --git a/data/mods/MindOverMatter/overmap/overmap_terrain.json b/data/mods/MindOverMatter/overmap/overmap_terrain.json index 4aecf92bd347a..d1654a95c62c6 100644 --- a/data/mods/MindOverMatter/overmap/overmap_terrain.json +++ b/data/mods/MindOverMatter/overmap/overmap_terrain.json @@ -7,7 +7,7 @@ "sym": "*", "color": "white", "flags": [ "NO_ROTATE" ], - "see_cost": 5 + "see_cost": "medium" }, { "type": "overmap_terrain", @@ -53,7 +53,7 @@ "color": "white", "vision_levels": "underground_dirt", "spawns": { "group": "GROUP_LAB_SURFACE", "population": [ 1, 5 ], "chance": 50 }, - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -79,7 +79,7 @@ "color": "dark_gray", "spawns": { "group": "GROUP_LAB_RESEARCH", "population": [ 5, 20 ], "chance": 50 }, "extras": "phavian_lab_lot", - "see_cost": 5, + "see_cost": "low", "mondensity": 2 }, { @@ -106,7 +106,7 @@ "looks_like": "lab_surface_brick_blockA2", "spawns": { "group": "GROUP_LAB_RESEARCH", "population": [ 10, 25 ], "chance": 60 }, "extras": "phavian_lab_interior", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2 }, { @@ -119,7 +119,7 @@ "looks_like": "lab_surface_brick_blockC3", "spawns": { "group": "GROUP_LAB_RESEARCH", "population": [ 8, 25 ], "chance": 50 }, "extras": "phavian_lab_interior", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "RISK_EXTREME" ] }, @@ -176,7 +176,7 @@ "vision_levels": "roof_or_air", "looks_like": "lab_surface_brick_block5C2", "color": "blue", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -264,7 +264,7 @@ "looks_like": "lab_surface_brick_block5A2", "vision_levels": "roof_or_air", "color": "dark_gray", - "see_cost": 2 + "see_cost": "low" }, { "type": "overmap_terrain", diff --git a/data/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json b/data/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json index 763f2e3e04d14..0868122f45dca 100644 --- a/data/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json +++ b/data/mods/My_Sweet_Cataclysm/sweet_mapgen/sweet_overmap_terrain.json @@ -5,7 +5,7 @@ "name": "chocolate bog", "sym": "F", "color": "blue", - "see_cost": 5, + "see_cost": "spaced_high", "mondensity": 2 } ] diff --git a/data/mods/No_Hope/overmap/overmap_terrain.json b/data/mods/No_Hope/overmap/overmap_terrain.json index f2d9be9e4a30e..d4515188f99d9 100644 --- a/data/mods/No_Hope/overmap/overmap_terrain.json +++ b/data/mods/No_Hope/overmap/overmap_terrain.json @@ -11,7 +11,7 @@ "name": "LMOE shelter", "sym": "+", "color": "red", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] } ] diff --git a/data/mods/No_Hope/overmap/overmap_terrain_necropolis.json b/data/mods/No_Hope/overmap/overmap_terrain_necropolis.json index 973bde830598d..0617da2e7c58b 100644 --- a/data/mods/No_Hope/overmap/overmap_terrain_necropolis.json +++ b/data/mods/No_Hope/overmap/overmap_terrain_necropolis.json @@ -4,7 +4,7 @@ "abstract": "generic_necropolis_surface_building", "name": "city building", "sym": "^", - "see_cost": 5, + "see_cost": "high", "mondensity": 2, "flags": [ "SIDEWALK", "SHOULD_NOT_SPAWN" ] }, @@ -318,7 +318,7 @@ "abstract": "generic_necropolis_underground", "name": "underground", "color": "yellow", - "see_cost": 999, + "see_cost": "opaque", "mondensity": 2, "flags": [ "SHOULD_NOT_SPAWN" ] }, diff --git a/data/mods/Sky_Island/island_mapgen.json b/data/mods/Sky_Island/island_mapgen.json index 48278e499cd15..83f61f84ab61a 100644 --- a/data/mods/Sky_Island/island_mapgen.json +++ b/data/mods/Sky_Island/island_mapgen.json @@ -14,7 +14,7 @@ "color": "c_white", "looks_like": "field", "mondensity": 0, - "see_cost": 1 + "see_cost": "low" }, { "type": "mapgen", diff --git a/data/mods/TEST_DATA/mapgen-test.json b/data/mods/TEST_DATA/mapgen-test.json index 5aed57b5ea6cd..1815c700a18b4 100644 --- a/data/mods/TEST_DATA/mapgen-test.json +++ b/data/mods/TEST_DATA/mapgen-test.json @@ -22,6 +22,7 @@ "sym": "%", "color": "white", "mondensity": 1, + "see_cost": "none", "flags": [ "SHOULD_NOT_SPAWN" ] }, { diff --git a/data/mods/TEST_DATA/nest_conditional_placement_test.json b/data/mods/TEST_DATA/nest_conditional_placement_test.json index 9c13ddbe89bf6..30859b7265296 100644 --- a/data/mods/TEST_DATA/nest_conditional_placement_test.json +++ b/data/mods/TEST_DATA/nest_conditional_placement_test.json @@ -138,6 +138,7 @@ "name": "nest conditional placement test", "sym": ".", "color": "white", + "see_cost": "none", "flags": [ "NO_ROTATE", "SHOULD_NOT_SPAWN" ] }, { diff --git a/data/mods/TEST_DATA/regions.json b/data/mods/TEST_DATA/regions.json index 0ad90c255b7d4..f39571b8c9d63 100644 --- a/data/mods/TEST_DATA/regions.json +++ b/data/mods/TEST_DATA/regions.json @@ -152,7 +152,7 @@ "name": "abandoned drive-through", "sym": "^", "color": "dark_gray_magenta", - "see_cost": 5, + "see_cost": "high", "extras": "build", "mondensity": 2, "mapgen": [ diff --git a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json index 8c7c6eccfeb5b..d61d942ded739 100644 --- a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json +++ b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_nether.json @@ -5,7 +5,7 @@ "name": "alien reef", "sym": "O", "color": "light_blue", - "see_cost": 3, + "see_cost": "medium", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] } ] diff --git a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json index 125f9960c276e..7af82088abe79 100644 --- a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json +++ b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_termites.json @@ -5,7 +5,7 @@ "name": "termite mound", "sym": "%", "color": "brown", - "see_cost": 2, + "see_cost": "medium", "flags": [ "KNOWN_UP", "KNOWN_DOWN", "RISK_EXTREME", "REQUIRES_PREDECESSOR" ] }, { @@ -14,7 +14,7 @@ "name": "termite mound", "sym": "%", "color": "brown", - "see_cost": 2, + "see_cost": "none", "flags": [ "KNOWN_DOWN", "RISK_EXTREME" ] }, { @@ -23,7 +23,7 @@ "name": "food storage", "sym": "O", "color": "green", - "see_cost": 5, + "see_cost": "high", "spawns": { "group": "GROUP_TERMITES", "population": [ 6, 10 ], "chance": 100 } }, { @@ -59,7 +59,7 @@ "id": "termites", "name": "termite tunnel", "color": "brown", - "see_cost": 5, + "see_cost": "high", "spawns": { "group": "GROUP_TERMITES", "population": [ 4, 6 ], "chance": 100 }, "flags": [ "LINEAR" ] } diff --git a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json index f6a525985bd1d..c8676dcb551b9 100644 --- a/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json +++ b/data/mods/TropiCataclysm/overmap/overmap_terrain/overmap_terrain_triffid.json @@ -5,7 +5,7 @@ "name": "triffid blossom", "sym": "T", "color": "magenta", - "see_cost": 3, + "see_cost": "medium", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] }, { @@ -14,7 +14,7 @@ "name": "triffid garden", "sym": "T", "color": "light_red", - "see_cost": 3, + "see_cost": "medium", "flags": [ "NO_ROTATE", "RISK_EXTREME" ] } ] diff --git a/data/mods/TropiCataclysm/tropical_overmap_terrain.json b/data/mods/TropiCataclysm/tropical_overmap_terrain.json index b6a7bee3d99c9..3c8947c3db910 100644 --- a/data/mods/TropiCataclysm/tropical_overmap_terrain.json +++ b/data/mods/TropiCataclysm/tropical_overmap_terrain.json @@ -59,7 +59,7 @@ "name": "desert", "sym": ".", "color": "yellow", - "see_cost": 2, + "see_cost": "none", "extras": "field", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, "flags": [ "NO_ROTATE" ] diff --git a/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json b/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json index a5fcf68c59969..2a699bd99f379 100644 --- a/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json +++ b/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json @@ -49,7 +49,7 @@ "sym": "F", "color": "c_light_green", "looks_like": "forest", - "see_cost": 5 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -58,7 +58,7 @@ "sym": ".", "color": "blue", "looks_like": "open_air", - "see_cost": 5 + "see_cost": "all_clear" }, { "type": "overmap_terrain", @@ -94,7 +94,7 @@ "name": "cathedral", "sym": "C", "color": "i_light_red", - "see_cost": 5, + "see_cost": "full_high", "mondensity": 2, "flags": [ "SIDEWALK" ] }, @@ -157,7 +157,7 @@ "sym": "O", "color": "light_green", "looks_like": "standing_stones", - "see_cost": 5, + "see_cost": "high", "mondensity": 2 }, { @@ -255,7 +255,7 @@ "name": "great tree trunk", "sym": "F", "color": "brown", - "see_cost": 1 + "see_cost": "high" }, { "type": "overmap_terrain", @@ -284,7 +284,7 @@ "name": "great tree canopy", "sym": ",", "color": "green", - "see_cost": 1 + "see_cost": "spaced_high" }, { "type": "overmap_terrain", @@ -302,7 +302,7 @@ "name": "great tree roots", "sym": "#", "color": "brown", - "see_cost": 1 + "see_cost": "full_high" }, { "type": "overmap_terrain", @@ -311,7 +311,7 @@ "sym": ".", "color": "blue", "looks_like": "pond_field", - "see_cost": 5 + "see_cost": "low" }, { "type": "overmap_terrain", @@ -319,6 +319,6 @@ "name": "pool depths", "sym": ".", "color": "blue", - "see_cost": 5 + "see_cost": "low" } ] diff --git a/data/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json b/data/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json index 979ae69a7e0b8..06ad757f2804b 100644 --- a/data/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json +++ b/data/mods/aftershock_exoplanet/Map/overmap_terrain/ice_fields.json @@ -6,7 +6,7 @@ "name": "Ice Fields", "sym": ".", "color": "light_gray", - "see_cost": 2, + "see_cost": "none", "extras": "field", "flags": [ "NO_ROTATE" ] }, @@ -16,7 +16,7 @@ "name": "glacier", "sym": "#", "color": "cyan", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -26,7 +26,7 @@ "name": "hydrothermal flats", "sym": "%", "color": "light_red", - "see_cost": 3, + "see_cost": "medium", "extras": "forest", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 3 ], "chance": 13 }, "flags": [ "NO_ROTATE", "SOURCE_FORAGE" ] @@ -38,7 +38,7 @@ "name": "hydrothermal flats", "sym": "%", "color": "light_red", - "see_cost": 4, + "see_cost": "spaced_high", "extras": "forest_thick", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 6 ], "chance": 15 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], @@ -51,7 +51,7 @@ "name": "hydrothermal flats", "sym": "%", "color": "cyan", - "see_cost": 4, + "see_cost": "spaced_high", "extras": "forest_water", "spawns": { "group": "GROUP_SWAMP", "population": [ 1, 4 ], "chance": 16 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], diff --git a/data/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json b/data/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json index d96aec2adb1b8..6540b4d703fd0 100644 --- a/data/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json +++ b/data/mods/aftershock_exoplanet/Map/overmap_terrain/overmap_terrain_transportation.json @@ -5,7 +5,7 @@ "name": "road", "copy-from": "generic_transportation", "color": "dark_gray", - "see_cost": 2, + "see_cost": "none", "extras": "road", "flags": [ "LINEAR", "REQUIRES_PREDECESSOR" ] }, diff --git a/data/mods/desert_region/overmap/desert_overmap_terrain.json b/data/mods/desert_region/overmap/desert_overmap_terrain.json index 7b058f61a1b33..01cce82f0f1f7 100644 --- a/data/mods/desert_region/overmap/desert_overmap_terrain.json +++ b/data/mods/desert_region/overmap/desert_overmap_terrain.json @@ -6,7 +6,7 @@ "name": "drylands", "sym": ".", "color": "yellow", - "see_cost": 2, + "see_cost": "none", "extras": "field", "flags": [ "NO_ROTATE" ] }, @@ -17,7 +17,7 @@ "name": "shrubland", "sym": "*", "color": "green", - "see_cost": 1, + "see_cost": "low", "extras": "forest", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 3 ], "chance": 13 }, "flags": [ "NO_ROTATE", "SOURCE_FORAGE" ] @@ -29,7 +29,7 @@ "name": "woodland", "sym": "F", "color": "green", - "see_cost": 4, + "see_cost": "spaced_high", "extras": "forest_thick", "spawns": { "group": "GROUP_FOREST", "population": [ 0, 6 ], "chance": 15 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], @@ -42,7 +42,7 @@ "name": "desert pavement", "sym": ",", "color": "dark_gray", - "see_cost": 2, + "see_cost": "spaced_high", "extras": "forest_water", "spawns": { "group": "GROUP_SWAMP", "population": [ 1, 4 ], "chance": 16 }, "mapgen": [ { "method": "builtin", "name": "forest" } ], @@ -54,7 +54,7 @@ "name": "sandstone", "sym": "%", "color": "brown", - "see_cost": 5, + "see_cost": "opaque", "flags": [ "NO_ROTATE" ] }, { @@ -63,7 +63,7 @@ "name": "mesa", "sym": "%", "color": "i_brown", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "NO_ROTATE" ] }, { @@ -81,7 +81,7 @@ "name": "mesa", "sym": "%", "color": "brown", - "see_cost": 5, + "see_cost": "full_high", "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -99,7 +99,7 @@ "name": "drylands", "sym": ".", "color": "brown", - "see_cost": 1 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -140,7 +140,7 @@ "name": "canyon", "sym": "V", "color": "light_gray", - "see_cost": 5, + "see_cost": "all_clear", "flags": [ "REQUIRES_PREDECESSOR" ] }, { @@ -150,7 +150,7 @@ "name": "lake bed", "sym": "#", "color": "dark_gray", - "see_cost": 1, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "LAKE" ] }, { @@ -188,7 +188,7 @@ "name": "riverbed", "sym": "R", "color": "dark_gray", - "see_cost": 1, + "see_cost": "none", "flags": [ "RIVER", "NO_ROTATE" ] }, { diff --git a/data/mods/innawood/overmap/terrain_hardcoded.json b/data/mods/innawood/overmap/terrain_hardcoded.json index 4fcb4346196d3..975d66e8210b0 100644 --- a/data/mods/innawood/overmap/terrain_hardcoded.json +++ b/data/mods/innawood/overmap/terrain_hardcoded.json @@ -6,7 +6,7 @@ "looks_like": "cave", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -16,7 +16,7 @@ "looks_like": "cave_underground", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -26,7 +26,7 @@ "looks_like": "cave_rat_underground", "sym": "C", "color": "brown", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "NO_ROTATE", "SOURCE_SAFETY" ] }, { @@ -36,7 +36,7 @@ "looks_like": "cave_rat", "sym": "C", "color": "dark_gray", - "see_cost": 2, + "see_cost": "full_high", "flags": [ "KNOWN_DOWN", "NO_ROTATE", "SOURCE_SAFETY" ] } ] diff --git a/data/mods/railroads/overmap/overmap_terrain/overmap_terrain_transportation.json b/data/mods/railroads/overmap/overmap_terrain/overmap_terrain_transportation.json index a1e8f6c546302..2d8460fbc5214 100644 --- a/data/mods/railroads/overmap/overmap_terrain/overmap_terrain_transportation.json +++ b/data/mods/railroads/overmap/overmap_terrain/overmap_terrain_transportation.json @@ -5,7 +5,7 @@ "name": "railroad", "copy-from": "generic_transportation", "color": "light_green", - "see_cost": 2, + "see_cost": "none", "flags": [ "LINEAR", "REQUIRES_PREDECESSOR" ] }, { @@ -15,7 +15,7 @@ "name": "railroad bridge", "sym": "│", "color": "white", - "see_cost": 2 + "see_cost": "none" }, { "type": "overmap_terrain", @@ -51,7 +51,7 @@ "name": "railroad level crossing", "sym": "┼", "color": "red", - "see_cost": 2, + "see_cost": "none", "extras": "road" }, { diff --git a/doc/OVERMAP.md b/doc/OVERMAP.md index 2c7a959628a5c..2bbbfee7d80f8 100644 --- a/doc/OVERMAP.md +++ b/doc/OVERMAP.md @@ -248,7 +248,7 @@ rotation for the referenced overmap terrains (e.g. the `_north` version for all) | `looks_like` | Id of another overmap terrain to be used for the graphical tile, if this doesn't have one. | | `vision_levels` | Id of a `oter_vision` that describes how this overmap terrain will be displayed when there is not full vision of the tile. | `connect_group` | Specify that this overmap terrain might be graphically connected to its neighbours, should a tileset wish to. It will connect to any other `overmap_terrain` with the same `connect_group`. | -| `see_cost` | Affects player vision on overmap. Higher values obstruct vision more. | +| `see_cost` | Affects player vision on overmap. See table below for possible values. | | `travel_cost_type` | How to treat this location when planning a route using autotravel on the overmap. Valid values are `road`,`field`,`dirt_road`,`trail`,`forest`,`shore`,`swamp`,`water`,`air`,`impassable`,`other`. Some types are harder to travel through with different types of vehicles, or on foot. | | `extras` | Reference to a named `map_extras` in region_settings, defines which map extras can be applied. | | `mondensity` | Summed with values for adjacent overmap terrains to influence density of monsters spawned here. | @@ -264,6 +264,18 @@ rotation for the referenced overmap terrains (e.g. the `_north` version for all) | `entry_eoc` | An effect on condition ID that will run when you enter this location. | | `exit_eoc` | An effect on condition ID that will run when you exit this location. | +### `see_cost` values + +| name | role | +| `"all_clear"` | This tile has no or minimal horizontal obstacles and can be seen down through | +| `"none"` | This tile has no or minimal horizontal obstacles - most flat terrain | +| `"low"` | This tile has low horizontal obstacles or few higher obstacles | +| `"medium"` | This tile has medium horizontal obstacles | +| `"spaced_high"` | This tile has high obstacles, but they are spaced and have several gaps - a forest | +| `"high"` | This tile has high obstacles, but still allows some sight around it - most buildings | +| `"full_high"` | This tile has high obstacles, and effectively cannot be seen through - multi-tile buildings | +| `"opaque"` | This tile cannot be seen through under any circumstance | + ### Example A real `overmap_terrain` wouldn't have all these defined at the same time, but in the interest of @@ -277,7 +289,7 @@ an exhaustive example... "sym": ".", "color": "brown", "looks_like": "forest", - "see_cost": 2, + "see_cost": "spaced_high", "extras": "field", "mondensity": 2, "spawns": { "group": "GROUP_FOREST", "population": [ 0, 1 ], "chance": 13 }, diff --git a/src/omdata.h b/src/omdata.h index 2ec8587849a8a..7c84d3db7309b 100644 --- a/src/omdata.h +++ b/src/omdata.h @@ -307,7 +307,20 @@ struct oter_type_t { public: overmap_land_use_code_id land_use_code = overmap_land_use_code_id::NULL_ID(); std::vector looks_like; - unsigned char see_cost = 0; // Affects how far the player can see in the overmap + enum class see_costs : uint8_t { + all_clear, // no vertical or horizontal obstacles + none, // no horizontal obstacles + low, // low horizontal obstacles or few higher ones + medium, // medium horizontal obstacles + spaced_high, // + high, // 0.9 + full_high, // 0.99 + opaque, // cannot see through + last + }; + static double see_cost_value( see_costs cost ); + + see_costs see_cost = see_costs::none; // Affects how far the player can see in the overmap oter_travel_cost_type travel_cost_type = oter_travel_cost_type::other; // Affects the pathfinding and travel times std::string extras = "none"; @@ -372,6 +385,17 @@ struct oter_type_t { void register_terrain( const oter_t &peer, size_t n, size_t max_n ); }; +template<> +struct enum_traits { + static constexpr oter_type_t::see_costs last = oter_type_t::see_costs::last; +}; + +namespace io +{ +template<> +std::string enum_to_string( oter_type_t::see_costs ); +} // namespace io + struct oter_t { private: const oter_type_t *type; @@ -414,8 +438,11 @@ struct oter_t { void get_rotation_and_subtile( int &rotation, int &subtile ) const; int get_rotation() const; - unsigned char get_see_cost() const { - return type->see_cost; + double get_see_cost() const { + return oter_type_t::see_cost_value( type->see_cost ); + } + bool can_see_down_through() const { + return type->see_cost == oter_type_t::see_costs::all_clear; } oter_travel_cost_type get_travel_cost_type() const { return type->travel_cost_type; diff --git a/src/overmap.cpp b/src/overmap.cpp index 596df416dc47a..5fbdddc7f7463 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -775,6 +775,24 @@ std::string oter_type_t::get_symbol() const return utf32_to_utf8( symbol ); } +double oter_type_t::see_cost_value( oter_type_t::see_costs cost ) +{ + switch( cost ) { + // *INDENT-OFF* + case oter_type_t::see_costs::all_clear: + case oter_type_t::see_costs::none: return 0; + case oter_type_t::see_costs::low: return 1; + case oter_type_t::see_costs::medium: return 2; + case oter_type_t::see_costs::spaced_high: return 4; + case oter_type_t::see_costs::high: return 5; + case oter_type_t::see_costs::full_high: return 10; + case oter_type_t::see_costs::opaque: return 999; + default: break; + // *INDENT-ON* + } + return 0; +} + namespace io { template<> @@ -863,7 +881,11 @@ void oter_type_t::load( const JsonObject &jo, const std::string &src ) optional( jo, was_loaded, "sym", symbol, unicode_codepoint_from_symbol_reader, NULL_UNICODE ); assign( jo, "name", name, strict ); - assign( jo, "see_cost", see_cost, strict ); + // For some reason an enum can be read as a number?? + if( jo.has_number( "see_cost" ) ) { + jo.throw_error( string_format( "In %s: See cost uses invalid number format", id.str() ) ); + } + mandatory( jo, was_loaded, "see_cost", see_cost ); assign( jo, "extras", extras, strict ); assign( jo, "mondensity", mondensity, strict ); assign( jo, "entry_eoc", entry_EOC, strict ); @@ -7691,6 +7713,27 @@ std::string enum_to_string( om_vision_level data ) debugmsg( "Unknown om_vision_level %d", static_cast( data ) ); return "unseen"; } + +template<> +std::string enum_to_string( oter_type_t::see_costs data ) +{ + switch( data ) { + // *INDENT-OFF* + case oter_type_t::see_costs::all_clear: return "all_clear"; + case oter_type_t::see_costs::none: return "none"; + case oter_type_t::see_costs::low: return "low"; + case oter_type_t::see_costs::medium: return "medium"; + case oter_type_t::see_costs::spaced_high: return "spaced_high"; + case oter_type_t::see_costs::high: return "high"; + case oter_type_t::see_costs::full_high: return "full_high"; + case oter_type_t::see_costs::opaque: return "opaque"; + // *INDENT-ON* + default: + break; + } + debugmsg( "Unknown see_cost %d", static_cast( data ) ); + return "none"; +} } // namespace io static const std::array suffixes = {{ "_north", "_west", "_south", "_east" }};