Skip to content

Commit

Permalink
update 2 houses (#36836)
Browse files Browse the repository at this point in the history
  • Loading branch information
@curstwist @I-am-Erk
curstwist authored and I-am-Erk committed Jan 9, 2020
1 parent 308d6dc commit 3731c9e
Show file tree
Hide file tree
Showing 5 changed files with 203 additions and 195 deletions.
157 changes: 71 additions & 86 deletions data/json/mapgen/house/house_dogs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,104 +24,89 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_dogs" ],
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
".###....P...............",
".#---v----v;v----------.",
".#|hk | oooo hv.",
".#| k + nnn hv.",
".#| | h|.",
".|-----+| v.",
".v | h v.",
".|d @@ | h h |.",
".v @@c | | ---nn-|.",
".|-----+- | |.",
".|d | Ov.",
".|d | CfSC|.",
".|--+-|-+---+---v-----|.",
".vB S|...............q.",
".|B t|...............q.",
".------...............q.",
".q....................q.",
".q....................q.",
".q....................q.",
".q....................q.",
".q....................q.",
".q....................q.",
".QQQQQQQQQQQQQQQQQQQQQQ.",
".!%%....p.---...........",
".%###o####o*o##########.",
".%#EI y| RRRR sHHHHo.",
".%# I E + Ho.",
".%#P | H#.",
".##||||+| EsE so.",
".o | o.",
".#d @@ | A A A #.",
".o @@s | hfh | ||JJJ|#^",
".#|||||+| hfh | Y #.",
".#U|d hfh |6 Oo.",
".#>+ |7432F51#.",
".###+###&###&###o######.",
".oB S#^~~~~~~........$.",
".#B8 t#%~~~~~~........$.",
".######%~~~~~~........$.",
".$....................$.",
".$....................$.",
".$....................$.",
".$....................$.",
".$....................$.",
".$....................$.",
".$$$$$$$$$$$$$$$$$$$$$$.",
"........................"
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"$": "t_fence",
"~": "t_concrete",
"&": "t_door_glass_c",
"!": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ]
},
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 1, 2 ] },
{ "point": "terrain", "id": "t_tree", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 2, 6 ] },
{ "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": 0, "repeat": [ 1, 2 ] },
{ "point": "terrain", "id": "t_tree_young", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 3, 5 ] }
],
"terrain": {
"#": "t_shrub",
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
";": "t_door_locked",
"@": "t_floor",
"B": "t_floor",
"C": "t_floor",
"O": "t_floor",
"P": "t_grass",
"Q": "t_fence_h",
"S": "t_floor",
"c": "t_floor",
"d": "t_floor",
"f": "t_floor",
"h": "t_floor",
"k": "t_floor",
"n": "t_floor",
"o": "t_floor",
"q": "t_fence_v",
"v": "t_window_domestic",
"|": "t_wall"
},
"furniture": {
"@": "f_bed",
"B": "f_bathtub",
"C": "f_cupboard",
"O": "f_oven",
"P": "f_mailbox",
"S": "f_sink",
"c": "f_counter",
"d": "f_dresser",
"f": "f_fridge",
"h": "f_chair",
"k": "f_desk",
"n": "f_table",
"o": "f_bookcase"
},
"toilets": { "t": { } },
"items": { "P": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] } },
"place_loot": [
{ "group": "bed", "x": [ 4, 5 ], "y": [ 7, 8 ], "chance": 90, "repeat": [ 1, 3 ] },
{ "group": "bedroom", "x": [ 2, 8 ], "y": [ 6, 8 ], "chance": 80, "repeat": [ 1, 4 ] },
{ "group": "livingroom", "x": [ 9, 21 ], "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "guns_pistol_common", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 10, 11 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 2, 2 ], "y": [ 7, 7 ], "chance": 85, "repeat": [ 1, 4 ] },
{ "group": "fridge", "x": [ 19, 19 ], "y": [ 11, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
{ "group": "kitchen", "x": [ 21, 21 ], "y": [ 11, 11 ], "chance": 85, "repeat": [ 1, 2 ] },
{ "group": "kitchen", "x": [ 18, 18 ], "y": [ 11, 11 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "kitchen", "x": [ 18, 20 ], "y": [ 7, 10 ], "chance": 65, "repeat": [ 1, 3 ] },
{ "group": "oven", "x": [ 21, 21 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "cleaning", "x": [ 2, 5 ], "y": [ 13, 14 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 2, 5 ], "y": [ 12, 14 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "office", "x": [ 2, 7 ], "y": [ 2, 4 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "dogfight", "x": [ 18, 18 ], "y": [ 17, 17 ], "chance": 95 }
{ "group": "guns_pistol_common", "x": 4, "y": 10, "chance": 5, "ammo": 90, "magazine": 100 },
{ "group": "dogfight", "x": 18, "y": 17, "chance": 95 }
],
"place_monsters": [ { "monster": "GROUP_DOGS", "x": [ 7, 21 ], "y": [ 13, 21 ], "chance": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_dogs_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" |22222222222222222223 ",
" |...................3 ",
" |...................3 ",
" |.............X.....3 ",
" |2...................3 ",
" |....................3 ",
" |....................3 ",
" |....................5 ",
" |....................3 ",
" |................&...3 ",
" |....................3 ",
" |....5---------------- ",
" |.=..3 ",
" |....3 ",
" |----3 ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
185 changes: 76 additions & 109 deletions data/json/mapgen/house/house_gardener.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,126 +2,93 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "house" ],
"om_terrain": [ "house_gardener" ],
"weight": 100,
"object": {
"fill_ter": "t_floor",
"rows": [
"...ss...................",
".#.ss.#.................",
"...ssp..................",
".--;;---................",
".|Y +d|................",
".| ----wwww---ww-ww-..",
".| h ???? |d kk|..",
".wc nn + h|..",
".wc nn K o| |..",
".|O h K o| @@ |..",
".|Cfc | d@@d|..",
".|---+-|--+-----------..",
".|t S $| rrrr rrrr|..",
".--w---| c|..",
".q#####|--+----------|..",
".q...................q..",
".q.X.m.m.m..mmmmmmmm.q..",
".q.X.m.m.m...........q..",
".q.x.m.m.m..mmmmmmmm.q..",
".q.x.m.m.m...........q..",
".q.x.m.m.m..mmmmmmmm.q..",
".q...................q..",
".QQQQQQQQQQQQQQQQQQQQQ..",
".%.--.%.................",
"...--p..................",
".##**###................",
".#L +U#^...............",
".#y ||##oooo###oo#oo#..",
".#3 h HHHHy|dy TII#..",
".o2 ff + h#..",
".o5 ff E R|E #..",
".#O h E R|T @@ #..",
".#1F7 66y y|D s@@s#..",
".#|||+|||||+|||||||||#..",
".#t B|>+ yy ;;;;;#..",
".#S8y8B|U|i y;#..",
".##o####v|i yyy'''''#^.",
".$%%%%%####*##########..",
".$...................$..",
".$.=.!.!.!..!!!!!!!!.$..",
".$.=.!.!.!...........$..",
".$.&.!.!.!..!!!!!!!!.$..",
".$.&.!.!.!...........$..",
".$.&.!.!.!..!!!!!!!!.$..",
".$...................$..",
".$$$$$$$$$$$$$$$$$$$$$..",
"........................"
],
"set": [
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 0 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 23, 23 ], "y": [ 0, 23 ], "repeat": [ 5, 10 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 23 ], "y": [ 23, 23 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 5, 8 ] },
{ "point": "terrain", "id": "t_dirt", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 1, 3 ] },
{ "point": "terrain", "id": "t_grass", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 1, 3 ] }
],
"palettes": [ "standard_domestic_palette" ],
"terrain": {
"#": "t_shrub",
"$": "t_floor",
"+": "t_door_c",
"-": "t_wall",
".": "t_grass",
"p": "t_grass",
";": "t_door_locked",
"?": "t_floor",
"@": "t_floor",
"B": "t_floor",
"C": "t_floor",
"Y": "t_floor",
"K": "t_floor",
"O": "t_floor",
"Q": "t_fence_h",
"S": "t_floor",
"X": "t_shrub_blueberry",
"c": "t_floor",
"d": "t_floor",
"f": "t_floor",
"h": "t_floor",
"k": "t_floor",
"m": "t_dirtmound",
"n": "t_floor",
"o": "t_floor",
"q": "t_fence_v",
"r": "t_floor",
"s": "t_sidewalk",
"w": "t_window",
"x": "t_shrub_strawberry",
"|": "t_wall"
},
"furniture": {
"$": "f_shower",
"?": "f_sofa",
"@": "f_bed",
"p": "f_mailbox",
"Y": "f_rack_coat",
"B": "f_bathtub",
"C": "f_cupboard",
"K": "f_armchair",
"O": "f_oven",
"S": "f_sink",
"c": "f_counter",
"d": "f_dresser",
"f": "f_fridge",
"h": "f_chair",
"k": "f_desk",
"n": "f_table",
"o": "f_bookcase",
"r": "f_rack"
},
"toilets": { "t": { } },
"items": {
"Y": { "item": "coat_rack", "chance": 30, "repeat": [ 1, 4 ] },
"p": { "item": "mail", "chance": 30, "repeat": [ 2, 5 ] }
"%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
"$": "t_fence",
"#": "t_adobe_brick_wall",
"=": "t_shrub_blueberry",
"!": "t_dirtmound",
"&": "t_shrub_strawberry"
},
"furniture": { ";": "f_rack", "'": "f_table" },
"place_loot": [
{ "group": "hydro", "x": [ 5, 5 ], "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": [ 7, 7 ], "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": [ 9, 9 ], "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": [ 16, 16 ], "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": [ 18, 18 ], "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": [ 20, 20 ], "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "dresser", "x": [ 6, 6 ], "y": [ 4, 4 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 17, 17 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "dresser", "x": [ 20, 20 ], "y": [ 10, 10 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "dresser", "x": [ 15, 15 ], "y": [ 6, 6 ], "chance": 60, "repeat": [ 1, 2 ] },
{ "group": "farming_tools", "x": [ 18, 21 ], "y": [ 12, 12 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "farming_seeds", "x": [ 12, 15 ], "y": [ 12, 12 ], "chance": 85, "repeat": [ 1, 5 ] },
{ "group": "oven", "x": [ 2, 2 ], "y": [ 9, 9 ], "chance": 75, "repeat": [ 1, 3 ] },
{ "group": "fridge", "x": [ 3, 3 ], "y": [ 10, 10 ], "chance": 90, "repeat": [ 1, 4 ] },
{ "group": "magazines", "x": [ 13, 13 ], "y": [ 8, 9 ], "chance": 80, "repeat": [ 1, 3 ] },
{ "group": "homebooks", "x": [ 13, 13 ], "y": [ 8, 9 ], "chance": 60, "repeat": [ 1, 2 ] },
{ "group": "dining", "x": [ 5, 6 ], "y": [ 7, 8 ], "chance": 75, "repeat": [ 1, 2 ] },
{ "group": "office", "x": [ 19, 20 ], "y": [ 6, 6 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "bed", "x": [ 18, 19 ], "y": [ 9, 10 ], "chance": 90, "repeat": [ 1, 2 ] },
{ "group": "softdrugs", "x": [ 2, 6 ], "y": [ 12, 12 ], "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "cleaning", "x": [ 2, 6 ], "y": [ 12, 12 ], "chance": 80, "repeat": [ 1, 2 ] }
{ "group": "hydro", "x": 5, "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": 7, "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": 9, "y": [ 16, 20 ], "chance": 90, "repeat": [ 1, 7 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": 16, "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": 18, "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "hydro", "x": [ 12, 18 ], "y": 20, "chance": 90, "repeat": [ 1, 9 ] },
{ "group": "farming_tools", "x": [ 16, 20 ], "y": 11, "chance": 65, "repeat": [ 1, 2 ] },
{ "group": "farming_seeds", "x": [ 16, 20 ], "y": 13, "chance": 85, "repeat": [ 1, 5 ] }
],
"place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 2, 21 ], "y": [ 2, 21 ], "chance": 2 } ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": "house_gardener_roof",
"object": {
"fill_ter": "t_shingle_flat_roof",
"rows": [
" ",
" ",
" |222223 ",
" |.....3 ",
" |.....522222222222223 ",
" |...................3 ",
" |...................3 ",
" |...=...............3 ",
" |...................3 ",
" |...................3 ",
" |...................3 ",
" |........&..........3 ",
" |...................3 ",
" |-----|.............5 ",
" |-------------3 ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
Loading

0 comments on commit 3731c9e

Please sign in to comment.