Skip to content

Commit

Permalink
Merge pull request #57557 from LovamKicsiGazsii/cash-register-6
Browse files Browse the repository at this point in the history 
Store Update 5
  • Loading branch information
@dseguin
dseguin authored May 10, 2022
2 parents 2256705 + 5721b8e commit 12c0750
Show file tree
Hide file tree
Showing 10 changed files with 597 additions and 566 deletions.
182 changes: 98 additions & 84 deletions data/json/mapgen/s_bookstore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,39 @@
"object": {
"fill_ter": "t_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~",
"*|----OOO-::--OO--OO--|*",
"*|s.l#.Thf..#ccccccccc|*",
"*|e..%................|*",
"*|#..#.hT...##%#%#%#--|*",
"*|...%..............:.:*",
"*|.###.Th...........:.:*",
"*|..................--|*",
"*|.h..h...TT.TT..]]..]|*",
"*|.T..T..........]]..]|*",
"*|.h..h...TT.TT..]]..]|*",
"*|f..............]]..]|*",
"*|...............]]..]|*",
"*|]..]]..]]..]]].....]|*",
"*|]..]]..]]........|--|*",
"*|]..]]..]]........+..|*",
"*|]..........]]]]]]|st|*",
"*|------+----------|--|*",
"***4|C.......f|bb.L|****",
"^***|CC.......+...L|*^**",
"****|CCC...CC<|-----****",
"**^*|----O----|*****^***",
"************************"
" ~~ ~",
" ~~ ~",
" |----OOO-::--OO--OO--|~",
" |s.l#.Thf..#ccccccccc|~",
" |e..%................|~",
" |#..#.hT...##%#%#%#--|~",
" |...%..............:.:~",
" |.###.Th...........:.:~",
" |..................--| ",
" |.h..h...TT.TT..]]..]| ",
" |.T..T..........]]..]| ",
" |.h..h...TT.TT..]]..]| ",
" |f..............]]..]| ",
" |...............]]..]| ",
" |]..]]..]]..]]].....]| ",
" |]..]]..]]........|--| ",
" |]..]]..]]........+''| ",
" |]..........]]]]]]|St| ",
" |------+----------|--| ",
" 4|C.......f|bb.L| ",
"^ |CC.......+...L| ^ ",
" |CCC...CC<|----- ",
" ^ |----O----| ^ ",
" "
],
"terrain": {
"*": "t_region_groundcover_urban",
" ": "t_region_groundcover_urban",
"^": "t_region_tree_nut",
"+": "t_door_c",
"-": "t_wall_w",
"'": "t_linoleum_white",
"t": "t_linoleum_white",
"S": "t_linoleum_white",
":": "t_door_glass_c",
"O": "t_window",
"|": "t_wall_w",
Expand All @@ -45,7 +48,7 @@
"~": "t_sidewalk"
},
"furniture": {
"%": "f_console_broken",
"%": "f_counter",
"#": "f_counter",
"T": "f_table",
"]": "f_rack",
Expand All @@ -56,8 +59,9 @@
"l": "f_stool",
"b": "f_bench",
"L": "f_locker",
"C": "f_crate_c",
"s": "f_sink"
"C": "f_cardboard_box",
"s": "f_sink",
"S": "f_sink"
},
"toilets": { "t": { } },
"items": {
Expand All @@ -69,7 +73,8 @@
{ "item": "jackets", "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "bags", "chance": 20, "repeat": [ 1, 2 ] },
{ "item": "snacks", "chance": 20, "repeat": [ 1, 2 ] }
]
],
"%": { "item": "cash_register_random", "chance": 100 }
},
"place_items": [
{ "item": "magazines", "x": 21, "y": [ 9, 14 ], "chance": 80, "repeat": [ 6, 20 ] },
Expand Down Expand Up @@ -139,7 +144,7 @@
"4": "t_gutter_downspout",
"5": "t_gutter_drop"
},
"furniture": { "&": "f_roof_turbine_vent", "=": "f_vent_pipe", "C": "f_crate_c" },
"furniture": { "&": "f_roof_turbine_vent", "=": "f_vent_pipe", "C": "f_cardboard_box" },
"place_items": [ { "item": "roof_trash", "x": [ 3, 20 ], "y": [ 4, 15 ], "chance": 50, "repeat": [ 1, 3 ] } ],
"items": {
"C": [
Expand Down Expand Up @@ -224,37 +229,40 @@
"object": {
"fill_ter": "t_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~",
"**|========::-OO--OO-|**",
"**|hTh.hTh...#.......|**",
"**|.h...h....#%##%##.|**",
"*qO..................Oq*",
"**|###%#.h...........|**",
"**|e...#.T...[[[[[..]|**",
"**|s..c#....>|-|....]|**",
"**|c..c#....||s|....]|**",
"**|...a#.h..|t.|TT..]|**",
"**|.##%#.T..|-+|TT..]|**",
"*qO.................]|**",
"**|hTh.hTh..........]|**",
"*qO.................]|**",
"**|[[[[[[[..[[[[[[..]|**",
"**|[[[[[[[..[[[[[[..]|**",
"**|..................|**",
"*qO..................Oq*",
"**|]]]]]]]]]]]]]]]]]]|**",
"**|------------------|**",
"************************",
"************************"
" ~~ ",
" ~~ ",
" ~~ ",
" |========::-OO--OO-| ",
" |hTh.hTh...#.h..h..| ",
" |.h...h....#%##%##.| ",
" qO..................Oq ",
" |###%#.h...........| ",
" |e...#.T...[[[[[..]| ",
" |s..c#....>|-|....]| ",
" |c..c#....||S|....]| ",
" |...a#.h..|t'|TT..]| ",
" |.##%#.T..|-+|TT..]| ",
" qO.................]| ",
" |hTh.hTh..........]| ",
" qO.................]| ",
" |[[[[[[[..[[[[[[..]| ",
" |[[[[[[[..[[[[[[..]| ",
" |..................| ",
" qO..................Oq ",
" |]]]]]]]]]]]]]]]]]]| ",
" |------------------| ",
" ",
" "
],
"terrain": {
"#": "t_floor",
"*": "t_region_groundcover_urban",
" ": "t_region_groundcover_urban",
"+": "t_door_c",
"-": "t_wall_w",
".": "t_floor",
"'": "t_linoleum_white",
"S": "t_linoleum_white",
"t": "t_linoleum_white",
":": "t_door_glass_c",
"=": "t_wall_glass",
">": "t_stairs_up",
Expand All @@ -264,7 +272,7 @@
"~": "t_sidewalk"
},
"furniture": {
"%": "f_console_broken",
"%": "f_counter",
"#": "f_counter",
"T": "f_table",
"[": "f_rack",
Expand All @@ -273,8 +281,9 @@
"c": "f_cupboard",
"e": "f_fridge",
"h": "f_chair",
"q": "f_bluebell",
"s": "f_sink"
"q": "f_region_flower",
"s": "f_sink",
"S": "f_sink"
},
"toilets": { "t": { } },
"place_items": [
Expand All @@ -295,7 +304,8 @@
{ "item": "coffee_table", "x": 4, "y": 13, "chance": 20 },
{ "item": "coffee_table", "x": 8, "y": 13, "chance": 20 }
],
"place_item": [ { "item": "coffeemaker", "x": 4, "y": 7, "chance": 30 }, { "item": "coffeemaker", "x": 4, "y": 12, "chance": 30 } ]
"place_item": [ { "item": "coffeemaker", "x": 4, "y": 7, "chance": 30 }, { "item": "coffeemaker", "x": 4, "y": 12, "chance": 30 } ],
"items": { "%": { "item": "cash_register_random", "chance": 100 } }
}
},
{
Expand Down Expand Up @@ -377,7 +387,8 @@
{ "item": "baked_goods", "chance": 30 },
{ "item": "coffee_counter", "chance": 20 }
]
}
},
"place_loot": [ { "group": "cash_register_random", "x": 5, "y": [ 4, 6 ] } ]
}
},
{
Expand Down Expand Up @@ -432,35 +443,38 @@
"fill_ter": "t_floor",
"rows": [
"~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~qSq~~~~~~~~~~qqq~~~~~",
"~~~qSq~~~~~~~~~~qSq~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~",
"~~~~~~~~~~~~~~~~~~~~~~~~",
"***********~************",
"***********~**|-----|***",
"*******^***~**|]]]]]|***",
"***********~**|]...]|***",
"***^*******~**|].].]|***",
"***********~**|].].]|***",
"***********~**|].].]|***",
"****|------+-O|....]|***",
"****|]]]]]..#a...T.]|***",
"****|]......#%#..T.]|***",
"****|].]]].........]|***",
"****|].]]].TT..TT..]|***",
"****|].............]|***",
"****|]]]]]]]]]]]]..]|***",
"****|------------.--||**",
"***********4|LbL|.|ts|**",
"*o**********+...+.+..|**",
"*******o****---------|**",
"**************o*********",
"************************"
" ~ ",
" ~ |-----| ",
" ^ ~ |]]]]]| ",
" ~ |]...]| ",
" ^ ~ |].].]| ",
" ~ |].].]| ",
" ~ |].].]| ",
" |------+-O|....]| ",
" |]]]]]..#a...T.]| ",
" |]......###..T.]| ",
" |].]]].........]| ",
" |].]]].TT..TT..]| ",
" |].............]| ",
" |]]]]]]]]]]]]..]| ",
" |------------.--|| ",
" 4|LbL|.|ts| ",
" o +...+.+''| ",
" o ---------| ",
" o ",
" "
],
"terrain": {
"*": "t_region_groundcover_urban",
" ": "t_region_groundcover_urban",
"+": [ "t_door_c", "t_door_locked" ],
"-": "t_wall_w",
".": "t_floor",
"t": "t_linoleum_white",
"s": "t_linoleum_white",
"'": "t_linoleum_white",
"O": "t_window",
"S": "t_sidewalk",
"^": "t_region_tree_nut",
Expand All @@ -471,7 +485,6 @@
"~": "t_sidewalk"
},
"furniture": {
"%": "f_console_broken",
"#": "f_counter",
"S": "f_statue",
"T": "f_table",
Expand Down Expand Up @@ -533,7 +546,8 @@
{ "item": "mansion_books", "x": [ 7, 9 ], "y": [ 14, 15 ], "chance": 10, "repeat": 2 },
{ "item": "bookstore_misc", "x": [ 11, 12 ], "y": 15, "chance": 25, "repeat": [ 2, 3 ] },
{ "item": "bookstore_misc", "x": [ 15, 16 ], "y": 15, "chance": 25, "repeat": [ 2, 3 ] },
{ "item": "bookstore_misc", "x": 17, "y": [ 12, 13 ], "chance": 25, "repeat": [ 2, 3 ] }
{ "item": "bookstore_misc", "x": 17, "y": [ 12, 13 ], "chance": 25, "repeat": [ 2, 3 ] },
{ "item": "cash_register_random", "x": [ 12, 14 ], "y": 13, "chance": 100 }
]
}
},
Expand Down
Loading

0 comments on commit 12c0750

Please sign in to comment.