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

Parametrize all walls: Part 1 #77459

Merged
merged 8 commits into from
Nov 2, 2024
Merged

Parametrize all walls: Part 1 #77459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
90276ca
Palette nesting
Milopetilo Oct 25, 2024
6082e0d
Names a-b
Milopetilo Oct 25, 2024
1a5d624
c-f
Milopetilo Oct 26, 2024
d6d1e9e
g names
Milopetilo Oct 30, 2024
a0cfad0
Merge remote-tracking branch 'upstream/master' into walls
Milopetilo Oct 30, 2024
c4aa06a
Small fix
Milopetilo Oct 30, 2024
5d01627
Merge remote-tracking branch 'upstream/master' into walls
Milopetilo Oct 31, 2024
3693bde
fix
Milopetilo Oct 31, 2024
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
26 changes: 13 additions & 13 deletions data/json/mapgen/Glassblower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,29 @@
"________ss4 2 ",
"________ss4 2 5 4 ",
"_______ss5 52 445 ",
"_______s%%--%rr%--%-%% ",
"_______s%...........E% ",
"_______sG.n.n.n.n.P%%%5 ",
"______s5w.n.n.n.n.B%S% ",
"______ss=.n.n.n.n..=.%55",
"______s5w.........R%t%1 ",
"______s4GEEcccc...P%v%4 ",
"______s %....T....E% 4 5",
"______s4%BBB....PEE%6 ",
"______s4%%%%%=%%xx%% 4 ",
"_______s##--#rr#--#-## ",
"_______s#...........E# ",
"_______sG.n.n.n.n.P###5 ",
"______s5w.n.n.n.n.B#S# ",
"______ss=.n.n.n.n..=.#55",
"______s5w.........R#t#1 ",
"______s4GEEcccc...P#v#4 ",
"______s #....T....E# 4 5",
"______s4#BBB....PEE#6 ",
"______s4#####=##xx## 4 ",
"______s 5 551 11 55 1 5",
"_____s42 41 1 4 2 5 ",
"_____s4||||||=|||x|| 4 ",
"_____s4|L??%'''qNmY| ",
"_____s4|L??|'''qNmY| ",
"_____ss='''='''''#'| 2 ",
"______ |fLm%''qqq''|6 ",
"______ |fLm|''qqq''|6 ",
"______4|||v|Q'''''m| 2 ",
"______ 2 5|Q'Qqq'Q| 54 ",
"_______ u H|<'Q''qQ|2 ",
"________ H||r|G|w||1 4 ",
"______UU5 5 5 "
],
"palettes": [ "parametrized_walls_palette" ],
"terrain": {
" ": "t_region_groundcover_urban",
"H": "t_region_groundcover_urban",
Expand All @@ -44,7 +45,6 @@
"s": "t_sidewalk",
"-": "t_wall_glass",
"|": "t_rock_wall",
"%": "t_wall_wood",
"+": "t_door_glass_c",
"=": "t_door_c",
"G": "t_window_stained_green",
Expand Down
137 changes: 68 additions & 69 deletions data/json/mapgen/abandoned_shopping_plaza.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
{
"type": "palette",
"id": "shoppingplaza",
"palettes": [ "parametrized_walls_palette" ],
"terrain": {
"^": "t_gutter_downspout",
" ": "t_floor",
"+": "t_door_locked",
"-": "t_wall_h",
".": "t_pavement",
"1": "t_window_boarded",
"2": "t_chainfence_h",
Expand All @@ -25,8 +25,7 @@
"H": "t_floor",
"I": "t_floor",
"r": "t_pavement",
"y": "t_pavement_y",
"|": "t_wall_v"
"y": "t_pavement_y"
},
"furniture": {
"A": "f_rack",
Expand Down Expand Up @@ -76,26 +75,26 @@
"7yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy",
"455555555555555555555555555555555555555555555555555555555555555555555555",
"455555555555555555555555555555555555555555555555555555555555555555555555",
"|-111111---++---111111-||-111111--5555--111111-||-111111---++---111111-|",
"| 1 1 || |-++-| || 1 1 |",
"| 1 1 || || 1 1 |",
"| --++-- || || --++-- |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| || || |",
"| |----| |----| |----",
"| + | + | + ",
"| | + | + | ",
"| |---|| |---|| |---|",
"| + || + || + |",
"|-------------------+--||-------------------+--||-------------------+--|",
"##111111###++###111111####111111##5555##111111####111111###++###111111##",
"# 1 1 ## ##++## ## 1 1 #",
"# 1 1 ## ## 1 1 #",
"# ##++## ## ## ##++## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ## ## #",
"# ###### ###### #####",
"# + # + # + ",
"# # + # + # ",
"# ###### ###### #####",
"# + ## + ## + #",
"####################+#######################+#######################+###",
"4r^rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr",
"888888888888888888888888888888888888888888888888888888888888888888888888"
],
Expand All @@ -112,52 +111,52 @@
"weight": 500,
"object": {
"rows": [
"22222222222222222222222222222222222222222222222244|-----------------|rrr",
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.........yyyyyy55| |^rr",
"y...y...y...y...y...y...y...y...y..............y551 |-+|",
"y...y...y...y...y...y...y...y...y..............y551 | |",
"y...y...y...y...y...y...y...y...y..............y551 | |",
"y...y...y...y...y...y...y...y...y.........yyyyyy551 |+-|",
"y...y...y...y...y...y...y...y...y..............y551 |",
"...............................................y551 |",
"...............................................y551 |",
"..........................................yyyyyy551 |",
"...............................................y55| |",
"...............................................y55-1- |",
"...............................................y5555+ |",
"..........................................yyyyyy5555+ |",
"...............................................y55-1- |",
"...............................................y55| |",
"...............................................y551 |",
"..........................................yyyyyy551 |",
"y...y...y...y...y...y...y...y...y..............y551 |",
"y...y...y...y...y...y...y...y...y..............y551 |",
"y...y...y...y...y...y...y...y...y..........55555551 |",
"y...y...y...y...y...y...y...y...y..........55555551 |",
"y...y...y...y...y...y...y...y...y..............y55| |",
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy55|---------------------",
"55555555555555555555555555555555555555555555555555+ A|",
"55555555555555555555555555555555555555555555555555+ A A A A A|",
"|-111111---++---111111-||-111111--5555--111111-|--| A A A A A|",
"| 1 1 || |-++-| |A A A A A A|",
"| 1 1 || |A FHF A A A A A|",
"| --++-- || |A F A A A A A|",
"| || |A A|",
"| || |A A|",
"| || |A A A A A A A A|",
"| || |A A A A A A A A|",
"| || |A A A A A A A A|",
"| || |A A A A A A A A|",
"| || |A A A A A A A A|",
"| || |A A|",
"| || |A A|",
"| || |A A A A A A A A|",
"| |----| |----| A A A A A A A|",
"| + | + | A A A A A A A|",
"+ | + | + A A A A A A A|",
"| |---|| |---|| A A A A A A A|",
"| + || + |A A|",
"|-------------------+--||-------------------+--||-------------------+--|",
"22222222222222222222222222222222222222222222222244###################rrr",
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.........yyyyyy55# #^rr",
"y...y...y...y...y...y...y...y...y..............y551 ##+#",
"y...y...y...y...y...y...y...y...y..............y551 # #",
"y...y...y...y...y...y...y...y...y..............y551 # #",
"y...y...y...y...y...y...y...y...y.........yyyyyy551 #+##",
"y...y...y...y...y...y...y...y...y..............y551 #",
"...............................................y551 #",
"...............................................y551 #",
"..........................................yyyyyy551 #",
"...............................................y55# #",
"...............................................y55#1# #",
"...............................................y5555+ #",
"..........................................yyyyyy5555+ #",
"...............................................y55#1# #",
"...............................................y55# #",
"...............................................y551 #",
"..........................................yyyyyy551 #",
"y...y...y...y...y...y...y...y...y..............y551 #",
"y...y...y...y...y...y...y...y...y..............y551 #",
"y...y...y...y...y...y...y...y...y..........55555551 #",
"y...y...y...y...y...y...y...y...y..........55555551 #",
"y...y...y...y...y...y...y...y...y..............y55# #",
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy55######################",
"55555555555555555555555555555555555555555555555555+ A#",
"55555555555555555555555555555555555555555555555555+ A A A A A#",
"##111111###++###111111####111111##5555##111111##### A A A A A#",
"# 1 1 ## ##++## #A A A A A A#",
"# 1 1 ## #A FHF A A A A A#",
"# ##++## ## #A F A A A A A#",
"# ## #A A#",
"# ## #A A#",
"# ## #A A A A A A A A#",
"# ## #A A A A A A A A#",
"# ## #A A A A A A A A#",
"# ## #A A A A A A A A#",
"# ## #A A A A A A A A#",
"# ## #A A#",
"# ## #A A#",
"# ## #A A A A A A A A#",
"# ###### ###### A A A A A A A#",
"# + # + # A A A A A A A#",
"+ # + # + A A A A A A A#",
"# ###### ###### A A A A A A A#",
"# + ## + #A A#",
"####################+#######################+#######################+###",
"rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr^r4",
"888888888888888888888888888888888888888888888888888888888888888888888888"
],
Expand Down
121 changes: 52 additions & 69 deletions data/json/mapgen/abstorefront.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,8 @@
{
"type": "palette",
"id": "abstorefront_palette",
"palettes": [ "parametrized_walls_palette" ],
"parameters": {
"wall_type": {
"type": "ter_str_id",
"default": {
"distribution": [
[ "t_wall_b", 1 ],
[ "t_wall_g", 1 ],
[ "t_wall_p", 1 ],
[ "t_wall_P", 1 ],
[ "t_wall_r", 1 ],
[ "t_wall_w", 6 ],
[ "t_wall_y", 1 ],
[ "t_brick_wall", 2 ],
[ "t_wall_wood", 1 ],
[ "t_adobe_brick_wall", 1 ]
]
}
},
"window_type": {
"type": "ter_str_id",
"default": {
Expand Down Expand Up @@ -53,7 +37,6 @@
"x": { "param": "window_type", "fallback": "t_window_boarded" },
"4": "t_gutter_downspout",
"<": "t_stairs_up",
"|": { "param": "wall_type", "fallback": "t_wall_w" },
"_": "t_pavement",
"~": "t_pavement_y",
"F": "t_chainfence",
Expand All @@ -76,7 +59,7 @@
"O": { "item": "methchef", "chance": 50 }
},
"vehicles": { ".": { "vehicle": "shopping_cart", "chance": 1 } },
"nested": { "|": { "chunks": [ [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] } },
"nested": { "#": { "chunks": [ [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 75 ] ] } },
"toilets": { "T": { } }
},
{
Expand All @@ -87,21 +70,21 @@
"fill_ter": "t_floor",
"rows": [
" ssss ",
" |||xxxxx||DD||xxxxx||| ",
" |B..................B| ",
" |B...c........B..B..B| ",
" |B...c........B..B..B| ",
" |B...c........B..B..B| ",
" ||cccc........B..B..B| ",
" |.............B..B..B| ",
" |.............B..B..B| ",
" |..BBB...BBB..B..B..B| ",
" |..B|B...B|B..B..B..B| ",
" |..BBB...BBB........B| ",
" |.............|||||+|| ",
" |.............|T.+..b| ",
" |BBBBBBBBBBBBB|S.|<.l| ",
" |||||||||||||||||||D|| ",
" ###xxxxx##DD##xxxxx### ",
" #B..................B# ",
" #B...c........B..B..B# ",
" #B...c........B..B..B# ",
" #B...c........B..B..B# ",
" ##cccc........B..B..B# ",
" #.............B..B..B# ",
" #.............B..B..B# ",
" #..BBB...BBB..B..B..B# ",
" #..B#B...B#B..B..B..B# ",
" #..BBB...BBB........B# ",
" #.............|||||+|# ",
" #.............|T.+..b# ",
" #BBBBBBBBBBBBB|S.|<.l# ",
" ###################D## ",
" 4 FRRsssF ",
" FRRsssF ",
" FRRsssF ",
Expand Down Expand Up @@ -167,19 +150,19 @@
"rows": [
"____ssssssssssssssssssss",
"____ssssssssssssssssssss",
"____~~~~ssssss||xx||xx||",
"________ssssss|B......B|",
"________ssssss|B..BB..B|",
"________ssssss|B..BB..B|",
"____~~~~|||D|||B..BB..B|",
"________|B........BB..B|",
"________|B............B|",
"________|B..ccc||+||||||",
"____~~~~|B..c..|l.l|T.S|",
"________|B..c..|b.b||+||",
"________|B..c..+.......|",
"________|B..|BB|...BBBB|",
"____~~~~|||||||||D||||||",
"____~~~~ssssss##xx##xx##",
"________ssssss#B......B#",
"________ssssss#B..BB..B#",
"________ssssss#B..BB..B#",
"____~~~~###D###B..BB..B#",
"________#B........BB..B#",
"________#B............B#",
"________#B..ccc##+######",
"____~~~~#B..c..#l.l#T.S#",
"________#B..c..#b.b##+##",
"________#B..c..+.......#",
"________#B..#BB#...BBBB#",
"____~~~~#########D######",
"sssssssssssFss<sssRRRF4 ",
"sssssssssssGssssssRRRF ",
" FFFFFFFFFFF ",
Expand Down Expand Up @@ -251,28 +234,28 @@
"fill_ter": "t_floor",
"rows": [
" ssss ",
" |||xxxxx||DD||xxxxx||| ",
" |B..................B| ",
" |B...c..........c...B| ",
" |B...c..........c...B| ",
" ||cccc..........cccc|| ",
" |....................| ",
" |....................| ",
" |B...BB...cc...BB...B| ",
" |B...BB...Oc...BB...B| ",
" |B...BB...Oc...BB...B| ",
" |B...BB...Oc...BB...B| ",
" |B...BB...cc...BB...B| ",
" |B..................B| ",
" |B...BB...BB...BB...B| ",
" |B...BB...BB...BB...B| ",
" |B...BB...BB...BB...B| ",
" |B...BB...BB...||||||| ",
" |B...BB...BB...|blBBB| ",
" |..............+.....Ds",
" |..............|.||+||R",
" |BBBBBBBBBBBBBB|<|S.T|R",
" |||||||||||||||||||||| ",
" ###xxxxx##DD##xxxxx### ",
" #B..................B# ",
" #B...c..........c...B# ",
" #B...c..........c...B# ",
" ##cccc..........cccc## ",
" #....................# ",
" #....................# ",
" #B...BB...cc...BB...B# ",
" #B...BB...Oc...BB...B# ",
" #B...BB...Oc...BB...B# ",
" #B...BB...Oc...BB...B# ",
" #B...BB...cc...BB...B# ",
" #B..................B# ",
" #B...BB...BB...BB...B# ",
" #B...BB...BB...BB...B# ",
" #B...BB...BB...BB...B# ",
" #B...BB...BB...####### ",
" #B...BB...BB...#blBBB# ",
" #..............+.....Ds",
" #..............#.##+##R",
" #BBBBBBBBBBBBBB#<#S.T#R",
" ###################### ",
" 4 "
],
"palettes": [ "abstorefront_palette" ],
Expand Down
Loading
Loading