Merge pull request #75236 from ehughsbaird/going-to-california

Add more granularity to overmap vision
CleverRaven · Jul 28, 2024 · d10b9fa · d10b9fa
2 parents a334d3d + 10d0f1c
commit d10b9fa
Show file tree

Hide file tree

Showing 82 changed files with 1,659 additions and 516 deletions.
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json b/data/json/overmap/overmap_terrain/overmap_terrain_LIXA.json
@@ -3,13 +3,15 @@
  "type": "overmap_terrain",
  "id": [ "LIXA_surface_1a", "LIXA_surface_2a", "LIXA_surface_1b", "LIXA_surface_2b" ],
  "name": "research facility",
+ "vision_levels": "large_building",
  "sym": "l",
  "color": "light_gray",
  "see_cost": 5
  },
  {
  "type": "overmap_terrain",
  "id": [ "LIXA_roof_1a", "LIXA_roof_2a", "LIXA_roof_1b", "LIXA_roof_2b" ],
+ "vision_levels": "roof_or_air",
  "name": "research facility roof",
  "sym": "l",
  "color": "light_gray",
@@ -19,13 +21,15 @@
  "type": "overmap_terrain",
  "id": [ "LIXA_entry_1", "LIXA_entry_2" ],
  "name": "research facility gate",
+ "vision_levels": "large_building",
  "sym": "l",
  "color": "light_gray",
  "see_cost": 5
  },
  {
  "type": "overmap_terrain",
  "id": [ "LIXA_road" ],
+ "copy-from": "road_abstract",
  "name": "research facility access road",
  "sym": "l",
  "color": "light_gray",
@@ -35,6 +39,7 @@
  "type": "overmap_terrain",
  "id": [ "LIXA_road_guard", "LIXA_road_guard_roof" ],
  "name": "research facility checkpoint",
+ "vision_levels": "large_building",
  "sym": "l",
  "color": "light_gray",
  "see_cost": 5
@@ -52,13 +57,15 @@
  "LIXA_stairshaft_2d"
  ],
  "name": "LIXA experiment floor access",
+ "vision_levels": "underground_stone",
  "sym": "l",
  "color": "light_gray",
  "see_cost": 5
  },
  {
  "type": "overmap_terrain",
  "id": [ "LIXA_workfloor_1a", "LIXA_workfloor_2a", "LIXA_workfloor_1b", "LIXA_workfloor_2b" ],
+ "vision_levels": "underground_stone",
  "name": "LIXA research floor",
  "sym": "L",
  "color": "light_blue",
@@ -68,13 +75,15 @@
  "type": "overmap_terrain",
  "id": [ "LIXA_device_1", "LIXA_device_2", "LIXA_device_3", "LIXA_device_2_roof", "LIXA_device_3_roof" ],
  "name": "LIXA device floor",
+ "vision_levels": "underground_stone",
  "sym": "L",
  "color": "light_blue",
  "see_cost": 5
  },
  {
  "type": "overmap_terrain",
  "id": [ "LIXA_device_unfolded_A", "LIXA_device_unfolded_B", "LIXA_device_unfolded_noaccess" ],
+ "vision_levels": "underground_stone",
  "name": "unfolded space",
  "sym": "!",
  "color": "white",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json b/data/json/overmap/overmap_terrain/overmap_terrain_abstract.json
@@ -2,25 +2,29 @@
  {
  "type": "overmap_terrain",
  "abstract": "generic_cropland",
+ "vision_levels": "open_land",
  "name": "generic_cropland",
  "land_use_code": "cropland"
  },
  {
  "type": "overmap_terrain",
  "abstract": "generic_pasture",
+ "vision_levels": "open_land",
  "name": "generic_pasture",
  "land_use_code": "pasture"
  },
  {
  "type": "overmap_terrain",
  "abstract": "generic_forest",
  "name": "generic_forest",
+ "vision_levels": "forested",
  "land_use_code": "forest",
  "connect_group": "forest"
  },
  {
  "type": "overmap_terrain",
  "abstract": "generic_wetland",
+ "vision_levels": "forested_swampy",
  "name": "generic_wetland",
  "land_use_code": "wetland"
  },
@@ -33,6 +37,7 @@
  {
  "type": "overmap_terrain",
  "abstract": "generic_open_land",
+ "vision_levels": "open_land",
  "name": "generic_open_land",
  "land_use_code": "open_land"
  },
@@ -99,12 +104,14 @@
  {
  "type": "overmap_terrain",
  "abstract": "generic_transitional",
+ "vision_levels": "blends_till_details",
  "name": "generic_transitional",
  "land_use_code": "transitional"
  },
  {
  "type": "overmap_terrain",
  "abstract": "generic_transportation",
+ "vision_levels": "blends_till_outlines",
  "name": "generic_transportation",
  "land_use_code": "transportation"
  },

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json b/data/json/overmap/overmap_terrain/overmap_terrain_agricultural.json
@@ -4,6 +4,7 @@
  "abstract": "generic_rural_road",
  "name": "rural road",
  "color": "brown",
+ "vision_levels": "blends_till_details",
  "travel_cost_type": "dirt_road",
  "see_cost": 2,
  "mondensity": 2,
@@ -28,6 +29,7 @@
  "name": "rural building",
  "sym": "#",
  "color": "i_brown",
+ "vision_levels": "isolated_building",
  "delete": { "flags": [ "RISK_HIGH" ] },
  "extend": { "flags": [ "SOURCE_FOOD", "SOURCE_SAFETY", "RISK_LOW", "SOURCE_FARMING" ] }
  },
