From 58edc32b297a572c56e4c42884814bca9f53692a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 12:21:05 -0500 Subject: [PATCH 01/18] outcrop --- data/json/mapgen/outcrop.json | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 data/json/mapgen/outcrop.json diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json new file mode 100644 index 0000000000000..f8de1e7547b61 --- /dev/null +++ b/data/json/mapgen/outcrop.json @@ -0,0 +1,75 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "outcrop" ], + "//": "Above ground", + "weight": 100, + "object": { + "rows": [ + " S S S", + " S S S ", + " S S S ", + " S ", + " S S SSSSS S ", + " SSSSSS$SSSSS ", + " SS$$$$$$$$$$SS ", + " S$$$$$$$$$$$$S S ", + " SS$$$$$$$$$$$$S ", + " S SS$$$$$$$$$$$$SS ", + " SS$$$$$$$$$$$$SS ", + " SS$$$$$$$$$$$$SS ", + " SS$$$$$$$$$$$$SS S", + " S S$$$$$$$$$$$$SS ", + " S$$$$$$$$$$$$S ", + " SS$$$$$$$$$$SS S ", + " SSS$SSSSSSSS ", + "S S S SS S ", + " S S ", + " S S ", + " S S ", + " S", + " S S ", + " S " + ], + "palettes": [ "bunker_ext" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "outcrop_roof" ], + "//": "Above ground", + "weight": 100, + "object": { + "fill_ter": "t_region_groundcover_barren", + "rows": [ + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvv((((((vvvvvvvvv", + "vvvvvvvvv($$$$(vvvvvvvvv", + "vvvvvvvvv($$$$(vvvvvvvvv", + "vvvvvvvvv($$$$(vvvvvvvvv", + "vvvvvvvvv($$$$(vvvvvvvvv", + "vvvvvvvvv((v(((vvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv", + "vvvvvvvvvvvvvvvvvvvvvvvv" + ], + "palettes": [ "bunker_ext" ] + } + } +] From 9d83bc5ec78838b2dc5720ad78b4eca9a9c3e557 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 12:31:28 -0500 Subject: [PATCH 02/18] Update overmap_terrain.json --- data/json/overmap/overmap_terrain/overmap_terrain.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 5c49ed398854c..ef5b70593b71d 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -832,6 +832,16 @@ "copy-from": "generic_giant_sinkhole", "name": "giant sinkhole base" }, + { + "type": "overmap_terrain", + "id": "outcrop", + "name": "outcrop", + "vision_levels": "natural_outcropping", + "sym": "O", + "color": "brown", + "see_cost": "spaced_high", + "flags": [ "REQUIRES_PREDECESSOR" ] + }, { "type": "overmap_terrain", "id": "cs_public_space", From 274e8e78082c09489dc509ff66b8cad047eb7cb5 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 14:11:02 -0500 Subject: [PATCH 03/18] Update specials.json --- data/json/overmap/overmap_special/specials.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index a5414b645802d..ae2875ea8f930 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4170,6 +4170,15 @@ "occurrences": [ 10, 100 ], "flags": [ "CLASSIC", "WILDERNESS", "OVERMAP_UNIQUE" ] }, + { + "type": "overmap_special", + "id": "outcrop", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" }, { "point": [ 0, 0, 1 ], "overmap": "outcrop_roof_north" } ], + "locations": [ "wilderness" ], + "city_distance": [ 15, -1 ], + "occurrences": [ 10, 100 ], + "flags": [ "CLASSIC", "WILDERNESS" ] + }, { "type": "overmap_special", "id": "ws_fire_lookout_tower", From b2f8518489744ccedfc5e83bcabecae88547ea10 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 14:28:18 -0500 Subject: [PATCH 04/18] use t_rock_floor_no_roof --- data/json/mapgen/outcrop.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index f8de1e7547b61..54f0cf59c29c2 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -53,10 +53,10 @@ "vvvvvvvvvvvvvvvvvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv", "vvvvvvvvv((((((vvvvvvvvv", - "vvvvvvvvv($$$$(vvvvvvvvv", - "vvvvvvvvv($$$$(vvvvvvvvv", - "vvvvvvvvv($$$$(vvvvvvvvv", - "vvvvvvvvv($$$$(vvvvvvvvv", + "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", + "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", + "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", + "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", "vvvvvvvvv((v(((vvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv", @@ -69,7 +69,8 @@ "vvvvvvvvvvvvvvvvvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv" ], - "palettes": [ "bunker_ext" ] + "palettes": [ "bunker_ext" ], + "terrain": { "◈": "t_rock_floor_no_roof" } } } ] From 3be8000f11077cfe4901f7cb0b67c6318de3b9f0 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 20:05:16 -0500 Subject: [PATCH 05/18] terrain for top --- .../overmap/overmap_terrain/overmap_terrain.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index ef5b70593b71d..2e5b4bf5ed3ac 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -1,3 +1,8 @@ +Cataclysm: Dark Days Ahead JSON Web Linting Tool +This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format. + +Paste some JSON into the field below and click "Lint" to run an autoformatter against it. + [ { "type": "overmap_terrain", @@ -842,6 +847,15 @@ "see_cost": "spaced_high", "flags": [ "REQUIRES_PREDECESSOR" ] }, + { + "type": "overmap_terrain", + "id": "outcrop_roof", + "vision_levels": "natural_outcropping", + "name": "outcrop top", + "sym": "O", + "color": "brown", + "see_cost": "none" + }, { "type": "overmap_terrain", "id": "cs_public_space", @@ -1202,3 +1216,4 @@ "flags": [ "REQUIRES_PREDECESSOR" ] } ] + From 4b32ce70551e2f8d3f53c165f441a65194306e6f Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 20:06:00 -0500 Subject: [PATCH 06/18] Update overmap_terrain.json --- data/json/overmap/overmap_terrain/overmap_terrain.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 2e5b4bf5ed3ac..341f6ac83af03 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -1,8 +1,3 @@ -Cataclysm: Dark Days Ahead JSON Web Linting Tool -This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format. - -Paste some JSON into the field below and click "Lint" to run an autoformatter against it. - [ { "type": "overmap_terrain", @@ -1216,4 +1211,3 @@ Paste some JSON into the field below and click "Lint" to run an autoformatter ag "flags": [ "REQUIRES_PREDECESSOR" ] } ] - From 2a37017f623a28736c0cda3c87c8b0b516551ca7 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 20:55:26 -0500 Subject: [PATCH 07/18] Update overmap_terrain.json --- data/json/overmap/overmap_terrain/overmap_terrain.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 341f6ac83af03..de9c185542c76 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -839,8 +839,7 @@ "vision_levels": "natural_outcropping", "sym": "O", "color": "brown", - "see_cost": "spaced_high", - "flags": [ "REQUIRES_PREDECESSOR" ] + "see_cost": "spaced_high" }, { "type": "overmap_terrain", From 94c389dc1f14fc559adeee7f5d7ac0fa2e892876 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 21:10:34 -0500 Subject: [PATCH 08/18] rework ground floor --- data/json/mapgen/outcrop.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index 54f0cf59c29c2..5a9fbc3a21593 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -12,18 +12,18 @@ " S S S ", " S ", " S S SSSSS S ", - " SSSSSS$SSSSS ", + " SSSSSSSSSSSS ", " SS$$$$$$$$$$SS ", - " S$$$$$$$$$$$$S S ", - " SS$$$$$$$$$$$$S ", - " S SS$$$$$$$$$$$$SS ", - " SS$$$$$$$$$$$$SS ", - " SS$$$$$$$$$$$$SS ", - " SS$$$$$$$$$$$$SS S", - " S S$$$$$$$$$$$$SS ", - " S$$$$$$$$$$$$S ", + " S$$TTTTTTTT$$S S ", + " SS$$T))))))T$$S ", + " S SS$$T)####)T$$SS ", + " SS$$T)####)T$$SS ", + " SS$$T)####)T$$SS ", + " SS$$T)####)T$$SS S", + " S S$$T))))))T$$SS ", + " S$$TTTTTTTT$$S ", " SS$$$$$$$$$$SS S ", - " SSS$SSSSSSSS ", + " SSSSSSSSSSSS ", "S S S SS S ", " S S ", " S S ", From c78c062fbfd181691b567f9289698079bbb85db5 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 31 Dec 2024 21:18:43 -0500 Subject: [PATCH 09/18] Match cut --- data/json/mapgen/outcrop.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index 5a9fbc3a21593..65e3795d62fe1 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -20,7 +20,7 @@ " SS$$T)####)T$$SS ", " SS$$T)####)T$$SS ", " SS$$T)####)T$$SS S", - " S S$$T))))))T$$SS ", + " S S$$T))T)))T$$SS ", " S$$TTTTTTTT$$S ", " SS$$$$$$$$$$SS S ", " SSSSSSSSSSSS ", From fdb3e4dace419857218b8953e9233ae4b875e157 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 1 Jan 2025 10:16:56 -0500 Subject: [PATCH 10/18] cavify with three variants --- data/json/mapgen/outcrop.json | 150 +++++++++++++++++++++------------- 1 file changed, 95 insertions(+), 55 deletions(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index 65e3795d62fe1..60cdb93c49cff 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -3,74 +3,114 @@ "type": "mapgen", "method": "json", "om_terrain": [ "outcrop" ], - "//": "Above ground", "weight": 100, "object": { + "rotation": [ 0, 3 ], + "predecessor_mapgen": "forest_thick", "rows": [ - " S S S", - " S S S ", - " S S S ", - " S ", - " S S SSSSS S ", - " SSSSSSSSSSSS ", - " SS$$$$$$$$$$SS ", - " S$$TTTTTTTT$$S S ", - " SS$$T))))))T$$S ", - " S SS$$T)####)T$$SS ", - " SS$$T)####)T$$SS ", - " SS$$T)####)T$$SS ", - " SS$$T)####)T$$SS S", - " S S$$T))T)))T$$SS ", - " S$$TTTTTTTT$$S ", - " SS$$$$$$$$$$SS S ", - " SSSSSSSSSSSS ", - "S S S SS S ", - " S S ", - " S S ", - " S S ", - " S", - " S S ", - " S " + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " %%%%%%%%% ", + " %%|||||||%% ", + " %|||||||||% ", + " %|||||||||% ", + " %|||||||||% ", + " %|||||||||% ", + " %%|||||||%% ", + " %%%%%%%%% ", + " ", + " ", + " ", + " ", + " ", + " ", + " " ], - "palettes": [ "bunker_ext" ] + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "cave_surface_palette" ] } }, { "type": "mapgen", "method": "json", - "om_terrain": [ "outcrop_roof" ], - "//": "Above ground", + "om_terrain": [ "outcrop" ], + "weight": 100, + "object": { + "rotation": [ 0, 3 ], + "predecessor_mapgen": "forest_thick", + "rows": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " %%%%%%%%% ", + " %%|||||||%% ", + " %|||||||||% ", + " %|||||||||% ", + " %%%%||||||% ", + " %|||||||||% ", + " %%|||||||%% ", + " %%%%%|%%% ", + " %%% ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "cave_surface_palette" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "outcrop" ], "weight": 100, "object": { - "fill_ter": "t_region_groundcover_barren", + "rotation": [ 0, 3 ], + "predecessor_mapgen": "forest_thick", "rows": [ - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvv((((((vvvvvvvvv", - "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", - "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", - "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", - "vvvvvvvvv(◈◈◈◈(vvvvvvvvv", - "vvvvvvvvv((v(((vvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv", - "vvvvvvvvvvvvvvvvvvvvvvvv" + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " %%%% ", + " %%%%||%%% ", + " %%|||||||%% ", + " %|||||||||% ", + " %%||||||||% ", + " %%%%||||||% ", + " %|||||||||% ", + " %%|||||||%% ", + " %%%%||%%% ", + " %%%% ", + " ", + " ", + " ", + " ", + " ", + " " ], - "palettes": [ "bunker_ext" ], - "terrain": { "◈": "t_rock_floor_no_roof" } + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "palettes": [ "cave_surface_palette" ] } } ] From 938eb832a9b70840143b381572ba5293dbed60d5 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 1 Jan 2025 10:17:58 -0500 Subject: [PATCH 11/18] Remove roof from specials.json --- data/json/overmap/overmap_special/specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index ae2875ea8f930..f88b39b64684d 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4173,7 +4173,7 @@ { "type": "overmap_special", "id": "outcrop", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" }, { "point": [ 0, 0, 1 ], "overmap": "outcrop_roof_north" } ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" } ], "locations": [ "wilderness" ], "city_distance": [ 15, -1 ], "occurrences": [ 10, 100 ], From d19a44cd52633889c20575cde6bbc7639e872dbf Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 1 Jan 2025 10:18:24 -0500 Subject: [PATCH 12/18] rem roof from overmap_terrain.json --- data/json/overmap/overmap_terrain/overmap_terrain.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index de9c185542c76..4a7a6a810124b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -841,15 +841,6 @@ "color": "brown", "see_cost": "spaced_high" }, - { - "type": "overmap_terrain", - "id": "outcrop_roof", - "vision_levels": "natural_outcropping", - "name": "outcrop top", - "sym": "O", - "color": "brown", - "see_cost": "none" - }, { "type": "overmap_terrain", "id": "cs_public_space", From 073bcc3eeba6238084cee733118f3939d60a61c2 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 1 Jan 2025 15:53:53 -0500 Subject: [PATCH 13/18] lumpier --- data/json/mapgen/outcrop.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index 60cdb93c49cff..e72481c32705a 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -55,15 +55,15 @@ " ", " ", " ", - " %%%%%%%%% ", - " %%|||||||%% ", - " %|||||||||% ", + " %%%%%% ", + " %%%%%||||%% ", " %|||||||||% ", - " %%%%||||||% ", - " %|||||||||% ", - " %%|||||||%% ", - " %%%%%|%%% ", - " %%% ", + " %||%||||||% ", + " %%%%%|||||% ", + " %|||||||||%%% ", + " %%||||||||||% ", + " %%%%%||||%%% ", + " %%%%%% ", " ", " ", " ", From 9e85fc16fe5b860c7da370be6892407aaf95ba10 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 3 Jan 2025 14:16:06 -0500 Subject: [PATCH 14/18] break up better --- data/json/mapgen/outcrop.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/mapgen/outcrop.json b/data/json/mapgen/outcrop.json index e72481c32705a..bbaed90888b1f 100644 --- a/data/json/mapgen/outcrop.json +++ b/data/json/mapgen/outcrop.json @@ -58,11 +58,11 @@ " %%%%%% ", " %%%%%||||%% ", " %|||||||||% ", - " %||%||||||% ", - " %%%%%|||||% ", - " %|||||||||%%% ", - " %%||||||||||% ", - " %%%%%||||%%% ", + " %%%%||||||% ", + " %||||||% ", + " %%%%||||||%%% ", + " %|||||||||||% ", + " %%%%%%||||%%% ", " %%%%%% ", " ", " ", @@ -90,14 +90,14 @@ " ", " ", " ", - " ", - " ", - " %%%% ", + " %%% ", + " %%|% ", + " %||% ", " %%%%||%%% ", - " %%|||||||%% ", - " %|||||||||% ", - " %%||||||||% ", - " %%%%||||||% ", + " %|||||||% ", + " %%%%%%%%% ", + " ", + " %%%%%%%%%%% ", " %|||||||||% ", " %%|||||||%% ", " %%%%||%%% ", From 47cbad480d4cd7e1f340906289d44cd85b2832f1 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 4 Jan 2025 11:17:31 -0500 Subject: [PATCH 15/18] No minimum occurences --- data/json/overmap/overmap_special/specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index f88b39b64684d..531216ca35315 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4176,7 +4176,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" } ], "locations": [ "wilderness" ], "city_distance": [ 15, -1 ], - "occurrences": [ 10, 100 ], + "occurrences": [ 0, 100 ], "flags": [ "CLASSIC", "WILDERNESS" ] }, { From 5ab3e89137d7f4e93d669f180af82755250e7256 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 9 Jan 2025 10:20:31 -0500 Subject: [PATCH 16/18] half as often, twice as far from cities --- data/json/overmap/overmap_special/specials.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index f36a0cddaa9e8..391ee09c6ac36 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -25,7 +25,7 @@ "overmaps": [ { "point": [ 1, 0, 0 ], "overmap": "motel_entrance_no_sidewalk_north" }, { "point": [ 0, 0, 0 ], "overmap": "motel_1_no_sidewalk_north" }, - { "point": [ 0, 1, 0 ], "overmap": "motel_2_no_sidewalk_north" }, + { "point": [ 0, 1, 0 ], "overmap": "motel_2_no_outsidewalk_north" }, { "point": [ 1, 1, 0 ], "overmap": "motel_3_no_sidewalk_north" }, { "point": [ 1, 0, 1 ], "overmap": "motel_entrance_roof_north" }, { "point": [ 0, 0, 1 ], "overmap": "motel_1_roof_north" }, @@ -4175,8 +4175,8 @@ "id": "outcrop", "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" } ], "locations": [ "wilderness" ], - "city_distance": [ 15, -1 ], - "occurrences": [ 0, 100 ], + "city_distance": [ 30, -1 ], + "occurrences": [ 0, 50 ], "flags": [ "CLASSIC", "WILDERNESS" ] }, { From 80160c7b79d55da25feaaf681adcc7811d44da86 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 9 Jan 2025 10:22:23 -0500 Subject: [PATCH 17/18] fix hotel merge conflict --- data/json/overmap/overmap_special/specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 391ee09c6ac36..f98ce04c81e0f 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -25,7 +25,7 @@ "overmaps": [ { "point": [ 1, 0, 0 ], "overmap": "motel_entrance_no_sidewalk_north" }, { "point": [ 0, 0, 0 ], "overmap": "motel_1_no_sidewalk_north" }, - { "point": [ 0, 1, 0 ], "overmap": "motel_2_no_outsidewalk_north" }, + { "point": [ 0, 1, 0 ], "overmap": "motel_2_no_sidewalk_north" }, { "point": [ 1, 1, 0 ], "overmap": "motel_3_no_sidewalk_north" }, { "point": [ 1, 0, 1 ], "overmap": "motel_entrance_roof_north" }, { "point": [ 0, 0, 1 ], "overmap": "motel_1_roof_north" }, From 7a16b20f9bb7f04b1e343b713f6363c4f80a3dcb Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 11 Jan 2025 18:40:56 -0500 Subject: [PATCH 18/18] One tenth as many spawns --- data/json/overmap/overmap_special/specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index f98ce04c81e0f..35469afd83d28 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4176,7 +4176,7 @@ "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "outcrop_north" } ], "locations": [ "wilderness" ], "city_distance": [ 30, -1 ], - "occurrences": [ 0, 50 ], + "occurrences": [ 0, 10 ], "flags": [ "CLASSIC", "WILDERNESS" ] }, {