From 8cb44e264735290baad47dd6a53dabde0c29b224 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:28:11 -0700 Subject: [PATCH 1/7] Heightmaps, and locations tweaked Because of height drop --- biomes/mushroom-forest.json | 2 +- biomes/mushroom-plains.json | 2 +- biomes/swamp-mountain-forest.json | 2 +- biomes/swamp-roofed-forest.json | 2 +- biomes/swamp-roofed-wayward.json | 2 +- biomes/swamp-willow-forest.json | 2 +- biomes/tundra-taiga.json | 2 +- regions/frozen.json | 2 +- regions/hot.json | 2 +- regions/swamp.json | 2 +- structures/mush-huts.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/biomes/mushroom-forest.json b/biomes/mushroom-forest.json index e3f9c4ea..7fc22a66 100644 --- a/biomes/mushroom-forest.json +++ b/biomes/mushroom-forest.json @@ -385,7 +385,7 @@ "zoom": 1.14, "shuffle": 16, "ratio": 0.59, - "height": 45, + "height": 30, "rarity": 55 } ], diff --git a/biomes/mushroom-plains.json b/biomes/mushroom-plains.json index 52aaaec7..f516f022 100644 --- a/biomes/mushroom-plains.json +++ b/biomes/mushroom-plains.json @@ -264,7 +264,7 @@ "zoom": 1.14, "shuffle": 16, "ratio": 0.59, - "height": 45, + "height": 30, "rarity": 55 }, { diff --git a/biomes/swamp-mountain-forest.json b/biomes/swamp-mountain-forest.json index 9817949b..3d56e712 100644 --- a/biomes/swamp-mountain-forest.json +++ b/biomes/swamp-mountain-forest.json @@ -439,7 +439,7 @@ "zoom": 3.14, "shuffle": 16, "ratio": 0.59, - "height": 67, + "height": 30, "rarity": 33 } ], diff --git a/biomes/swamp-roofed-forest.json b/biomes/swamp-roofed-forest.json index 6c1efd83..b4760e19 100644 --- a/biomes/swamp-roofed-forest.json +++ b/biomes/swamp-roofed-forest.json @@ -524,7 +524,7 @@ "zoom": 3.15, "shuffle": 11, "ratio": 0.58, - "height": 53, + "height": 30, "rarity": 32 } ], diff --git a/biomes/swamp-roofed-wayward.json b/biomes/swamp-roofed-wayward.json index 4d2f7827..3bd04da5 100644 --- a/biomes/swamp-roofed-wayward.json +++ b/biomes/swamp-roofed-wayward.json @@ -498,7 +498,7 @@ "zoom": 3.15, "shuffle": 11, "ratio": 0.58, - "height": 53, + "height": 30, "rarity": 36 } ], diff --git a/biomes/swamp-willow-forest.json b/biomes/swamp-willow-forest.json index 78887849..6bfea1b0 100644 --- a/biomes/swamp-willow-forest.json +++ b/biomes/swamp-willow-forest.json @@ -488,7 +488,7 @@ "zoom": 3.14, "shuffle": 16, "ratio": 0.59, - "height": 58, + "height": 30, "rarity": 31 } ], diff --git a/biomes/tundra-taiga.json b/biomes/tundra-taiga.json index 200d5c56..18983231 100644 --- a/biomes/tundra-taiga.json +++ b/biomes/tundra-taiga.json @@ -356,7 +356,7 @@ { "tileset": "village-stone", "zoom": 2, - "rarity": 159 + "rarity": 100 } ], "generators": [ diff --git a/regions/frozen.json b/regions/frozen.json index ababe2fa..d4223d0b 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -7,7 +7,7 @@ "tileset": "soul-temple", "zoom": 2, "rarity": 12, - "height": 36 + "height": 35 }, { "tileset": "ruins", diff --git a/regions/hot.json b/regions/hot.json index c5dee024..6dcb8a9c 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -41,7 +41,7 @@ "zoom": 0.25, "shuffle": 5, "ratio": 0.05, - "height": 25, + "height": 30, "rarity": 15 } ], diff --git a/regions/swamp.json b/regions/swamp.json index 953203ae..ad35c0b6 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -29,7 +29,7 @@ "zoom": 0.25, "shuffle": 5, "ratio": 0.05, - "height": 25, + "height": 35, "rarity": 15 }, { diff --git a/structures/mush-huts.json b/structures/mush-huts.json index 6e784db5..5893afdc 100644 --- a/structures/mush-huts.json +++ b/structures/mush-huts.json @@ -3,7 +3,7 @@ "entityInitialSpawns": [ { "entity": "villager", - "maxSpawns": 5, + "maxSpawns": 4, "minSpawns": 2 } ], From 8b3397d24e1d11b7f04f166f43b7b0369a892cd6 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:34:51 -0700 Subject: [PATCH 2/7] dw --- regions/hot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regions/hot.json b/regions/hot.json index 6dcb8a9c..2234511c 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -42,7 +42,7 @@ "shuffle": 5, "ratio": 0.05, "height": 30, - "rarity": 15 + "rarity": 150 } ], "landBiomes": [ From 709c8c33fef7871faabd7e8dc88681d17fb08f08 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:36:32 -0700 Subject: [PATCH 3/7] dwa --- regions/frozen.json | 2 +- regions/swamp.json | 2 +- regions/tundra.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/regions/frozen.json b/regions/frozen.json index d4223d0b..3e585e88 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -6,7 +6,7 @@ { "tileset": "soul-temple", "zoom": 2, - "rarity": 12, + "rarity": 120, "height": 35 }, { diff --git a/regions/swamp.json b/regions/swamp.json index ad35c0b6..dad3dff2 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -30,7 +30,7 @@ "shuffle": 5, "ratio": 0.05, "height": 35, - "rarity": 15 + "rarity": 150 }, { "tileset": "ruins", diff --git a/regions/tundra.json b/regions/tundra.json index 598f2e19..961468c6 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -6,7 +6,7 @@ { "tileset": "ruins", "zoom": 1, - "rarity": 300 + "rarity": 200 } ], "landBiomes": [ From 798d19152bc6889ef9c056c2080696a423085843 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:39:39 -0700 Subject: [PATCH 4/7] AjhhHH --- regions/mosaic.json | 2 +- regions/mushroom.json | 2 +- regions/temperate.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/regions/mosaic.json b/regions/mosaic.json index 645ff5a0..91ed5bac 100644 --- a/regions/mosaic.json +++ b/regions/mosaic.json @@ -3,7 +3,7 @@ { "tileset": "ruins", "zoom": 1, - "rarity": 400 + "rarity": 100 } ], "landBiomes": [ diff --git a/regions/mushroom.json b/regions/mushroom.json index 492afddd..4ec33115 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -31,7 +31,7 @@ { "tileset": "ruins", "zoom": 1, - "rarity": 600 + "rarity": 300 } ], diff --git a/regions/temperate.json b/regions/temperate.json index d99dfafe..7e2e07fe 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -6,7 +6,7 @@ { "tileset": "ruins", "zoom": 1, - "rarity": 600 + "rarity": 300 } ], "spotBiomes": [ From 80b2dba05650d86cd1b158126f2070965d27b2e1 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:40:11 -0700 Subject: [PATCH 5/7] ew --- regions/swamp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regions/swamp.json b/regions/swamp.json index dad3dff2..ffd9655a 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -29,7 +29,7 @@ "zoom": 0.25, "shuffle": 5, "ratio": 0.05, - "height": 35, + "height": 30, "rarity": 150 }, { From ff3a96e2ce356b7b74af30807ed8fa569d8dabcb Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 21:43:53 -0700 Subject: [PATCH 6/7] d --- regions/hot.json | 2 +- regions/swamp.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/regions/hot.json b/regions/hot.json index 2234511c..ca713f58 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -42,7 +42,7 @@ "shuffle": 5, "ratio": 0.05, "height": 30, - "rarity": 150 + "rarity": 200 } ], "landBiomes": [ diff --git a/regions/swamp.json b/regions/swamp.json index ffd9655a..9444bed3 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -30,7 +30,7 @@ "shuffle": 5, "ratio": 0.05, "height": 30, - "rarity": 150 + "rarity": 200 }, { "tileset": "ruins", From e1b63464f99e4990e7bf93da75f599966594e84c Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Fri, 16 Oct 2020 22:28:17 -0700 Subject: [PATCH 7/7] Oops fixed the melding issue --- structures/mush-huts.json | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/structures/mush-huts.json b/structures/mush-huts.json index 5893afdc..239d7447 100644 --- a/structures/mush-huts.json +++ b/structures/mush-huts.json @@ -1,12 +1,5 @@ { "gridHeight": 32, - "entityInitialSpawns": [ - { - "entity": "villager", - "maxSpawns": 4, - "minSpawns": 2 - } - ], "maxLayers": 1, "bore": false, "wallStyle": { @@ -20,7 +13,7 @@ "ceiling": "AGNOSTIC", "east": "NEVER", "entitySpawnOverrides": [], - "placeMode": "CENTER_HEIGHT", + "placeMode": "PAINT", "south": "NEVER", "rareObjects": [], "north": "NEVER", @@ -38,7 +31,7 @@ "ceiling": "AGNOSTIC", "east": "NEVER", "entitySpawnOverrides": [], - "placeMode": "CENTER_HEIGHT", + "placeMode": "PAINT", "south": "NEVER", "rareObjects": [], "north": "REQUIRED", @@ -56,7 +49,7 @@ "ceiling": "AGNOSTIC", "east": "NEVER", "entitySpawnOverrides": [], - "placeMode": "CENTER_HEIGHT", + "placeMode": "PAINT", "south": "REQUIRED", "rareObjects": [], "north": "REQUIRED", @@ -74,7 +67,7 @@ "ceiling": "AGNOSTIC", "east": "REQUIRED", "entitySpawnOverrides": [], - "placeMode": "CENTER_HEIGHT", + "placeMode": "PAINT", "south": "NEVER", "rareObjects": [], "north": "REQUIRED", @@ -91,6 +84,13 @@ { "ceiling": "AGNOSTIC", "east": "REQUIRED", + "entityInitialSpawns": [ + { + "entity": "villager", + "maxSpawns": 2, + "minSpawns": 1 + } + ], "entitySpawnOverrides": [], "placeMode": "FAST_MIN_HEIGHT", "south": "NEVER", @@ -117,6 +117,13 @@ { "ceiling": "AGNOSTIC", "east": "REQUIRED", + "entityInitialSpawns": [ + { + "entity": "villager", + "maxSpawns": 2, + "minSpawns": 1 + } + ], "entitySpawnOverrides": [], "placeMode": "FAST_MIN_HEIGHT", "south": "REQUIRED",