Skip to content

Commit

Permalink
fix: pizza parlor (#4035)
Browse files Browse the repository at this point in the history 
* Fix pizza parlor

* Create pizza_parlor_nested.json

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@0Monet @autofix-ci
0Monet and autofix-ci[bot] authored Dec 31, 2023
1 parent 578117a commit 22d0717
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 63 deletions.
40 changes: 40 additions & 0 deletions data/json/mapgen/nested/pizza_parlor_nested.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "pizza_parlor_kitchen_a",
"object": {
"mapgensize": [ 6, 6 ],
"rotation": [ 0, 3 ],
"rows": [
"F L ",
"F c",
"Z ",
"c c",
"c {",
"O {"
],
"terrain": { " ": "t_null" },
"furniture": { "{": "f_rack", "c": "f_counter", "F": "f_fridge", "L": "f_locker", "Z": "f_freezer", "O": "f_woodstove" }
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "pizza_parlor_kitchen_b",
"object": {
"mapgensize": [ 6, 6 ],
"rotation": [ 0, 3 ],
"rows": [
"O {",
"c {",
"c c",
" c",
" c",
"ccfccc"
],
"terrain": { " ": "t_null" },
"furniture": { "{": "f_rack", "c": "f_counter", "O": "f_woodstove", "f": "f_counter_gate_c" }
}
}
]
101 changes: 38 additions & 63 deletions data/json/mapgen/pizza_parlor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,82 +9,68 @@
"fill_ter": "t_floor",
"rows": [
"-||||||||||||||- Y",
"-FwlwL-P#######-4 ",
"-Flwlw#..U.U.U.g ",
"-Zwlwl@........g ",
"-#lwlw#........g ",
"-#wlwl{........g ",
"-Olwlw{........g ",
"-Owlwl{........g ",
"-#lwlw{........G ",
"-#wlwl#........g ",
"-wlwlw#....BB..g ",
"-lwlwl#....TT..g ",
"-##f###....BB..- Y",
"-lwlwl-Pccccccc-4 ",
"-wlwlwl..U.U.U.g ",
"-lwlwl@........g ",
"-wlwlwl........g ",
"-lwlwlw........g ",
"-wlwlwl........g ",
"-lwlwlw........g ",
"-wlwlwl........G ",
"-lwlwlw........g ",
"-wlwlwl....BB..g ",
"-lwlwlw....TT..g ",
"-wlwlwl....BB..- Y",
"-.............P-r rrrrrR",
"-..............-cccccccR",
"-C.....BB..BB..gccccBccR",
"-C.....TT..TT..gcccBTBcR",
"---....BB..BB..gccccBccR",
"-<+............gcccccccR",
"---+-..........GccccBccR",
"-sll-..BB..BB..gcccBTBcR",
"-lll-..TT..TT..gccccBccR",
"-tll-..BB..BB.PgcccccccR",
"-..............-,,,,,,,R",
"-C.....BB..BB..g,,,,b,,R",
"-C.....TT..TT..g,,,b#b,R",
"---....BB..BB..g,,,,b,,R",
"-<+............g,,,,,,,R",
"---+-..........G,,,,b,,R",
"-sll-..BB..BB..g,,,b#b,R",
"-lll-..TT..TT..g,,,,b,,R",
"-tll-..BB..BB.Pg,,,,,,,R",
"-||||||||||||||-r rrrrrR"
],
"set": [
{ "line": "terrain", "id": "t_concrete", "x": 20, "x2": 20, "y": 15, "y2": 17 },
{ "point": "terrain", "id": "t_concrete", "x": 21, "y": 16 },
{ "point": "terrain", "id": "t_concrete", "x": 19, "y": 16 },
{ "line": "terrain", "id": "t_concrete", "x": 20, "x2": 20, "y": 19, "y2": 21 },
{ "point": "terrain", "id": "t_concrete", "x": 21, "y": 20 },
{ "point": "terrain", "id": "t_concrete", "x": 19, "y": 20 }
],
"terrain": {
"@": "t_console_broken",
"l": "t_linoleum_gray",
"w": "t_linoleum_white",
",": "t_concrete",
" ": "t_sidewalk",
"#": "t_linoleum_white",
"+": "t_door_c",
"-": "t_wall_r",
".": "t_floor",
"@": "t_console_broken",
"F": "t_linoleum_white",
"G": "t_door_glass_c",
"L": "t_linoleum_white",
"O": "t_linoleum_white",
"Z": "t_linoleum_gray",
"R": "t_railing_v",
"c": "t_concrete",
"f": "t_linoleum_white",
"g": "t_wall_glass",
"l": "t_linoleum_gray",
"r": "t_railing_h",
"s": "t_linoleum_gray",
"t": "t_linoleum_gray",
"w": "t_linoleum_white",
"{": "t_linoleum_white",
"4": "t_gutter_downspout",
"<": "t_ladder_up",
"|": "t_wall_r"
},
"furniture": {
"#": "f_counter",
"c": "f_counter",
"B": "f_bench",
"C": "f_trashcan",
"Z": "f_freezer",
"f": "f_counter_gate_c",
"F": "f_fridge",
"H": "f_chair",
"L": "f_locker",
"O": "f_woodstove",
"P": "f_indoor_plant",
"T": "f_table",
"U": "f_chair",
"s": "f_sink",
"{": "f_rack"
"s": "f_sink"
},
"mapping": {
"Y": { "terrain": "t_sidewalk", "furniture": "f_street_light" },
"#": { "terrain": "t_concrete", "furniture": "f_table" },
"b": { "terrain": "t_concrete", "furniture": "f_bench" }
},
"mapping": { "Y": { "terrain": "t_sidewalk", "furniture": "f_street_light" } },
"toilets": { "t": { } },
"place_nested": [
{ "chunks": [ "pizza_parlor_kitchen_a" ], "x": 1, "y": 1 },
{ "chunks": [ "pizza_parlor_kitchen_b" ], "x": 1, "y": 7 }
],
"place_items": [
{ "item": "pizza_display", "x": 6, "y": [ 5, 8 ], "chance": 65, "repeat": [ 3, 4 ] },
{ "item": "pizza_kitchen", "x": 1, "y": [ 4, 5 ], "chance": 80, "repeat": [ 7, 10 ] },
Expand Down Expand Up @@ -114,7 +100,6 @@
"type": "mapgen",
"method": "json",
"om_terrain": "s_pizza_parlor_roof",
"weight": 200,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
Expand Down Expand Up @@ -143,17 +128,8 @@
"|.=............3 ",
"---------------- "
],
"terrain": {
".": "t_flat_roof",
" ": "t_open_air",
"2": "t_gutter_north",
"-": "t_gutter_south",
"3": "t_gutter_east",
"|": "t_gutter_west",
">": "t_ladder_down",
"5": "t_gutter_drop"
},
"furniture": { "&": "f_roof_turbine_vent", "=": "f_vent_pipe", "A": "f_air_conditioner" },
"palettes": [ "roof_palette" ],
"terrain": { ">": "t_ladder_down" },
"place_items": [ { "item": "roof_trash", "x": [ 4, 13 ], "y": [ 3, 20 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"place_nested": [
{
Expand Down Expand Up @@ -287,7 +263,6 @@
"type": "mapgen",
"method": "json",
"om_terrain": "s_pizza_parlor_roof_1",
"weight": 200,
"object": {
"fill_ter": "t_tar_flat_roof",
"rows": [
Expand Down

0 comments on commit 22d0717

Please sign in to comment.