Skip to content

Commit

Permalink
Moved overmap terrain definitions from mapgen json to overmap_terrain…
Browse files Browse the repository at this point in the history 
….json (#27421)

* Moved overmap terrain definitions from mapgen json to overmap_terrain.json
  • Loading branch information
@ZhilkinSerg @kevingranade
ZhilkinSerg authored and kevingranade committed Jan 6, 2019
1 parent 4f267bf commit e539249
Show file tree
Hide file tree
Showing 8 changed files with 660 additions and 715 deletions.
141 changes: 65 additions & 76 deletions data/json/mapgen/homeimprovement.json
View file
Expand Up @@ -19,81 +19,70 @@
"items": [ [ "r_carpet", 45 ], [ "g_carpet", 45 ], [ "y_carpet", 45 ], [ "p_carpet", 45 ] ] "items": [ [ "r_carpet", 45 ], [ "g_carpet", 45 ], [ "y_carpet", 45 ], [ "p_carpet", 45 ] ]
}, },
{ {
"id": "home_improvement", "type": "mapgen",
"type": "overmap_terrain", "method": "json",
"name": "home improvement store", "om_terrain": [ "home_improvement" ],
"sym": 94, "weight": 10000,
"color": "c_yellow_green", "object": {
"see_cost": 5, "rows": [
"mondensity": 2, ",,,,,,,,,,,,,,,,,,,,,,,,",
"extras": "build", ",,,,,,,,,,,,,,,,,,,,,,,,",
"mapgen": [ ",----------++---------|,",
{ ",|.@.@.@.@.rr?????????|,",
"method": "json", ",O.........rr.........O,",
"weight": 10000, ",|.@.@.@.@.rr?????????|,",
"object": { ",|rrrrrrrrrrrrrrrrrrrr|,",
"rows": [ ",|rrrrrrrrrrrrrrrrrrrr|,",
",,,,,,,,,,,,,,,,,,,,,,,,", ",|:::::::::rryyyyyyyyy|,",
",,,,,,,,,,,,,,,,,,,,,,,,", ",|.........rr.........|,",
",----------++---------|,", ",|:::::::::rr^^^^^^^^^|,",
",|.@.@.@.@.rr?????????|,", ",|rrrrrrrrrrrrrrrrrrrr|,",
",O.........rr.........O,", ",|rrrrrrrrrrrrrrrrrrrr|,",
",|.@.@.@.@.rr?????????|,", ",O.........rr.........O,",
",|rrrrrrrrrrrrrrrrrrrr|,", ",O.........rr.........O,",
",|rrrrrrrrrrrrrrrrrrrr|,", ",|rrrrrrrrrrrrrrrrrrrr|,",
",|:::::::::rryyyyyyyyy|,", ",|rrrrrrrrrrrrrrrrrrrr|,",
",|.........rr.........|,", ",|#########rr#########|,",
",|:::::::::rr^^^^^^^^^|,", ",O.........rr.........O,",
",|rrrrrrrrrrrrrrrrrrrr|,", ",|#########rr#########|,",
",|rrrrrrrrrrrrrrrrrrrr|,", ",O.........rr.........O,",
",O.........rr.........O,", ",|#########rr#########|,",
",O.........rr.........O,", ",---------------------|,",
",|rrrrrrrrrrrrrrrrrrrr|,", ",,,,,,,,,,,,,,,,,,,,,,,,"
",|rrrrrrrrrrrrrrrrrrrr|,", ],
",|#########rr#########|,", "terrain": {
",O.........rr.........O,", " ": "t_floor",
",|#########rr#########|,", "#": "t_floor",
",O.........rr.........O,", "+": "t_door_c",
",|#########rr#########|,", ",": "t_pavement",
",---------------------|,", "-": "t_wall",
",,,,,,,,,,,,,,,,,,,,,,,," ".": "t_floor",
], ":": "t_floor",
"terrain": { "?": "t_floor",
" ": "t_floor", "@": "t_floor",
"#": "t_floor", "O": "t_window",
"+": "t_door_c", "^": "t_floor",
",": "t_pavement", "r": "t_carpet_red",
"-": "t_wall", "y": "t_floor",
".": "t_floor", "|": "t_wall"
":": "t_floor", },
"?": "t_floor", "furniture": { "#": "f_counter", ":": "f_dresser", "?": "f_statue", "@": "f_bed", "^": "f_indoor_plant", "y": "f_indoor_plant_y" },
"@": "t_floor", "place_items": [
"O": "t_window", { "item": "bed", "x": [ 3, 3 ], "y": [ 3, 3 ], "chance": 80 },
"^": "t_floor", { "item": "bed", "x": [ 5, 5 ], "y": [ 3, 3 ], "chance": 80 },
"r": "t_carpet_red", { "item": "bed", "x": [ 7, 7 ], "y": [ 3, 3 ], "chance": 80 },
"y": "t_floor", { "item": "bed", "x": [ 9, 9 ], "y": [ 3, 3 ], "chance": 80 },
"|": "t_wall" { "item": "bed", "x": [ 3, 3 ], "y": [ 5, 5 ], "chance": 80 },
}, { "item": "bed", "x": [ 5, 5 ], "y": [ 5, 5 ], "chance": 80 },
"furniture": { "#": "f_counter", ":": "f_dresser", "?": "f_statue", "@": "f_bed", "^": "f_indoor_plant", "y": "f_indoor_plant_y" }, { "item": "bed", "x": [ 7, 7 ], "y": [ 5, 5 ], "chance": 80 },
"place_items": [ { "item": "bed", "x": [ 9, 9 ], "y": [ 5, 5 ], "chance": 80 },
{ "item": "bed", "x": [ 3, 3 ], "y": [ 3, 3 ], "chance": 80 }, { "item": "paint", "x": [ 2, 10 ], "y": 17, "chance": 75 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 3, 3 ], "chance": 80 }, { "item": "paint", "x": [ 2, 10 ], "y": 19, "chance": 75 },
{ "item": "bed", "x": [ 7, 7 ], "y": [ 3, 3 ], "chance": 80 }, { "item": "paint", "x": [ 2, 10 ], "y": 21, "chance": 75 },
{ "item": "bed", "x": [ 9, 9 ], "y": [ 3, 3 ], "chance": 80 }, { "item": "rug", "x": [ 13, 21 ], "y": 17, "chance": 75 },
{ "item": "bed", "x": [ 3, 3 ], "y": [ 5, 5 ], "chance": 80 }, { "item": "rug", "x": [ 13, 21 ], "y": 19, "chance": 75 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 5, 5 ], "chance": 80 }, { "item": "rug", "x": [ 13, 21 ], "y": 21, "chance": 75 }
{ "item": "bed", "x": [ 7, 7 ], "y": [ 5, 5 ], "chance": 80 }, ]
{ "item": "bed", "x": [ 9, 9 ], "y": [ 5, 5 ], "chance": 80 }, }
{ "item": "paint", "x": [ 2, 10 ], "y": 17, "chance": 75 },
{ "item": "paint", "x": [ 2, 10 ], "y": 19, "chance": 75 },
{ "item": "paint", "x": [ 2, 10 ], "y": 21, "chance": 75 },
{ "item": "rug", "x": [ 13, 21 ], "y": 17, "chance": 75 },
{ "item": "rug", "x": [ 13, 21 ], "y": 19, "chance": 75 },
{ "item": "rug", "x": [ 13, 21 ], "y": 21, "chance": 75 }
]
}
}
],
"flags": [ "SIDEWALK" ]
} }
] ]
143 changes: 66 additions & 77 deletions data/json/mapgen/jewel_store.json
View file
@@ -1,81 +1,70 @@
[ [
{ {
"id": "s_jewelry", "type": "mapgen",
"type": "overmap_terrain", "method": "json",
"name": "jewelry store", "om_terrain": [ "s_jewelry" ],
"sym": 74, "weight": 500,
"color": "white", "object": {
"see_cost": 5, "rows": [
"mondensity": 2, "....________________....",
"extras": "build", "....,____,____,____,....",
"mapgen": [ "....,____,____,____,....",
{ "....,____,____,____,....",
"method": "json", "....,____,____,____,....",
"weight": 500, "....FFFFFFFFFFFFFFFF....",
"object": { "....FFFFFFFFFFFFFFFF....",
"rows": [ "....|-hhhhh++hhhhh-|....",
"....________________....", "....| |....",
"....,____,____,____,....", "....|hh hh|....",
"....,____,____,____,....", "....|#v hhhh v#|....",
"....,____,____,____,....", "....|#v v##v v#|....",
"....,____,____,____,....", "....|#v v##v v#|....",
"....FFFFFFFFFFFFFFFF....", "85^5|#v hhhh v#|....",
"....FFFFFFFFFFFFFFFF....", "8___|hh hh|....",
"....|-hhhhh++hhhhh-|....", "8___| r|....",
"....| |....", "8___| r|....",
"....|hh hh|....", "8__f|##### r|....",
"....|#v hhhh v#|....", "8__f| rrrr|....",
"....|#v v##v v#|....", "8___|-&------------|....",
"....|#v v##v v#|....", "8___& ###### T|....",
"85^5|#v hhhh v#|....", "8555| c T|....",
"8___|hh hh|....", "....|GG |....",
"8___| r|....", "....|--------------|...."
"8___| r|....", ],
"8__f|##### r|....", "terrain": {
"8__f| rrrr|....", " ": "t_floor",
"8___|-&------------|....", "#": "t_floor",
"8___& ###### T|....", "&": "t_door_locked",
"8555| c T|....", "+": "t_door_glass_c",
"....|GG |....", ",": "t_pavement_y",
"....|--------------|...." "-": "t_wall",
], ".": "t_grass",
"terrain": { "5": "t_chainfence_h",
" ": "t_floor", "8": "t_chainfence_v",
"#": "t_floor", "F": "t_sidewalk",
"&": "t_door_locked", "G": "t_floor",
"+": "t_door_glass_c", "T": "t_floor",
",": "t_pavement_y", "^": "t_chaingate_l",
"-": "t_wall", "_": "t_pavement",
".": "t_grass", "c": "t_floor",
"5": "t_chainfence_h", "f": "t_pavement",
"8": "t_chainfence_v", "h": "t_wall_glass",
"F": "t_sidewalk", "r": "t_floor",
"G": "t_floor", "v": "t_wall_glass",
"T": "t_floor", "|": "t_wall"
"^": "t_chaingate_l", },
"_": "t_pavement", "furniture": { "#": "f_counter", "G": "f_desk", "T": "f_safe_l", "c": "f_chair", "f": "f_trashcan", "r": "f_rack" },
"c": "t_floor", "place_items": [
"f": "t_pavement", { "item": "jewelry_front", "x": [ 5, 5 ], "y": [ 10, 13 ], "chance": 75 },
"h": "t_wall_glass", { "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 10, 13 ], "chance": 75 },
"r": "t_floor", { "item": "jewelry_front", "x": [ 11, 12 ], "y": [ 11, 12 ], "chance": 75 },
"v": "t_wall_glass", { "item": "jewelry_front", "x": [ 15, 18 ], "y": [ 18, 18 ], "chance": 50 },
"|": "t_wall" { "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 15, 17 ], "chance": 50 },
}, { "item": "jewelry_back", "x": [ 9, 14 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 1, 2 ] },
"furniture": { "#": "f_counter", "G": "f_desk", "T": "f_safe_l", "c": "f_chair", "f": "f_trashcan", "r": "f_rack" }, { "item": "jewelry_safe", "x": [ 18, 18 ], "y": [ 20, 21 ], "chance": 95 },
"place_items": [ { "item": "trash", "x": [ 3, 3 ], "y": [ 17, 18 ], "chance": 50 }
{ "item": "jewelry_front", "x": [ 5, 5 ], "y": [ 10, 13 ], "chance": 75 }, ],
{ "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 10, 13 ], "chance": 75 }, "place_vehicles": [ { "vehicle": "security_van", "x": 11, "y": 2, "chance": 20, "fuel": 20, "status": 0, "rotation": 0 } ]
{ "item": "jewelry_front", "x": [ 11, 12 ], "y": [ 11, 12 ], "chance": 75 }, }
{ "item": "jewelry_front", "x": [ 15, 18 ], "y": [ 18, 18 ], "chance": 50 },
{ "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 15, 17 ], "chance": 50 },
{ "item": "jewelry_back", "x": [ 9, 14 ], "y": [ 20, 20 ], "chance": 80, "repeat": [ 1, 2 ] },
{ "item": "jewelry_safe", "x": [ 18, 18 ], "y": [ 20, 21 ], "chance": 95 },
{ "item": "trash", "x": [ 3, 3 ], "y": [ 17, 18 ], "chance": 50 }
],
"place_vehicles": [ { "vehicle": "security_van", "x": 11, "y": 2, "chance": 20, "fuel": 20, "status": 0, "rotation": 0 } ]
}
}
],
"flags": [ "SIDEWALK" ]
} }
] ]

0 comments on commit e539249

Please sign in to comment.