@@ -91,6 +93,7 @@
  "farm_9"
  ],
  "copy-from": "generic_rural_building",
+ "vision_levels": "farm_field",
  "name": "farm field"
  },
  {
@@ -138,6 +141,7 @@
  ],
  "copy-from": "generic_rural_building",
  "name": "farm field",
+ "vision_levels": "farm_field",
  "see_cost": 2,
  "extras": "agricultural",
  "looks_like": "farm_5",
@@ -149,6 +153,7 @@
  "copy-from": "generic_rural_building",
  "name": "hay field",
  "color": "brown",
+ "vision_levels": "farm_field",
  "see_cost": 2,
  "extras": "agricultural",
  "looks_like": "ranch_camp_76",
@@ -248,6 +253,7 @@
  "id": "farm_stills_11",
  "copy-from": "generic_rural_building",
  "name": "orchard",
+ "vision_levels": "isolated_building",
  "spawns": { "group": "GROUP_WASP_FORAGER", "population": [ 1, 4 ], "chance": 10 },
  "color": "brown"
  },
@@ -258,6 +264,7 @@
  "name": "apple orchard",
  "sym": "T",
  "color": "light_green",
+ "vision_levels": "first_glance_forest",
  "looks_like": "forest",
  "spawns": { "group": "GROUP_WASP_FORAGER", "population": [ 1, 4 ], "chance": 5 },
  "mondensity": 3
@@ -269,6 +276,7 @@
  "name": "orchard processing",
  "sym": "T",
  "color": "i_light_green",
+ "vision_levels": "isolated_building",
  "mondensity": 3
  },
  {
@@ -278,6 +286,7 @@
  "name": "orchard stall",
  "sym": "T",
  "color": "i_light_green",
+ "vision_levels": "isolated_building",
  "mondensity": 3
  },
  {
@@ -524,13 +533,15 @@
  "id": [ "forest_trail_intersection" ],
  "copy-from": "generic_rural_building",
  "name": "forest trail",
+ "vision_levels": "forested",
  "sym": "O",
  "color": "green"
  },
  {
  "type": "overmap_terrain",
  "id": [ "moonshine_still", "moonshine_still_1", "moonshine_still_2" ],
  "copy-from": "generic_rural_building",
+ "vision_levels": "blends_till_details",
  "name": "moonshine still",
  "sym": "S"
  },
@@ -545,6 +556,7 @@
  "type": "overmap_terrain",
  "id": "TreeFarm_1b",
  "copy-from": "generic_rural_building",
+ "vision_levels": "forested",
  "name": "tree farm",
  "sym": "T",
  "spawns": { "group": "GROUP_WASP_FORAGER", "population": [ 1, 2 ], "chance": 20 },

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json b/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json
@@ -124,6 +124,7 @@
  "aircraft_carrier_1a_4",
  "aircraft_carrier_2a_4"
  ],
+ "vision_levels": "large_ship",
  "name": "aircraft carrier",
  "sym": "A",
  "color": "red",
@@ -174,6 +175,7 @@
  "aircraft_carrier_13b_-1",
  "aircraft_carrier_13c_-1"
  ],
