Merge pull request #57618 from dseguin/fix_house08_mapgen

Fix house_08 mapgen errors
CleverRaven · May 11, 2022 · c1e2b3c · c1e2b3c
2 parents 9b1541e + 9745166
commit c1e2b3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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" }
   }
 ]