From 3c7a51429cbefdde934348a26faf636fc1ef57f0 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 26 Aug 2023 16:10:03 -0700 Subject: Update mapgen pallete patch to fix floors under sandbags in fema camps. --- PKGBUILD | 12 +- terrain-13_fix-lab-machinery-palette.patch | 246 --------------------------- terrain-13_fix-mapgen-palettes.patch | 256 +++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 251 deletions(-) delete mode 100644 terrain-13_fix-lab-machinery-palette.patch create mode 100644 terrain-13_fix-mapgen-palettes.patch diff --git a/PKGBUILD b/PKGBUILD index 7870cbb..12b108a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental pkgver=202308231412 _pkgver=2023-08-23-1412 -pkgrel=1 +pkgrel=2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -119,7 +119,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "terrain-10_fix-milbase_minefield.patch" "terrain-11_clean-up-map-extras.patch" "terrain-12_add_fmc_stairs.patch" - "terrain-13_fix-lab-machinery-palette.patch" + "terrain-13_fix-mapgen-palettes.patch" "tools-01_foldable-bottle-is-container.patch" "tools-03_shears-use-light-battery.patch" @@ -227,7 +227,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40 'f830baa8e9d2f2d844520ef3199a7ac62913afb016d40028d99865ba5c6143c08aa8cec9322a67d808fa526954a78416c90cf35ef31cc8dc4dec64950f58adfd' 'f87e28d0b11fb19477a4d91d9d761e03293561a04543e405894cd6c1e63c0353626cb91a781410d299dc3ebcb290be6ceb822cb65c9530c356ac9d4787b322b7' '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618' - '05b040cf267056acbdd5fe0dcf0f4fc9c541075c33e425e74bc2b0a8420c8e76b188164022ad9af65b334dedf2b98727ba3b6b6a7419d4fdbec112ba9e3abb6a' + '257a9600c893dcba966007b17dffe58f507b52eb8282e624dfe441e5a78bf45210b866b7a5e2ebd6fe8e86a6ac55f427100c52396bb7c05d6e979c9f41a0059a' '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d' '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac' '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1' @@ -596,10 +596,12 @@ prepare() { # The roof has stairs down, but the main floor lacked a matching stairs up. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-12_add_fmc_stairs.patch - # Fix light machinery incorrectly appearing under various lab furniture + # Fix mismatched mapgen palettes: + # Fixes light machinery incorrectly appearing under various lab furniture # All said items define C as the tile in question, but C is already in lab_palette as t_machinery_electronic. # Changed all such C to K since it was unused in either lab_palette or lab_loot_home_office. - patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-13_fix-lab-machinery-palette.patch + # Also fixes sandbag walls at fema camps having indoor flooring underneath. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/terrain-13_fix-mapgen-palettes.patch # # tool fixes diff --git a/terrain-13_fix-lab-machinery-palette.patch b/terrain-13_fix-lab-machinery-palette.patch deleted file mode 100644 index 4151d6f..0000000 --- a/terrain-13_fix-lab-machinery-palette.patch +++ /dev/null @@ -1,246 +0,0 @@ ---- a/data/json/mapgen/lab/lab_floorplans.json -+++ b/data/json/mapgen/lab/lab_floorplans.json -@@ -119,7 +119,7 @@ - "...|...|r......|X.....X|", - "...|...|.......|---W---|", - "LLL|LLL|.......| |", -- "...C..........l| |", -+ "...K..........l| |", - "..............l| |", - "...............+ |", - "...............| |", -@@ -148,7 +148,7 @@ - "F": "t_chainfence_h", - "f": "t_chainfence_v", - "H": "t_chaingate_c", -- "C": "t_gates_control_concrete_lab" -+ "K": "t_gates_control_concrete_lab" - }, - "mapping": { "r": { "items": [ { "item": "hardware", "chance": 10 }, { "item": "robots", "chance": 10 } ] } }, - "place_nested": [ -@@ -238,10 +238,10 @@ - "..c|c..c|c....c|c..c|c..", - "..---..---....---..---..", - "........................", -- "...C....C......C....C...", -+ "...K....K......K....K...", - "........................", - "........................", -- "...C....C......C....C...", -+ "...K....K......K....K...", - "........................", - "..---..---.....|---+---|", - "..c|c..c|c.....| |", -@@ -254,11 +254,11 @@ - "rrr.....!.....l|-------|" - ], - "palettes": [ "lab_palette", "lab_loot_research" ], -- "furniture": { "f": "f_null", "C": "f_centrifuge" }, -+ "furniture": { "f": "f_null", "K": "f_centrifuge" }, - "terrain": { - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "!": [ "t_thconc_floor", "t_thconc_floor", "t_console_broken", "t_generator_broken" ], -- "C": "t_thconc_floor" -+ "K": "t_thconc_floor" - }, - "mapping": { - "c": { "items": [ { "item": "chem_lab", "chance": 10 }, { "item": "tools_science", "chance": 10 } ] }, -@@ -401,7 +401,7 @@ - "...| |---+---|..", - "...| |..........", - "...|---------|..........", -- "...| |C|cccxc...hh", -+ "...| |K|cccxc...hh", - "l..| | +...hc...tt", - "l..| |f|....c...hh", - "l..? |--cc.cc.....", -@@ -415,8 +415,8 @@ - ], - "palettes": [ "lab_palette", "lab_loot_home_office" ], - "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] }, -- "furniture": { "^": "f_indoor_plant", "C": "f_cupboard" }, -- "mapping": { "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, -+ "furniture": { "^": "f_indoor_plant", "K": "f_cupboard" }, -+ "mapping": { "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, - "place_nested": [ - { "chunks": [ "lab_spawn_9x9_wall_nw" ], "x": 3, "y": 2 }, - { "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 3 }, -@@ -437,7 +437,7 @@ - ".......L...............l", - ".......L...............l", - ".......L....----?----..l", -- "-------|C...| |..l", -+ "-------|K...| |..l", - ".......L....| |..l", - ".......L....| |..l", - ".......L....+ |..l", -@@ -465,7 +465,7 @@ - "F": "t_chainfence_h", - "f": "t_chainfence_v", - "H": "t_chaingate_c", -- "C": "t_gates_control_concrete_lab", -+ "K": "t_gates_control_concrete_lab", - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] - }, - "mapping": { -@@ -509,7 +509,7 @@ - "rows": [ - "..cccccc.|...|,,,|..|,,,", - "c........|...|,,,|.6|,,,", -- "c..Ccxc..|...|,,,g..g,,,", -+ "c..Kcxc..|...|,,,g..g,,,", - "c........g...|,,,g..g,,,", - "c........g...|,,,L..L,,,", - "......llS|...|---|..|---", -@@ -533,10 +533,10 @@ - "........................" - ], - "palettes": [ "lab_palette", "lab_loot_research" ], -- "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "C": "f_centrifuge" }, -+ "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "K": "f_centrifuge" }, - "terrain": { - ",": "t_floor_blue", -- "C": "t_floor_blue", -+ "K": "t_floor_blue", - "?": "t_floor_blue", - "/": "t_floor_blue", - "7": "t_console", -@@ -593,7 +593,7 @@ - "bb...+.......| |", - "bb...+.......| |", - "...ht|.......| |", -- "-----|..C6...+ |", -+ "-----|..K6...+ |", - "....l|.......| |", - "bb...+.......| |", - "bb...+.......| |", -@@ -606,7 +606,7 @@ - "bb...+.......| |", - "bb...+.......| |", - "...ht|.......| |", -- "-----|..Cx...? |", -+ "-----|..Kx...? |", - "...ht|.......| |", - "bb...+.......| |", - "bb...+.......| |", -@@ -615,12 +615,12 @@ - ], - "palettes": [ "lab_palette" ], - "terrain": { -- "C": "t_floor", -+ "K": "t_floor", - "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], - "7": "t_floor", - "8": "t_floor" - }, -- "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "C": "f_centrifuge" }, -+ "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "K": "f_centrifuge" }, - "items": { - "b": { "item": "hospital_bed", "chance": 33 }, - "l": { "item": "surgery", "chance": 50 }, -@@ -661,7 +661,7 @@ - "fill_ter": "t_thconc_floor", - "rows": [ - ",,,,,|..|.....|.........", -- ",,,,,|7.|.....|..cxcC...", -+ ",,,,,|7.|.....|..cxcK...", - ",,,,,g..g.....g.......l.", - ",,,,,g..g.....g.......l.", - ",,,,,L..g.....|.......S.", -@@ -686,8 +686,8 @@ - "........................" - ], - "palettes": [ "lab_palette" ], -- "furniture": { "C": "f_centrifuge" }, -- "terrain": { "C": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, -+ "furniture": { "K": "f_centrifuge" }, -+ "terrain": { "K": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, - "mapping": { - "c": { "items": [ { "item": "office", "chance": 30 }, { "item": "tools_science", "chance": 15 } ] }, - "l": { "items": [ { "item": "science", "chance": 60 } ] } -@@ -746,7 +746,7 @@ - ".......L.........G......", - ".......L.........|..ddd.", - ".......L.........g..dh..", -- "-------|C........g......", -+ "-------|K........g......", - ".......L.........g......", - ".......L.........|dh....", - ".......L.........|dxd.^.", -@@ -762,7 +762,7 @@ - "P": "t_generator_broken", - "S": "t_sewage_pump", - "p": "t_sewage_pipe", -- "C": "t_gates_control_concrete_lab", -+ "K": "t_gates_control_concrete_lab", - "g": "t_wall_glass", - "G": "t_door_glass_lab_c" - }, -@@ -826,21 +826,21 @@ - "...htth..g....gWWWWWWWl|", - "...htth..g....gWWWcWWWl|", - ".........G....LWWWcWWWW|", -- ".........g....gWWWCWWWW|", -+ ".........g....gWWWKWWWW|", - "...htth..g....gWWWcWWWW|", - "...htth..g....gWWWWWWhd|", - "........^|....|rrrWWdxd|", - ".........|....|---------" - ], - "palettes": [ "lab_palette", "lab_loot_home_office" ], -- "furniture": { "^": "f_indoor_plant", "C": "f_centrifuge" }, -+ "furniture": { "^": "f_indoor_plant", "K": "f_centrifuge" }, - "terrain": { - "E": "t_elevator", - "e": "t_elevator_control_off", - "w": "t_water_sh", - "W": "t_water_dp", - "=": "t_door_lab_c", -- "C": "t_thconc_floor" -+ "K": "t_thconc_floor" - }, - "mapping": { "t": { "items": [ { "item": "vending_food_items", "chance": 20 } ] } }, - "place_loot": [ -@@ -920,20 +920,20 @@ - "TS| F +`````+ F |ST|", - "--|V F w`hth`w F V|--|", - "rr--| -w---w- |--rr|", -- "-+|s| CSC|CSC |s|+-|", -- " | C|C | x|", -+ "-+|s| KSK|KSK |s|+-|", -+ " | K|K | x|", - " t + O|O + t|", - "bb |hh f|f hh| bb|", -- "bb ]|tt C|C tt|] bb|", -+ "bb ]|tt K|K tt|] bb|", - "--------+-----+--------|", - "........................", - "........................", - "--------+-----+--------|", -- "bb ]|tt C|C tt|] bb|", -+ "bb ]|tt K|K tt|] bb|", - "bb |hh f|f hh| bb|", - " t + O|O + t|", -- " | C|C | |", -- "-+|s| CSC|CSC |s|+-|", -+ " | K|K | |", -+ "-+|s| KSK|KSK |s|+-|", - "rr--| -w---w- |--rr|", - "--|V F w`hth`w F V|--|", - "TS| F +`````+ F |ST|", -@@ -941,13 +941,13 @@ - "BB|FFFt |`````| tFFF|BB|" - ], - "palettes": [ "lab_palette", "lab_loot_home_office" ], -- "furniture": { "F": "f_sofa", "B": "f_bathtub", "C": "f_counter", "O": "f_oven", "V": "f_table" }, -+ "furniture": { "F": "f_sofa", "B": "f_bathtub", "K": "f_counter", "O": "f_oven", "V": "f_table" }, - "terrain": { "w": "t_window_domestic", "`": "t_grass", "+": "t_door_lab_c" }, - "mapping": { - "t": { "items": [ { "item": "livingroom", "chance": 20 } ] }, - "F": { "items": [ { "item": "livingroom", "chance": 5 } ] }, - "f": { "items": [ { "item": "fridge", "chance": 80 } ] }, -- "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, -+ "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, - "O": { "items": [ { "item": "oven", "chance": 70 } ] }, - "r": { - "items": [ diff --git a/terrain-13_fix-mapgen-palettes.patch b/terrain-13_fix-mapgen-palettes.patch new file mode 100644 index 0000000..520c5ff --- /dev/null +++ b/terrain-13_fix-mapgen-palettes.patch @@ -0,0 +1,256 @@ +--- a/data/json/mapgen/lab/lab_floorplans.json ++++ b/data/json/mapgen/lab/lab_floorplans.json +@@ -119,7 +119,7 @@ + "...|...|r......|X.....X|", + "...|...|.......|---W---|", + "LLL|LLL|.......| |", +- "...C..........l| |", ++ "...K..........l| |", + "..............l| |", + "...............+ |", + "...............| |", +@@ -148,7 +148,7 @@ + "F": "t_chainfence_h", + "f": "t_chainfence_v", + "H": "t_chaingate_c", +- "C": "t_gates_control_concrete_lab" ++ "K": "t_gates_control_concrete_lab" + }, + "mapping": { "r": { "items": [ { "item": "hardware", "chance": 10 }, { "item": "robots", "chance": 10 } ] } }, + "place_nested": [ +@@ -238,10 +238,10 @@ + "..c|c..c|c....c|c..c|c..", + "..---..---....---..---..", + "........................", +- "...C....C......C....C...", ++ "...K....K......K....K...", + "........................", + "........................", +- "...C....C......C....C...", ++ "...K....K......K....K...", + "........................", + "..---..---.....|---+---|", + "..c|c..c|c.....| |", +@@ -254,11 +254,11 @@ + "rrr.....!.....l|-------|" + ], + "palettes": [ "lab_palette", "lab_loot_research" ], +- "furniture": { "f": "f_null", "C": "f_centrifuge" }, ++ "furniture": { "f": "f_null", "K": "f_centrifuge" }, + "terrain": { + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], + "!": [ "t_thconc_floor", "t_thconc_floor", "t_console_broken", "t_generator_broken" ], +- "C": "t_thconc_floor" ++ "K": "t_thconc_floor" + }, + "mapping": { + "c": { "items": [ { "item": "chem_lab", "chance": 10 }, { "item": "tools_science", "chance": 10 } ] }, +@@ -401,7 +401,7 @@ + "...| |---+---|..", + "...| |..........", + "...|---------|..........", +- "...| |C|cccxc...hh", ++ "...| |K|cccxc...hh", + "l..| | +...hc...tt", + "l..| |f|....c...hh", + "l..? |--cc.cc.....", +@@ -415,8 +415,8 @@ + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], + "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] }, +- "furniture": { "^": "f_indoor_plant", "C": "f_cupboard" }, +- "mapping": { "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, ++ "furniture": { "^": "f_indoor_plant", "K": "f_cupboard" }, ++ "mapping": { "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, + "place_nested": [ + { "chunks": [ "lab_spawn_9x9_wall_nw" ], "x": 3, "y": 2 }, + { "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 3 }, +@@ -437,7 +437,7 @@ + ".......L...............l", + ".......L...............l", + ".......L....----?----..l", +- "-------|C...| |..l", ++ "-------|K...| |..l", + ".......L....| |..l", + ".......L....| |..l", + ".......L....+ |..l", +@@ -465,7 +465,7 @@ + "F": "t_chainfence_h", + "f": "t_chainfence_v", + "H": "t_chaingate_c", +- "C": "t_gates_control_concrete_lab", ++ "K": "t_gates_control_concrete_lab", + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] + }, + "mapping": { +@@ -509,7 +509,7 @@ + "rows": [ + "..cccccc.|...|,,,|..|,,,", + "c........|...|,,,|.6|,,,", +- "c..Ccxc..|...|,,,g..g,,,", ++ "c..Kcxc..|...|,,,g..g,,,", + "c........g...|,,,g..g,,,", + "c........g...|,,,L..L,,,", + "......llS|...|---|..|---", +@@ -533,10 +533,10 @@ + "........................" + ], + "palettes": [ "lab_palette", "lab_loot_research" ], +- "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "C": "f_centrifuge" }, ++ "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "K": "f_centrifuge" }, + "terrain": { + ",": "t_floor_blue", +- "C": "t_floor_blue", ++ "K": "t_floor_blue", + "?": "t_floor_blue", + "/": "t_floor_blue", + "7": "t_console", +@@ -593,7 +593,7 @@ + "bb...+.......| |", + "bb...+.......| |", + "...ht|.......| |", +- "-----|..C6...+ |", ++ "-----|..K6...+ |", + "....l|.......| |", + "bb...+.......| |", + "bb...+.......| |", +@@ -606,7 +606,7 @@ + "bb...+.......| |", + "bb...+.......| |", + "...ht|.......| |", +- "-----|..Cx...? |", ++ "-----|..Kx...? |", + "...ht|.......| |", + "bb...+.......| |", + "bb...+.......| |", +@@ -615,12 +615,12 @@ + ], + "palettes": [ "lab_palette" ], + "terrain": { +- "C": "t_floor", ++ "K": "t_floor", + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], + "7": "t_floor", + "8": "t_floor" + }, +- "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "C": "f_centrifuge" }, ++ "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "K": "f_centrifuge" }, + "items": { + "b": { "item": "hospital_bed", "chance": 33 }, + "l": { "item": "surgery", "chance": 50 }, +@@ -661,7 +661,7 @@ + "fill_ter": "t_thconc_floor", + "rows": [ + ",,,,,|..|.....|.........", +- ",,,,,|7.|.....|..cxcC...", ++ ",,,,,|7.|.....|..cxcK...", + ",,,,,g..g.....g.......l.", + ",,,,,g..g.....g.......l.", + ",,,,,L..g.....|.......S.", +@@ -686,8 +686,8 @@ + "........................" + ], + "palettes": [ "lab_palette" ], +- "furniture": { "C": "f_centrifuge" }, +- "terrain": { "C": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, ++ "furniture": { "K": "f_centrifuge" }, ++ "terrain": { "K": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, + "mapping": { + "c": { "items": [ { "item": "office", "chance": 30 }, { "item": "tools_science", "chance": 15 } ] }, + "l": { "items": [ { "item": "science", "chance": 60 } ] } +@@ -746,7 +746,7 @@ + ".......L.........G......", + ".......L.........|..ddd.", + ".......L.........g..dh..", +- "-------|C........g......", ++ "-------|K........g......", + ".......L.........g......", + ".......L.........|dh....", + ".......L.........|dxd.^.", +@@ -762,7 +762,7 @@ + "P": "t_generator_broken", + "S": "t_sewage_pump", + "p": "t_sewage_pipe", +- "C": "t_gates_control_concrete_lab", ++ "K": "t_gates_control_concrete_lab", + "g": "t_wall_glass", + "G": "t_door_glass_lab_c" + }, +@@ -826,21 +826,21 @@ + "...htth..g....gWWWWWWWl|", + "...htth..g....gWWWcWWWl|", + ".........G....LWWWcWWWW|", +- ".........g....gWWWCWWWW|", ++ ".........g....gWWWKWWWW|", + "...htth..g....gWWWcWWWW|", + "...htth..g....gWWWWWWhd|", + "........^|....|rrrWWdxd|", + ".........|....|---------" + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], +- "furniture": { "^": "f_indoor_plant", "C": "f_centrifuge" }, ++ "furniture": { "^": "f_indoor_plant", "K": "f_centrifuge" }, + "terrain": { + "E": "t_elevator", + "e": "t_elevator_control_off", + "w": "t_water_sh", + "W": "t_water_dp", + "=": "t_door_lab_c", +- "C": "t_thconc_floor" ++ "K": "t_thconc_floor" + }, + "mapping": { "t": { "items": [ { "item": "vending_food_items", "chance": 20 } ] } }, + "place_loot": [ +@@ -920,20 +920,20 @@ + "TS| F +`````+ F |ST|", + "--|V F w`hth`w F V|--|", + "rr--| -w---w- |--rr|", +- "-+|s| CSC|CSC |s|+-|", +- " | C|C | x|", ++ "-+|s| KSK|KSK |s|+-|", ++ " | K|K | x|", + " t + O|O + t|", + "bb |hh f|f hh| bb|", +- "bb ]|tt C|C tt|] bb|", ++ "bb ]|tt K|K tt|] bb|", + "--------+-----+--------|", + "........................", + "........................", + "--------+-----+--------|", +- "bb ]|tt C|C tt|] bb|", ++ "bb ]|tt K|K tt|] bb|", + "bb |hh f|f hh| bb|", + " t + O|O + t|", +- " | C|C | |", +- "-+|s| CSC|CSC |s|+-|", ++ " | K|K | |", ++ "-+|s| KSK|KSK |s|+-|", + "rr--| -w---w- |--rr|", + "--|V F w`hth`w F V|--|", + "TS| F +`````+ F |ST|", +@@ -941,13 +941,13 @@ + "BB|FFFt |`````| tFFF|BB|" + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], +- "furniture": { "F": "f_sofa", "B": "f_bathtub", "C": "f_counter", "O": "f_oven", "V": "f_table" }, ++ "furniture": { "F": "f_sofa", "B": "f_bathtub", "K": "f_counter", "O": "f_oven", "V": "f_table" }, + "terrain": { "w": "t_window_domestic", "`": "t_grass", "+": "t_door_lab_c" }, + "mapping": { + "t": { "items": [ { "item": "livingroom", "chance": 20 } ] }, + "F": { "items": [ { "item": "livingroom", "chance": 5 } ] }, + "f": { "items": [ { "item": "fridge", "chance": 80 } ] }, +- "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, ++ "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, + "O": { "items": [ { "item": "oven", "chance": 70 } ] }, + "r": { + "items": [ +--- a/data/json/mapgen_palettes/fema.json ++++ b/data/json/mapgen_palettes/fema.json +@@ -26,6 +26,7 @@ + "g": "t_wall_glass", + "I": "t_column", + "i": "t_sidewalk", ++ "N": [ [ "t_region_groundcover", 10 ], [ "t_region_groundcover_barren", 3 ] ], + "P": "t_water_pump", + "s": "t_floor", + "w": [ "t_window_domestic", "t_curtains", "t_curtains" ], -- cgit v1.2.1