Skip to content

Commit

Permalink
Merge pull request #57556 from LovamKicsiGazsii/cash-register-5
Browse files Browse the repository at this point in the history 
Store Update 4
  • Loading branch information
@dseguin
dseguin authored May 10, 2022
2 parents 6cfd375 + d1349c1 commit 2256705
Show file tree
Hide file tree
Showing 10 changed files with 362 additions and 338 deletions.
16 changes: 9 additions & 7 deletions data/json/mapgen/Pottery_Sewing_Shops.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ssssussssssb3sssssusssss",
"s51|---+-|s55s|-+---|15s",
"s11|.c..P-ssss-P..c.|11s",
"s4||TC..B||<<||n..CT||4s",
"s4||Tc..B||<<||n..cT||4s",
"s;|R.c..B||||||n..c.R|;s",
"s;|B....B|t|SS|n....B|;s",
"s;|B.nn..=wwww=..nn.n|4s",
Expand All @@ -28,16 +28,17 @@
"s;|**nh*nh*|Q*******q|;s",
"s;|E******q|Q*qY*Y**q|;s",
"s4|||||||=||||||+|||||4s",
"s;__UU_____4|g_|_UU___;s",
"s;_________2__________4s",
"s;_________4__________;s"
"s; UU 4|g | UU ;s",
"s; 2 4s",
"ss 4 ss"
],
"terrain": {
".": "t_floor",
"s": "t_sidewalk",
"u": "t_sidewalk",
"U": "t_concrete",
" ": "t_concrete",
"_": "t_pavement",
"U": "t_pavement",
",": "t_pavement_y",
";": "t_region_groundcover_urban",
"H": "t_region_groundcover_urban",
Expand Down Expand Up @@ -65,7 +66,6 @@
"<": "t_stairs_up"
},
"furniture": {
"C": "f_console_broken",
"H": "f_bench",
"S": "f_sink",
"T": "f_stool",
Expand Down Expand Up @@ -110,7 +110,9 @@
{ "item": "trash", "x": [ 12, 12 ], "y": [ 10, 10 ], "chance": 70, "repeat": [ 2, 10 ] },
{ "item": "trash", "x": [ 4, 5 ], "y": [ 21, 21 ], "chance": 50, "repeat": [ 2, 10 ] },
{ "item": "trash", "x": [ 4, 5 ], "y": [ 21, 21 ], "chance": 50, "repeat": [ 2, 10 ] },
{ "item": "trash", "x": [ 11, 11 ], "y": [ 21, 23 ], "chance": 70, "repeat": [ 2, 10 ] }
{ "item": "trash", "x": [ 11, 11 ], "y": [ 21, 23 ], "chance": 70, "repeat": [ 2, 10 ] },
{ "item": "cash_register_random", "x": 5, "y": [ 8, 10 ], "chance": 100 },
{ "item": "cash_register_random", "x": 18, "y": [ 8, 10 ], "chance": 100 }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
Expand Down
161 changes: 73 additions & 88 deletions data/json/mapgen/petstore.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,49 @@
"object": {
"fill_ter": "t_floor",
"rows": [
"...........2rrrrrrrrrrrr",
".|--6666--|2yrrryrrryrrr",
".| 4 |2yrrryrrryrrr",
".|-- CC I72yrrryrrryrrr",
".| 4 CC I72yrrryrrryrrr",
".|-- CC I72yrrryrrryrrr",
".| 4 |2yyyyyyyyyyyy",
".|-- --|2222222222222",
".| 4 |....322223...",
".--+-11----------gg-|...",
".| CCC7 oo |...",
".| A A 7 oo |...",
".| A A A A -6gg6|...",
"...........2rrrrrrrrrrr2",
".|||6666|||2rrryrrryrrr2",
".|#4 |2rrryrrryrrr2",
".||| CC I62rrryrrryrrr2",
".|#4 CC I62rrryrrryrrr2",
".||| CC I62rrryrrryrrr2",
".|#4 |2yyyyyyyyyyy2",
".||| |||2222222222222",
".|#4 4#|2222222222222",
".|||| ||||||||||gg||...",
".| CCC6 oo |...",
".| A A A 6 oo |...",
".| A A A A |6gg6|...",
".1 A A A A oo |...",
".| A A oo 1...",
".| dddd dddd1...",
".1 K K L d Fd dF d|...",
".| K K L ---.",
".| K K L |||.",
".| CC CC AA|.",
".|+--+-- |.",
".| B| G| KAAAAAAAAAAA|.",
".|------+-------------|.",
".....RrrrrrUUrrUrrrr....",
".....rrrrrrrUrrrrrrr...."
".|+||+|| |.",
".|-B|#G| KAAAAAAAAAAA|.",
".|||||||+||||||||||||||.",
"......~~~~~UU~UU~~......",
"......~~~~~~~~~~~~......"
],
"terrain": {
" ": "t_floor",
"#": "t_thconc_floor",
"G": "t_thconc_floor",
"-": "t_linoleum_white",
"B": "t_linoleum_white",
"U": "t_concrete",
"~": "t_concrete",
"+": "t_door_c",
"-": "t_wall_w",
".": "t_grass",
".": "t_region_groundcover_urban",
"1": "t_window",
"2": "t_sidewalk",
"3": "t_tree_young",
"4": "t_chaingate_c",
"5": "t_wall_wood",
"6": "t_wall_glass_h",
"7": "t_wall_glass_v",
"6": "t_wall_glass",
"g": "t_door_glass_c",
"o": "t_carpet_green",
"r": "t_pavement",
"U": "t_pavement",
"y": "t_pavement_y",
"|": "t_wall_w",
"R": "t_gutter_downspout"
Expand All @@ -59,7 +61,7 @@
"G": "f_locker",
"H": "f_table",
"I": "f_sofa",
"d": "f_desk",
"d": "f_counter",
"K": "f_counter",
"L": "f_counter",
"U": [ "f_dumpster", "f_recycle_bin" ]
Expand All @@ -73,7 +75,11 @@
"K": { "item": "petstore_misc", "chance": 70, "repeat": [ 2, 8 ] },
"d": { "item": "office", "chance": 50, "repeat": [ 2, 4 ] },
"U": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] }
}
},
"place_loot": [
{ "group": "cash_register_random", "x": [ 11, 13 ], "y": 15 },
{ "group": "cash_register_random", "x": [ 16, 18 ], "y": 15 }
]
}
},
{
Expand Down Expand Up @@ -133,7 +139,7 @@
{
"method": "json",
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_linoleum_gray",
"place_item": [
{ "item": "pet_carrier", "repeat": 1, "x": 21, "y": 9 },
{ "item": "pet_carrier", "repeat": 1, "x": 21, "y": 10 },
Expand All @@ -152,9 +158,14 @@
"toilets": { "T": { } },
"place_items": [
{ "chance": 15, "item": "vet_softdrug", "x": 21, "y": 6 },
{ "chance": 30, "item": "vet_utility", "x": [ 20, 21 ], "y": 3 }
{ "chance": 30, "item": "vet_utility", "x": [ 20, 21 ], "y": 3 },
{ "item": "cash_register_random", "x": 19, "y": [ 4, 6 ], "chance": 100 }
],
"items": { "l": { "item": "cleaning", "chance": 30 }, "T": { "item": "softdrugs", "chance": 30 } },
"items": {
"l": { "item": "cleaning", "chance": 30 },
"T": { "item": "softdrugs", "chance": 30 },
"{": { "item": "petstore_shelves", "chance": 70, "repeat": [ 2, 8 ] }
},
"place_monster": [
{ "monster": "mon_cat", "x": 2, "y": 3 },
{ "monster": "mon_rabbit", "x": 2, "y": 7 },
Expand All @@ -172,36 +183,36 @@
"_|CC+....|++|......#..|_",
"_|---..............#A.|_",
"_|CCW..............#..|_",
"_|CC+...{..........-D-|_",
"_|---...{.............|_",
"_|CCW...{.............|_",
"_|CCW...{.............|_",
"_|CC+...{.............|_",
"_|---...{......{{{{{{{|_",
"_|CCW...{.....--------|_",
"_|CC+...{.{........-D-|_",
"_|---...{.{...........|_",
"_|CCW...{.{...{{..{{..|_",
"_|CCW...{.{...{{..{{..|_",
"_|CC+...{.{...........|_",
"_|---...{.{...{{{{{{{{|_",
"_|CCW...{.{...--------|_",
"_|CCW.................|_",
"_|CC+.................|_",
"_|||||||||||||b||-...-|_",
"___c_______4|T.&|l....|_",
"___c___d___d|||||l...&|_",
"___c_ddddddddcdd|.....|_",
"___c__d__d_d_addb....&|_",
"___c_________cdd|.....|_",
"___cddddddd4|T.&|l....|_",
"___cdddddddd|||||l...&|_",
"___cdddddddddcdd|.....|_",
"___cdddddddddaddb....&|_",
"___cdddddddddcdd|.....|_",
"___ccccccccccccc|||||||_",
"________________________"
],
"terrain": {
"+": "t_door_glass_c",
"-": "t_wall_w",
".": "t_floor",
".": "t_linoleum_gray",
"C": "t_thconc_floor",
"D": "t_door_c",
"W": "t_wall_glass",
"_": "t_grass",
"_": "t_region_groundcover_urban",
"a": "t_chaingate_c",
"b": "t_door_locked",
"c": "t_chainfence",
"d": "t_dirt",
"d": "t_region_soil",
"s": "t_sidewalk",
"w": "t_wall_glass_alarm",
"|": "t_brick_wall",
Expand Down Expand Up @@ -266,7 +277,7 @@
{
"method": "json",
"object": {
"fill_ter": "t_floor",
"fill_ter": "t_thconc_floor",
"furniture": {
"#": "f_counter",
"&": "f_trashcan",
Expand All @@ -279,7 +290,7 @@
"Y": "f_locker",
"G": "f_locker",
"t": "f_toilet",
"p": [ "f_datura", "f_bluebell", "f_mutpoppy", "f_dahlia", "f_flower_tulip", "f_chamomile", "f_flower_spurge", "f_lily" ],
"p": "f_region_flower",
"{": "f_rack",
"K": "f_birdbath"
},
Expand All @@ -292,13 +303,13 @@
{ "chance": 85, "repeat": [ 1, 4 ], "item": "vet_utility", "x": 14, "y": 14 },
{ "chance": 85, "repeat": [ 1, 4 ], "item": "vet_utility", "x": 14, "y": 12 },
{ "chance": 85, "repeat": [ 1, 4 ], "item": "vet_utility", "x": 11, "y": [ 11, 12 ] },
{ "chance": 70, "repeat": [ 1, 6 ], "item": "magazines", "x": 7, "y": 11 }
{ "chance": 70, "repeat": [ 1, 6 ], "item": "magazines", "x": 7, "y": 11 },
{ "item": "cash_register_random", "x": 7, "y": [ 7, 11 ], "chance": 100 }
],
"items": {
"{": { "item": "petstore_shelves", "chance": 70, "repeat": [ 1, 4 ] },
"G": { "item": "cleaning", "chance": 70, "repeat": [ 1, 4 ] },
"l": { "item": "petstore_misc", "chance": 70, "repeat": [ 1, 4 ] },
"#": { "item": "office", "chance": 80, "repeat": [ 2, 4 ] },
"Y": [ { "item": "jackets", "chance": 10 }, { "item": "bags", "chance": 10 } ]
},
"place_monster": [
Expand Down Expand Up @@ -332,55 +343,29 @@
"_|....................S|",
"_|....................#|",
"_||D||e|||||||||||||||||",
"_|t.|...a&HH|ddd_d____dC",
"4|..|.......Ddddd__d___C",
"_|#S|YYG....|dd_d_d__d_C",
"_||||||||w|||ccccccccccc",
"________________________"
"_|t.|...a&HH|ddddddddduC",
"4|..|.......DddddddddduC",
"_|#S|YYG....|ddddddddduC",
"_||||||||w|||CCCCCCCCCCC",
"________uuu_____________"
],
"terrain": {
"+": "t_door_glass_c",
"_": [ [ "t_grass", 5 ], [ "t_grass_long", 2 ], "t_dirt", "t_shrub" ],
"p": "t_grass",
"K": "t_grass",
"_": "t_region_groundcover_urban",
"p": "t_region_groundcover_urban",
"K": "t_region_groundcover_urban",
"-": "t_wall_glass",
".": "t_floor",
"C": "t_chainfence_v",
".": "t_thconc_floor",
"C": "t_chainfence",
"D": "t_door_c",
"c": "t_chainfence_h",
"d": "t_dirt",
"d": "t_region_soil",
"e": "t_door_c_peep",
"s": "t_sidewalk",
"u": "t_underbrush",
"u": "t_region_shrub_decorative",
"w": "t_window",
"|": "t_brick_wall",
"4": "t_gutter_downspout",
"9": [
"t_tree_blackjack",
"t_tree_walnut",
"t_tree_chestnut",
"t_tree_beech",
"t_tree_hazelnut",
"t_tree_cottonwood",
"t_tree",
"t_tree_elm",
"t_tree_dead",
"t_tree_apple",
"t_tree_pear",
"t_tree_cherry",
"t_tree_peach",
"t_tree_apricot",
"t_tree_plum",
"t_tree_mulberry",
"t_tree_elderberry",
"t_tree_pine",
"t_tree_birch",
"t_tree_willow",
"t_tree_maple",
"t_tree_hickory",
"t_tree_almond",
"t_tree_pecan"
]
"9": "t_region_tree"
}
},
"om_terrain": "s_petstore_2",
Expand Down
Loading

0 comments on commit 2256705

Please sign in to comment.