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

standard house palette update - bedside table #1909

Merged
merged 9 commits into from
Sep 29, 2022
Merged

standard house palette update - bedside table #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
63197f0
[CDDA PORT] adding house_34
LilShiningMan Aug 29, 2022
7c28efa
Merge branch 'upload' of https://github.com/cataclysmbnteam/Cataclysm…
LilShiningMan Sep 4, 2022
a4bd05c
Merge branch 'upload' of https://github.com/cataclysmbnteam/Cataclysm…
LilShiningMan Sep 12, 2022
c943d13
add 2storymodern03
LilShiningMan Sep 12, 2022
9ff93e7
Update 2storymodern03.json
LilShiningMan Sep 12, 2022
ea63e82
Update 2storymodern03.json
LilShiningMan Sep 18, 2022
a7daa79
Merge remote-tracking branch 'upstream/upload' into add-2storymodern03
LilShiningMan Sep 25, 2022
48cb907
standard house palette update
LilShiningMan Sep 25, 2022
5ad9dfa
Update palettes.json
LilShiningMan Sep 28, 2022
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
10 changes: 5 additions & 5 deletions data/json/mapgen/house/2storymodern03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"^^^^######### T#^",
"^^^^#D,$,,,,+ #^",
"^^^^#,,,,h,,###++#++# #^",
"^^^^#C@@,II,+d#zz#LL#<#^",
"^^^^#¤@@,II,+d#zz#LL#<#^",
"^^^^###################^",
"^^^^^^^^^^^^^^^^^^^^^^^^",
"^^^^^^^^^^^^^^^^^^^^^^^^",
Expand All @@ -46,7 +46,7 @@
"@": "t_carpet_red",
"$": "t_carpet_red",
"D": "t_carpet_red",
"C": "t_carpet_red"
"¤": "t_carpet_red"
},
"furniture": { "!": "f_counter", "$": "f_bigmirror" }
}
Expand Down Expand Up @@ -128,7 +128,7 @@
"....#d + y!#.",
"....od T bRRRR# o.",
"....#D @@ #+######+## #.",
"....##C@@C# d#v R#>o.",
"....##¤@@¤# d#v R#>o.",
".....#::::#Dd#Ph z!R#y#.",
"..........#####rr#o####.",
"..............#oo#.^....",
Expand All @@ -149,8 +149,8 @@
",": "t_floor_noroof",
"₸": "t_floor_noroof"
},
"furniture": { "!": "f_table", "₸": "f_deckchair", "C": "f_table" },
"items": { "!": { "item": "table_foyer", "chance": 50 }, "C": { "item": "nightstand", "chance": 30 } }
"furniture": { "!": "f_table", "₸": "f_deckchair" },
"items": { "!": { "item": "table_foyer", "chance": 50 } }
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -67,7 +67,8 @@
"@": "f_bed",
"Ø": "f_pinball_machine",
"Æ": "f_arcade_machine",
"ʭ": "f_ladder"
"ʭ": "f_ladder",
"¤": "f_table"
},
"terrain": {
"a": "t_thconc_floor",
Expand Down Expand Up @@ -188,6 +189,7 @@
{ "item": "harddrugs", "chance": 2 }
],
"9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] },
"¤": { "item": "nightstand", "chance": 30 },
"@": { "item": "bed", "chance": 50 },
"Z": { "item": "laundry", "chance": 100 },
"W": { "item": "laundry", "chance": 50 },
Expand Down
3 changes: 2 additions & 1 deletion data/mods/No_Hope/palettes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"≠": "f_locker",
"Ø": "f_pinball_machine",
"Æ": "f_arcade_machine",
"ʭ": "f_ladder"
"ʭ": "f_ladder",
"¤": "f_table"
},
"terrain": {
"a": "t_thconc_floor",
Expand Down