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.

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

Use parametrized carpets where appropriate #77287

Merged
merged 21 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions data/json/mapgen/art_gallery.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"|&.......-____-....P...|",
"|S.P.....-____-........|",
"|&......^|W++W|^.......|",
"|..........cc..........|",
"|..........cc........r.|",
"|.......#d.cc......Prrr|",
"|..........==..........|",
"|..........==........r.|",
"|.......#d.==......Prrr|",
"|........d...........r.|",
"|sa....................|",
"|#P......|----|........|",
Expand All @@ -32,6 +32,7 @@
"|3...|HH^|.<W<.|^HH|..3|",
"||||||||||||||||||||||||"
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
"+": "t_door_glass_c",
"-": "t_wall_glass_alarm",
Expand All @@ -41,7 +42,6 @@
"D": "t_door_c",
"W": "t_wall_glass",
"_": "t_sidewalk",
"c": "t_carpet_red",
"g": "t_region_groundcover_forest",
"u": "t_region_shrub",
"<": "t_stairs_up",
Expand Down Expand Up @@ -90,9 +90,9 @@
"|........-____-........|",
"|........-____-........|",
"|...9P..^|W++W|^..P9...|",
"|..........cc..........|",
"|..........cc..........|",
"|...9P..#d.cc.....P9...|",
"|..........==..........|",
"|..........==..........|",
"|...9P..#d.==.....P9...|",
"|........d.............|",
"|......................|",
"|........|----|........|",
Expand All @@ -107,6 +107,7 @@
"|3...|HH^|.<W<.|^HH|..3|",
"||||||||||||||||||||||||"
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
"+": "t_door_glass_c",
"-": "t_wall_glass_alarm",
Expand All @@ -116,7 +117,6 @@
"D": "t_door_c",
"W": "t_wall_glass",
"_": "t_sidewalk",
"c": "t_carpet_red",
"g": "t_region_groundcover_forest",
"u": "t_region_shrub",
"<": "t_stairs_up",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@
"````````````````````````````````````##```##`````",
"````````````````````````````````````````````````"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"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" ],
"=": "t_carpet_green",
"_": "t_pavement",
"`": "t_concrete",
"K": "t_concrete",
Expand Down Expand Up @@ -197,9 +196,8 @@
"______~~~___________________________~~~~~~~_____",
"________________________________________________"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"terrain": {
"=": "t_carpet_green",
"_": "t_open_air",
"~": "t_flat_roof",
"t": "t_linoleum_gray",
Expand Down Expand Up @@ -256,10 +254,9 @@
"````````````````````````````````````````````````",
"````````````````````````````````````````````````"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"liquids": { "Я": { "liquid": "water", "amount": [ 0, 1000 ] } },
"terrain": {
"=": "t_carpet_green",
"`": "t_open_air",
"-": "t_gutter",
"!": "t_gutter_drop",
Expand Down
18 changes: 9 additions & 9 deletions data/json/mapgen/city_blocks/urban_14_dense_house_mart_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,11 @@
"============#####o#######o#######===============",
"================================================"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"terrain": {
"=": "t_open_air",
"~": "t_carpet_yellow",
"!": "t_carpet_yellow",
"~": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"!": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"}": "t_ladder_up",
"{": "t_ladder_down",
"%": "t_metal_railing",
Expand Down Expand Up @@ -280,11 +280,11 @@
"````````````#####o#######o#######```````````````",
"````````````````````````````````````````````````"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"terrain": {
"`": "t_open_air",
"~": "t_carpet_yellow",
"!": "t_carpet_yellow",
"~": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"!": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"_": "t_flat_roof",
"/": "t_gutter_drop",
"-": "t_gutter",
Expand Down Expand Up @@ -353,11 +353,11 @@
"````````````#####o#######o#######```````````````",
"````````````````````````````````````````````````"
],
"palettes": [ "standard_domestic_palette" ],
"palettes": [ "standard_domestic_palette", "parametrized_carpets_palette" ],
"terrain": {
"`": "t_open_air",
"~": "t_carpet_yellow",
"!": "t_carpet_yellow",
"~": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"!": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"_": "t_flat_roof",
"}": "t_ladder_up",
"{": "t_ladder_down",
Expand Down
22 changes: 16 additions & 6 deletions data/json/mapgen/city_blocks/urban_25_dense_diner_apt.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,18 @@
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=$$=~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~====~~~~~~~"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_lino_kitchen" ],
"palettes": [
"standard_domestic_palette",
"standard_domestic_lino_bathroom",
"standard_domestic_lino_kitchen",
"parametrized_carpets_palette"
],
"terrain": {
"~": "t_open_air",
"=": "t_flat_roof",
"/": "t_door_metal_pickable",
"`": "t_carpet_green",
";": "t_carpet_yellow",
"`": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
";": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"%": "t_gutter_drop",
"$": "t_glass_roof",
"0": "t_grate",
Expand Down Expand Up @@ -309,13 +314,18 @@
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_lino_kitchen" ],
"palettes": [
"standard_domestic_palette",
"standard_domestic_lino_bathroom",
"standard_domestic_lino_kitchen",
"parametrized_carpets_palette"
],
"terrain": {
"~": "t_open_air",
"=": "t_flat_roof",
"/": "t_door_metal_pickable",
"`": "t_carpet_green",
";": "t_carpet_yellow",
"`": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
";": { "param": "carpet_color_type", "fallback": "t_carpet_yellow" },
"%": "t_gutter_drop",
"$": "t_glass_roof",
"0": "t_grate",
Expand Down
14 changes: 8 additions & 6 deletions data/json/mapgen/cs_sex_shop.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
"..-----------X|hLLB,s|..",
"....4ooooooooo--------.."
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
".": "t_region_groundcover_urban",
",": "t_floor",
"_": "t_carpet_green",
"t": "t_carpet_green",
"r": "t_carpet_green",
"_": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"t": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"r": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"|": "t_wall_r",
"-": "t_wall_r",
"X": "t_door_metal_pickable",
Expand Down Expand Up @@ -133,12 +134,13 @@
"..-----------X|hLLB,s|..",
"....4ooooooooo--------.."
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
".": "t_region_groundcover_urban",
",": "t_floor",
"_": "t_carpet_green",
"t": "t_carpet_green",
"r": "t_carpet_green",
"_": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"t": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"r": { "param": "carpet_color_type", "fallback": "t_carpet_green" },
"|": "t_wall_r",
"-": "t_wall_r",
"X": "t_door_metal_pickable",
Expand Down
7 changes: 4 additions & 3 deletions data/json/mapgen/daycare.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"**0*********************",
" "
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
"7": "t_region_tree_shade",
" ": "t_region_groundcover_urban",
Expand All @@ -46,9 +47,9 @@
"8": "t_chainfence",
"L": "t_sandbox",
"M": "t_monkey_bars",
",": "t_carpet_red",
"a": "t_carpet_red",
"#": "t_carpet_red",
",": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"a": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"#": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"g": "t_door_glass_c",
"_": "t_pavement",
"Á": "t_pavement",
Expand Down
13 changes: 9 additions & 4 deletions data/json/mapgen/farm_stills.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@
" Ʌ……………………………………………………? [ [ [ [ [ [ ?……………………………………………………………………………………………………………………Ʌ ",
" ɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅɅ "
],
"palettes": [ "standard_domestic_palette", "standard_domestic_lino_kitchen", "standard_domestic_lino_bathroom" ],
"palettes": [
"standard_domestic_palette",
"standard_domestic_lino_kitchen",
"standard_domestic_lino_bathroom",
"parametrized_carpets_palette"
],
"terrain": {
" ": "t_region_groundcover",
"…": [ [ "t_region_soil", 25 ], [ "t_region_groundcover", 3 ] ],
Expand All @@ -97,9 +102,9 @@
",": "t_region_soil",
"Ʌ": "t_splitrail_fence",
".": "t_floor",
";": "t_carpet_red",
"h": "t_carpet_red",
"f": "t_carpet_red",
";": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"h": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"f": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"[": "t_region_tree_fruit",
"|": "t_wall_w",
"{": "t_door_metal_locked",
Expand Down
9 changes: 5 additions & 4 deletions data/json/mapgen/gas_stations/gas_station_bunker.json
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@
"|gg|hhc...chh|gg| ||||",
"||||||||||||||||| "
],
"palettes": [ "parametrized_carpets_palette" ],
"terrain": {
" ": "t_rock",
".": "t_thconc_floor",
Expand All @@ -337,10 +338,10 @@
"c": "t_wall_glass",
"d": "t_door_glass_c",
"e": "t_door_metal_c",
"_": "t_carpet_red",
"g": "t_carpet_red",
"h": "t_carpet_red",
"i": "t_carpet_red",
"_": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"g": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"h": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"i": { "param": "carpet_color_type", "fallback": "t_carpet_red" },
"q": "t_sewage_pipe",
",": "t_linoleum_gray",
"t": "t_linoleum_gray",
Expand Down
30 changes: 15 additions & 15 deletions data/json/mapgen/golfcourse.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@
"│44444444444444444wwww44444444444444444444444444444444444444444&44__444│s;;;;;;;;;;;;;;;;;;;;;;s",
"│444__444____44444wwww44_____44444444________________________44P_vvvv44│s;;É;;;;;;;;;;;;;;;;Á;;s",
"│44vvvv__....______www__..ggg._444P_vvvv..............___ggg.ddddvvvv_4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_vvvv...........====....gGg.ddddddvvvv.................gGg.ddddvvvv_4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_vvvv...........====....ggg.ddddddvvvv.................ggg._44_vvvv_4│syyyyyy;;;;;;;;;;yyyyyys",
"│4_vvvv...........cccc....gGg.ddddddvvvv.................gGg.ddddvvvv_4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_vvvv...........cccc....ggg.ddddddvvvv.................ggg._44_vvvv_4│syyyyyy;;;;;;;;;;yyyyyys",
"│4_vvvv.........__wwww_......._4444_vvvv...................._444_...._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_...........___44www4_______44444__....___________________4444_...._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│P_dd_&444444444444www4444444444444&4____44444444444444444444444_...._4│s;;É;;;;;;;;;;;;;;;;Á;;s",
"│44dd44444444444444www44444444444444444444444444444444444444444_....._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│44dd4444444444444www4444____444___________________________4444_...._44│s;;;;;;;;;;;;;;;;;;;;;;s",
"│44dd___4444444444www444_....__.........................vvvv&44_....._4│syyyyyy;;;;;;;;;;yyyyyys",
"│44_...._44444&P44www444_.ggg...........................vvvv_44_....._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4__ggg._444____dd====ddd.gGg.............ooo...........vvvv_44_....._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_.gGg.444_vvvvdd====ddd.ggg.............oooo..........vvvv_44__...._4│s;;É;;;;;;;;;;;;;;;;Á;;s",
"│4__ggg._444____ddccccddd.gGg.............ooo...........vvvv_44_....._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_.gGg.444_vvvvddccccddd.ggg.............oooo..........vvvv_44__...._4│s;;É;;;;;;;;;;;;;;;;Á;;s",
"│4_.ggg.444_vvvv_4wwww44_...._......______oooo___________dd44444_...._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_...._444_vvvv_44www444____4______44444______4444444444ddP4444_...._4│s;;;;;;;;;;;;;;;;;;;;;;s",
"│4_...._444_vvvv_44www44444444444444444444444444444444444dd44444_...._4│syyyyyy;;;;;;;;;;yyyyyys",
Expand All @@ -42,11 +42,11 @@
"│44_...._44_...._44ww444_.gGg.__44_.ggg..........vvvv44_____444_....._4│ss|,{{,{{,{{,,,,,,{{,|ss",
"│44_...._44_...._44ww444_.ggg.__44_.gGg..........vvvv_4_..._444_....._4│ss|,{{,{{,{{,,,,,,{{,|ss",
"│4_....._44_...._44ww444_.....__44_.ggg..........vvvvdddggg_44__....._4│ss|,,,,,,,,,,,,,,,,,,|ss",
"│4_....._44_...._44www44_....._444_..............vvvvdddgGg_44__....._4│ss|,CCC,ccccccccc,,,D|ss",
"│4_....._44_...._44www44_....._4444_dd_______________P4_ggg_44__....__4│ss|,,,C,ccccccccc,,,r|ss",
"│4ooo.__44__...._44www44_....._44444dd&4444444444444444_..._444_....__4│ss|,a,C,ccccccccc,,,F|ss",
"│4oooo._44_....._44www44_....._44444ddP4444444444444444_..._444_....._4│ss|tttC,ccccccccc,,,,|ss",
"│4ooooo._4_....._444ww44_....._444__dd_444_____44444&44_..._444_....._4│ss|||||,ccccccccc,{{,|ss",
"│4_....._44_...._44www44_....._444_..............vvvvdddgGg_44__....._4│ss|,===,=========,,,D|ss",
"│4_....._44_...._44www44_....._4444_dd_______________P4_ggg_44__....__4│ss|,,,=,=========,,,r|ss",
"│4ooo.__44__...._44www44_....._44444dd&4444444444444444_..._444_....__4│ss|,a,=,=========,,,F|ss",
"│4oooo._44_....._44www44_....._44444ddP4444444444444444_..._444_....._4│ss|ttt=,=========,,,,|ss",
"│4ooooo._4_....._444ww44_....._444__dd_444_____44444&44_..._444_....._4│ss|||||,=========,{{,|ss",
"│4oooo.._4_....__444ww44_....._444_vvvv_4_.ggg_44____44_..._444_....._4│ss| +,,,,,,,,,,,{{,|ss",
"│44oo..._4_....__444ww44_....._444_vvvv_4_.gGg_4Pvvvv44_..._444__...._4│ss|T S|p,aaaa,,,,,,,p|ss",
"│44_...._44_...__444ww44_....._44_.vvvv_4_.ggg.ddvvvv44_...__44__...._4│ss|||||||||||||+||||||ss",
Expand All @@ -69,21 +69,22 @@
"│444444444444444444www__444ddP444__...._4ooo.._4_....._4_...._4444dd_________________________44│",
"│444________4444444www..444dd4444_....._4ooo.._4_....._4_...._4444dd444444444444444444444444444│",
"│44_vvvv...________www..___dd_444_....._4_o..._4_....._4_vvvv_444Pdd444444444444_____________44│",
"│44_vvvv...........===........_44__...._4__..._4_.ggg._P_vvvv_44&_dd____________..........ggg_4│",
"│44_vvvv...........===.....ggg._4__...._4_...._4_.gGg.dddvvvv_44_vvvv.....................gGg_4│",
"│44_vvvv...........ccc........_44__...._4__..._4_.ggg._P_vvvv_44&_dd____________..........ggg_4│",
"│44_vvvv...........ccc.....ggg._4__...._4_...._4_.gGg.dddvvvv_44_vvvv.....................gGg_4│",
"│44_vvvv...........ww......gGg._44_...._44_..._4_.ggg.dddvvvv_44_vvvv.....................ggg_4│",
"│44_....___________ww___...ggg_444_...._44_...._4__.__44______44_vvvv........................_4│",
"│444dd__4444444444www444______4444_...._44_...._44___44444&44444_vvvv........._____________dd44│",
"│44Pdd4&4444444444www444444444444_....._44_...._44444444444444444_____________4444444444444dd44│",
"│444dd444444______www___444444444_....._44_...._444444444444444444444444444444444_____44444ddP4│",
"│444dd4_____......www..._______44_.ggg._44_vvvv_44_____________44444_____________....._____dd_4│",
"│444_ggg..........www......vvvv_4_.gGg._44_vvvv_4_ggg........._______....................vvvv_&│",
"│444_gGg...........===.....vvvvddd.ggg._44_vvvvdddgGg.........................oo.........vvvv_4│",
"│444_ggg...........===.....vvvvddd....__44_vvvvdddggg.......__________......oooooo.......vvvv_4│",
"│444_gGg...........ccc.....vvvvddd.ggg._44_vvvvdddgGg.........................oo.........vvvv_4│",
"│444_ggg...........ccc.....vvvvddd....__44_vvvvdddggg.......__________......oooooo.......vvvv_4│",
"│444444____________www_____vvvv4P______444_____P4___________4444444444_____ooooooo_______vvvv_4│",
"│4444444444444444444ww4444444&44444444444444444444444444444444444444444444444444444444444444444│",
"││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││││"
],
"palettes": [ "parametrized_carpets_palette" ],
"vendingmachines": { "D": { "item_group": "vending_drink", "lootable": true }, "F": { "item_group": "vending_food", "lootable": true } },
"place_monster": [ { "group": "GROUP_ZOMBIE", "x": [ 72, 95 ], "y": [ 24, 47 ], "repeat": [ 0, 4 ] } ],
"terrain": {
Expand All @@ -98,15 +99,14 @@
"<": "t_stairs_up",
"G": "t_golf_hole",
"P": "t_grass_long",
"=": "t_dock",
"c": "t_dock",
"_": "t_grass_long",
".": "t_region_grass",
"o": "t_sand",
",": "t_floor",
" ": "t_linoleum_gray",
"T": "t_linoleum_gray",
"S": "t_linoleum_gray",
"c": "t_carpet_purple",
"&": "t_region_grass",
"v": "t_grass_golf",
"g": "t_grass_golf",
Expand Down
Loading
Loading