Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moved overmap terrain definitions from mapgen json to overmap_terrain.json #27421

Merged
merged 3 commits into from Jan 6, 2019
Merged

Moved overmap terrain definitions from mapgen json to overmap_terrain.json #27421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb99e3c
Moved overmap terrain definitions from mapgen json to overmap_terrain…
ZhilkinSerg Jan 3, 2019
26f5761
Merge branch 'master' into mapgen-normalize-json-1
kevingranade Jan 6, 2019
a1fab13
Fix bad merge
kevingranade Jan 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
141 changes: 65 additions & 76 deletions data/json/mapgen/homeimprovement.json
View file
Open in desktop
Expand Up @@ -19,81 +19,70 @@
"items": [ [ "r_carpet", 45 ], [ "g_carpet", 45 ], [ "y_carpet", 45 ], [ "p_carpet", 45 ] ]
},
{
"id": "home_improvement",
"type": "overmap_terrain",
"name": "home improvement store",
"sym": 94,
"color": "c_yellow_green",
"see_cost": 5,
"mondensity": 2,
"extras": "build",
"mapgen": [
{
"method": "json",
"weight": 10000,
"object": {
"rows": [
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",----------++---------|,",
",|.@.@.@.@.rr?????????|,",
",O.........rr.........O,",
",|.@.@.@.@.rr?????????|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|:::::::::rryyyyyyyyy|,",
",|.........rr.........|,",
",|:::::::::rr^^^^^^^^^|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",O.........rr.........O,",
",O.........rr.........O,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|#########rr#########|,",
",O.........rr.........O,",
",|#########rr#########|,",
",O.........rr.........O,",
",|#########rr#########|,",
",---------------------|,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"terrain": {
" ": "t_floor",
"#": "t_floor",
"+": "t_door_c",
",": "t_pavement",
"-": "t_wall",
".": "t_floor",
":": "t_floor",
"?": "t_floor",
"@": "t_floor",
"O": "t_window",
"^": "t_floor",
"r": "t_carpet_red",
"y": "t_floor",
"|": "t_wall"
},
"furniture": { "#": "f_counter", ":": "f_dresser", "?": "f_statue", "@": "f_bed", "^": "f_indoor_plant", "y": "f_indoor_plant_y" },
"place_items": [
{ "item": "bed", "x": [ 3, 3 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 7, 7 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 9, 9 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 3, 3 ], "y": [ 5, 5 ], "chance": 80 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 5, 5 ], "chance": 80 },
{ "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" ]
"type": "mapgen",
"method": "json",
"om_terrain": [ "home_improvement" ],
"weight": 10000,
"object": {
"rows": [
",,,,,,,,,,,,,,,,,,,,,,,,",
",,,,,,,,,,,,,,,,,,,,,,,,",
",----------++---------|,",
",|.@.@.@.@.rr?????????|,",
",O.........rr.........O,",
",|.@.@.@.@.rr?????????|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|:::::::::rryyyyyyyyy|,",
",|.........rr.........|,",
",|:::::::::rr^^^^^^^^^|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",O.........rr.........O,",
",O.........rr.........O,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|rrrrrrrrrrrrrrrrrrrr|,",
",|#########rr#########|,",
",O.........rr.........O,",
",|#########rr#########|,",
",O.........rr.........O,",
",|#########rr#########|,",
",---------------------|,",
",,,,,,,,,,,,,,,,,,,,,,,,"
],
"terrain": {
" ": "t_floor",
"#": "t_floor",
"+": "t_door_c",
",": "t_pavement",
"-": "t_wall",
".": "t_floor",
":": "t_floor",
"?": "t_floor",
"@": "t_floor",
"O": "t_window",
"^": "t_floor",
"r": "t_carpet_red",
"y": "t_floor",
"|": "t_wall"
},
"furniture": { "#": "f_counter", ":": "f_dresser", "?": "f_statue", "@": "f_bed", "^": "f_indoor_plant", "y": "f_indoor_plant_y" },
"place_items": [
{ "item": "bed", "x": [ 3, 3 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 7, 7 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 9, 9 ], "y": [ 3, 3 ], "chance": 80 },
{ "item": "bed", "x": [ 3, 3 ], "y": [ 5, 5 ], "chance": 80 },
{ "item": "bed", "x": [ 5, 5 ], "y": [ 5, 5 ], "chance": 80 },
{ "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 }
]
}
}
]
143 changes: 66 additions & 77 deletions data/json/mapgen/jewel_store.json
View file
Open in desktop
@@ -1,81 +1,70 @@
[
{
"id": "s_jewelry",
"type": "overmap_terrain",
"name": "jewelry store",
"sym": 74,
"color": "white",
"see_cost": 5,
"mondensity": 2,
"extras": "build",
"mapgen": [
{
"method": "json",
"weight": 500,
"object": {
"rows": [
"....________________....",
"....,____,____,____,....",
"....,____,____,____,....",
"....,____,____,____,....",
"....,____,____,____,....",
"....FFFFFFFFFFFFFFFF....",
"....FFFFFFFFFFFFFFFF....",
"....|-hhhhh++hhhhh-|....",
"....| |....",
"....|hh hh|....",
"....|#v hhhh v#|....",
"....|#v v##v v#|....",
"....|#v v##v v#|....",
"85^5|#v hhhh v#|....",
"8___|hh hh|....",
"8___| r|....",
"8___| r|....",
"8__f|##### r|....",
"8__f| rrrr|....",
"8___|-&------------|....",
"8___& ###### T|....",
"8555| c T|....",
"....|GG |....",
"....|--------------|...."
],
"terrain": {
" ": "t_floor",
"#": "t_floor",
"&": "t_door_locked",
"+": "t_door_glass_c",
",": "t_pavement_y",
"-": "t_wall",
".": "t_grass",
"5": "t_chainfence_h",
"8": "t_chainfence_v",
"F": "t_sidewalk",
"G": "t_floor",
"T": "t_floor",
"^": "t_chaingate_l",
"_": "t_pavement",
"c": "t_floor",
"f": "t_pavement",
"h": "t_wall_glass",
"r": "t_floor",
"v": "t_wall_glass",
"|": "t_wall"
},
"furniture": { "#": "f_counter", "G": "f_desk", "T": "f_safe_l", "c": "f_chair", "f": "f_trashcan", "r": "f_rack" },
"place_items": [
{ "item": "jewelry_front", "x": [ 5, 5 ], "y": [ 10, 13 ], "chance": 75 },
{ "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 10, 13 ], "chance": 75 },
{ "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" ]
"type": "mapgen",
"method": "json",
"om_terrain": [ "s_jewelry" ],
"weight": 500,
"object": {
"rows": [
"....________________....",
"....,____,____,____,....",
"....,____,____,____,....",
"....,____,____,____,....",
"....,____,____,____,....",
"....FFFFFFFFFFFFFFFF....",
"....FFFFFFFFFFFFFFFF....",
"....|-hhhhh++hhhhh-|....",
"....| |....",
"....|hh hh|....",
"....|#v hhhh v#|....",
"....|#v v##v v#|....",
"....|#v v##v v#|....",
"85^5|#v hhhh v#|....",
"8___|hh hh|....",
"8___| r|....",
"8___| r|....",
"8__f|##### r|....",
"8__f| rrrr|....",
"8___|-&------------|....",
"8___& ###### T|....",
"8555| c T|....",
"....|GG |....",
"....|--------------|...."
],
"terrain": {
" ": "t_floor",
"#": "t_floor",
"&": "t_door_locked",
"+": "t_door_glass_c",
",": "t_pavement_y",
"-": "t_wall",
".": "t_grass",
"5": "t_chainfence_h",
"8": "t_chainfence_v",
"F": "t_sidewalk",
"G": "t_floor",
"T": "t_floor",
"^": "t_chaingate_l",
"_": "t_pavement",
"c": "t_floor",
"f": "t_pavement",
"h": "t_wall_glass",
"r": "t_floor",
"v": "t_wall_glass",
"|": "t_wall"
},
"furniture": { "#": "f_counter", "G": "f_desk", "T": "f_safe_l", "c": "f_chair", "f": "f_trashcan", "r": "f_rack" },
"place_items": [
{ "item": "jewelry_front", "x": [ 5, 5 ], "y": [ 10, 13 ], "chance": 75 },
{ "item": "jewelry_front", "x": [ 18, 18 ], "y": [ 10, 13 ], "chance": 75 },
{ "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 } ]
}
}
]