From fefb15f2a833b7a1e1e7576c4f82895fad8053f3 Mon Sep 17 00:00:00 2001 From: cora Date: Sat, 18 Jun 2022 14:28:05 +0200 Subject: [PATCH] Add new fungus tree schematics --- mods/ITEMS/mcl_crimson/init.lua | 4 +- .../schematics/crimson_fungus_1.mts | Bin 0 -> 200 bytes .../schematics/crimson_fungus_2.mts | Bin 0 -> 208 bytes .../schematics/crimson_fungus_3.mts | Bin 0 -> 273 bytes .../schematics/crimson_mushroom.mts | Bin 169 -> 0 bytes .../schematics/warped_fungus_1.mts | Bin 0 -> 209 bytes .../schematics/warped_fungus_2.mts | Bin 0 -> 193 bytes .../schematics/warped_fungus_3.mts | Bin 0 -> 223 bytes .../schematics/warped_mushroom.mts | Bin 167 -> 0 bytes mods/MAPGEN/mcl_biomes/init.lua | 96 ++++++++++++++---- mods/MAPGEN/mcl_geodes/init.lua | 2 - 11 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 mods/ITEMS/mcl_crimson/schematics/crimson_fungus_1.mts create mode 100644 mods/ITEMS/mcl_crimson/schematics/crimson_fungus_2.mts create mode 100644 mods/ITEMS/mcl_crimson/schematics/crimson_fungus_3.mts delete mode 100644 mods/ITEMS/mcl_crimson/schematics/crimson_mushroom.mts create mode 100644 mods/ITEMS/mcl_crimson/schematics/warped_fungus_1.mts create mode 100644 mods/ITEMS/mcl_crimson/schematics/warped_fungus_2.mts create mode 100644 mods/ITEMS/mcl_crimson/schematics/warped_fungus_3.mts delete mode 100644 mods/ITEMS/mcl_crimson/schematics/warped_mushroom.mts diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index 9b2a33bb9..a7fe33f71 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -212,7 +212,7 @@ minetest.register_node("mcl_crimson:stripped_warped_hyphae", { description = S("Stripped warped hyphae"), _doc_items_longdesc = S("The stripped hyphae of a warped fungus"), _doc_items_hidden = false, - tiles = {"warped_stem_stripped_top.png", "crimson_stem_warped_top.png", "warped_stem_stripped_side.png"}, + tiles = {"warped_stem_stripped_top.png", "warped_stem_stripped_top.png", "warped_stem_stripped_side.png"}, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, groups = {handy = 1, axey = 1, tree = 1, building_block = 1, material_wood = 1}, @@ -349,7 +349,7 @@ minetest.register_node("mcl_crimson:crimson_hyphae", { sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 2, _mcl_hardness = 2, - _mcl_stripped_variant = stripped_variant, + _mcl_stripped_variant = "mcl_crimson:stripped_crimson_hyphae", }) --Stem bark, stripped stem and bark diff --git a/mods/ITEMS/mcl_crimson/schematics/crimson_fungus_1.mts b/mods/ITEMS/mcl_crimson/schematics/crimson_fungus_1.mts new file mode 100644 index 0000000000000000000000000000000000000000..a61712fef3802fbc332eacdf57d548af07641d55 GIT binary patch literal 200 zcmeYb3HD`RVPIw8U|_9>0tOZa=ETe*2ASOCocO%dl8n?MD+m=|o>){8pOllIoXsEw zl1(nk%q`B(vx3s`8I=VYiKz_Y$a2LQMfv%;IhpAhB^7h71~~FHDDY%|efW1*+k-WS zT3RNn-j=#Fl}&-wduuvtkLT{4wZHXqG?P05(@t2LJ#7 literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_crimson/schematics/crimson_fungus_2.mts b/mods/ITEMS/mcl_crimson/schematics/crimson_fungus_2.mts new file mode 100644 index 0000000000000000000000000000000000000000..b509fae50ffceae723bc9f763deef124308dada0 GIT binary patch literal 208 zcmeYb3HD`RVPIw8U|_9>0tOZa=ETe*2ASOCocO%dl8n?MD+m=|o>){8pOllIoXsEw zl1(nk%q`B(vx3s`8I=VYiKz_Y$a2LQMfv%;IhpAhB^7h-P6*^WV8G#AYF)9;ZqB1i zncm-bi(GOztQ?XuVc(=@6ZcrwPJMQFspQWYYQ0Nxr7Eqvf7ebs|KzRFkMFOhnX)Gu l%Gb#%*5>pw(k>!drit_Vwb28I2N-E~O4SCDgpujPusvvIf%`2rp zIxqcsytVY6!h*|1c}!PAr>vWIO8X7d!6+>uK_Sa&chf`dOrKqRE@%A8UqLU}Ro>OL zRqyeaBKs%RSqlnpoy&fG`La{>t7w<7zcJ4LuIBz|-=Oks!W5xv(S<5}N+uWlX9+6* wbbZ0p_^?X9uz0tOZa=ETe*2ASOCocO%dl8n?MD+m=|o>){8pOllIoXsE( zl1(nk%q`B(vntLg%FoZu$xP2EVUR+WfGUX3s4U1xOs$xcoN$0!V&MeNb4f?mH!>s~ vVUnD1=4c+Xv7eZSsqr0^v^~!R9~XVP0tOZa=ETe*2HD)?ocQFT%-rJqJgf4=qJq?v`0~V}lK7;Y z{N!u~Ni5PCl?54zsSM)CQpFiX`T4mynduoN6?3izIPx7(;8=Y7@b9mw9xTfyyxlP? zp?PbFtC+%uyQgO5AGjlEbx~aU{o)jZwj(y0a+5#3&f50OdUlQJxBuUdHAl%@%e-<$ i$=UnZ;>Z*>yU>jVDCh#$SE$N>O|^jhHn literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_crimson/schematics/warped_fungus_2.mts b/mods/ITEMS/mcl_crimson/schematics/warped_fungus_2.mts new file mode 100644 index 0000000000000000000000000000000000000000..564731158990f9d900c96f316339d095f18c9513 GIT binary patch literal 193 zcmeYb3HD`RVPIuoV_>ZZ0|pib=ETe*2HD)?ocQFT%-rJqJgf4=qJq?v`0~V}lK7;Y z{N!u~ab)S@jH3Mf+?>qxj1mS(WC^IgjLL$H#MFv8XZ;-c4j6Du`ueb@*87T9NevoyR`P3Gy2k712R5;JMMM$>-}|YCMqvn)Z;p~Tfgwzl+gm)8AbW|xjC8X86^yo$P!R}8I=VYiK!KH-cAVQJD|YfoM>$k9`6>Q$Z_gV ztgnatn)Mt30&09eBiK*Xh8|-%e(>D>nCT0D-&klNlB9h0{{x?@+ZFNW*Y2NZeO}}8 t2_B_Mj5gmUUoiUe?6>wsU+a!wAz9vSTq<``0tOZa=ETe*2JzhFocQFT%-rJqJgef2qWt{aoXqr$5(Zgh ziSopvg4C4w^2DN&_@tctEYca31sRE{6?2jk4sc6I&M;6=Ww>mjwnKxNi(As* naY|!|@nPSjW7%?sdg|wEm&|Hszrru<;3UDD#lUdWGWje3N1r*c diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 3d1653846..5be23e766 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -1567,7 +1567,7 @@ local function register_dimension_biomes() }) minetest.register_decoration({ deco_type = "simple", - place_on = {"mcl_nether:netherrack","mcl_nether:glowstone"}, + place_on = {"mcl_nether:netherrack","mcl_nether:glowstone","mcl_blackstone:nether_gold","mcl_nether:quartz_ore","mcl_core:gravel","mcl_nether:soul_sand"}, sidelen = 16, fill_ratio = 10, biomes = { "CrimsonForest" }, @@ -1594,7 +1594,7 @@ local function register_dimension_biomes() }) minetest.register_decoration({ deco_type = "simple", - place_on = {"mcl_nether:netherrack","mcl_nether:glowstone"}, + place_on = {"mcl_nether:netherrack","mcl_nether:glowstone","mcl_blackstone:nether_gold","mcl_nether:quartz_ore","mcl_core:gravel","mcl_nether:soul_sand"}, sidelen = 16, fill_ratio = 10, biomes = { "WarpedForest" }, @@ -4115,16 +4115,44 @@ local function register_dimension_decorations() }) minetest.register_decoration({ deco_type = "schematic", - name = "mcl_biomes:warped_tree", + name = "mcl_biomes:warped_tree1", place_on = {"mcl_crimson:warped_nylium"}, sidelen = 16, - fill_ratio = 0.022, + fill_ratio = 0.007, + biomes = {"WarpedForest"}, + y_min = mcl_vars.mg_lava_nether_max + 1, + y_max = mcl_vars.mg_nether_max - 15, + flags = "all_floors, place_center_x, place_center_z", + schematic = mod_mcl_crimson.."/schematics/warped_fungus_1.mts", + size = {x = 5, y = 11, z = 5}, + rotation = "random", + }) + minetest.register_decoration({ + deco_type = "schematic", + name = "mcl_biomes:warped_tree2", + place_on = {"mcl_crimson:warped_nylium"}, + sidelen = 16, + fill_ratio = 0.005, biomes = {"WarpedForest"}, y_min = mcl_vars.mg_lava_nether_max + 1, y_max = mcl_vars.mg_nether_max - 10, flags = "all_floors, place_center_x, place_center_z", - schematic = mod_mcl_crimson.."/schematics/warped_mushroom.mts", - size = {x = 5, y = 8, z = 5}, + schematic = mod_mcl_crimson.."/schematics/warped_fungus_2.mts", + size = {x = 5, y = 6, z = 5}, + rotation = "random", + }) + minetest.register_decoration({ + deco_type = "schematic", + name = "mcl_biomes:warped_tree3", + place_on = {"mcl_crimson:warped_nylium"}, + sidelen = 16, + fill_ratio = 0.003, + biomes = {"WarpedForest"}, + y_min = mcl_vars.mg_lava_nether_max + 1, + y_max = mcl_vars.mg_nether_max - 14, + flags = "all_floors, place_center_x, place_center_z", + schematic = mod_mcl_crimson.."/schematics/warped_fungus_3.mts", + size = {x = 5, y = 12, z = 5}, rotation = "random", }) minetest.register_decoration({ @@ -4177,15 +4205,43 @@ local function register_dimension_decorations() name = "mcl_biomes:crimson_tree", place_on = {"mcl_crimson:crimson_nylium"}, sidelen = 16, - fill_ratio = 0.022, + fill_ratio = 0.008, biomes = {"CrimsonForest"}, y_min = mcl_vars.mg_lava_nether_max + 1, y_max = mcl_vars.mg_nether_max - 10, flags = "all_floors, place_center_x, place_center_z", - schematic = mod_mcl_crimson.."/schematics/crimson_mushroom.mts", + schematic = mod_mcl_crimson.."/schematics/crimson_fungus_1.mts", size = {x = 5, y = 8, z = 5}, rotation = "random", }) + minetest.register_decoration({ + deco_type = "schematic", + name = "mcl_biomes:crimson_tree2", + place_on = {"mcl_crimson:crimson_nylium"}, + sidelen = 16, + fill_ratio = 0.006, + biomes = {"CrimsonForest"}, + y_min = mcl_vars.mg_lava_nether_max + 1, + y_max = mcl_vars.mg_nether_max - 15, + flags = "all_floors, place_center_x, place_center_z", + schematic = mod_mcl_crimson.."/schematics/crimson_fungus_2.mts", + size = {x = 5, y = 12, z = 5}, + rotation = "random", + }) + minetest.register_decoration({ + deco_type = "schematic", + name = "mcl_biomes:crimson_tree3", + place_on = {"mcl_crimson:crimson_nylium"}, + sidelen = 16, + fill_ratio = 0.004, + biomes = {"CrimsonForest"}, + y_min = mcl_vars.mg_lava_nether_max + 1, + y_max = mcl_vars.mg_nether_max - 20, + flags = "all_floors, place_center_x, place_center_z", + schematic = mod_mcl_crimson.."/schematics/crimson_fungus_3.mts", + size = {x = 7, y = 13, z = 7}, + rotation = "random", + }) minetest.register_decoration({ deco_type = "simple", place_on = {"mcl_crimson:crimson_nylium"}, @@ -4321,10 +4377,17 @@ if mg_name ~= "singlenode" then -- Overworld decorations for v6 are handled in mcl_mapgen_core - local deco_id_crimson_tree =minetest.get_decoration_id("mcl_biomes:crimson_tree") - local deco_id_warped_tree =minetest.get_decoration_id("mcl_biomes:warped_tree") - minetest.set_gen_notify({decoration=true}, { deco_id_crimson_tree }) - minetest.set_gen_notify({decoration=true}, { deco_id_warped_tree }) + local deco_ids_fungus ={ + minetest.get_decoration_id("mcl_biomes:crimson_tree1"), + minetest.get_decoration_id("mcl_biomes:crimson_tree2"), + minetest.get_decoration_id("mcl_biomes:crimson_tree3"), + minetest.get_decoration_id("mcl_biomes:warped_tree1"), + minetest.get_decoration_id("mcl_biomes:warped_tree2"), + minetest.get_decoration_id("mcl_biomes:warped_tree3") + } + for _,f in pairs(deco_ids_fungus) do + minetest.set_gen_notify({decoration=true}, { f }) + end if deco_id_chorus_plant or deco_id_crimson_tree or deco_id_warped_tree then mcl_mapgen_core.register_generator("chorus_grow", nil, function(minp, maxp, blockseed) if minp.y > -26900 then return end @@ -4341,11 +4404,10 @@ if mg_name ~= "singlenode" then end end if minp.y > mcl_vars.mg_nether_max then return end - for _, pos in ipairs(gennotify["decoration#"..deco_id_crimson_tree] or {}) do - minetest.fix_light(vector.offset(pos,-8,-8,-8),vector.offset(pos,8,8,8)) - end - for _, pos in ipairs(gennotify["decoration#"..deco_id_warped_tree] or {}) do - minetest.fix_light(vector.offset(pos,-8,-8,-8),vector.offset(pos,8,8,8)) + for _,f in pairs(deco_ids_fungus) do + for _, pos in ipairs(gennotify["decoration#"..f] or {}) do + minetest.fix_light(vector.offset(pos,-8,-8,-8),vector.offset(pos,8,8,8)) + end end end) end diff --git a/mods/MAPGEN/mcl_geodes/init.lua b/mods/MAPGEN/mcl_geodes/init.lua index 84acd973b..c03173367 100644 --- a/mods/MAPGEN/mcl_geodes/init.lua +++ b/mods/MAPGEN/mcl_geodes/init.lua @@ -76,10 +76,8 @@ mcl_structures.register_structure("geode",{ flags = "absvalue", }, flags = "place_center_x, place_center_z, force_placement", - biomes = ocean_biomes, y_max = -24, y_min = mcl_vars.mg_overworld_min, - filenames = schems, y_offset = function(pr) return pr:next(-4,-2) end, place_func = function(pos,def,pr) local p = vector.new(pos.x + pr:next(-30,30),pos.y,pos.z + pr:next(-30,30))