+ "vision_levels": "large_ship",
  "name": "aircraft carrier",
  "sym": "A",
  "color": "red",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_alien.json b/data/json/overmap/overmap_terrain/overmap_terrain_alien.json
@@ -2,6 +2,7 @@
  {
  "type": "overmap_terrain",
  "id": "exo_safehouse_stone_0",
+ "vision_levels": "isolated_building",
  "name": "unusual stone barn",
  "sym": "^",
  "color": "brown",
@@ -11,24 +12,21 @@
  {
  "type": "overmap_terrain",
  "id": "exo_safehouse_stone_1",
- "name": "unusual stone barn",
- "sym": "^",
- "color": "brown",
- "see_cost": 2,
+ "copy-from": "exo_safehouse_stone_0",
  "flags": [ "KNOWN_UP", "KNOWN_DOWN" ]
  },
  {
  "type": "overmap_terrain",
  "id": "exo_safehouse_stone_2",
+ "vision_levels": "roof_or_air",
  "name": "unusual stone barn roof",
- "sym": "^",
- "color": "brown",
- "see_cost": 2,
+ "copy-from": "exo_safehouse_stone_0",
  "flags": [ "KNOWN_DOWN" ]
  },
  {
  "type": "overmap_terrain",
  "id": "exo_warehouse_1",
+ "vision_levels": "isolated_building",
  "name": "strange warehouse",
  "sym": "#",
  "color": "light_gray",
@@ -38,15 +36,13 @@
  {
  "type": "overmap_terrain",
  "id": "exo_warehouse_2",
- "name": "strange warehouse",
- "sym": "#",
- "color": "light_gray",
- "see_cost": 2,
+ "copy-from": "exo_warehouse_1",
  "flags": [ "KNOWN_DOWN" ]
  },
  {
  "type": "overmap_terrain",
  "id": [ "slimepit_bottom" ],
+ "vision_levels": "underground_dirt",
  "name": "slime pit",
  "sym": "~",
  "color": "light_green",
@@ -57,11 +53,13 @@
  "type": "overmap_terrain",
  "id": [ "slimepit_top" ],
  "copy-from": "slimepit_bottom",
+ "vision_levels": "natural_depression",
  "flags": [ "KNOWN_DOWN", "NO_ROTATE", "REQUIRES_PREDECESSOR" ]
  },
  {
  "type": "overmap_terrain",
  "id": "exodii_base_x0y0z0",
+ "vision_levels": "large_outcropping",
  "name": "rocky butte",
  "sym": "%",
  "color": "light_gray",
@@ -71,6 +69,7 @@
  {
  "type": "overmap_terrain",
  "id": "exodii_base_x0y3z0",
+ "vision_levels": "large_outcropping",
  "name": "ground-level entrance",
  "sym": "?",
  "color": "white",
@@ -100,6 +99,7 @@
  {
  "type": "overmap_terrain",
  "id": "exodii_base_x0y0z1",
+ "vision_levels": "large_outcropping",
  "name": "scrap metal encampment",
  "sym": "%",
  "color": "light_gray",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_ants.json b/data/json/overmap/overmap_terrain/overmap_terrain_ants.json
@@ -3,6 +3,7 @@
  "type": "overmap_terrain",
  "id": "anthill",
  "name": "anthill",
+ "vision_levels": "natural_outcropping",
  "sym": "%",
  "color": "brown",
  "see_cost": 2,
@@ -11,6 +12,7 @@
  {
  "type": "overmap_terrain",
  "id": "ants_food",
+ "vision_levels": "underground_dirt",
  "name": "ant food storage",
  "sym": "O",
  "color": "green",
@@ -20,6 +22,7 @@
  {
  "type": "overmap_terrain",
  "id": "acid_ants_food",
+ "vision_levels": "underground_dirt",
  "name": "ant food storage",
  "sym": "O",
  "color": "green",
@@ -71,6 +74,7 @@
  {
  "type": "overmap_terrain",
  "id": "ants",
+ "vision_levels": "underground_dirt",
  "name": "ant tunnel",
  "color": "brown",
  "see_cost": 5,
@@ -80,6 +84,7 @@
  {
  "type": "overmap_terrain",
  "id": "acid_ants",
+ "vision_levels": "underground_dirt",
  "name": "ant tunnel",
  "color": "brown",
  "see_cost": 5,