diff --git a/core.clutter/objects/cactu-sred/c1.iob b/core.clutter/objects/cactu-sred/c1.iob deleted file mode 100644 index 7586f1e7..00000000 Binary files a/core.clutter/objects/cactu-sred/c1.iob and /dev/null differ diff --git a/core.clutter/objects/cactu-sred/c2.iob b/core.clutter/objects/cactu-sred/c2.iob deleted file mode 100644 index 0797b52d..00000000 Binary files a/core.clutter/objects/cactu-sred/c2.iob and /dev/null differ diff --git a/core.clutter/objects/cactu-sred/c3.iob b/core.clutter/objects/cactu-sred/c3.iob deleted file mode 100644 index 795f9eb3..00000000 Binary files a/core.clutter/objects/cactu-sred/c3.iob and /dev/null differ diff --git a/core.clutter/objects/cactu-sred/c4.iob b/core.clutter/objects/cactu-sred/c4.iob deleted file mode 100644 index eb67dc36..00000000 Binary files a/core.clutter/objects/cactu-sred/c4.iob and /dev/null differ diff --git a/core.clutter/objects/lilly.iob b/core.clutter/objects/lilly.iob deleted file mode 100644 index 97c061fd..00000000 Binary files a/core.clutter/objects/lilly.iob and /dev/null differ diff --git a/core.clutter/objects/shroom/SavanaRock1.iob b/core.clutter/objects/shroom/SavanaRock1.iob new file mode 100644 index 00000000..02b6e444 Binary files /dev/null and b/core.clutter/objects/shroom/SavanaRock1.iob differ diff --git a/core.clutter/objects/shroom/mushclutt1.iob b/core.clutter/objects/shroom/mushclutt1.iob new file mode 100644 index 00000000..00d2c681 Binary files /dev/null and b/core.clutter/objects/shroom/mushclutt1.iob differ diff --git a/core.clutter/objects/shroom/mushclutt2.iob b/core.clutter/objects/shroom/mushclutt2.iob new file mode 100644 index 00000000..d2985882 Binary files /dev/null and b/core.clutter/objects/shroom/mushclutt2.iob differ diff --git a/core.clutter/objects/shroom/mushclutt3.iob b/core.clutter/objects/shroom/mushclutt3.iob new file mode 100644 index 00000000..7b94d6c8 Binary files /dev/null and b/core.clutter/objects/shroom/mushclutt3.iob differ diff --git a/core.clutter/objects/shroom/mushclutt4.iob b/core.clutter/objects/shroom/mushclutt4.iob new file mode 100644 index 00000000..f5d956bb Binary files /dev/null and b/core.clutter/objects/shroom/mushclutt4.iob differ diff --git a/core.clutter/objects/shroom/mushclutt5.iob b/core.clutter/objects/shroom/mushclutt5.iob new file mode 100644 index 00000000..e8be707f Binary files /dev/null and b/core.clutter/objects/shroom/mushclutt5.iob differ diff --git a/iris.overworld.hot/biomes/hot-mesa.json b/iris.overworld.hot/biomes/hot-mesa.json index 7fcad06d..038d6db8 100644 --- a/iris.overworld.hot/biomes/hot-mesa.json +++ b/iris.overworld.hot/biomes/hot-mesa.json @@ -68,6 +68,31 @@ "BLACK_TERRACOTTA" ] }, + "objects": [ + { + "chance": 0.05, + "density": 1, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "haybale/hay1", + "haybale/hay3", + "haybale/hay2" + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "decorators": [ { "zoom": 0.3, diff --git a/iris.overworld.swamp/biomes/swamp-mushroom.json b/iris.overworld.swamp/biomes/swamp-mushroom.json index 5a9d7963..d3c2d856 100644 --- a/iris.overworld.swamp/biomes/swamp-mushroom.json +++ b/iris.overworld.swamp/biomes/swamp-mushroom.json @@ -1,140 +1,290 @@ { - "name": "Mushroom Swamp", - "layers": [ - { - "terrainZoom": 0.5, - "dispersion": "WISPY", - "palette": [ - "MYCELIUM", - "MYCELIUM", - "MYCELIUM", - "MYCELIUM", - "GRAVEL", - "MYCELIUM", - "MYCELIUM", - "MYCELIUM" - ] - }, - { - "minHeight": 2, - "maxHeight": 4, - "palette": [ - "DIRT", - "COARSE_DIRT" - ] - }, - { - "minHeight": 6, - "maxHeight": 18, - "dispersion": "SCATTER", - "palette": [ - "STONE", - "ANDESITE", - "STONE" - ] - } + "name":"Mushroom Swamp", + "layers":[ + { + "terrainZoom":0.5, + "dispersion":"WISPY", + "palette":[ + "MYCELIUM", + "MYCELIUM", + "MYCELIUM", + "MYCELIUM", + "GRAVEL", + "MYCELIUM", + "MYCELIUM", + "MYCELIUM" + ] + }, + { + "minHeight":2, + "maxHeight":4, + "palette":[ + "DIRT", + "COARSE_DIRT" + ] + }, + { + "minHeight":6, + "maxHeight":18, + "dispersion":"SCATTER", + "palette":[ + "STONE", + "ANDESITE", + "STONE" + ] + } ], - "slab": { - "dispersion": "WISPY", - "terrainZoom": 0.35, - "palette": [ - "AIR", - "AIR", - "AIR", - "AIR", - "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", - "AIR", - "AIR", - "AIR", - "AIR", - "AIR", - "AIR" - ] + "slab":{ + "dispersion":"WISPY", + "terrainZoom":0.35, + "palette":[ + "AIR", + "AIR", + "AIR", + "AIR", + "minecraft:cobblestone_slab[type=bottom,waterlogged=false]", + "minecraft:mossy_cobblestone_slab[type=bottom,waterlogged=false]", + "AIR", + "AIR", + "AIR", + "AIR" + ] }, - "wall": - { - "dispersion": "SCATTER", - "palette": [ - "STONE", - "ANDESITE", - "STONE" - ] + "wall":{ + "dispersion":"SCATTER", + "palette":[ + "STONE", + "ANDESITE", + "STONE" + ] }, - "objects": [ - { - "chance": 0.5, - "density": 2, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "mushroom-red/small-organell-r-1", - "mushroom-red/small-organell-r-2", - "mushroom-red/small-organell-r-3", - "mushroom-red/small-organell-r-4", - "mushroom-red/small-organell-r-5", - "mushroom-red/small-organell-r-6", - "mushroom-red/small-organell-r-7", - "mushroom-red/small-organell-r-8", - "mushroom-red/small-organell-r-9", - "mushroom-red/small-organell-r-10" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - }, - { - "chance": 0.5, - "density": 2, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": [ - "mushroom-red/organell-r-1", - "mushroom-red/organell-r-2", - "mushroom-red/organell-b-1", - "mushroom-red/organell-b-2", - "mushroom-red/organell-r-3", - "mushroom-red/organell-r-4", - "mushroom-red/organell-r-5", - "mushroom-red/organell-r-6", - "mushroom-red/organell-r-7", - "mushroom-red/organell-r-8", - "mushroom-red/organell-r-9", - "mushroom-red/organell-r-10" - ], - "translate": { - "x": 0, - "y": -1, - "z": 0 - } - } + "objects":[ + { + "chance":0.21, + "density":2, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + }, + { + "chance":0.21, + "edit":[ + { + "find":"red_mushroom_block", + "replace":"brown_mushroom_block" + } + ], + "density":2, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "mushroom-red/small-organell-r-1", + "mushroom-red/small-organell-r-2", + "mushroom-red/small-organell-r-3", + "mushroom-red/small-organell-r-4", + "mushroom-red/small-organell-r-5", + "mushroom-red/small-organell-r-6", + "mushroom-red/small-organell-r-7", + "mushroom-red/small-organell-r-8", + "mushroom-red/small-organell-r-9", + "mushroom-red/small-organell-r-10" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + }, + { + "chance":0.5, + "density":2, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + }, + { + "chance":0.5, + "edit":[ + { + "find":"red_mushroom_block", + "replace":"brown_mushroom_block" + } + ], + "density":2, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "mushroom-red/organell-r-1", + "mushroom-red/organell-r-2", + "mushroom-red/organell-b-1", + "mushroom-red/organell-b-2", + "mushroom-red/organell-r-3", + "mushroom-red/organell-r-4", + "mushroom-red/organell-r-5", + "mushroom-red/organell-r-6", + "mushroom-red/organell-r-7", + "mushroom-red/organell-r-8", + "mushroom-red/organell-r-9", + "mushroom-red/organell-r-10" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + }, + { + "chance":0.1, + "edit":[ + { + "find":"red_mushroom_block", + "replace":"brown_mushroom_block" + } + ], + "density":1, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + }, + { + "chance":0.1, + "density":1, + "rotation":{ + "yAxis":{ + "min":0, + "max":0, + "interval":90, + "enabled":true + }, + "enabled":true + }, + "place":[ + "shroom/mushclutt1", + "shroom/mushclutt2", + "shroom/mushclutt3", + "shroom/mushclutt4", + "shroom/mushclutt5" + ], + "translate":{ + "x":0, + "y":-1, + "z":0 + } + } + ], + "decorators":[ + { + "zoom":0.3, + "chance":0.009, + "palette":[ + "minecraft:stone_button[face=floor,facing=east,powered=false]", + "minecraft:stone_button[face=floor,facing=south,powered=false]" + ], + "dispersion":"SCATTER", + "variance":"SCATTER" + }, + { + "zoom":0.3, + "chance":0.05, + "palette":[ + "red_mushroom", + "brown_mushroom" + ], + "dispersion":"SCATTER", + "variance":"SCATTER" + } ], "generators":[ - { - "generator": "plain", - "min": 4, - "max": 11 - }, - { - "generator": "wavy", - "min": 2, - "max": 7 - } + { + "generator":"plain", + "min":4, + "max":11 + }, + { + "generator":"wavy", + "min":2, + "max":7 + } ], - "derivative": "MUSHROOM_FIELDS" -} \ No newline at end of file + "derivative":"MUSHROOM_FIELDS" + } \ No newline at end of file