Merge pull request #78297 from Milopetilo/domestic-construction-variant

Add a domestic construction palette
CleverRaven · Dec 4, 2024 · 419748e · 419748e
2 parents 50c7721 + 0f9a766
commit 419748e
Show file tree

Hide file tree

Showing 49 changed files with 215 additions and 53 deletions.
diff --git a/data/json/mapgen/house/bungalow01.json b/data/json/mapgen/house/bungalow01.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette"

diff --git a/data/json/mapgen/house/bungalow02.json b/data/json/mapgen/house/bungalow02.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow03.json b/data/json/mapgen/house/bungalow03.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow04.json b/data/json/mapgen/house/bungalow04.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow05.json b/data/json/mapgen/house/bungalow05.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",
         "parametrized_carpets_palette"

diff --git a/data/json/mapgen/house/bungalow06.json b/data/json/mapgen/house/bungalow06.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow07.json b/data/json/mapgen/house/bungalow07.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",
         "parametrized_carpets_palette"

diff --git a/data/json/mapgen/house/bungalow08.json b/data/json/mapgen/house/bungalow08.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",
         "parametrized_carpets_palette"
@@ -41,7 +41,6 @@
       "terrain": {
         "`": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
         "_": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
-        "|": "t_wall",
         "?": "t_column",
         ";": "t_water_sh",
         "W": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },

diff --git a/data/json/mapgen/house/bungalow09.json b/data/json/mapgen/house/bungalow09.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow10.json b/data/json/mapgen/house/bungalow10.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",
         "parametrized_carpets_palette"

diff --git a/data/json/mapgen/house/bungalow11.json b/data/json/mapgen/house/bungalow11.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_lino_kitchen",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow12.json b/data/json/mapgen/house/bungalow12.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow14.json b/data/json/mapgen/house/bungalow14.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_lino_kitchen",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow15.json b/data/json/mapgen/house/bungalow15.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_lino_kitchen",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow16.json b/data/json/mapgen/house/bungalow16.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",
         "parametrized_carpets_palette"

diff --git a/data/json/mapgen/house/bungalow17.json b/data/json/mapgen/house/bungalow17.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_bathroom",
         "standard_domestic_lino_kitchen",
         "standard_domestic_landscaping_palette"

diff --git a/data/json/mapgen/house/bungalow18.json b/data/json/mapgen/house/bungalow18.json
@@ -5,7 +5,11 @@
     "weight": 50,
     "method": "json",
     "object": {
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_lino_bathroom",
+        "standard_domestic_landscaping_palette"
+      ],
       "fill_ter": "t_floor_waxed",
       "rows": [
         "................_______.",

diff --git a/data/json/mapgen/house/bungalow19.json b/data/json/mapgen/house/bungalow19.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow20.json b/data/json/mapgen/house/bungalow20.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/bungalow21.json b/data/json/mapgen/house/bungalow21.json
@@ -5,7 +5,11 @@
     "weight": 250,
     "method": "json",
     "object": {
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_lino_bathroom",
+        "standard_domestic_landscaping_palette"
+      ],
       "fill_ter": "t_floor",
       "rows": [
         ".[...........p._______..",

diff --git a/data/json/mapgen/house/bungalow22.json b/data/json/mapgen/house/bungalow22.json
@@ -6,7 +6,7 @@
     "method": "json",
     "object": {
       "palettes": [
-        "domestic_general_and_variant_palette",
+        "domestic_general_construction_and_variant_palette",
         "standard_domestic_lino_kitchen",
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette",

diff --git a/data/json/mapgen/house/house07.json b/data/json/mapgen/house/house07.json
@@ -32,7 +32,7 @@
         ".#################oo###.",
         "............^..........."
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "set": [ { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "chance": 40, "repeat": [ 1, 2 ] } ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 2, "y": 0 } ],
       "place_loot": [ { "group": "livingroom", "x": [ 1, 10 ], "y": [ 1, 13 ], "chance": 90, "repeat": [ 1, 5 ] } ],

diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json
@@ -33,7 +33,7 @@
         ".ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ.",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "set": [
         { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 1, 2 ] },
         { "point": "terrain", "id": "t_tree", "x": [ 2, 11 ], "y": [ 16, 21 ], "repeat": [ 2, 6 ] },

diff --git a/data/json/mapgen/house/house09.json b/data/json/mapgen/house/house09.json
@@ -33,7 +33,7 @@
         ".####oo################.",
         "...................^...."
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 17, "y": 0 } ],
       "place_monsters": [
         { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 },

diff --git a/data/json/mapgen/house/house12.json b/data/json/mapgen/house/house12.json
@@ -32,7 +32,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 5, "y": 1 } ],
       "place_loot": [ { "group": "livingroom", "x": [ 3, 7 ], "y": [ 13, 19 ], "chance": 90, "repeat": [ 1, 4 ] } ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 10 } ]

