diff --git a/biomes/ocean/deep.json b/biomes/ocean/deep.json index 0686905b..5fa65e20 100644 --- a/biomes/ocean/deep.json +++ b/biomes/ocean/deep.json @@ -134,13 +134,5 @@ "structures/shipupsidedownbackhalfdegraded" ] } - ], - "entityInitialSpawns": [ - { - "entity": "dolphin", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 100 - } ] } diff --git a/biomes/temperate/birch-denmyre.json b/biomes/temperate/birch-denmyre.json index 9b852312..e6210a19 100644 --- a/biomes/temperate/birch-denmyre.json +++ b/biomes/temperate/birch-denmyre.json @@ -210,20 +210,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "wall": { "style": {"style": "STATIC"}, "palette": [ diff --git a/biomes/temperate/birch-forest.json b/biomes/temperate/birch-forest.json index bcc51a7a..5dbdea0d 100644 --- a/biomes/temperate/birch-forest.json +++ b/biomes/temperate/birch-forest.json @@ -221,25 +221,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/birch-thin.json b/biomes/temperate/birch-thin.json index 600e8655..f0ba798c 100644 --- a/biomes/temperate/birch-thin.json +++ b/biomes/temperate/birch-thin.json @@ -193,25 +193,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + } } diff --git a/biomes/temperate/combo-forest.json b/biomes/temperate/combo-forest.json index 8b01e466..578b0187 100644 --- a/biomes/temperate/combo-forest.json +++ b/biomes/temperate/combo-forest.json @@ -318,26 +318,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "biomeScatter": ["FOREST"], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/flower-forest.json b/biomes/temperate/flower-forest.json index 5b31b383..5a3494ec 100644 --- a/biomes/temperate/flower-forest.json +++ b/biomes/temperate/flower-forest.json @@ -61,17 +61,6 @@ "structure": "village-temperate" } ], - "entityInitialSpawns": [{ - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 20 - }, { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }], "objects": [ { "chance": 0.07, diff --git a/biomes/temperate/highlands.json b/biomes/temperate/highlands.json index 459b922b..68d872f8 100644 --- a/biomes/temperate/highlands.json +++ b/biomes/temperate/highlands.json @@ -55,20 +55,6 @@ ] } ], - "entityInitialSpawns": [ - { - "entity": "bee", - "maxSpawns": 5, - "minSpawns": 2, - "rarity": 3 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "decorators": [ { "chance": 0.003, diff --git a/biomes/temperate/island.json b/biomes/temperate/island.json index cb7ec4cc..4e9b5cdd 100644 --- a/biomes/temperate/island.json +++ b/biomes/temperate/island.json @@ -127,13 +127,5 @@ "biomeScatter": [ "FOREST", "PLAINS" - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } ] } diff --git a/biomes/temperate/longtree-forest.json b/biomes/temperate/longtree-forest.json index 03bd9e73..4273ae60 100644 --- a/biomes/temperate/longtree-forest.json +++ b/biomes/temperate/longtree-forest.json @@ -408,19 +408,5 @@ } ], "style": {"style": "STATIC"} - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 70 - } - ] + } } diff --git a/biomes/temperate/lush-plains-red.json b/biomes/temperate/lush-plains-red.json index 3e2bb614..d0d450d8 100644 --- a/biomes/temperate/lush-plains-red.json +++ b/biomes/temperate/lush-plains-red.json @@ -223,19 +223,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/lush-plains-yellow.json b/biomes/temperate/lush-plains-yellow.json index 4a4d458b..45a8ca22 100644 --- a/biomes/temperate/lush-plains-yellow.json +++ b/biomes/temperate/lush-plains-yellow.json @@ -223,19 +223,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/lush-plains.json b/biomes/temperate/lush-plains.json index 2add643f..f8d3875d 100644 --- a/biomes/temperate/lush-plains.json +++ b/biomes/temperate/lush-plains.json @@ -251,19 +251,5 @@ "wall": {"palette": [ {"block": "stone"}, {"block": "andesite"} - ]}, - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ] + ]} } diff --git a/biomes/temperate/meadows.json b/biomes/temperate/meadows.json index aaa02124..3e86b798 100644 --- a/biomes/temperate/meadows.json +++ b/biomes/temperate/meadows.json @@ -213,20 +213,6 @@ } ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 80 - } - ], "biomeStyle": {"style": "SIMPLEX"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/oak-denmyre.json b/biomes/temperate/oak-denmyre.json index a93177ad..582610c9 100644 --- a/biomes/temperate/oak-denmyre.json +++ b/biomes/temperate/oak-denmyre.json @@ -220,25 +220,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + } } diff --git a/biomes/temperate/oak-forest.json b/biomes/temperate/oak-forest.json index 27314c2f..9e1d19bd 100644 --- a/biomes/temperate/oak-forest.json +++ b/biomes/temperate/oak-forest.json @@ -235,25 +235,5 @@ } } } - ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } ] } diff --git a/biomes/temperate/plains.json b/biomes/temperate/plains.json index 4fd1af6e..467d9a7b 100644 --- a/biomes/temperate/plains.json +++ b/biomes/temperate/plains.json @@ -313,20 +313,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "horse", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - } - ], "biomeStyle": {"style": "SIMPLEX"}, "wall": {"palette": [ {"block": "stone"}, diff --git a/biomes/temperate/plateau.json b/biomes/temperate/plateau.json index 69724edc..464ed3b8 100644 --- a/biomes/temperate/plateau.json +++ b/biomes/temperate/plateau.json @@ -311,25 +311,5 @@ {"block": "stone"} ] }, - "biomeScatter": ["FOREST"], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ] + "biomeScatter": ["FOREST"] } diff --git a/biomes/temperate/sakura-pink-forest.json b/biomes/temperate/sakura-pink-forest.json index 8a3a5af7..3a78eb20 100644 --- a/biomes/temperate/sakura-pink-forest.json +++ b/biomes/temperate/sakura-pink-forest.json @@ -48,26 +48,6 @@ ] } ], - "entityInitialSpawns": [ - { - "entity": "sheep", - "minSpawns": 1, - "maxSpawns": 2, - "rarity": 10 - }, - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 90 - } - ], "objects": [ { "chance": 0.2, diff --git a/biomes/temperate/shore/beach.json b/biomes/temperate/shore/beach.json index df16be32..b767931e 100644 --- a/biomes/temperate/shore/beach.json +++ b/biomes/temperate/shore/beach.json @@ -62,14 +62,6 @@ } } ], - "entityInitialSpawns": [ - { - "entity": "turtle", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 80 - } - ], "objects": [{ "mode": "PAINT", "chance": 0.0025, diff --git a/biomes/tundra/autumn.json b/biomes/tundra/autumn.json index c99368da..5ba268d3 100644 --- a/biomes/tundra/autumn.json +++ b/biomes/tundra/autumn.json @@ -489,19 +489,5 @@ } } } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/forest.json b/biomes/tundra/forest.json index cbfd7fda..0cadfef1 100644 --- a/biomes/tundra/forest.json +++ b/biomes/tundra/forest.json @@ -221,19 +221,5 @@ "biomeScatter": [ "TAIGA_HILLS", "MOUNTAINS" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/mountains-cliffs.json b/biomes/tundra/mountains-cliffs.json index c5d660a5..1f02a090 100644 --- a/biomes/tundra/mountains-cliffs.json +++ b/biomes/tundra/mountains-cliffs.json @@ -268,25 +268,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - }, - { - "entity": "llama", - "maxSpawns": 2, - "minSpawns": 5, - "rarity": 80 - } ] } diff --git a/biomes/tundra/mountains.json b/biomes/tundra/mountains.json index 68e5324f..7044241a 100644 --- a/biomes/tundra/mountains.json +++ b/biomes/tundra/mountains.json @@ -227,25 +227,5 @@ "TAIGA_HILLS", "MOUNTAINS", "SWAMP" - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 70 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - }, - { - "entity": "llama", - "maxSpawns": 2, - "minSpawns": 5, - "rarity": 80 - } ] } diff --git a/biomes/tundra/redwood-cliffs.json b/biomes/tundra/redwood-cliffs.json index 64fc51d0..7202a6d3 100644 --- a/biomes/tundra/redwood-cliffs.json +++ b/biomes/tundra/redwood-cliffs.json @@ -409,19 +409,5 @@ ], "mode": "VACUUM" } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 2, - "maxSpawns": 5, - "rarity": 90 - }, - { - "entity": "goat", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 60 - } ] } diff --git a/biomes/tundra/redwood-forest.json b/biomes/tundra/redwood-forest.json index 635ff364..243b91f2 100644 --- a/biomes/tundra/redwood-forest.json +++ b/biomes/tundra/redwood-forest.json @@ -371,19 +371,5 @@ ], "mode": "VACUUM" } - ], - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } ] } diff --git a/biomes/tundra/sequia-redwoods.json b/biomes/tundra/sequia-redwoods.json index d0cd49ec..42472afa 100644 --- a/biomes/tundra/sequia-redwoods.json +++ b/biomes/tundra/sequia-redwoods.json @@ -317,19 +317,5 @@ "wall": { "style": {"style": "STATIC"}, "palette": [{"block": "coarse_dirt"}] - }, - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 50 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 50 - } - ] + } } diff --git a/biomes/tundra/taiga.json b/biomes/tundra/taiga.json index 18306c0b..258db56a 100644 --- a/biomes/tundra/taiga.json +++ b/biomes/tundra/taiga.json @@ -304,19 +304,5 @@ {"block": "andesite"}, {"block": "stone"} ] - }, - "entityInitialSpawns": [ - { - "entity": "wolf", - "minSpawns": 1, - "maxSpawns": 3, - "rarity": 30 - }, - { - "entity": "fox", - "maxSpawns": 1, - "minSpawns": 3, - "rarity": 30 - } - ] + } } diff --git a/regions/frozen.json b/regions/frozen.json index c5b1ab90..ebbb80c6 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -37,39 +37,7 @@ "style": "IRIS", "zoom": 5 } - }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 25 - }, - { - "entity": "polar-bear", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 20 - } - ], + } "deposits": [ { "minHeight": 8, diff --git a/regions/hot.json b/regions/hot.json index 80b038b7..3fc7ed0c 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -31,39 +31,6 @@ "zoom": 5 } }, - - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "donkey", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "mule", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 50 - }, - { - "entity": "rabbit", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 20 - }, - { - "entity": "wanderingtrader", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 250 - } - ], "spotBiomes": [{ "biome": "hot/oasis", "scale": 5, diff --git a/regions/mushroom.json b/regions/mushroom.json index fb3c2424..69054ba5 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -259,19 +259,6 @@ "soundDistance": 3 } ], - "entityInitialSpawns": [ - { - "entity": "mooshroom", - "maxSpawns": 4, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "cow", - "maxSpawns": 2, - "rarity": 20 - } - ], "shoreHeightMin": 3.2, "shoreHeightMax": 6.2, "loot": { diff --git a/regions/swamp.json b/regions/swamp.json index ae856250..265307b0 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -31,38 +31,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 16 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 8 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 12 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 28 - } - ], "biomeImplosionRatio": 0.26, "deposits": [ { diff --git a/regions/temperate.json b/regions/temperate.json index 1ec4184a..9b2c20de 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -32,32 +32,6 @@ "rarity": 750 }], "ENTITY_SPAWNS": "Sheep is purposely missing from this list so it doesn't spawn in estranged plains", - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "bee", - "maxSpawns": 3, - "minSpawns": 2, - "rarity": 60 - } - ], "shoreRatio": 0.1, "shoreBiomeZoom": 0.15, "biomeImplosionRatio": 0.7, diff --git a/regions/tropical.json b/regions/tropical.json index e955a4f9..0c850d52 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -39,74 +39,6 @@ "zoom": 5 } }, - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 18 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 39 - }, - { - "entity": "ocelot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 10 - }, - { - "entity": "parrot", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 15 - }, - { - "entity": "turtle", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 80 - }, - { - "entity": "panda", - "maxSpawns": 3, - "minSpawns": 1, - "rarity": 40 - }, - { - "entity": "pandaUwU", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 150 - }, - { - "entity": "aeternum", - "maxSpawns": 1, - "minSpawns": 1, - "rarity": 200 - } - ], "jigsawStructures": [{ "structure": "murky_stronghold", "rarity": 750 diff --git a/regions/tundra.json b/regions/tundra.json index aea96a5d..6e93fc9c 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -32,38 +32,7 @@ "cave/tundra-cavern", "cave/spiked-cavern" ], - "entityInitialSpawns": [ - { - "entity": "chicken", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "cow", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "pig", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "sheep", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 14 - }, - { - "entity": "wolf", - "maxSpawns": 2, - "minSpawns": 1, - "rarity": 29 - } - ], + "riverBiomes": [ "tundra/sea/river", "tundra/sea/river-rocky",