From 5c41cce34108e51c167e0c143247adf64b73259c Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 2 Feb 2023 13:42:36 -0500 Subject: [PATCH 1/9] Add the stuff --- data/json/mapgen/drug_lab.json | 50 +++++++++++++++++++ .../overmap/overmap_special/specials.json | 10 ++++ .../overmap_terrain/overmap_terrain.json | 8 +++ 3 files changed, 68 insertions(+) create mode 100644 data/json/mapgen/drug_lab.json diff --git a/data/json/mapgen/drug_lab.json b/data/json/mapgen/drug_lab.json new file mode 100644 index 0000000000000..9bd820978af38 --- /dev/null +++ b/data/json/mapgen/drug_lab.json @@ -0,0 +1,50 @@ +[ + { + "method": "json", + "om_terrain": "drug_lab", + "type": "mapgen", + "weight": 100, + "object": { + "predecessor_mapgen": "forest", + "rows": [ + " ", + " ", + " ", + " ", + " ___ ", + " _c___ ", + " ___c_ ", + " _a___ ", + " _____ ", + " ________ ", + " |++|++|____ ", + " |ddddd|_____ ", + " |ddOdd|_____ ", + " |ddOdd| _ ", + " |tdddt| ", + " |tbdbt| ", + " |ttttt| ", + " ||||||| ", + " ", + " ", + " ", + " ", + " ", + " " + ], + "palettes": [ "moonshine_palette" ], + "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ] , "repeat": [ 2, 3 ] } ], + "items": { + " ": [ { "item": "trash", "chance": 1 }, { "item": "clutter_yard", "chance": 1 } ], + "t": [ + { "item": "hazmat_suits", "chance": 70 }, + { "item": "hazmat_masks", "chance": 70 }, + { "item": "mobile_meth_lab", "chance": 70 }, + { "item": "supplies_reagents_lab", "chance": 20 }, + { "item": "methlab", "chance": 90 } + ] + } + } + } +] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 6a966aed76f86..cd6d36e78ae2f 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4437,6 +4437,16 @@ "occurrences": [ 0, 3 ], "flags": [ "CLASSIC", "WILDERNESS", "MAN_MADE" ] }, + { + "type": "overmap_special", + "id": "drug_lab", + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "drug_lab" } ], + "locations": [ "forest" ], + "city_distance": [ 20, 60 ], + "city_sizes": [ 8, -1 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC", "WILDERNESS", "MAN_MADE" ] + }, { "id": "Railroad Station", "type": "overmap_special", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index b2cb25f88edab..17511aee0a7a4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -603,6 +603,14 @@ "color": "i_cyan", "see_cost": 5 }, + { + "type": "overmap_terrain", + "id": "drug_lab", + "name": "drug lab", + "sym": "^", + "color": "brown", + "see_cost": 5 + }, { "type": "overmap_terrain", "id": [ From 693698d6e8761998383561747ec86a7e146e9ec8 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Thu, 2 Feb 2023 13:48:18 -0500 Subject: [PATCH 2/9] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/mapgen/drug_lab.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/mapgen/drug_lab.json b/data/json/mapgen/drug_lab.json index 9bd820978af38..322caad459535 100644 --- a/data/json/mapgen/drug_lab.json +++ b/data/json/mapgen/drug_lab.json @@ -1,5 +1,5 @@ [ - { + { "method": "json", "om_terrain": "drug_lab", "type": "mapgen", @@ -34,17 +34,17 @@ ], "palettes": [ "moonshine_palette" ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], - "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ] , "repeat": [ 2, 3 ] } ], + "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ], "repeat": [ 2, 3 ] } ], "items": { " ": [ { "item": "trash", "chance": 1 }, { "item": "clutter_yard", "chance": 1 } ], - "t": [ - { "item": "hazmat_suits", "chance": 70 }, - { "item": "hazmat_masks", "chance": 70 }, - { "item": "mobile_meth_lab", "chance": 70 }, - { "item": "supplies_reagents_lab", "chance": 20 }, - { "item": "methlab", "chance": 90 } + "t": [ + { "item": "hazmat_suits", "chance": 70 }, + { "item": "hazmat_masks", "chance": 70 }, + { "item": "mobile_meth_lab", "chance": 70 }, + { "item": "supplies_reagents_lab", "chance": 20 }, + { "item": "methlab", "chance": 90 } ] } } - } + } ] From 08b7b00baae20a496cf60ab0d064664ba77173be Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 2 Feb 2023 14:00:00 -0500 Subject: [PATCH 3/9] Remove some stuff --- data/json/mapgen/drug_lab.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/json/mapgen/drug_lab.json b/data/json/mapgen/drug_lab.json index 322caad459535..9a72e0f14584b 100644 --- a/data/json/mapgen/drug_lab.json +++ b/data/json/mapgen/drug_lab.json @@ -5,7 +5,6 @@ "type": "mapgen", "weight": 100, "object": { - "predecessor_mapgen": "forest", "rows": [ " ", " ", @@ -33,7 +32,6 @@ " " ], "palettes": [ "moonshine_palette" ], - "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ], "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 9, 16 ], "y": [ 9, 14 ], "repeat": [ 2, 3 ] } ], "items": { " ": [ { "item": "trash", "chance": 1 }, { "item": "clutter_yard", "chance": 1 } ], From ad18db72d88e798f65ac2f493507f30d1cb56ee0 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 2 Feb 2023 14:00:41 -0500 Subject: [PATCH 4/9] Remove mapgen weight --- data/json/mapgen/drug_lab.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/mapgen/drug_lab.json b/data/json/mapgen/drug_lab.json index 9a72e0f14584b..d55e612804b4a 100644 --- a/data/json/mapgen/drug_lab.json +++ b/data/json/mapgen/drug_lab.json @@ -3,7 +3,6 @@ "method": "json", "om_terrain": "drug_lab", "type": "mapgen", - "weight": 100, "object": { "rows": [ " ", From f2739f8f706335ab39a6bd9810c47c5352621ac7 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 2 Feb 2023 14:07:02 -0500 Subject: [PATCH 5/9] Add fill_ter --- data/json/mapgen/drug_lab.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/mapgen/drug_lab.json b/data/json/mapgen/drug_lab.json index d55e612804b4a..a2758663e7e92 100644 --- a/data/json/mapgen/drug_lab.json +++ b/data/json/mapgen/drug_lab.json @@ -4,6 +4,7 @@ "om_terrain": "drug_lab", "type": "mapgen", "object": { + "fill_ter": "t_region_groundcover", "rows": [ " ", " ", From 60fe60d867446bca16474531633db748b6c30650 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Thu, 2 Feb 2023 14:34:27 -0500 Subject: [PATCH 6/9] add some flags --- data/json/overmap/overmap_terrain/overmap_terrain.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json index 17511aee0a7a4..f48f5616bbbbb 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -609,7 +609,8 @@ "name": "drug lab", "sym": "^", "color": "brown", - "see_cost": 5 + "see_cost": 5, + "flags": [ "NO_ROTATE" ] }, { "type": "overmap_terrain", From 3de96772694a9959a0fbf5dd04b3973b1e412533 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Mon, 6 Feb 2023 10:11:17 -0500 Subject: [PATCH 7/9] Add a rotation --- 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 cd6d36e78ae2f..2098f49a2b22a 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4440,7 +4440,7 @@ { "type": "overmap_special", "id": "drug_lab", - "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "drug_lab" } ], + "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "drug_lab_north" } ], "locations": [ "forest" ], "city_distance": [ 20, 60 ], "city_sizes": [ 8, -1 ], From d8f6d0fbfd5362d9073ff3f549ce905db052ad80 Mon Sep 17 00:00:00 2001 From: MNG-cataclysm Date: Mon, 6 Feb 2023 10:50:55 -0500 Subject: [PATCH 8/9] remove a flag --- 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 f48f5616bbbbb..17511aee0a7a4 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain.json @@ -609,8 +609,7 @@ "name": "drug lab", "sym": "^", "color": "brown", - "see_cost": 5, - "flags": [ "NO_ROTATE" ] + "see_cost": 5 }, { "type": "overmap_terrain", From 99e7848689bd5bcef78f4d7da1af9f6421430aec Mon Sep 17 00:00:00 2001 From: MNG-cataclysm <58958654+MNG-cataclysm@users.noreply.github.com> Date: Sat, 11 Mar 2023 12:42:42 -0500 Subject: [PATCH 9/9] Update data/json/overmap/overmap_special/specials.json Co-authored-by: anothersimulacrum --- data/json/overmap/overmap_special/specials.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 2098f49a2b22a..ece5ad3437f7f 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -4444,8 +4444,8 @@ "locations": [ "forest" ], "city_distance": [ 20, 60 ], "city_sizes": [ 8, -1 ], - "occurrences": [ 0, 2 ], - "flags": [ "CLASSIC", "WILDERNESS", "MAN_MADE" ] + "occurrences": [ 1, 5 ], + "flags": [ "UNIQUE", "CLASSIC", "WILDERNESS", "MAN_MADE" ] }, { "id": "Railroad Station",