diff --git a/data/json/mapgen/house/house15.json b/data/json/mapgen/house/house15.json
@@ -32,7 +32,7 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "terrain": { "%": "t_region_shrub_fruit" },
       "furniture": { "!": "f_bluebell", "$": [ "f_treadmill", "f_treadmill_mechanical" ] },
       "place_loot": [ { "group": "livingroom", "x": [ 7, 16 ], "y": [ 7, 9 ], "chance": 90, "repeat": [ 1, 6 ] } ],

diff --git a/data/json/mapgen/house/house16.json b/data/json/mapgen/house/house16.json
@@ -32,7 +32,7 @@
         "..u...-------------.....",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 8, "y": 1 } ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 5 } ]
     }

diff --git a/data/json/mapgen/house/house17.json b/data/json/mapgen/house/house17.json
@@ -32,7 +32,7 @@
         "..........#####...##o##.",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_landscaping_palette" ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 7, "y": 1 } ],
       "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 6 } ]
     }

diff --git a/data/json/mapgen/house/house18.json b/data/json/mapgen/house/house18.json
@@ -32,7 +32,7 @@
         ".#d@@s +Dz|g|zD+ III #..",
         ".##oo######*######oo##.."
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [ "domestic_general_construction_and_variant_palette", "standard_domestic_lino_bathroom" ],
       "terrain": { "p": "t_sidewalk", "X": "t_sidewalk" },
       "place_loot": [ { "item": "television", "x": 4, "y": 2, "chance": 70 }, { "item": "television", "x": 15, "y": 7, "chance": 70 } ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 5, "y": 0 } ],

diff --git a/data/json/mapgen/house/house20.json b/data/json/mapgen/house/house20.json
@@ -33,7 +33,11 @@
         "..[.........[...........",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "terrain": {
         "K": "t_concrete",
         "G": "t_concrete",

diff --git a/data/json/mapgen/house/house22.json b/data/json/mapgen/house/house22.json
@@ -79,7 +79,11 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "terrain": { "b": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" } },
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 5, "y": 1 } ]
     }

diff --git a/data/json/mapgen/house/house26.json b/data/json/mapgen/house/house26.json
@@ -33,7 +33,11 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 12, "y": 0 } ]
     }
   },

diff --git a/data/json/mapgen/house/house27.json b/data/json/mapgen/house/house27.json
@@ -33,7 +33,11 @@
         "........................",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 7, "y": 1 } ]
     }
   },

diff --git a/data/json/mapgen/house/house28.json b/data/json/mapgen/house/house28.json
@@ -33,7 +33,11 @@
         "Ŧ.[............[.......Ŧ",
         "ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 15, "y": 1 } ]
     }
   },

diff --git a/data/json/mapgen/house/house29.json b/data/json/mapgen/house/house29.json
@@ -33,7 +33,11 @@
         "Ŧ......................Ŧ",
         "ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 8, "y": 1 } ]
     }
   },

diff --git a/data/json/mapgen/house/house30.json b/data/json/mapgen/house/house30.json
@@ -33,7 +33,11 @@
         "...u....``````.....X....",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 6, "y": 1 } ]
     }
   },

diff --git a/data/json/mapgen/house/house31.json b/data/json/mapgen/house/house31.json
@@ -33,7 +33,11 @@
         ".....[......[...........",
         "...................%...."
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_landscaping_palette", "standard_domestic_lino_bathroom" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_landscaping_palette",
+        "standard_domestic_lino_bathroom"
+      ],
       "terrain": {
         "-": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
         "=": "t_door_metal_locked",

diff --git a/data/json/mapgen/house/house32.json b/data/json/mapgen/house/house32.json
@@ -32,7 +32,11 @@
         "......[.......[.........",
         "........................"
       ],
-      "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
+      "palettes": [
+        "domestic_general_construction_and_variant_palette",
+        "standard_domestic_lino_bathroom",
+        "standard_domestic_landscaping_palette"
+      ],
       "terrain": {
         "'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
         "=": "t_door_metal_locked",