Skip to content

Commit

Permalink
Merge pull request #36097 from ymber/floor
Browse files Browse the repository at this point in the history
Fix flower tiles in clothing stores
  • Loading branch information
ZhilkinSerg authored Dec 14, 2019
2 parents d2cb78a + 3da5b27 commit eea9fee
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions data/json/mapgen_palettes/clothes_store_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "palette",
"id": "clothes_store_palette",
"terrain": { "%": "t_console_broken" },
"terrain": { "%": "t_console_broken", "p": [ [ "t_grass", 10 ], [ "t_dirt", 2 ] ] },
"furniture": {
"c": "f_counter",
"C": "f_armchair",
Expand Down Expand Up @@ -58,7 +58,13 @@
{
"type": "palette",
"id": "tailor_palette",
"terrain": { "%": "t_console_broken", ";": "t_door_locked", "0": "t_window_alarm", "z": "t_shrub" },
"terrain": {
"%": "t_console_broken",
";": "t_door_locked",
"0": "t_window_alarm",
"z": "t_shrub",
"p": [ [ "t_grass", 10 ], [ "t_dirt", 2 ] ]
},
"furniture": {
"c": "f_counter",
"R": "f_clothing_rail",
Expand Down Expand Up @@ -92,7 +98,14 @@
{
"type": "palette",
"id": "furs_palette",
"terrain": { "%": "t_console_broken", ";": "t_door_locked", "i": "t_door_locked_interior", "0": "t_window_alarm", "z": "t_shrub" },
"terrain": {
"%": "t_console_broken",
";": "t_door_locked",
"i": "t_door_locked_interior",
"0": "t_window_alarm",
"z": "t_shrub",
"p": [ [ "t_grass", 10 ], [ "t_dirt", 2 ] ]
},
"furniture": {
"c": "f_displaycase",
"s": "f_stool",
Expand Down

0 comments on commit eea9fee

Please sign in to comment.