From 5f81c3dfa265350313b8fcf80b0728f66bd11743 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 30 Jun 2022 09:12:11 +0100 Subject: [PATCH 01/10] add initial support for dfcavern saplings --- depends.txt | 1 + mod.conf | 2 +- mods.lua | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/depends.txt b/depends.txt index 2ef3ad6..5bdcc1f 100644 --- a/depends.txt +++ b/depends.txt @@ -9,3 +9,4 @@ flowers? dye? ferns? dryplants? +df_trees? diff --git a/mod.conf b/mod.conf index 650af82..7f91a15 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = bonemeal depends = default -optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants +optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings. diff --git a/mods.lua b/mods.lua index be9c0ad..1cee64c 100644 --- a/mods.lua +++ b/mods.lua @@ -190,3 +190,21 @@ if minetest.get_modpath("dye") then }) end end + + +if minetest.get_modpath("df_trees") then + + local function spore_tree_fix(pos) + minetest.set_node(pos, {name = "air"}) + df_trees.spawn_spore_tree(pos) + end + + bonemeal:add_sapling({ + {"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil"}, + {"df_trees:fungiwood_sapling", df_trees.spawn_fungiwood, "soil"}, + {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil"}, + {"df_trees:spore_tree_sapling", spore_tree_fix, "soil"}, + {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil"}, + {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil"} + }) +end From bb34fbae3df2456636fae81ccff074edecebe132 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 30 Jun 2022 12:48:18 +0100 Subject: [PATCH 02/10] tweak crop growth, add df_farming crops --- depends.txt | 1 + init.lua | 15 ++++++++++++++- mod.conf | 2 +- mods.lua | 13 +++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/depends.txt b/depends.txt index 5bdcc1f..b1e1dee 100644 --- a/depends.txt +++ b/depends.txt @@ -10,3 +10,4 @@ dye? ferns? dryplants? df_trees? +df_farming? diff --git a/init.lua b/init.lua index 8cfa1f9..f1b14fb 100644 --- a/init.lua +++ b/init.lua @@ -218,12 +218,25 @@ local function check_crops(pos, nodename, strength) crop = nodename:split(":")[2] -- get stage number or set to 0 for seed - stage = tonumber( crop:split("_")[2] ) or 0 + if crop:split("_")[3] then + stage = crop:split("_")[3] + else + stage = crop:split("_")[2] + end + + stage = tonumber(stage) or 0 + stage = min(stage + strength, crops[n][2]) -- check for place_param setting nod = crops[n][1] .. stage def = minetest.registered_nodes[nod] + + -- make sure crop exists or isn't fully grown already + if not def or nod == nodename then + return false + end + def = def and def.place_param2 or 0 minetest.set_node(pos, {name = nod, param2 = def}) diff --git a/mod.conf b/mod.conf index 7f91a15..8865483 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = bonemeal depends = default -optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees +optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees, df_farming description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings. diff --git a/mods.lua b/mods.lua index 1cee64c..e105f17 100644 --- a/mods.lua +++ b/mods.lua @@ -208,3 +208,16 @@ if minetest.get_modpath("df_trees") then {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil"} }) end + + +if minetest.get_modpath("df_farming") then + + bonemeal:add_crop({ + {"df_farming:cave_wheat_", 8, "df_farming:cave_wheat_seed"}, + {"df_farming:dimple_cup_", 4, "df_farming:dimple_cup_seed"}, + {"df_farming:pig_tail_", 8, "df_farming:pig_tail_seed"}, + {"df_farming:plump_helmet_", 4, "df_farming:plump_helmet_spawn"}, + {"df_farming:quarry_bush_", 5, "df_farming:quarry_bush_seed"}, + {"df_farming:sweet_pod_", 6, "df_farming:sweet_pod_seed"} + }) +end From 996094dd5c69013deb479cf6ff381f496de0dcf6 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 30 Jun 2022 13:00:50 +0100 Subject: [PATCH 03/10] fix fungiwood sapling, restart any crop timers --- init.lua | 2 ++ mods.lua | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index f1b14fb..8bff31e 100644 --- a/init.lua +++ b/init.lua @@ -243,6 +243,8 @@ local function check_crops(pos, nodename, strength) particle_effect(pos) + minetest.get_node_timer(pos):start(10) -- restart any timers + return true end end diff --git a/mods.lua b/mods.lua index e105f17..1a61e78 100644 --- a/mods.lua +++ b/mods.lua @@ -199,9 +199,14 @@ if minetest.get_modpath("df_trees") then df_trees.spawn_spore_tree(pos) end + local function fungiwood_fix(pos) + minetest.set_node(pos, {name = "air"}) + df_trees.spawn_fungiwood(pos) + end + bonemeal:add_sapling({ {"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil"}, - {"df_trees:fungiwood_sapling", df_trees.spawn_fungiwood, "soil"}, + {"df_trees:fungiwood_sapling", fungiwood_fix, "soil"}, {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil"}, {"df_trees:spore_tree_sapling", spore_tree_fix, "soil"}, {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil"}, From 1a1c49ba06fee78a5b83c3af04fbee48f51073a4 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Jul 2022 11:20:06 +0100 Subject: [PATCH 04/10] add ignore_light flag to crop and sapling growth, tidy code --- api.txt | 6 +++-- init.lua | 68 ++++++++++++++++++++++++++++++-------------------------- mods.lua | 24 ++++++++++---------- 3 files changed, 52 insertions(+), 46 deletions(-) diff --git a/api.txt b/api.txt index 47b631d..e1966a2 100644 --- a/api.txt +++ b/api.txt @@ -15,7 +15,7 @@ Adding Crops ------------ bonemeal:add_crop({ - { nodename_start, growing_steps, seed_name } + { nodename_start, growing_steps, seed_name, ignore_light } }) This command is used to add new crops for bonemeal to work on. @@ -25,6 +25,7 @@ e.g. bonemeal:add_crop({ {"farming:cotton_", 8, "farming:seed_cotton"}, {"farming:wheat_", 8, "farming:seed_wheat"}, + {"mymod:dark_wheat_", 8, "mymod:dark_wheat_seed", true}, -- can grow in darkness }) @@ -32,7 +33,7 @@ Adding Saplings --------------- bonemeal:add_sapling({ - { sapling_node, function, soil_type[sand, dirt, nodename] } + { sapling_node, function, soil_type["sand", "dirt", nodename, "group:"], ignore_light } }) This command will add new saplings for bonemeal to grow on sand, soil or a @@ -41,6 +42,7 @@ specified node type. bonemeal:add_sapling({ {"ethereal:palm_sapling", ethereal.grow_palm_tree, "soil"}, {"ethereal:palm_sapling", ethereal.grow_palm_tree, "sand"}, + {"mymod:dark_tree", mymod.dark_tree, "group:soil", true}, -- can grow in darkness }) diff --git a/init.lua b/init.lua index 8bff31e..03dce23 100644 --- a/init.lua +++ b/init.lua @@ -151,7 +151,7 @@ end -- sapling check -local function check_sapling(pos, nodename) +local function check_sapling(pos, sapling_node, light_ok) -- what is sapling placed on? local under = minetest.get_node({ @@ -165,36 +165,36 @@ local function check_sapling(pos, nodename) -- check list for sapling and function for n = 1, #saplings do - if saplings[n][1] == nodename then + if saplings[n][1] == sapling_node then - grow_on = saplings[n][3] + grow_on = saplings[n][3] or "" - -- sapling grows on top of specific node - if grow_on - and grow_on ~= "soil" - and grow_on ~= "sand" - and grow_on == under.name then + -- backwards compatibility, add 'group:' to older grouping + if grow_on == "soil" or grow_on == "sand" then + grow_on = "group:" .. grow_on + end + + -- sapling grows on top of specific node group + if grow_on:find("group:") then + + local group = grow_on:split(":")[2] + + if minetest.get_item_group(under.name, group) > 0 then + can_grow = true + end + + -- sapling grows on specific node + elseif grow_on == under.name then can_grow = true end - -- sapling grows on top of soil (default) - if can_grow == nil - and (grow_on == nil or grow_on == "soil") - and minetest.get_item_group(under.name, "soil") > 0 then - can_grow = true - end + -- check if we can grow sapling at current light level + if can_grow and (light_ok or saplings[n][4] == true) then - -- sapling grows on top of sand - if can_grow == nil - and grow_on == "sand" - and minetest.get_item_group(under.name, "sand") > 0 then - can_grow = true - end - - -- check if we can grow sapling - if can_grow then particle_effect(pos) + grow_tree(pos, saplings[n][2]) + return true end end @@ -203,15 +203,17 @@ end -- crops check -local function check_crops(pos, nodename, strength) +local function check_crops(pos, nodename, strength, light_ok) local mod, crop, stage, nod, def -- grow registered crops for n = 1, #crops do - if nodename:find(crops[n][1]) - or nodename == crops[n][3] then + -- check if crop can grow in current light level + if (light_ok or crops[n][4] == true) + and (nodename:find(crops[n][1]) + or nodename == crops[n][3]) then -- separate mod and node name mod = nodename:split(":")[1] .. ":" @@ -336,7 +338,7 @@ end -- add to sapling list --- {sapling node, schematic or function name, "soil"|"sand"|specific_node} +-- {sapling node, schematic or function name, "soil"|"sand"|specific_node|"group:"} --e.g. {"default:sapling", default.grow_new_apple_tree, "soil"} function bonemeal:add_sapling(list) @@ -485,20 +487,22 @@ function bonemeal:on_use(pos, strength, node) end -- light check depending on strength (strength of 4 = no light needed) + local light_ok = true + if (minetest.get_node_light(pos) or 0) < (12 - (strength * 3)) then - return + light_ok = nil end -- check for tree growth if pointing at sapling if (minetest.get_item_group(node.name, "sapling") > 0 or node.name == "default:large_cactus_seedling") and random(5 - strength) == 1 then - check_sapling(pos, node.name) + check_sapling(pos, node.name, light_ok) return true end -- check for crop growth - if check_crops(pos, node.name, strength) then + if check_crops(pos, node.name, strength, light_ok) then return true end end @@ -628,10 +632,10 @@ minetest.register_craft({ recipe = { {"group:bone", "group:bone", "group:bone"}, {"bucket:bucket_water", "bucket:bucket_water", "bucket:bucket_water"}, - {"bucket:bucket_water", "default:torch", "bucket:bucket_water"}, + {"bucket:bucket_water", "default:torch", "bucket:bucket_water"} }, replacements = { - {"bucket:bucket_water", "bucket:bucket_empty 5"}, + {"bucket:bucket_water", "bucket:bucket_empty 5"} } }) diff --git a/mods.lua b/mods.lua index 1a61e78..4483748 100644 --- a/mods.lua +++ b/mods.lua @@ -205,12 +205,12 @@ if minetest.get_modpath("df_trees") then end bonemeal:add_sapling({ - {"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil"}, - {"df_trees:fungiwood_sapling", fungiwood_fix, "soil"}, - {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil"}, - {"df_trees:spore_tree_sapling", spore_tree_fix, "soil"}, - {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil"}, - {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil"} + {"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil", true}, + {"df_trees:fungiwood_sapling", fungiwood_fix, "soil", true}, + {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil", true}, + {"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true}, + {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true}, + {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil", true} }) end @@ -218,11 +218,11 @@ end if minetest.get_modpath("df_farming") then bonemeal:add_crop({ - {"df_farming:cave_wheat_", 8, "df_farming:cave_wheat_seed"}, - {"df_farming:dimple_cup_", 4, "df_farming:dimple_cup_seed"}, - {"df_farming:pig_tail_", 8, "df_farming:pig_tail_seed"}, - {"df_farming:plump_helmet_", 4, "df_farming:plump_helmet_spawn"}, - {"df_farming:quarry_bush_", 5, "df_farming:quarry_bush_seed"}, - {"df_farming:sweet_pod_", 6, "df_farming:sweet_pod_seed"} + {"df_farming:cave_wheat_", 8, "df_farming:cave_wheat_seed", true}, + {"df_farming:dimple_cup_", 4, "df_farming:dimple_cup_seed", true}, + {"df_farming:pig_tail_", 8, "df_farming:pig_tail_seed", true}, + {"df_farming:plump_helmet_", 4, "df_farming:plump_helmet_spawn", true}, + {"df_farming:quarry_bush_", 5, "df_farming:quarry_bush_seed", true}, + {"df_farming:sweet_pod_", 6, "df_farming:sweet_pod_seed", true} }) end From 08ed68a8b7ecf09e490983be8e5c2dff74057a88 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Jul 2022 11:26:00 +0100 Subject: [PATCH 05/10] added dfcavern's nether cap --- mods.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index 4483748..de023ce 100644 --- a/mods.lua +++ b/mods.lua @@ -210,7 +210,8 @@ if minetest.get_modpath("df_trees") then {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil", true}, {"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true}, {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true}, - {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil", true} + {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil", true}, + {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true} }) end From e163e815d6fc2ecfea1889122482976a3f0d5b4a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Jul 2022 12:32:38 +0100 Subject: [PATCH 06/10] add missing nether cap entry --- mods.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index de023ce..cd9c470 100644 --- a/mods.lua +++ b/mods.lua @@ -211,7 +211,8 @@ if minetest.get_modpath("df_trees") then {"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true}, {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true}, {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil", true}, - {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true} + {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true}, + {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:cools_lava", true} }) end From 4a0eddef029045510fe648ae78d86177817b73f2 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 1 Jul 2022 14:36:36 +0100 Subject: [PATCH 07/10] add df_primordial_items saplings --- depends.txt | 1 + init.lua | 8 +++----- mod.conf | 2 +- mods.lua | 26 ++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/depends.txt b/depends.txt index b1e1dee..2bdb578 100644 --- a/depends.txt +++ b/depends.txt @@ -11,3 +11,4 @@ ferns? dryplants? df_trees? df_farming? +df_primordial_items? diff --git a/init.lua b/init.lua index 03dce23..9e6e673 100644 --- a/init.lua +++ b/init.lua @@ -493,11 +493,9 @@ function bonemeal:on_use(pos, strength, node) light_ok = nil end - -- check for tree growth if pointing at sapling - if (minetest.get_item_group(node.name, "sapling") > 0 - or node.name == "default:large_cactus_seedling") - and random(5 - strength) == 1 then - check_sapling(pos, node.name, light_ok) + -- check for sapling growth + if random(5 - strength) == 1 + and check_sapling(pos, node.name, light_ok) then return true end diff --git a/mod.conf b/mod.conf index 8865483..7a3948b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,4 +1,4 @@ name = bonemeal depends = default -optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees, df_farming +optional_depends = intllib, lucky_block, farming, ethereal, moretrees, technic_worldgen, flowers, dye, ferns, dryplants, df_trees, df_farming, df_primordial_items description = Adds bone and bonemeal giving the ability to quickly grow plants and saplings. diff --git a/mods.lua b/mods.lua index cd9c470..bd4f69e 100644 --- a/mods.lua +++ b/mods.lua @@ -228,3 +228,29 @@ if minetest.get_modpath("df_farming") then {"df_farming:sweet_pod_", 6, "df_farming:sweet_pod_seed", true} }) end + + +if minetest.get_modpath("df_primordial_items") then + + local function mush_fix(pos) + minetest.set_node(pos, {name = "air"}) + mapgen_helper.place_schematic(pos, + df_primordial_items.get_primordial_mushroom(), (math.random(1,4)-1)*90) + end + + local function fern_fix(pos) + minetest.set_node(pos, {name = "air"}) + local rotations = {0, 90, 180, 270} + mapgen_helper.place_schematic(pos, + df_primordial_items.get_fern_schematic(), rotations[math.random(1,#rotations)]) + end + + bonemeal:add_sapling({ + {"df_primordial_items:jungle_mushroom_sapling", + df_primordial_items.spawn_jungle_mushroom, "soil", true}, + {"df_primordial_items:jungletree_sapling", + df_primordial_items.spawn_jungle_tree, "soil", true}, + {"df_primordial_items:mush_sapling", mush_fix, "soil", true}, + {"df_primordial_items:fern_sapling", fern_fix, "soil", true} + }) +end From 1315e2cc5f8630cdffb2f5e9c2139ca8ef756447 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 8 Jul 2022 09:21:32 +0100 Subject: [PATCH 08/10] add df_primordial_items and tweak surface detection for decorations --- init.lua | 23 +++++++---------------- mods.lua | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/init.lua b/init.lua index 9e6e673..af2a5c3 100644 --- a/init.lua +++ b/init.lua @@ -86,7 +86,8 @@ minetest.after(0.1, function() if def.groups and def.groups.flower and not node:find("waterlily") - and not node:find("xdecor:potted_") then + and not node:find("xdecor:potted_") + and not node:find("df_farming:") then flowers[#flowers + 1] = node end end @@ -95,6 +96,8 @@ end) -- default biomes deco local deco = { + {"default:dirt", green_grass, flowers}, + {"default:dirt_with_grass", green_grass, flowers}, {"default:dry_dirt", dry_grass, {}}, {"default:dry_dirt_with_dry_grass", dry_grass, {}}, {"default:dirt_with_dry_grass", dry_grass, flowers}, @@ -259,33 +262,21 @@ local function check_soil(pos, nodename, strength) -- set radius according to strength local side = strength - 1 local tall = max(strength - 2, 0) - local floor - local groups = minetest.registered_items[nodename] - and minetest.registered_items[nodename].groups or {} - - -- only place decoration on one type of surface - if groups.soil then - floor = {"group:soil"} - elseif groups.sand then - floor = {"group:sand"} - else - floor = {nodename} - end -- get area of land with free space above local dirt = minetest.find_nodes_in_area_under_air( {x = pos.x - side, y = pos.y - tall, z = pos.z - side}, - {x = pos.x + side, y = pos.y + tall, z = pos.z + side}, floor) + {x = pos.x + side, y = pos.y + tall, z = pos.z + side}, {nodename}) -- set default grass and decoration - local grass = green_grass - local decor = flowers + local grass, decor -- choose grass and decoration to use on dirt patch for n = 1, #deco do -- do we have a grass match? if nodename == deco[n][1] then + grass = deco[n][2] or {} decor = deco[n][3] or {} end diff --git a/mods.lua b/mods.lua index bd4f69e..54de673 100644 --- a/mods.lua +++ b/mods.lua @@ -253,4 +253,26 @@ if minetest.get_modpath("df_primordial_items") then {"df_primordial_items:mush_sapling", mush_fix, "soil", true}, {"df_primordial_items:fern_sapling", fern_fix, "soil", true} }) + + local jgrass = { + "df_primordial_items:jungle_grass_1", + "df_primordial_items:jungle_grass_2", + "df_primordial_items:jungle_grass_3", + "df_primordial_items:fern_1", + "df_primordial_items:fern_2", + "", "", "", "" + } + + local jdeco = { + "df_primordial_items:jungle_mushroom_1", + "df_primordial_items:jungle_mushroom_2", + "df_primordial_items:glow_plant_1", + "df_primordial_items:glow_plant_2", + "df_primordial_items:glow_plant_3", + "", "", "" + } + + bonemeal:add_deco({ + {"df_primordial_items:dirt_with_jungle_grass", jgrass, jdeco} + }) end From 9ceeb63c8ac58896878fd6fe421c007f5cbfbfef Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 24 Jul 2022 08:29:15 +0100 Subject: [PATCH 09/10] add df_trees blood thorn, add df_primordial_items fungal deco --- mods.lua | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index 54de673..648ae34 100644 --- a/mods.lua +++ b/mods.lua @@ -245,13 +245,18 @@ if minetest.get_modpath("df_primordial_items") then df_primordial_items.get_fern_schematic(), rotations[math.random(1,#rotations)]) end + local function blood_fix(pos) + df_trees.grow_blood_thorn(pos, minetest.get_node(pos)) + end + bonemeal:add_sapling({ {"df_primordial_items:jungle_mushroom_sapling", df_primordial_items.spawn_jungle_mushroom, "soil", true}, {"df_primordial_items:jungletree_sapling", df_primordial_items.spawn_jungle_tree, "soil", true}, {"df_primordial_items:mush_sapling", mush_fix, "soil", true}, - {"df_primordial_items:fern_sapling", fern_fix, "soil", true} + {"df_primordial_items:fern_sapling", fern_fix, "soil", true}, + {"df_trees:blood_thorn", blood_fix, "sand", true} }) local jgrass = { @@ -275,4 +280,20 @@ if minetest.get_modpath("df_primordial_items") then bonemeal:add_deco({ {"df_primordial_items:dirt_with_jungle_grass", jgrass, jdeco} }) + + local fgrass = { + "df_primordial_items:fungal_grass_1", + "df_primordial_items:fungal_grass_2", + "", "", "", "" + } + + local fdeco = { + "df_primordial_items:glow_orb_stalks", + "df_primordial_items:glow_pods", + "", "", "" + } + + bonemeal:add_deco({ + {"df_primordial_items:dirt_with_mycelium", fgrass, fdeco} + }) end From 1f4c1a1fd757835127c65c3199e5b9f67dea9053 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 24 Jul 2022 08:34:46 +0100 Subject: [PATCH 10/10] fix df_trees tunnel tube growth --- mods.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mods.lua b/mods.lua index 648ae34..bd516db 100644 --- a/mods.lua +++ b/mods.lua @@ -204,13 +204,18 @@ if minetest.get_modpath("df_trees") then df_trees.spawn_fungiwood(pos) end + local function tunnel_fix(pos) + minetest.set_node(pos, {name = "air"}) + df_trees.spawn_tunnel_tube(pos) + end + bonemeal:add_sapling({ {"df_trees:black_cap_sapling", df_trees.spawn_black_cap, "soil", true}, {"df_trees:fungiwood_sapling", fungiwood_fix, "soil", true}, {"df_trees:goblin_cap_sapling", df_trees.spawn_goblin_cap, "soil", true}, {"df_trees:spore_tree_sapling", spore_tree_fix, "soil", true}, {"df_trees:tower_cap_sapling", df_trees.spawn_tower_cap, "soil", true}, - {"df_trees:tunnel_tube_sapling", df_trees.spawn_tunnel_tube, "soil", true}, + {"df_trees:tunnel_tube_sapling", tunnel_fix, "soil", true}, {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:nether_cap", true}, {"df_trees:nether_cap_sapling", df_trees.spawn_nether_cap, "group:cools_lava", true} })