add ignore_light flag to crop and sapling growth, tidy code
This commit is contained in:
tenplus1
parent
996094dd5c
commit
1a1c49ba06
6
api.txt
6
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
|
||||
})
|
||||
|
||||
|
||||
|
|
|
|||
68
init.lua
68
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"}
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
|||
24
mods.lua
24
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue