Merge pull request CleverRaven#74290 from Procyonae/CityUniqueFlag

CITY_UNIQUE flag
XygenSS · Jun 7, 2024 · 36fe02f · 36fe02f
2 parents 59b112e + 259eb15
commit 36fe02f
Show file tree

Hide file tree

Showing 25 changed files with 189 additions and 156 deletions.
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -1724,7 +1724,8 @@
  { "point": [ 0, -3, 2 ], "overmap": "police_dept_d012_south" },
  { "point": [ 1, -3, 2 ], "overmap": "police_dept_d112_south" }
  ],
- "city_sizes": [ 14, -1 ]
+ "city_sizes": [ 14, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -2259,7 +2260,8 @@
  { "point": [ 2, 2, 2 ], "overmap": "megastore_1_2_roof_south" },
  { "point": [ 1, 2, 2 ], "overmap": "megastore_2_2_roof_south" }
  ],
- "city_sizes": [ 12, -1 ]
+ "city_sizes": [ 12, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -2285,7 +2287,8 @@
  { "point": [ 1, 2, 1 ], "overmap": "hospital_8_roof_north" },
  { "point": [ 2, 2, 1 ], "overmap": "hospital_7_roof_north" }
  ],
- "city_sizes": [ 12, -1 ]
+ "city_sizes": [ 12, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "id": "urban_35_hospital",
@@ -2327,7 +2330,9 @@
  { "point": [ 1, 0, 6 ], "overmap": "urban_35_31_south" },
  { "point": [ 0, 0, 6 ], "overmap": "urban_35_32_south" },
  { "point": [ 1, 0, 7 ], "overmap": "urban_35_33_south" }
- ]
+ ],
+ "city_sizes": [ 8, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -2977,7 +2982,8 @@
  { "point": [ 0, 1, -1 ], "overmap": "cathedral_b_SW_north" },
  { "point": [ 1, 1, -1 ], "overmap": "cathedral_b_SE_north" }
  ],
- "city_sizes": [ 14, -1 ]
+ "city_sizes": [ 14, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -3236,7 +3242,8 @@
  { "point": [ 1, 1, 0 ], "overmap": "mall_a_80_south" },
  { "point": [ 0, 1, 0 ], "overmap": "mall_a_81_south" }
  ],
- "city_sizes": [ 16, -1 ]
+ "city_sizes": [ 16, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -3485,7 +3492,8 @@
  { "point": [ 2, 1, 3 ], "overmap": "stadium_2_1_3_north" },
  { "point": [ 0, 3, 3 ], "overmap": "stadium_0_3_3_north" }
  ],
- "city_sizes": [ 16, -1 ]
+ "city_sizes": [ 16, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -3638,7 +3646,8 @@
  { "point": [ 5, 5, 5 ], "overmap": "stadium_football_5_5_5_north" },
  { "point": [ 6, 5, 5 ], "overmap": "stadium_football_6_5_5_north" }
  ],
- "city_sizes": [ 16, -1 ]
+ "city_sizes": [ 16, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",
@@ -3735,7 +3744,8 @@
  { "point": [ 0, 1, 2 ], "overmap": "town_hall_0_1_roof_north" },
  { "point": [ 1, 1, 2 ], "overmap": "town_hall_1_1_roof_north" }
  ],
