From b7e2bda680ba1c12e5f56f841095c9ed596a4bc4 Mon Sep 17 00:00:00 2001 From: Zlorthishen <79779913+Zlorthishen@users.noreply.github.com> Date: Wed, 9 Oct 2024 20:52:58 -0500 Subject: [PATCH] update --- .../convention_center/convention_center.json | 2 +- .../convention_center_nested.json | 20 ++++++++++++------- .../convention_center_palette.json | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/data/json/mapgen/convention_center/convention_center.json b/data/json/mapgen/convention_center/convention_center.json index 65967e021710..cabcaacc2a25 100644 --- a/data/json/mapgen/convention_center/convention_center.json +++ b/data/json/mapgen/convention_center/convention_center.json @@ -258,7 +258,7 @@ " ", " ", " " - ], + ], "terrain": { "v": "t_ladder_down" }, "palettes": [ "roof_palette" ] } diff --git a/data/json/mapgen/convention_center/convention_center_nested.json b/data/json/mapgen/convention_center/convention_center_nested.json index bec216f0d8e1..8ab91dad8053 100644 --- a/data/json/mapgen/convention_center/convention_center_nested.json +++ b/data/json/mapgen/convention_center/convention_center_nested.json @@ -26,7 +26,8 @@ " n h * h n ", " n X* n " ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 19 ], "y": [ 0, 19 ], "density": 0.1 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -61,7 +62,8 @@ " ", " " ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 19 ], "y": [ 0, 19 ], "density": 0.1 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -101,7 +103,8 @@ "│││││ n * h n ", "│││││ ** * ** " ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.2 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -141,7 +144,8 @@ " nnnnnn n h │││││", " *** │││││" ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 23 ], "y": [ 0, 23 ], "density": 0.2 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -176,7 +180,8 @@ " ", " " ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 19 ], "y": [ 0, 19 ], "density": 0.1 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -211,7 +216,8 @@ " ", " X XX" ], - "furniture": {"X": "f_crate_c"}, + "place_monsters": [ { "monster": "GROUP_ZOMBIE_GUNSTORE", "x": [ 0, 19 ], "y": [ 0, 19 ], "density": 0.1 } ], + "furniture": { "X": "f_crate_c" }, "items": { "n": [ { "item": "guns_common", "chance": 20 }, { "item": "gunmod_common", "chance": 20 } ], "X": [ { "item": "guns_common", "chance": 70 }, { "item": "guns_rare", "chance": 40 } ] @@ -855,7 +861,7 @@ "palettes": [ "convention_nested_palette" ], "place_loot": [ { "item": "coffeemaker", "x": [ 5, 6 ], "y": 0 } ] } - }, + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen_palettes/convention_center_palette.json b/data/json/mapgen_palettes/convention_center_palette.json index 9943d549f6d1..ebeb504e9398 100644 --- a/data/json/mapgen_palettes/convention_center_palette.json +++ b/data/json/mapgen_palettes/convention_center_palette.json @@ -7,7 +7,7 @@ "distribution": [ [ "convention_nested_vacant", 2 ], [ "convention_nested_fandom", 5 ], - [ "convention_nested_gunshow", 500 ], + [ "convention_nested_gunshow", 7 ], [ "convention_nested_lecture_small", 2 ], [ "convention_nested_lecture_big", 3 ] ]