Skip to content

Commit

Permalink
mainline fuji structures 3 stores (#40706)
Browse files Browse the repository at this point in the history
  • Loading branch information
@curstwist
curstwist authored May 20, 2020
1 parent 2647a67 commit dc32e4c
Show file tree
Hide file tree
Showing 13 changed files with 441 additions and 448 deletions.
152 changes: 152 additions & 0 deletions data/json/mapgen/store/s_camping.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_camping" ],
"object": {
"fill_ter": "t_linoleum_gray",
"rows": [
"..............`````.....",
".##ccc##ccc##.`````.....",
".# MMM MMMz#.`````.....",
".# b``````.....",
".# ss ss b``````.....",
".c ss ss tƃ##ghhggg##..",
".# ss ss u #________#..",
".# ss ss M cj____G__g..",
".# ss ss M cj___GiG_g..",
".c ss ss u cGG___G__g..",
".# ss ss tƃ#GG______g..",
".# ## ## b________#..",
".# ss ss y#____www_g..",
".c c____xvw_g..",
".# c__K_www_g..",
".# ssssss y#________g..",
".# ||||||b|#;_K__jjj#..",
".# |ooo===q###hh#####..",
".#|b|oop===q#mm__illlg..",
".#z |=======b_____lllg..",
".# |rr=====b________h..",
";#AB|krr==kk#iii_____g..",
".############ggggggggg..",
"........................"
],
"terrain": {
"#": "t_adobe_brick_wall",
"|": "t_wall_w",
"b": "t_door_c",
"c": "t_wall_glass",
".": "t_region_groundcover_urban",
"`": "t_sidewalk",
"_": "t_pavement",
"g": "t_chainfence_v",
"h": "t_chaingate_c",
"i": "t_pavement",
"j": "t_pavement",
"l": "t_pavement",
"m": "t_pavement",
"=": "t_thconc_floor",
"o": "t_thconc_floor",
"p": "t_thconc_floor",
"q": "t_thconc_floor",
"r": "t_thconc_floor",
"k": "t_thconc_floor",
"s": "t_linoleum_gray",
"t": "t_linoleum_gray",
"u": "t_console_broken",
"v": "t_pavement",
"w": "t_pavement",
"x": "t_pavement",
"K": "t_pavement",
"G": "t_pavement",
"y": "t_linoleum_gray",
"z": "t_linoleum_gray",
"A": "t_linoleum_gray",
"B": "t_linoleum_gray",
"M": "t_linoleum_gray",
";": "t_gutter_downspout"
},
"furniture": {
"i": "f_brazier",
"j": "f_bench",
"G": "f_camp_chair",
"K": "f_tourist_table",
"r": "f_camp_chair",
"k": "f_tourist_table",
"l": "f_dumpster",
"m": "f_crate_c",
"o": "f_crate_c",
"p": "f_crate_o",
"q": "f_bench",
"s": "f_rack",
"ƃ": "f_counter_gate_c",
"t": "f_counter",
"v": "f_groundsheet",
"w": "f_canvas_wall",
"x": "f_canvas_door",
"M": "f_displaycase",
"y": "f_vending_c",
"z": "f_trashcan",
"A": "f_sink"
},
"toilets": { "B": { } },
"place_loot": [
{ "group": "cannedfood", "chance": 50, "repeat": 10, "x": [ 3, 3 ], "y": [ 4, 10 ] },
{ "group": "swimmer_shoes", "chance": 50, "repeat": 3, "x": 4, "y": [ 4, 5 ] },
{ "group": "NC_COWBOY_shoes", "chance": 50, "repeat": 6, "x": 4, "y": [ 6, 10 ] },
{ "group": "camping", "chance": 60, "repeat": 10, "x": 6, "y": [ 4, 10 ] },
{ "group": "hand_tools", "chance": 60, "repeat": 5, "x": 7, "y": [ 4, 10 ] },
{ "group": "softdrugs", "chance": 60, "repeat": 2, "x": [ 3, 4 ], "y": 12 },
{ "group": "archery", "chance": 50, "repeat": 2, "x": [ 4, 7 ], "y": 15 },
{ "group": "archery_ammo", "chance": 50, "repeat": 2, "x": [ 8, 9 ], "y": 15 },
{ "group": "archery_ammo", "chance": 50, "repeat": 4, "x": [ 3, 5 ], "y": 2 },
{ "group": "archery_mods", "chance": 50, "repeat": 4, "x": [ 8, 10 ], "y": 2 },
{ "group": "kitchen_nonfood", "chance": 50, "repeat": 4, "x": [ 6, 7 ], "y": 12 },
{ "group": "book_survival", "chance": 50, "repeat": 2, "x": 10, "y": 7 },
{ "group": "tools_hunting", "chance": 50, "repeat": 2, "x": 10, "y": 7 },
{ "group": "vending_food_items", "chance": 80, "repeat": 2, "x": 11, "y": 15 },
{ "group": "vending_drink", "chance": 80, "repeat": 1, "x": 11, "y": 12 },
{ "group": "trash", "chance": 50, "repeat": 5, "x": 11, "y": 2 },
{ "group": "trash", "chance": 50, "repeat": 5, "x": [ 18, 20 ], "y": [ 18, 19 ] },
{ "group": "camping", "chance": 60, "repeat": 4, "x": [ 5, 6 ], "y": 17 },
{ "group": "hand_tools", "chance": 50, "repeat": 3, "x": 7, "y": 17 },
{ "group": "cannedfood", "chance": 60, "repeat": 6, "x": [ 5, 6 ], "y": 18 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_camping_roof" ],
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" |22222222223 ",
" |..........3 ",
" |..oo..oo..3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..oo..oo..3 ",
" |..........3 ",
" |...A......3 ",
" |..........3 ",
" |..oo..oo..3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |..........3 ",
" |.=........5 ",
" |.=........3 ",
" |..........3 ",
" |.......:..3 ",
" |....A.....3 ",
" 5..........3 ",
" |----------3 ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
4 changes: 2 additions & 2 deletions ...Fuji_Structures/worldgen/s_cardealer.json → data/json/mapgen/store/s_cardealer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
],
"terrain": {
"a": "t_pavement_y",
"b": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
"c": "t_wall",
"b": "t_region_groundcover_urban",
"c": "t_adobe_brick_wall",
"d": "t_floor",
"e": "t_sidewalk",
"f": "t_window",
Expand Down
198 changes: 198 additions & 0 deletions data/json/mapgen/store/s_diner.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_diner" ],
"object": {
"fill_ter": "t_linoleum_white",
"rows": [
"%%%%```%%%%!!%````!%....",
".`````````%%%%````!%.[..",
".`````````````````!%%%%%",
".``v```v``%%%%````!!!!!!",
".`vuv`vuv##bb##cc##bb##.",
".``v```v`#<;;;;;;;;;;;#.",
".````````#G ;gG ;gG ;G#.",
".##bbbbb##F; Ff; Ff; F#.",
".bHH;G;HH#G ;gG ;gG ;G#.",
".bFF F FF#;; ; ; ; ; ;#.",
".bH@;g;@H## ;## ;## ;##.",
".#F; ; ; ; ; ; ; ; ; ;#.",
".#||||; ; ; ; A A A A #.",
".#HH@| ;@H|~~eeeeeeeee#.",
".#FfF ; Ff|~~~~~~~~~~~#.",
".#HH@| ;@H|tt~~~~~n~~m#.",
".#||||; |||||||eee||~|#.",
".#j~m| ;|s~EI|p~~~~~~~#.",
".#k~~c; |~~~I|p~~~~~~~#.",
".#|||| ;||c|||~~ee~|||#.",
".#k~~c; c~~~~~~~~~~~~~#.",
".#j~m| ;|mm~r~eeoo~|qq#.",
".######c###############.",
"......```..............."
],
"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_region_groundcover_urban",
"#": "t_brick_wall",
"|": "t_wall_w",
"b": "t_window",
"c": "t_door_c",
";": "t_linoleum_gray",
"G": "t_linoleum_gray",
"F": "t_linoleum_gray",
"H": "t_linoleum_gray",
"A": "t_linoleum_gray",
"~": "t_thconc_floor",
"s": "t_thconc_floor",
"I": "t_thconc_floor",
"E": "t_thconc_floor",
"e": "t_thconc_floor",
".": "t_region_groundcover_urban",
"`": "t_sidewalk",
"j": "t_thconc_floor",
"k": "t_thconc_floor",
"m": "t_thconc_floor",
"n": "t_console_broken",
"o": "t_thconc_floor",
"p": "t_thconc_floor",
"q": "t_thconc_floor",
"r": "t_thconc_floor",
"t": "t_thconc_floor",
"u": "t_sidewalk",
"v": "t_sidewalk",
"<": "t_stairs_up"
},
"furniture": {
"e": "f_counter",
"f": "f_table",
"F": "f_table",
"@": "f_sofa",
"H": "f_sofa",
"A": "f_stool",
"g": "f_chair",
"G": "f_chair",
"!": "f_region_flower",
"k": "f_sink",
"l": "f_trashcan",
"m": "f_trashcan",
"o": "f_sink",
"p": "f_oven",
"q": "f_fridge",
"r": "f_locker",
"I": "f_desk",
"E": "f_armchair",
"s": "f_locker",
"t": "f_rack",
"u": "f_table",
"v": "f_chair"
},
"toilets": { "j": { } },
"items": {
"p": { "item": "oven", "chance": 80, "repeat": [ 2, 4 ] },
"F": [
{ "item": "coffee_dishes", "chance": 20 },
{ "item": "coffee_condiments", "chance": 20 },
{ "item": "baked_goods", "chance": 10 },
{ "item": "prepared_teas", "chance": 20 },
{ "item": "coffee_counter", "chance": 20 }
],
"f": [
{ "item": "coffee_dishes", "chance": 20 },
{ "item": "coffee_condiments", "chance": 20 },
{ "item": "baked_goods", "chance": 10 },
{ "item": "prepared_teas", "chance": 20 },
{ "item": "coffee_table", "chance": 20 }
],
"m": { "item": "bar_trash", "chance": 50, "repeat": [ 1, 2 ] },
"I": { "item": "office", "chance": 30, "repeat": [ 1, 2 ] }
},
"place_loot": [
{ "group": "coffee_prep", "chance": 50, "repeat": [ 4 ], "x": [ 11, 12 ], "y": [ 15, 15 ] },
{ "group": "bar_food", "chance": 50, "repeat": [ 4 ], "x": [ 20, 20 ], "y": [ 21, 21 ] },
{ "group": "diner_food", "chance": 50, "repeat": [ 4 ], "x": [ 21, 21 ], "y": [ 21, 21 ] },
{ "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 16, 16 ], "y": [ 21, 21 ] },
{ "group": "kitchen", "chance": 80, "repeat": [ 2 ], "x": [ 17, 17 ], "y": [ 21, 21 ] },
{ "group": "cleaning_bulk", "chance": 50, "repeat": [ 2 ], "x": [ 12, 12 ], "y": [ 21, 21 ] },
{ "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 18, 18 ] },
{ "group": "cleaning", "chance": 50, "repeat": [ 1 ], "x": [ 2, 2 ], "y": [ 20, 20 ] },
{ "group": "restaur_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 14, 15 ], "y": [ 21, 21 ] },
{ "group": "fast_kitchen", "chance": 50, "repeat": [ 2 ], "x": [ 16, 17 ], "y": [ 19, 19 ] }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_diner_2ndfloor" ],
"object": {
"fill_ter": "t_linoleum_white",
"rows": [
"************************",
"************************",
"************************",
"************************",
"*********###WW#WW#WW###*",
"*********#>#hh...h..hh#*",
"*********#.#tt...t..ttW*",
"*##W###W##..hh...h..hh#*",
"*#....................#*",
"*W^..RRRRRRRRRRRRRR..^W*",
"*Wh..R;;;;;;;;;;;;R...W*",
"*Wt..R;;;;;;;;;;;;R..^W*",
"*Wh..RRRRRRRRRRRRRR...W*",
"*W^...................W*",
"*#........hth.hth.hth.#*",
"*####.####WWW#WWW#WWW##*",
"*4zz#.j#9zzzzzzzzzzzzz6*",
"*4zz#+##zzzzzzzzz&zzzz6*",
"*4zzzzzzzzzzzzzzzzzzzz6*",
"*4zzzzzzzzzzzz((zzzzzz6*",
"*4zzzzzzzzzzzzzzzzzzzz6*",
"*4zzzzzzzzzzzzzzzzzzzz6*",
"*4555555555555555555556*",
"************************"
],
"palettes": [ "apartment_palette" ],
"terrain": { "*": "t_open_air", "9": "t_gutter_downspout", "R": "t_glass_railing", ";": "t_open_air_rooved", "#": "t_brick_wall" },
"furniture": { "h": "f_chair" },
"items": { "t": { "item": "coffee_table", "chance": 50 }, "j": { "item": "bar_trash", "chance": 65, "repeat": [ 1, 3 ] } }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_diner_roof" ],
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" ",
" ",
" |2222222222223 ",
" |..........X.3 ",
" |............3 ",
" |2222222|............3 ",
" |....................3 ",
" |....................3 ",
" |....................3 ",
" |...A.........A......3 ",
" |....................3 ",
" |.........&..........3 ",
" |...............==...3 ",
" |--|..35-------------3 ",
" |..3 ",
" |--3 ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ]
}
}
]
25 changes: 25 additions & 0 deletions data/json/overmap/multitile_city_buildings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3535,5 +3535,30 @@
{ "point": [ 0, 0, 0 ], "overmap": "s_laundromat_1_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_laundromat_roof_1_north" }
]
},
{
"type": "city_building",
"id": "s_camping",
"locations": [ "land" ],
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_camping_north" }, { "point": [ 0, 0, 1 ], "overmap": "s_camping_roof_north" } ]
},
{
"type": "city_building",
"id": "s_cardealer",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_cardealer_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_cardealer_roof_north" }
]
},
{
"type": "city_building",
"id": "s_diner",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "s_diner_north" },
{ "point": [ 0, 0, 1 ], "overmap": "s_diner_2ndfloor_north" },
{ "point": [ 0, 0, 2 ], "overmap": "s_diner_roof_north" }
]
}
]
Loading

0 comments on commit dc32e4c

Please sign in to comment.