Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix house_08 mapgen errors #57618

Merged
merged 1 commit into from
May 11, 2022
Merged

Fix house_08 mapgen errors #57618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions data/json/mapgen/house/house08.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
7 changes: 7 additions & 0 deletions data/json/mapgen_palettes/house_general_palette.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
}
]