Make the carpet not fallback

CleverRaven · Oct 21, 2024 · 7591f02 · 7591f02
1 parent 4cb12c5
commit 7591f02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json
@@ -694,8 +694,9 @@
         "|HWX XCA|",
         "|||||||||"
       ],
-      "palette": [ "standard_domestic_palette" ],
       "terrain": {
+        "|": "t_wall_w",
+        "+": "t_door_c",
         " ": "t_linoleum_gray",
         "C": "t_linoleum_gray",
         "X": "t_linoleum_gray",
@@ -762,7 +763,8 @@
         "?": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "x": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "%": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
-        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" }
+        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
+        "T": "t_floor"
       },
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "furniture": { "%": "f_arcade_machine", "?": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -836,7 +838,8 @@
         "?": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "x": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "%": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
-        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" }
+        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
+        "T": "t_floor"
       },
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "furniture": { "%": "f_arcade_machine", "?": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -911,7 +914,8 @@
         "?": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "x": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "%": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
-        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" }
+        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
+        "T": "t_floor"
       },
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "furniture": { "%": "f_arcade_machine", "?": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -985,7 +989,8 @@
         "?": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "x": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
         "%": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
-        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" }
+        "&": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
+        "T": "t_floor"
       },
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
       "furniture": { "%": "f_arcade_machine", "?": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -2235,7 +2240,7 @@
         "|x==lH|",
         "+====?|",
         "|=h===|",
-        "|Trr %|",
+        "|Trr=%|",
         "|||||||"
       ],
       "palettes": [ "standard_domestic_palette", "standard_domestic_carpet_palette" ],

diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
@@ -350,6 +350,7 @@
     "parameters": {
       "carpet_color_type": {
         "type": "ter_str_id",
+        "scope": "nest",
         "default": {
           "distribution": [ [ "t_carpet_red", 1 ], [ "t_carpet_green", 1 ], [ "t_carpet_purple", 1 ], [ "t_carpet_yellow", 1 ] ]
         }