Skip to content

Commit

Permalink
Merge pull request #57558 from LovamKicsiGazsii/cash-register-7
Browse files Browse the repository at this point in the history 
Store Update 6
  • Loading branch information
@dseguin
dseguin authored May 10, 2022
2 parents 12c0750 + 684cc3e commit b072194
Show file tree
Hide file tree
Showing 12 changed files with 365 additions and 341 deletions.
63 changes: 32 additions & 31 deletions data/json/mapgen/homeimprovement.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@
"om_terrain": [ "home_improvement" ],
"weight": 10000,
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_thconc_floor",
"rows": [
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",----------++---------|,",
",|.@.@.@.@.rr.#....???|,",
",O.........rr.#.A....?O,",
",|.@.@.@[email protected].#%###..?|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|:::::::::rryyyyyyyyy|,",
",|.........rr.........|,",
",|111111111rrLLLLLLLLL|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",OSSSSSSSSSrr333333333O,",
",O222222222rr333333333O,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",||+|||rrrrrrrrrrrrrrr|,",
",|y.ll|####rr#########|,",
",OI...|#...rr.........O,",
",|Ih.S|####rr#########|,",
",O--+-|#...rr.........O,",
",|6..&|####rr#########|,",
",---------------------|,",
",,,,,,,,,U<UU4,,,,,,,,,,"
" ,, ",
" ,, ",
" ||||||||||++|||||||||| ",
" |.@.@.@.@....#....???| ",
" O............#.A....?O ",
" |.@.@.@[email protected].#%###..?| ",
" |.........rr.........| ",
" |.........rr.........| ",
" |:::::::::rryyyyyyyyy| ",
" |.........rr.........| ",
" |111111111rrLLLLLLLLL| ",
" |.........rr.........| ",
" |.........rr.........| ",
" OSSSSSSSSSrr333333333O ",
" O222222222rr333333333O ",
" |.........rr.........| ",
" ||+|||....rr.........| ",
" |y.ll|####rr#########| ",
" OI...|#...rr.........O ",
" |Ih.S|####rr#########| ",
" O||+||#..............O ",
" |6..&|####..#########| ",
" |||||||||||||||||||||| ",
" U<UU4 "
],
"terrain": {
"+": "t_door_c",
",": "t_pavement",
"-": "t_wall_r",
".": "t_floor",
" ": "t_region_groundcover_urban",
",": "t_concrete",
".": "t_thconc_floor",
"O": "t_window",
"r": "t_carpet_red",
"|": "t_wall_r",
"r": "t_carpet_concrete_red",
"|": "t_wall_w",
"4": "t_gutter_downspout",
"<": "t_ladder_up"
},
Expand Down Expand Up @@ -82,7 +82,8 @@
{ "item": "paint", "x": [ 6, 10 ], "y": 21, "chance": 75, "repeat": [ 2, 8 ] },
{ "item": "rug", "x": [ 13, 21 ], "y": 17, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "rug", "x": [ 13, 21 ], "y": 19, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "rug", "x": [ 13, 21 ], "y": 21, "chance": 75, "repeat": [ 1, 3 ] }
{ "item": "rug", "x": [ 13, 21 ], "y": 21, "chance": 75, "repeat": [ 1, 3 ] },
{ "item": "cash_register_random", "x": 14, "y": [ 3, 5 ], "chance": 100 }
]
}
},
Expand Down
103 changes: 53 additions & 50 deletions data/json/mapgen/homeimprovement_superstore_new.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@
" f SSS nn|^.77777.^|......|...........||",
" f000000 SS nnn|||||||||||......|8.........8| ",
" f0000000 SSS |.6666666........|8...999...8| ",
" f}}}}}00 SS nnnn|................|8...999...8| ",
" f}MMM}00 SS nnnn|.6666666........|8...999...8| ",
" f}MMM}00SSS |?????????.......|8...999...8| ",
" f}MMM}00SS nnnnn|................|8...999...8||",
" f}}{}}00SS nnnnn|.4444444........|8.........8=&",
" f0H00H00SS |.4444444........|...........= ",
" f0000000SSSSSSSS|............................= ",
" f{000000 SS nnnn|................|8...999...8| ",
" f0000000 SS nnnn|.6666666........|8...999...8| ",
" f0000000SSS |?????????.......|8...999...8| ",
" f0000000SS nnnnn|................|8...999...8||",
" f0000000SS nnnnn|.4444444........|8.........8=&",
" f0000000SS |.4444444........|...........= ",
" f0H00H00SSSSSSSS|............................= ",
" f0000000SS |?????????...................= ",
" f00000H0SS & & &|.5555555....................=&",
" f0}}{}}0SS |............................||",
" f0}MMM}0SSS& & &|.5555555..^....^|.888888888.| ",
" f0}MMM}0 SS ||||||||||||=!!=|||||||||||||| ",
" f0}MMM}0/SS& & &|QQ'Q'kk'@@@?..?bbbibbi((itis| ",
" f0}}}}}0 SSS |QQ'Q'''''''?..?bbbibbiiiitis| ",
" f0/0000 SS & &|'''''kk''P'?..?bbiibbi((itis| ",
" f0M000H0SS & & &|.5555555....................=&",
" f0000000SS |............................||",
" f0000000SSS& & &|.5555555..^....^|.888888888.| ",
" f0000000 SS ||||||||||||=!!=|||||||||||||| ",
" f0000000/SS& & &|QQ'Q'kk'@@@?..?bbbibbi((itis| ",
" f0000000 SSS |QQ'Q'''''''?..?bbbibbiiiitis| ",
" f000000 SS & &|'''''kk''P'?..?bbiibbi((itis| ",
" f000000 / SSS |'''''''''''?..?iiiiiiiiiiiis||",
" f00000 SSS &=^..........................^=&",
" f000 SSSS!............................= ",
Expand All @@ -59,33 +59,33 @@
" W...............|....................||+|||+|| ",
" |...............|....................|iis|sii| ",
" |...............|....................|iis|sii| ",
" W..............X|...|dd|......|dd|...|iis|sii| ",
" |..............X|...xh.c......c..x...|iis|sii| ",
" W..............X|...|cx|......|xc|...|iis|sii| ",
" |..............X|...ch.c......c..c...|iis|sii| ",
"f|.......g...X.XX|...c..c......c.hc...|i|||||i| ",
"f|#######|||+|WW||...c.hx......xh.c...|i+t|t+i| ",
"f|#######|||+|WW||...c.hc......ch.c...|i+t|t+i| ",
"fS_______g|I..xdd|...|dd|......|dd|...|i|||||i| ",
"fS_______S|I..h.c|....................|i+t|t+i| ",
"fS_______SWx.....|$..................V|i|||||i| ",
"fS_______SWdh....|$......^....^......V|i+t|t+i| ",
"fS_______S|I..h.c|......||=!!=||......|i|||||i| ",
"fS_______S|I..xdd|......|/ SS /|......|i+t|t+i| ",
"fS_______S|||||||||====|| SS ||====|||||||||| ",
"/S_______SSSS & / &SSSSSSSSSSSSSSS.........=S",
"&S_______SSSSS /& & SSSSSSSSSSSSSSSS.........=S",
" S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS=========|S",
" S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS",
"&S_______SS____,____,____,____,____,____,____SSS",
"/S_______SS____,____,____,____,____,____,____SSS",
"&S_______SS____,____,____,____,____,____,____S/S",
" S_______SS____,____,____,____,____,____,____S S",
" S_______SS____,____,____,____,____,____,____SBS",
"&S_______SS____,____,____,____,____,____,____SBS",
"/S_______SS____,____,____,____,____,____,____SBS",
"&S_______SS____,____,____,____,____,____,____SBS",
" S_______SS____,____,____,____,____,____,____S S",
" S_______SS__________________________________S/S",
"&S_______SS__________________________________SSS",
"/S_______SS__________________________________SSS",
"fS_______S|I..xdd|......|SSSSSS|......|i+t|t+i| ",
"fS_______S|||||||||====||SSSSSS||====||||||||||&",
"/S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS.........=/",
"&S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS.........=&",
" S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSS=========| ",
" S_______SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS ",
"&S_______SS____,____,____,____,____,____,____SS&",
"/S_______SS____,____,____,____,____,____,____SS/",
"&S_______SS____,____,____,____,____,____,____SS&",
" S_______SS____,____,____,____,____,____,____SS ",
" S_______SS____,____,____,____,____,____,____SS ",
"&S_______SS____,____,____,____,____,____,____SS&",
"/S_______SS____,____,____,____,____,____,____SS/",
"&S_______SS____,____,____,____,____,____,____SS&",
" S_______SS____,____,____,____,____,____,____SS ",
" S_______SS__________________________________SS ",
"&S_______SS__________________________________SS&",
"/S_______SS__________________________________SS/",
"************************************************",
"*zzzzz***********??????????????????????????????*",
"*zzzzz***********?zzzzzzzzzzzzzzzzzzzzzzzzzzzz??",
Expand Down Expand Up @@ -160,6 +160,12 @@
"************************************************"
],
"palettes": [ "home_improvement_palette" ],
"place_loot": [
{ "group": "cash_register_random", "x": 21, "y": [ 46, 47 ] },
{ "group": "cash_register_random", "x": 24, "y": [ 46, 47 ] },
{ "group": "cash_register_random", "x": 31, "y": [ 46, 47 ] },
{ "group": "cash_register_random", "x": 34, "y": [ 46, 47 ] }
],
"items": {
"d": { "item": "office", "chance": 45, "repeat": [ 1, 2 ] },
"D": { "item": "hardware_trash", "chance": 40, "repeat": [ 1, 3 ] },
Expand Down Expand Up @@ -199,14 +205,14 @@
],
"place_vehicles": [
{ "vehicle": "warehouse_vehicles", "x": [ 5, 12 ], "y": [ 42, 45 ], "chance": 100 },
{ "vehicle": "shopping_cart", "x": [ 37, 46 ], "y": [ 56, 57 ], "chance": 35, "repeat": 8 },
{ "vehicle": "car", "x": 42, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 37, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 32, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 27, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 22, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 17, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "car", "x": 12, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }
{ "vehicle": "shopping_cart", "x": [ 37, 46 ], "y": [ 56, 57 ], "chance": 100, "repeat": [ 1, 8 ] },
{ "vehicle": "parking_garage", "x": 42, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 37, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 32, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 27, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 22, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 17, "y": [ 62, 65 ], "chance": 15, "rotation": 270 },
{ "vehicle": "parking_garage", "x": 12, "y": [ 62, 65 ], "chance": 15, "rotation": 270 }
]
}
},
Expand All @@ -219,14 +225,13 @@
"$": "t_atm",
"&": "t_region_groundcover_urban",
"B": "t_region_groundcover_urban",
" ": [ [ "t_region_groundcover_urban", 10 ], "t_region_shrub" ],
"/": [ [ "t_region_tree", 2 ], "t_region_shrub" ],
" ": "t_region_groundcover_urban",
"/": "t_region_tree",
"0": "t_grass_golf",
"a": "t_sandmound",
"A": "t_claymound",
"M": "t_grass_golf",
"{": "t_grass_golf",
"}": "t_grass_golf",
"H": "t_grass_golf",
"~": "t_woodchips",
"n": "t_dirtmound",
Expand Down Expand Up @@ -317,15 +322,13 @@
"q": "f_bookcase",
"B": "f_bench",
"&": "f_region_flower",
"M": "f_fema_groundsheet",
"{": "f_canvas_door",
"}": "f_canvas_wall",
"H": "f_camp_chair",
"X": [ [ "f_crate_c", 3 ], "f_crate_o" ],
"D": "f_dumpster",
"O": "f_air_conditioner",
"j": "f_standing_tank",
"J": "f_water_heater"
}
},
"nested": { "M": { "chunks": [ "tent_5x5_N" ] }, "{": { "chunks": [ "tent_5x5_S" ] } }
}
]
Loading

0 comments on commit b072194

Please sign in to comment.