From 5598d4747460db93b089031a69c1fc8c59f1ed1e Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 25 Aug 2020 19:16:30 -0700 Subject: [PATCH] fixes --- overworld/regions/swamp.json | 2 +- overworld/regions/temperate.json | 8 +- overworld/regions/tundra.json | 2 +- overworld/structures/murky-stronghold.json | 361 +++++++----------- overworld/structures/ogMurkyCavern.json | 152 -------- overworld/structures/village-dark.json | 94 ----- .../{Village-2.json => village-stone.json} | 0 7 files changed, 136 insertions(+), 483 deletions(-) delete mode 100644 overworld/structures/ogMurkyCavern.json delete mode 100644 overworld/structures/village-dark.json rename overworld/structures/{Village-2.json => village-stone.json} (100%) diff --git a/overworld/regions/swamp.json b/overworld/regions/swamp.json index 74b3d8ef..66afc685 100644 --- a/overworld/regions/swamp.json +++ b/overworld/regions/swamp.json @@ -43,7 +43,7 @@ ], "structures": [ { - "tileset": "ogMurkyCavern", + "tileset": "murky-stronghold", "zoom": 0.25, "ratio": 0.05, "height": 25, diff --git a/overworld/regions/temperate.json b/overworld/regions/temperate.json index 01246875..c8610058 100644 --- a/overworld/regions/temperate.json +++ b/overworld/regions/temperate.json @@ -20,10 +20,10 @@ ], "structures": [ { - "tileset": "village-dark", - "ratio": 0.8, - "rarity": 1, - "zoom": 1 + "tileset": "village-stone", + "ratio": 0.05, + "rarity": 5, + "zoom": 0.25 } ], "shoreBiomes": [ diff --git a/overworld/regions/tundra.json b/overworld/regions/tundra.json index eb20685b..4a12081b 100644 --- a/overworld/regions/tundra.json +++ b/overworld/regions/tundra.json @@ -30,7 +30,7 @@ }, "structures": [ { - "tileset": "village-dark", + "tileset": "village-stone", "ratio": 0.8, "rarity": 1, "zoom": 1 diff --git a/overworld/structures/murky-stronghold.json b/overworld/structures/murky-stronghold.json index 6737547d..f0b9cb1a 100644 --- a/overworld/structures/murky-stronghold.json +++ b/overworld/structures/murky-stronghold.json @@ -1,253 +1,152 @@ { - "name": "Example Temple", - "gridSize": 5, "gridHeight": 6, - "maxLayers": 1, - "mergeEdges": false, - "wallChance": 0.45, - "loot": { - "tables": [ - "global-treasure", - "tropical-treasure", - "hot-treasure", - "cold-treasure", - "global-tools" - ] + "wallStyle": { + "multiplier": 1, + "style": "STATIC", + "zoom": 1, + "exponent": 1 }, "tiles": [ { - "ceiling": "REQUIRED", - "floor": "REQUIRED", - "north": "NEVER", + "ceiling": "AGNOSTIC", + "east": "NEVER", + "placeMode": "PAINT", "south": "NEVER", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/fc-x-1", - "structure/murky-stronghold/fc-x-2", - "structure/murky-stronghold/fc-x-3", - "structure/murky-stronghold/fc-x-4", - "structure/murky-stronghold/fc-x-5", - "structure/murky-stronghold/fc-x-6", - "structure/murky-stronghold/fc-x-7", - "structure/murky-stronghold/fc-x-8" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", + "rareObjects": [], "north": "NEVER", + "objects": [ + "structure/OgMurkyCavern/cross-1", + "structure/OgMurkyCavern/cross-2", + "structure/OgMurkyCavern/cross-3", + "structure/OgMurkyCavern/cross-4", + "structure/OgMurkyCavern/cross-5", + "structure/OgMurkyCavern/cross-6", + "structure/OgMurkyCavern/cross-7", + "structure/OgMurkyCavern/cross-8" + ], + "west": "NEVER", + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" + }, + { + "ceiling": "AGNOSTIC", + "east": "NEVER", + "placeMode": "PAINT", "south": "NEVER", - "east": "NEVER", - "west": "NEVER", + "rareObjects": [], + "north": "REQUIRED", "objects": [ - "structure/murky-stronghold/c-x-1", - "structure/murky-stronghold/c-x-2", - "structure/murky-stronghold/c-x-3", - "structure/murky-stronghold/c-x-4", - "structure/murky-stronghold/c-x-5", - "structure/murky-stronghold/c-x-6" - ] + "structure/OgMurkyCavern/t-connect-1", + "structure/OgMurkyCavern/t-connect-2", + "structure/OgMurkyCavern/t-connect-3", + "structure/OgMurkyCavern/t-connect-4" + ], + "west": "NEVER", + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" }, { - "ceiling": "NEVER", - "floor": "REQUIRED", - "north": "NEVER", + "ceiling": "AGNOSTIC", + "east": "NEVER", + "placeMode": "PAINT", + "south": "REQUIRED", + "rareObjects": [], + "north": "REQUIRED", + "objects": [ + "structure/OgMurkyCavern/hall-1", + "structure/OgMurkyCavern/hall-2", + "structure/OgMurkyCavern/hall-3", + "structure/OgMurkyCavern/hall-4" + ], + "west": "NEVER", + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" + }, + { + "ceiling": "AGNOSTIC", + "east": "REQUIRED", + "placeMode": "PAINT", "south": "NEVER", - "east": "NEVER", + "rareObjects": [], + "north": "REQUIRED", + "objects": [ + "structure/OgMurkyCavern/corner-1", + "structure/OgMurkyCavern/corner-2", + "structure/OgMurkyCavern/corner-3", + "structure/OgMurkyCavern/corner-4" + ], "west": "NEVER", - "objects": [ - "structure/murky-stronghold/f-x-1", - "structure/murky-stronghold/f-x-2", - "structure/murky-stronghold/f-x-3", - "structure/murky-stronghold/f-x-4", - "structure/murky-stronghold/f-x-5", - "structure/murky-stronghold/f-x-6" - ] - }, - - - - - - { - "ceiling": "REQUIRED", - "floor": "REQUIRED", - "north": "NEVER", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/fc-sw-1", - "structure/murky-stronghold/fc-sw-2", - "structure/murky-stronghold/fc-sw-3", - "structure/murky-stronghold/fc-sw-4" - ] + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" }, { - "ceiling": "NEVER", - "floor": "REQUIRED", - "north": "NEVER", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/f-sw-1", - "structure/murky-stronghold/f-sw-2", - "structure/murky-stronghold/f-sw-3", - "structure/murky-stronghold/f-sw-4" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", - "north": "NEVER", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/c-sw-1", - "structure/murky-stronghold/c-sw-2", - "structure/murky-stronghold/c-sw-3", - "structure/murky-stronghold/c-sw-4" - ] - }, - - - - - - { - "ceiling": "REQUIRED", - "floor": "REQUIRED", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/fc-nsw-1", - "structure/murky-stronghold/fc-nsw-2", - "structure/murky-stronghold/fc-nsw-3", - "structure/murky-stronghold/fc-nsw-4" - ] - }, - { - "ceiling": "NEVER", - "floor": "REQUIRED", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/f-nsw-1", - "structure/murky-stronghold/f-nsw-2", - "structure/murky-stronghold/f-nsw-3", - "structure/murky-stronghold/f-nsw-4" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "REQUIRED", - "objects": [ - "structure/murky-stronghold/c-nsw-1", - "structure/murky-stronghold/c-nsw-2", - "structure/murky-stronghold/c-nsw-3", - "structure/murky-stronghold/c-nsw-4" - ] - }, - - - - - - { - "ceiling": "REQUIRED", - "floor": "REQUIRED", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/fc-ns-1", - "structure/murky-stronghold/fc-ns-2", - "structure/murky-stronghold/fc-ns-3", - "structure/murky-stronghold/fc-ns-4" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/c-ns-1", - "structure/murky-stronghold/c-ns-2", - "structure/murky-stronghold/c-ns-3", - "structure/murky-stronghold/c-ns-4" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", - "north": "REQUIRED", - "south": "REQUIRED", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/c-ns-1", - "structure/murky-stronghold/c-ns-2", - "structure/murky-stronghold/c-ns-3", - "structure/murky-stronghold/c-ns-4" - ] - }, - - { - "ceiling": "REQUIRED", - "floor": "REQUIRED", - "north": "REQUIRED", + "ceiling": "AGNOSTIC", + "east": "REQUIRED", + "placeMode": "PAINT", "south": "NEVER", - "east": "NEVER", - "west": "NEVER", + "rareObjects": [], + "north": "REQUIRED", "objects": [ - "structure/murky-stronghold/fc-n-1", - "structure/murky-stronghold/fc-n-2", - "structure/murky-stronghold/fc-n-3", - "structure/murky-stronghold/fc-n-4" - ] + "structure/OgMurkyCavern/room-1", + "structure/OgMurkyCavern/room-2", + "structure/OgMurkyCavern/room-3", + "structure/OgMurkyCavern/room-4" + ], + "west": "REQUIRED", + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" }, { - "ceiling": "NEVER", - "floor": "REQUIRED", + "ceiling": "AGNOSTIC", + "east": "REQUIRED", + "placeMode": "PAINT", + "south": "REQUIRED", + "rareObjects": [], "north": "REQUIRED", - "south": "NEVER", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/f-n-1", - "structure/murky-stronghold/f-n-2", - "structure/murky-stronghold/f-n-3", - "structure/murky-stronghold/f-n-4" - ] - }, - { - "ceiling": "REQUIRED", - "floor": "NEVER", - "north": "REQUIRED", - "south": "NEVER", - "east": "NEVER", - "west": "NEVER", - "objects": [ - "structure/murky-stronghold/c-n-1", - "structure/murky-stronghold/c-n-2", - "structure/murky-stronghold/c-n-3", - "structure/murky-stronghold/c-n-4" - ] + "objects": ["structure/OgMurkyCavern/walled-room-1"], + "west": "REQUIRED", + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "floor": "REQUIRED" } - ] + ], + "gridSize": 5, + "wallChance": 0.35, + "maxLayers": 1, + "name": "OgMurkyCavern", + "underwater": false, + "loot": { + "mode": "ADD", + "tables": [], + "multiplier": 1 + }, + "clamp": { + "minimumHeight": 0, + "maximumHeight": 255 + }, + "bore": true, + "mergeEdges": false } diff --git a/overworld/structures/ogMurkyCavern.json b/overworld/structures/ogMurkyCavern.json deleted file mode 100644 index f0b9cb1a..00000000 --- a/overworld/structures/ogMurkyCavern.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "gridHeight": 6, - "wallStyle": { - "multiplier": 1, - "style": "STATIC", - "zoom": 1, - "exponent": 1 - }, - "tiles": [ - { - "ceiling": "AGNOSTIC", - "east": "NEVER", - "placeMode": "PAINT", - "south": "NEVER", - "rareObjects": [], - "north": "NEVER", - "objects": [ - "structure/OgMurkyCavern/cross-1", - "structure/OgMurkyCavern/cross-2", - "structure/OgMurkyCavern/cross-3", - "structure/OgMurkyCavern/cross-4", - "structure/OgMurkyCavern/cross-5", - "structure/OgMurkyCavern/cross-6", - "structure/OgMurkyCavern/cross-7", - "structure/OgMurkyCavern/cross-8" - ], - "west": "NEVER", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - }, - { - "ceiling": "AGNOSTIC", - "east": "NEVER", - "placeMode": "PAINT", - "south": "NEVER", - "rareObjects": [], - "north": "REQUIRED", - "objects": [ - "structure/OgMurkyCavern/t-connect-1", - "structure/OgMurkyCavern/t-connect-2", - "structure/OgMurkyCavern/t-connect-3", - "structure/OgMurkyCavern/t-connect-4" - ], - "west": "NEVER", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - }, - { - "ceiling": "AGNOSTIC", - "east": "NEVER", - "placeMode": "PAINT", - "south": "REQUIRED", - "rareObjects": [], - "north": "REQUIRED", - "objects": [ - "structure/OgMurkyCavern/hall-1", - "structure/OgMurkyCavern/hall-2", - "structure/OgMurkyCavern/hall-3", - "structure/OgMurkyCavern/hall-4" - ], - "west": "NEVER", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - }, - { - "ceiling": "AGNOSTIC", - "east": "REQUIRED", - "placeMode": "PAINT", - "south": "NEVER", - "rareObjects": [], - "north": "REQUIRED", - "objects": [ - "structure/OgMurkyCavern/corner-1", - "structure/OgMurkyCavern/corner-2", - "structure/OgMurkyCavern/corner-3", - "structure/OgMurkyCavern/corner-4" - ], - "west": "NEVER", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - }, - { - "ceiling": "AGNOSTIC", - "east": "REQUIRED", - "placeMode": "PAINT", - "south": "NEVER", - "rareObjects": [], - "north": "REQUIRED", - "objects": [ - "structure/OgMurkyCavern/room-1", - "structure/OgMurkyCavern/room-2", - "structure/OgMurkyCavern/room-3", - "structure/OgMurkyCavern/room-4" - ], - "west": "REQUIRED", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - }, - { - "ceiling": "AGNOSTIC", - "east": "REQUIRED", - "placeMode": "PAINT", - "south": "REQUIRED", - "rareObjects": [], - "north": "REQUIRED", - "objects": ["structure/OgMurkyCavern/walled-room-1"], - "west": "REQUIRED", - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "floor": "REQUIRED" - } - ], - "gridSize": 5, - "wallChance": 0.35, - "maxLayers": 1, - "name": "OgMurkyCavern", - "underwater": false, - "loot": { - "mode": "ADD", - "tables": [], - "multiplier": 1 - }, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "bore": true, - "mergeEdges": false -} diff --git a/overworld/structures/village-dark.json b/overworld/structures/village-dark.json deleted file mode 100644 index 6c06d594..00000000 --- a/overworld/structures/village-dark.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "name": "Dark Village", - "gridHeight": 25, - "gridSize": 20, - "maxLayers": 1, - "wallChance": 0.435, - "loot": { - "tables": [ - "global-treasure", - "tropical-treasure", - "hot-treasure", - "cold-treasure", - "global-tools" - ] - }, - "tiles": [ - { - "ceiling": "AGNOSTIC", - "floor": "REQUIRED", - "north": "REQUIRED", - "east": "NEVER", - "south": "REQUIRED", - "west": "REQUIRED", - "objects": [ - "village-bits/bland-e-1", - "village-bits/bland-e-2", - "village-bits/bland-e-3", - "village-bits/bland-e-4", - "village-bits/bland-e-5" - - ] - }, - { - "ceiling": "AGNOSTIC", - "floor": "REQUIRED", - "north": "NEVER", - "east": "NEVER", - "south": "REQUIRED", - "west": "REQUIRED", - "objects": [ - "village-bits/bland-ne-1", - "village-bits/bland-ne-2", - "village-bits/bland-ne-3", - "village-bits/bland-ne-4", - "village-bits/bland-ne-5" - ] - }, - { - "ceiling": "AGNOSTIC", - "floor": "REQUIRED", - "north": "NEVER", - "east": "NEVER", - "south": "NEVER", - "west": "REQUIRED", - "objects": [ - "village-bits/bland-nes-1", - "village-bits/bland-nes-2", - "village-bits/bland-nes-3", - "village-bits/bland-nes-4", - "village-bits/bland-nes-5" - ] - }, - { - "ceiling": "AGNOSTIC", - "floor": "REQUIRED", - "north": "NEVER", - "east": "REQUIRED", - "south": "NEVER", - "west": "REQUIRED", - "objects": [ - "village-bits/bland-ns-1", - "village-bits/bland-ns-2", - "village-bits/bland-ns-3", - "village-bits/bland-ns-4", - "village-bits/bland-ns-5" - ] - }, - { - "ceiling": "AGNOSTIC", - "floor": "REQUIRED", - "north": "REQUIRED", - "east": "NEVER", - "south": "NEVER", - "west": "NEVER", - "objects": [ - "village-bits/stonehome-esw-1", - "village-bits/stonehome-esw-2", - "village-bits/stonehome-esw-3", - "village-bits/stonehome-esw-4" - ] - } - - ] -} \ No newline at end of file diff --git a/overworld/structures/Village-2.json b/overworld/structures/village-stone.json similarity index 100% rename from overworld/structures/Village-2.json rename to overworld/structures/village-stone.json