- "city_sizes": [ 10, -1 ]
+ "city_sizes": [ 10, -1 ],
+ "flags": [ "CITY_UNIQUE" ]
  },
  {
  "type": "city_building",

diff --git a/data/json/overmap/overmap_mutable/anthill.json b/data/json/overmap/overmap_mutable/anthill.json
@@ -18,7 +18,7 @@
  "locations": [ "subterranean_empty" ],
  "city_distance": [ 10, -1 ],
  "occurrences": [ 80, 100 ],
- "flags": [ "ANT", "UNIQUE", "WILDERNESS" ],
+ "flags": [ "ANT", "OVERMAP_UNIQUE", "WILDERNESS" ],
  "spawns": { "group": "GROUP_ANT_SURFACE", "population": [ 1000, 2000 ], "radius": [ 10, 30 ] },
  "check_for_locations": [
  [ [ 0, 0, 0 ], [ "land", "agricultural" ] ],
@@ -91,7 +91,7 @@
  "locations": [ "subterranean_empty" ],
  "city_distance": [ 10, -1 ],
  "occurrences": [ 80, 100 ],
- "flags": [ "ANT", "UNIQUE", "WILDERNESS" ],
+ "flags": [ "ANT", "OVERMAP_UNIQUE", "WILDERNESS" ],
  "spawns": { "group": "GROUP_ACID_ANT_SURFACE", "population": [ 1000, 2000 ], "radius": [ 10, 30 ] },
  "check_for_locations": [
  [ [ 0, 0, 0 ], [ "land", "agricultural" ] ],

diff --git a/data/json/overmap/overmap_mutable/crater.json b/data/json/overmap/overmap_mutable/crater.json
@@ -7,7 +7,7 @@
  "occurrences": [ 66, 100 ],
  "//": "Spawn after all roads from other specials to avoid their roads routing around placed craters",
  "priority": -2,
- "flags": [ "UNIQUE", "BLOB", "CLASSIC" ],
+ "flags": [ "OVERMAP_UNIQUE", "BLOB", "CLASSIC" ],
  "check_for_locations_area": [ { "type": [ "land", "road", "agricultural" ], "from": [ -1, -1, 0 ], "to": [ 1, 1, 0 ] } ],
  "joins": [ "crater_to_crater", "root" ],
  "overmaps": {

diff --git a/data/json/overmap/overmap_mutable/farm_horse_mutable.json b/data/json/overmap/overmap_mutable/farm_horse_mutable.json
@@ -7,7 +7,7 @@
  "city_distance": [ 5, -1 ],
  "city_sizes": [ 1, -1 ],
  "occurrences": [ 80, 100 ],
- "flags": [ "CLASSIC", "MAN_MADE", "FARM", "UNIQUE" ],
+ "flags": [ "CLASSIC", "MAN_MADE", "FARM", "OVERMAP_UNIQUE" ],
  "check_for_locations_area": [ { "type": [ "forest_without_trail", "field" ], "from": [ -6, -2, 0 ], "to": [ 7, 9, 0 ] } ],
  "joins": [
  "root_to_road",

diff --git a/data/json/overmap/overmap_special/alien.json b/data/json/overmap/overmap_special/alien.json
@@ -12,7 +12,7 @@
  "city_distance": [ 0, 30 ],
  "city_sizes": [ 0, 16 ],
  "occurrences": [ 2, 100 ],
- "flags": [ "EXODII", "CBM", "UNIQUE" ]
+ "flags": [ "EXODII", "CBM", "OVERMAP_UNIQUE" ]
  },
  {
  "type": "overmap_special",

diff --git a/data/json/overmap/overmap_special/campus.json b/data/json/overmap/overmap_special/campus.json
@@ -125,7 +125,7 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 0, 0 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  },
  {
  "type": "overmap_special",
@@ -152,7 +152,7 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 0, 0 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  },
  {
  "type": "overmap_special",
@@ -195,7 +195,7 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 0, 0 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  },
  {
  "type": "overmap_special",
@@ -226,7 +226,7 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 0, 0 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  },
  {
  "type": "overmap_special",
@@ -249,6 +249,6 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 0, 0 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  }
 ]
diff --git a/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json b/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json
@@ -132,6 +132,6 @@
  "city_distance": [ 3, -1 ],
  "city_sizes": [ 1, 16 ],
  "occurrences": [ 30, 100 ],
- "flags": [ "UNIQUE", "MAN_MADE" ]
+ "flags": [ "OVERMAP_UNIQUE", "MAN_MADE" ]
  }
 ]
diff --git a/data/json/overmap/overmap_special/oil_platform.json b/data/json/overmap/overmap_special/oil_platform.json
@@ -211,6 +211,6 @@
  "city_distance": [ 150, 1000 ],
  "locations": [ "ocean_surface" ],
  "occurrences": [ 5, 100 ],
- "flags": [ "MAN_MADE", "OCEAN", "UNIQUE" ]
+ "flags": [ "MAN_MADE", "OCEAN", "OVERMAP_UNIQUE" ]
  }
 ]