From cfd6d303555872203d8d58bb3fbbb75a21d981c5 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 28 Jul 2020 21:07:44 -0700 Subject: [PATCH] mushroom overhaullll --- core.clutter/objects/cactu-sred/c1.iob | Bin 69 -> 0 bytes core.clutter/objects/cactu-sred/c2.iob | Bin 100 -> 0 bytes core.clutter/objects/cactu-sred/c3.iob | Bin 131 -> 0 bytes core.clutter/objects/cactu-sred/c4.iob | Bin 162 -> 0 bytes core.clutter/objects/lilly.iob | Bin 42 -> 0 bytes core.clutter/objects/shroom/SavanaRock1.iob | Bin 0 -> 1098 bytes core.clutter/objects/shroom/mushclutt1.iob | Bin 0 -> 207 bytes core.clutter/objects/shroom/mushclutt2.iob | Bin 0 -> 113 bytes core.clutter/objects/shroom/mushclutt3.iob | Bin 0 -> 689 bytes core.clutter/objects/shroom/mushclutt4.iob | Bin 0 -> 395 bytes core.clutter/objects/shroom/mushclutt5.iob | Bin 0 -> 301 bytes iris.overworld.hot/biomes/hot-mesa.json | 25 ++ .../biomes/swamp-mushroom.json | 416 ++++++++++++------ 13 files changed, 308 insertions(+), 133 deletions(-) delete mode 100644 core.clutter/objects/cactu-sred/c1.iob delete mode 100644 core.clutter/objects/cactu-sred/c2.iob delete mode 100644 core.clutter/objects/cactu-sred/c3.iob delete mode 100644 core.clutter/objects/cactu-sred/c4.iob delete mode 100644 core.clutter/objects/lilly.iob create mode 100644 core.clutter/objects/shroom/SavanaRock1.iob create mode 100644 core.clutter/objects/shroom/mushclutt1.iob create mode 100644 core.clutter/objects/shroom/mushclutt2.iob create mode 100644 core.clutter/objects/shroom/mushclutt3.iob create mode 100644 core.clutter/objects/shroom/mushclutt4.iob create mode 100644 core.clutter/objects/shroom/mushclutt5.iob diff --git a/core.clutter/objects/cactu-sred/c1.iob b/core.clutter/objects/cactu-sred/c1.iob deleted file mode 100644 index 7586f1e728c2d3b59da195d99373e2b6092c9399..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69 zcmZQzU|?imU|<4bF#Z2O0|O9?=Vs=mCKn~9l~^SwCYO{JM<=GI+8V_E2LlE^gmiIY GUJ3x6@fd>u diff --git a/core.clutter/objects/cactu-sred/c2.iob b/core.clutter/objects/cactu-sred/c2.iob deleted file mode 100644 index 0797b52d4f77ab8847314505696d6245405ed1c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 100 zcmZQzU|?imU|cN diff --git a/core.clutter/objects/lilly.iob b/core.clutter/objects/lilly.iob deleted file mode 100644 index 97c061fd696232822c135ee79dcd5728055e2c39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42 jcmZQzU|?iG#Xv5DP;O>kYI0FxT8ULoW=>^%L1GF3M?42u diff --git a/core.clutter/objects/shroom/SavanaRock1.iob b/core.clutter/objects/shroom/SavanaRock1.iob new file mode 100644 index 0000000000000000000000000000000000000000..02b6e44406aad2f0750b1e3d67cabdec3c62e8b6 GIT binary patch literal 1098 zcma)4(F(#a49rA*^z;76fMt{pf4=>Ci2vLKEdFm>Q?9VL-(8ja-l oms83C2?^^UY`Q4g{+2nMBedV&Cqtz1&(}uo&xw?xfUwAjH-n1G#Q*>R literal 0 HcmV?d00001 diff --git a/core.clutter/objects/shroom/mushclutt1.iob b/core.clutter/objects/shroom/mushclutt1.iob new file mode 100644 index 0000000000000000000000000000000000000000..00d2c681e73c61570d57156c298639da51e34bb7 GIT binary patch literal 207 zcma)#(F%hw3`MhjPrqQ`Zwy34I!&o)n~|jW`C7Hp*99&)50`rY-~j;7obuN-^E-?Y zd$vwrA&F?~-|idM=AO(a%-qEPx_`j+B?rP$`>{px$2ap*3?XQqBS M702!$hNE{2Hrpsj8UO$Q literal 0 HcmV?d00001 diff --git a/core.clutter/objects/shroom/mushclutt2.iob b/core.clutter/objects/shroom/mushclutt2.iob new file mode 100644 index 0000000000000000000000000000000000000000..d298588250e2c255404afeb490f23c0cdb1f68a5 GIT binary patch literal 113 zcmZQzU|?iG#Xv4YWNv0&YI0FxT8ULrYD#==X>mqTetvFzQciwyc63U9d7f=aQE949 eYGQE-gq4?HRFVN<7U!43n56{}q4HFyx>x{Z5F@+* literal 0 HcmV?d00001 diff --git a/core.clutter/objects/shroom/mushclutt3.iob b/core.clutter/objects/shroom/mushclutt3.iob new file mode 100644 index 0000000000000000000000000000000000000000..7b94d6c8d6f2c5f688f28cd01ac9e4529e582e34 GIT binary patch literal 689 zcmZQzU|?oIV0Ivz;s1Yz$lT1l)a0VXv=XbL)Rg$#(&CJw{QTVbq@4WZ?C6yI@;uv; zqS92I)WqTv2rDnYs3ZfzEY2^5F-r>|LglGYb+KUM85qJ47QhWJE=kRWn4OlGQ%scM h5QPZSfldbjS~?$W0gar`z({-NgRG!&_%PDY0s!+}{apY6 literal 0 HcmV?d00001 diff --git a/core.clutter/objects/shroom/mushclutt4.iob b/core.clutter/objects/shroom/mushclutt4.iob new file mode 100644 index 0000000000000000000000000000000000000000..f5d956bbb98eff1ce4b562df2034e94ed552b9ed GIT binary patch literal 395 zcmcK0!3u*g3LihmS0RYc9d51OT zw;dg}YnTw+^NRGO-jmtRzp0bv&Bm%^B(1yF_MsZfQnK$Ag$cBX^;5Q%VmQEEy&-2F*8 T`N`Q34}e`wg!{qj5Y7hxHX3Ss literal 0 HcmV?d00001 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