Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upFix mapgen extras #23480
Conversation
illi-kun
added
Mapgen
<Bugfix>
labels
Apr 14, 2018
This comment has been minimized.
This comment has been minimized.
|
Looks good with several suggestions which doesn't prevent merging.
Search ""building"" (2 hits in 2 files) C:\Projects\Cataclysm-DDA\data\json\regional_map_settings.json (1 hit)
Line 71: "building": {
C:\Projects\Cataclysm-DDA\data\mods\BrightNights\regional_map_settings.json (1 hit)
Line 67: "building": {
Search ""build"" (416 hits in 28 files)C:\Projects\Cataclysm-DDA\data\json\mapgen\antique_store.json (1 hit) Line 10: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\bowling_alley.json (1 hit) Line 145: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\boxing.json (1 hit) Line 63: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\dojo.json (1 hit) Line 77: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\fire_station.json (1 hit) Line 31: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\gardening_store.json (1 hit) Line 10: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\gym.json (1 hit) Line 42: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\homeimprovement.json (1 hit) Line 29: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\jewel_store.json (1 hit) Line 10: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\laundromat.json (1 hit) Line 148: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\mortuary.json (1 hit) Line 45: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\museum.json (1 hit) Line 10: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\mapgen\veterinarian.json (1 hit) Line 104: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\overmap_specials.json (3 hits) Line 1559: "extras" : "build", Line 1574: "extras" : "build", Line 1589: "extras" : "build", C:\Projects\Cataclysm-DDA\data\json\overmap_terrain.json (40 hits) Line 22: "extras" : "build", Line 333: "extras" : "build", Line 346: "extras" : "build", Line 520: "extras" : "build", Line 704: "extras" : "build", Line 714: "extras" : "build", Line 733: "extras" : "build", Line 742: "extras" : "build", Line 761: "extras" : "build", Line 779: "extras" : "build", Line 890: "extras" : "build", Line 900: "extras" : "build", Line 910: "extras" : "build", Line 920: "extras" : "build", Line 1324: "extras" : "build", Line 1334: "extras" : "build", Line 1344: "extras" : "build", Line 1354: "extras" : "build", Line 1444: "extras" : "build", Line 1454: "extras" : "build", Line 1463: "extras" : "build", Line 1472: "extras" : "build", Line 1601: "extras" : "build", Line 5344: "extras" : "build", Line 6688: "extras": "build", Line 6699: "extras": "build", Line 6710: "extras": "build", Line 6721: "extras": "build", Line 6732: "extras": "build", Line 6743: "extras": "build", Line 6858: "extras": "build", Line 6869: "extras": "build", Line 7206: "extras": "build", Line 7217: "extras": "build", Line 7228: "extras": "build", Line 7239: "extras": "build", Line 7250: "extras": "build", Line 7261: "extras": "build", Line 7376: "extras": "build", Line 7387: "extras": "build", C:\Projects\Cataclysm-DDA\data\json\test_regions.json (1 hit) Line 69: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\alt_map_key\overmap_terrain.json (70 hits) Line 259: "extras" : "build", Line 274: "extras" : "build", Line 289: "extras" : "build", Line 302: "extras" : "build", Line 320: "extras" : "build", Line 330: "extras" : "build", Line 340: "extras" : "build", Line 350: "extras" : "build", Line 491: "extras" : "build", Line 573: "extras" : "build", Line 583: "extras" : "build", Line 593: "extras" : "build", Line 603: "extras" : "build", Line 613: "extras" : "build", Line 623: "extras" : "build", Line 633: "extras" : "build", Line 643: "extras" : "build", Line 653: "extras" : "build", Line 663: "extras" : "build", Line 673: "extras" : "build", Line 683: "extras" : "build", Line 693: "extras" : "build", Line 703: "extras" : "build", Line 713: "extras" : "build", Line 723: "extras" : "build", Line 733: "extras" : "build", Line 752: "extras" : "build", Line 761: "extras" : "build", Line 780: "extras" : "build", Line 798: "extras" : "build", Line 870: "extras" : "build", Line 889: "extras" : "build", Line 899: "extras" : "build", Line 909: "extras" : "build", Line 919: "extras" : "build", Line 929: "extras" : "build", Line 939: "extras" : "build", Line 949: "extras" : "build", Line 959: "extras" : "build", Line 1363: "extras" : "build", Line 1373: "extras" : "build", Line 1383: "extras" : "build", Line 1393: "extras" : "build", Line 1483: "extras" : "build", Line 1493: "extras" : "build", Line 1502: "extras" : "build", Line 1511: "extras" : "build", Line 1640: "extras" : "build", Line 5571: "extras" : "build", Line 6918: "extras": "build", Line 6929: "extras": "build", Line 6940: "extras": "build", Line 6951: "extras": "build", Line 6962: "extras": "build", Line 6973: "extras": "build", Line 7088: "extras": "build", Line 7099: "extras": "build", Line 7449: "extras": "build" Line 7466: "extras": "build" Line 7475: "extras": "build" Line 7484: "extras": "build" Line 7493: "extras": "build" Line 7502: "extras": "build" Line 7511: "extras": "build" Line 7520: "extras": "build" Line 7529: "extras": "build" Line 7538: "extras": "build" Line 7547: "extras": "build" Line 7556: "extras": "build" Line 7565: "extras": "build" C:\Projects\Cataclysm-DDA\data\mods\Animatronics\bankrupt_pizzeria.json (1 hit) Line 177: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\DinoMod\fieldoffice.json (1 hit) Line 100: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Buildings\overmap_terrain.json (29 hits) Line 9: "extras" : "build", Line 19: "extras" : "build", Line 29: "extras" : "build", Line 39: "extras" : "build", Line 49: "extras" : "build", Line 59: "extras" : "build", Line 69: "extras" : "build", Line 79: "extras" : "build", Line 89: "extras" : "build", Line 99: "extras" : "build", Line 109: "extras" : "build", Line 119: "extras" : "build", Line 129: "extras" : "build", Line 139: "extras" : "build", Line 149: "extras" : "build", Line 159: "extras" : "build", Line 169: "extras" : "build", Line 179: "extras" : "build", Line 189: "extras" : "build", Line 199: "extras" : "build", Line 209: "extras" : "build", Line 219: "extras" : "build", Line 229: "extras" : "build", Line 239: "extras" : "build", Line 249: "extras" : "build", Line 259: "extras" : "build", Line 269: "extras" : "build", Line 279: "extras" : "build", Line 289: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\bandit_tower\overmap_terrain.json (29 hits) Line 8: "extras" : "build", Line 16: "extras" : "build", Line 25: "extras" : "build", Line 33: "extras" : "build", Line 41: "extras" : "build", Line 49: "extras" : "build", Line 57: "extras" : "build", Line 65: "extras" : "build", Line 73: "extras" : "build", Line 81: "extras" : "build", Line 89: "extras" : "build", Line 97: "extras" : "build", Line 105: "extras" : "build", Line 113: "extras" : "build", Line 121: "extras" : "build", Line 129: "extras" : "build", Line 137: "extras" : "build", Line 145: "extras" : "build", Line 153: "extras" : "build", Line 161: "extras" : "build", Line 169: "extras" : "build", Line 177: "extras" : "build", Line 185: "extras" : "build", Line 193: "extras" : "build", Line 201: "extras" : "build", Line 209: "extras" : "build", Line 217: "extras" : "build", Line 225: "extras" : "build", Line 233: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\estate\overmap_terrain.json (32 hits) Line 8: "extras" : "build", Line 17: "extras" : "build", Line 25: "extras" : "build", Line 33: "extras" : "build", Line 41: "extras" : "build", Line 49: "extras" : "build", Line 58: "extras" : "build", Line 67: "extras" : "build", Line 76: "extras" : "build", Line 85: "extras" : "build", Line 94: "extras" : "build", Line 103: "extras" : "build", Line 112: "extras" : "build", Line 121: "extras" : "build", Line 130: "extras" : "build", Line 139: "extras" : "build", Line 148: "extras" : "build", Line 157: "extras" : "build", Line 166: "extras" : "build", Line 175: "extras" : "build", Line 184: "extras" : "build", Line 193: "extras" : "build", Line 202: "extras" : "build", Line 211: "extras" : "build", Line 220: "extras" : "build", Line 229: "extras" : "build", Line 238: "extras" : "build", Line 247: "extras" : "build", Line 256: "extras" : "build", Line 265: "extras" : "build", Line 274: "extras" : "build", Line 283: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\factory\overmap_terrain.json (10 hits) Line 8: "extras" : "build", Line 17: "extras" : "build", Line 26: "extras" : "build", Line 35: "extras" : "build", Line 44: "extras" : "build", Line 53: "extras" : "build", Line 62: "extras" : "build", Line 71: "extras" : "build", Line 80: "extras" : "build", Line 89: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\military_outpost\overmap_terrain.json (39 hits) Line 8: "extras" : "build", Line 17: "extras" : "build", Line 26: "extras" : "build", Line 35: "extras" : "build", Line 44: "extras" : "build", Line 53: "extras" : "build", Line 62: "extras" : "build", Line 71: "extras" : "build", Line 80: "extras" : "build", Line 89: "extras" : "build", Line 98: "extras" : "build", Line 107: "extras" : "build", Line 116: "extras" : "build", Line 125: "extras" : "build", Line 134: "extras" : "build", Line 143: "extras" : "build", Line 152: "extras" : "build", Line 161: "extras" : "build", Line 170: "extras" : "build", Line 179: "extras" : "build", Line 188: "extras" : "build", Line 197: "extras" : "build", Line 206: "extras" : "build", Line 215: "extras" : "build", Line 224: "extras" : "build", Line 233: "extras" : "build", Line 242: "extras" : "build", Line 251: "extras" : "build", Line 260: "extras" : "build", Line 269: "extras" : "build", Line 278: "extras" : "build", Line 287: "extras" : "build", Line 296: "extras" : "build", Line 305: "extras" : "build", Line 314: "extras" : "build", Line 323: "extras" : "build", Line 332: "extras" : "build", Line 341: "extras" : "build", Line 350: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\multistory_houses\overmap_terrain.json (75 hits) Line 8: "extras" : "build", Line 18: "extras" : "build", Line 27: "extras" : "build", Line 36: "extras" : "build", Line 45: "extras" : "build", Line 54: "extras" : "build", Line 64: "extras" : "build", Line 73: "extras" : "build", Line 82: "extras" : "build", Line 91: "extras" : "build", Line 100: "extras" : "build", Line 110: "extras" : "build", Line 119: "extras" : "build", Line 128: "extras" : "build", Line 137: "extras" : "build", Line 146: "extras" : "build", Line 156: "extras" : "build", Line 165: "extras" : "build", Line 174: "extras" : "build", Line 183: "extras" : "build", Line 192: "extras" : "build", Line 202: "extras" : "build", Line 211: "extras" : "build", Line 220: "extras" : "build", Line 229: "extras" : "build", Line 238: "extras" : "build", Line 248: "extras" : "build", Line 257: "extras" : "build", Line 266: "extras" : "build", Line 275: "extras" : "build", Line 284: "extras" : "build", Line 294: "extras" : "build", Line 303: "extras" : "build", Line 312: "extras" : "build", Line 321: "extras" : "build", Line 331: "extras" : "build", Line 340: "extras" : "build", Line 349: "extras" : "build", Line 358: "extras" : "build", Line 368: "extras" : "build", Line 377: "extras" : "build", Line 386: "extras" : "build", Line 395: "extras" : "build", Line 405: "extras" : "build", Line 414: "extras" : "build", Line 423: "extras" : "build", Line 432: "extras" : "build", Line 442: "extras" : "build", Line 451: "extras" : "build", Line 460: "extras" : "build", Line 469: "extras" : "build", Line 479: "extras" : "build", Line 488: "extras" : "build", Line 497: "extras" : "build", Line 506: "extras" : "build", Line 516: "extras" : "build", Line 525: "extras" : "build", Line 534: "extras" : "build", Line 543: "extras" : "build", Line 553: "extras" : "build", Line 563: "extras" : "build", Line 572: "extras" : "build", Line 582: "extras" : "build", Line 591: "extras" : "build", Line 600: "extras" : "build", Line 609: "extras" : "build", Line 619: "extras" : "build", Line 629: "extras" : "build", Line 638: "extras" : "build", Line 648: "extras" : "build", Line 657: "extras" : "build", Line 666: "extras" : "build", Line 675: "extras" : "build", Line 685: "extras" : "build", Line 695: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\refugee_tower\overmap_terrain.json (33 hits) Line 8: "extras" : "build", Line 16: "extras" : "build", Line 24: "extras" : "build", Line 32: "extras" : "build", Line 40: "extras" : "build", Line 48: "extras" : "build", Line 56: "extras" : "build", Line 64: "extras" : "build", Line 72: "extras" : "build", Line 80: "extras" : "build", Line 88: "extras" : "build", Line 96: "extras" : "build", Line 104: "extras" : "build", Line 112: "extras" : "build", Line 120: "extras" : "build", Line 128: "extras" : "build", Line 136: "extras" : "build", Line 144: "extras" : "build", Line 152: "extras" : "build", Line 160: "extras" : "build", Line 168: "extras" : "build", Line 176: "extras" : "build", Line 184: "extras" : "build", Line 192: "extras" : "build", Line 200: "extras" : "build", Line 208: "extras" : "build", Line 216: "extras" : "build", Line 224: "extras" : "build", Line 232: "extras" : "build", Line 240: "extras" : "build", Line 248: "extras" : "build", Line 256: "extras" : "build", Line 264: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\More_Locations\tri_tower\overmap_terrain.json (29 hits) Line 8: "extras" : "build", Line 17: "extras" : "build", Line 26: "extras" : "build", Line 35: "extras" : "build", Line 44: "extras" : "build", Line 53: "extras" : "build", Line 62: "extras" : "build", Line 71: "extras" : "build", Line 80: "extras" : "build", Line 89: "extras" : "build", Line 98: "extras" : "build", Line 107: "extras" : "build", Line 116: "extras" : "build", Line 125: "extras" : "build", Line 134: "extras" : "build", Line 143: "extras" : "build", Line 152: "extras" : "build", Line 161: "extras" : "build", Line 170: "extras" : "build", Line 179: "extras" : "build", Line 188: "extras" : "build", Line 197: "extras" : "build", Line 206: "extras" : "build", Line 215: "extras" : "build", Line 224: "extras" : "build", Line 233: "extras" : "build", Line 242: "extras" : "build", Line 251: "extras" : "build", Line 260: "extras" : "build", C:\Projects\Cataclysm-DDA\data\mods\Z-Level_Buildings\overmap_terrain.json (11 hits) Line 9: "extras" : "build", Line 19: "extras" : "build", Line 29: "extras" : "build", Line 39: "extras" : "build", Line 49: "extras" : "build", Line 59: "extras" : "build", Line 69: "extras" : "build", Line 79: "extras" : "build", Line 89: "extras" : "build", Line 99: "extras" : "build", Line 109: "extras" : "build", |
ZhilkinSerg
approved these changes
Apr 14, 2018
This comment has been minimized.
This comment has been minimized.
|
Thanks for hint about mod. Concerning build to building conversion - these are big changes for minor benefit. |
ZhilkinSerg
self-assigned this
Apr 14, 2018
This comment has been minimized.
This comment has been minimized.
I agree. |
ZhilkinSerg
removed their assignment
Apr 14, 2018
ZhilkinSerg
merged commit 1f3b9fe
into
CleverRaven:master
Apr 14, 2018
illi-kun
deleted the
illi-kun:build
branch
Apr 14, 2018
nexusmrsep
added this to Done
in Mapgen and overmapgen improvements
Sep 3, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
illi-kun commentedApr 14, 2018
Closes #23465.
This needs to be done because a lot of extras definitions in
overmap_specials.jsonhave this record:"extras" : "build",