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.

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

Overmap overhaul (step 6) #20295

Merged
merged 14 commits into from Mar 1, 2017
@@ -5,10 +5,8 @@
"name": "antique store",
"sym": 65,
"color": "brown",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -88,6 +86,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -11,10 +11,8 @@
"name": "arcade",
"sym": 65,
"color": "cyan",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"mapgen": [
{
"method": "json",
@@ -89,6 +87,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -140,10 +140,8 @@
"name": "bowling alley",
"sym": 66,
"color": "red",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -267,6 +265,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -58,10 +58,8 @@
"name": "boxing gym",
"sym": 94,
"color": "yellow_cyan",
"rotate": true,
"see_cost": 5,
"mondensity": 3,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -153,6 +151,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -72,10 +72,8 @@
"name": "dojo",
"sym": 94,
"color": "i_ltcyan",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -151,6 +149,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -26,10 +26,8 @@
"name": "fire station",
"sym": 70,
"color": "red",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -143,6 +141,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -5,10 +5,8 @@
"name": "gardening supply",
"sym": 71,
"color": "green",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -113,6 +111,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -37,10 +37,8 @@
"name": "fitness gym",
"sym": 94,
"color": "i_ltcyan",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -145,6 +143,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -29,10 +29,8 @@
"name": "home improvement store",
"sym": 94,
"color": "c_yellow_green",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -139,6 +137,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -5,10 +5,8 @@
"name": "jewelry store",
"sym": 74,
"color": "white",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -119,6 +117,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -143,10 +143,8 @@
"name": "laundromat",
"sym": 94,
"color": "white_white",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -251,6 +249,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -21,13 +21,7 @@
"//": "Its contents make no sense, it is supposed to use all the available mapgen possibilities.",
"sym": 37,
"color": "white",
"rotate": false,
"line_drawing": false,
"mondensity": 1,
"allow_road": false,
"sidewalk": false,
"known_up": false,
"known_down": false
"mondensity": 1
},
{
"type": "mapgen",
@@ -40,10 +40,8 @@
"name": "mortuary",
"sym": 77,
"color": "i_blue",
"rotate": true,
"see_cost": 5,
"mondensity": 6,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -140,6 +138,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -5,10 +5,8 @@
"name": "museum",
"sym": 77,
"color": "white",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -132,6 +130,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -99,10 +99,8 @@
"name": "veterinarian clinic",
"sym": 94,
"color": "i_pink",
"rotate": true,
"see_cost": 5,
"mondensity": 2,
"sidewalk": true,
"extras": "build",
"mapgen": [
{
@@ -223,6 +221,7 @@
]
}
}
]
],
"flags": [ "SIDEWALK" ]
}
]
@@ -7,6 +7,7 @@
],
"locations" : [ "land", "swamp" ],
"occurrences" : [0, 10],
"rotate" : false,
"flags" : [ "BLOB", "CLASSIC" ]
},{
"type" : "overmap_special",
@@ -108,6 +109,7 @@
"locations" : [ "water" ],
"city_sizes" : [1, 12],
"occurrences" : [0, 1],
"rotate" : false,
"spawns" : { "group" : "GROUP_RAZORCLAW", "population":[30,60], "radius":[2, 10] }
},{
"type" : "overmap_special",
@@ -283,7 +285,8 @@
"locations" : [ "forest"],
"city_distance" : [20, -1],
"city_sizes" : [0, 6],
"occurrences" : [0, 1]
"occurrences" : [0, 1],
"rotate" : false
},{
"type" : "overmap_special",
"id" : "Lab",
@@ -347,7 +350,8 @@
"locations" : [ "wilderness", "swamp" ],
"city_distance" : [4, -1],
"city_sizes" : [2, 10],
"occurrences" : [0, 5]
"occurrences" : [0, 5],
"rotate" : false
},{
"type" : "overmap_special",
"id" : "Military Outpost",
@@ -1317,7 +1321,8 @@
"locations" : [ "wilderness", "swamp" ],
"city_distance" : [-1, 2],
"city_sizes" : [2, 14],
"occurrences" : [0, 4]
"occurrences" : [0, 4],
"rotate" : false
},{
"type" : "overmap_special",
"id" : "power_station_small",
@@ -1331,6 +1336,7 @@
"city_distance" : [-1, 6],
"city_sizes" : [2, 14],
"occurrences" : [0, 4],
"rotate" : false,
"spawns" : { "group" : "GROUP_SMALL_STATION", "population":[4, 10], "radius":[2, 4] }
},{
"type" : "overmap_special",
@@ -1677,6 +1683,7 @@
"locations" : [ "field" ],
"city_distance" : [-1, -1],
"occurrences" : [0, 15],
"rotate" : false,
"flags" : [ "CLASSIC" ]
},{
"type" : "overmap_special",
@@ -1687,6 +1694,7 @@
"locations" : [ "forest" ],
"city_distance" : [-1, -1],
"occurrences" : [0, 12],
"rotate" : false,
"flags" : [ "CLASSIC" ]
},{
"type" : "overmap_special",
@@ -1697,6 +1705,7 @@
"locations" : [ "swamp" ],
"city_distance" : [-1, -1],
"occurrences" : [0, 9],
"rotate" : false,
"flags" : [ "CLASSIC" ]
},{
"type": "overmap_special",
@@ -1708,6 +1717,7 @@
"city_distance": [12, -1],
"city_sizes": [4, 16],
"occurrences": [0, 8],
"rotate" : false,
"flags": [ "CLASSIC" ]
},{
"type" : "overmap_special",
@@ -1737,6 +1747,7 @@
"city_distance" : [20, -1],
"city_sizes" : [1, 12],
"occurrences" : [0, 1],
"rotate" : false,
"flags" : [ "CLASSIC" ]
}
]
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.