Fix the broken (#77208)

CleverRaven · Oct 21, 2024 · 63186b8 · 63186b8
1 parent cad7c4d
commit 63186b8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/data/json/mapgen/basement/basement_game.json b/data/json/mapgen/basement/basement_game.json
@@ -248,6 +248,7 @@
  " ",
  " "
  ],
+ "terrain": { "z": "t_floor" },
  "furniture": { "H": "f_home_furnace", "W": [ "f_water_heater", "f_water_heater_family" ], "z": "f_cardboard_box" },
  "liquids": { "W": { "liquid": "water_clean", "amount": [ 0, 100 ] } },
  "palettes": [ "basement_game" ],

diff --git a/data/json/mapgen/house/house37.json b/data/json/mapgen/house/house37.json
@@ -45,7 +45,6 @@
  "U": "t_thconc_floor",
  "A": "t_thconc_floor",
  "N": "t_thconc_floor",
- "y": "t_concrete",
  "_": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
  "'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
  "$": "t_screened_porch_wall",

diff --git a/data/json/mapgen/house/house_wooded.json b/data/json/mapgen/house/house_wooded.json
@@ -20,9 +20,9 @@
  ".%#@@ I| |2O1F|P #[.",
  "..o + |R o..",
  "%.#|+|||| |3457||+||+##.",
- "%.#--B|6+ |t-8#.",
- "..#StB|U+ hhh r|B-S#.",
- ".^#|||||| fff |B-Q#^",
+ "%.#~~B|6+ |t~8#.",
+ "..#StB|U+ hhh r|B~S#.",
+ ".^#|||||| fff |B~Q#^",
  ".%#Rss hhh||+||+##.",
  ".%#y s##)]#o## II o..",
  ".%#x H#```}}}#d s#[.",
@@ -33,7 +33,7 @@
  ".[.................[....",
  "....[...........[....[.."
  ],
- "palettes": [ "domestic_general_and_variant_palette" ],
+ "palettes": [ "domestic_general_and_variant_palette", "standard_domestic_lino_bathroom" ],
  "terrain": {
  "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
  "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
@@ -44,12 +44,6 @@
  "_": "t_concrete",
  "/": "t_screened_porch_wall",
  "=": "t_screen_door_c",
- "-": "t_linoleum_white",
- "Q": "t_linoleum_white",
- "8": "t_linoleum_white",
- "9": "t_linoleum_white",
- "S": "t_linoleum_white",
- "t": "t_linoleum_white",
  ")": "t_wall_glass",
  "]": "t_door_glass_c"
  },

diff --git a/data/json/mapgen/house/urban_10_house_brick_pool.json b/data/json/mapgen/house/urban_10_house_brick_pool.json
@@ -12,15 +12,15 @@
  ".........%%%..%%%......``......%%%..%%%.....`...",
  ".......###o####o###....``....###o####o###...`...",
  ".......#y y#....``....#R #...`...",
- ".......# hffh J#``````````#R HH x#...`...",
- "......%# hffh J#``````````#R H l x#%..`...",
+ ".......# hffh M#``````````#R HH x#...`...",
+ "......%# hffh M#``````````#R H l x#%..`...",
  "......%o hffh y###o#**#o### H l xo%..`...",
  "..[...%#R iiiL iii H y#%..`...",
  ".......#R ET #...`...",
- "......^#|||7_AA___||+|| ||+||||+|||||||#^..`...",
- ".......#6_|F_JJ___|U q|><|t,S|T R#%..`[..",
- "$$$ƃ$$$#6_+_______############E hr #$$$ƃ$$$",
- "$......#6_|1O523_Y#``GKG`````* rrr R#%..`..$",
+ "......^#|||7=AA===||+|| ||+||||+|||||||#^..`...",
+ ".......#6=|F=JJ===|U q|><|t~S|T R#%..`[..",
+ "$$$ƃ$$$#6=+=======############E hr #$$$ƃ$$$",
+ "$......#6=|1O523=Y#``GKG`````* rrr R#%..`..$",
  "$......######o##*##``````````##o######o##...`..$",
  "$.............%```````~~~~```````%...%%%....`..$",
  "$.............%``````~~~~~~``````%......X..``..$",
@@ -38,11 +38,10 @@
  "standard_domestic_landscaping_palette"
  ],
  "terrain": {
- ",": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
  "K": "t_concrete",
  "G": "t_concrete",
- "Y": "t_linoleum_gray",
- "A": "t_linoleum_gray",
+ "Y": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
+ "A": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
  "$": "t_privacy_fence",
  "~": "t_water_pool_outdoors",
  "ƃ": "t_privacy_fencegate_c"

diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json
@@ -2082,7 +2082,8 @@
  "%": "t_carpet_purple",
  "T": "t_carpet_purple",
  "=": "t_carpet_purple",
- "x": "t_carpet_purple"
+ "x": "t_carpet_purple",
+ "s": "t_carpet_purple"
  },
  "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
  "furniture": { "%": "f_arcade_machine", "=": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -2156,7 +2157,8 @@
  "%": "t_carpet_green",
  "T": "t_carpet_green",
  "=": "t_carpet_green",
- "x": "t_carpet_green"
+ "x": "t_carpet_green",
+ "s": "t_carpet_green"
  },
  "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
  "furniture": { "%": "f_arcade_machine", "=": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -2232,7 +2234,8 @@
  "%": "t_carpet_red",
  "T": "t_carpet_red",
  "=": "t_carpet_red",
- "x": "t_carpet_red"
+ "x": "t_carpet_red",
+ "s": "t_carpet_red"
  },
  "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
  "furniture": { "%": "f_arcade_machine", "=": "f_speaker_cabinet", "&": "f_pinball_machine" },
@@ -2307,7 +2310,8 @@
  "%": "t_carpet_red",
  "T": "t_carpet_red",
  "=": "t_carpet_red",
- "x": "t_carpet_red"
+ "x": "t_carpet_red",
+ "s": "t_carpet_red"
  },
  "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
  "furniture": { "%": "f_arcade_machine", "=": "f_speaker_cabinet", "&": "f_pinball_machine" },

diff --git a/data/json/mapgen/s_coffee.json b/data/json/mapgen/s_coffee.json
@@ -58,6 +58,7 @@
  "f": "t_linoleum_white",
  "l": "t_linoleum_white",
  "w": "t_linoleum_white",
+ "x": "t_linoleum_white",
  "+": "t_door_c",
  "3": [ "t_door_locked", "t_door_locked_alarm" ],
  "I": "t_door_locked_interior",