From 9745166fc66a19afd02327c95be42a457d616462 Mon Sep 17 00:00:00 2001 From: David Seguin Date: Tue, 10 May 2022 19:22:24 -0400 Subject: [PATCH] Use palettes for missing terrain symbol definitions --- data/json/mapgen/house/house08.json | 7 ++++--- data/json/mapgen_palettes/house_general_palette.json | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json index f57fa5ad93f73..ea456cecd2bbe 100644 --- a/data/json/mapgen/house/house08.json +++ b/data/json/mapgen/house/house08.json @@ -97,9 +97,10 @@ ".ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ.", "........................" ], - "palettes": [ "standard_domestic_palette" ], - "terrain": { "?": "t_grass", "!": "t_grass", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, - "furniture": { "?": "f_chair", "!": "f_table" }, + "palettes": [ + { "distribution": [ [ "standard_domestic_palette", 10 ], [ "standard_domestic_palette_abandoned", 2 ] ] }, + "standard_domestic_party_palette" + ], "place_fields": [ { "field": "fd_blood", "x": [ 9, 11 ], "y": [ 12, 14 ], "repeat": [ 4, 6 ] } ], "place_loot": [ { "group": "livingroom", "x": [ 9, 21 ], "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 4 ] }, diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index cc1e092ec6e73..de7247428546f 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -333,5 +333,12 @@ "`": "t_concrete" }, "furniture": { "!": "f_region_flower" } + }, + { + "type": "palette", + "id": "standard_domestic_party_palette", + "//": "Intended to be used in conjunction with standard_domestic_palette. Load the domestic palette first, then this one to use open symbols for house party decorations.", + "terrain": { "?": "t_grass", "!": "t_grass", "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ] }, + "furniture": { "?": "f_chair", "!": "f_table" } } ]