mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-11-24 11:53:46 +01:00
Merge pull request 'Improve plant growth system, add moisture level' (#4681) from kno10/VoxeLibre:pumpkin-melon-growth-1 into master
Reviewed-on: https://git.minetest.land/VoxeLibre/VoxeLibre/pulls/4681 Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
This commit is contained in:
the-real-herowl
commit
2b7b7f1872
@ -171,7 +171,8 @@ minetest.register_craft({
|
||||
},
|
||||
})
|
||||
|
||||
mcl_farming:add_plant("plant_beetroot", "mcl_farming:beetroot", {"mcl_farming:beetroot_0", "mcl_farming:beetroot_1", "mcl_farming:beetroot_2"}, 68, 3)
|
||||
-- beetroots grow at 2/3rd of the default speed
|
||||
mcl_farming:add_plant("plant_beetroot", "mcl_farming:beetroot", {"mcl_farming:beetroot_0", "mcl_farming:beetroot_1", "mcl_farming:beetroot_2"}, 8.7012, 35)
|
||||
|
||||
if minetest.get_modpath("doc") then
|
||||
for i = 1, 2 do
|
||||
|
||||
@ -118,7 +118,7 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
mcl_farming:add_plant("plant_carrot", "mcl_farming:carrot", {"mcl_farming:carrot_1", "mcl_farming:carrot_2", "mcl_farming:carrot_3", "mcl_farming:carrot_4", "mcl_farming:carrot_5", "mcl_farming:carrot_6", "mcl_farming:carrot_7"}, 25, 20)
|
||||
mcl_farming:add_plant("plant_carrot", "mcl_farming:carrot", {"mcl_farming:carrot_1", "mcl_farming:carrot_2", "mcl_farming:carrot_3", "mcl_farming:carrot_4", "mcl_farming:carrot_5", "mcl_farming:carrot_6", "mcl_farming:carrot_7"}, 5.8013, 35)
|
||||
|
||||
if minetest.get_modpath("doc") then
|
||||
for i=2,7 do
|
||||
|
||||
@ -123,10 +123,10 @@ local stem_def = {
|
||||
}
|
||||
|
||||
-- Register stem growth
|
||||
mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 30, 5)
|
||||
mcl_farming:add_plant("plant_melon_stem", "mcl_farming:melontige_unconnect", {"mcl_farming:melontige_1", "mcl_farming:melontige_2", "mcl_farming:melontige_3", "mcl_farming:melontige_4", "mcl_farming:melontige_5", "mcl_farming:melontige_6", "mcl_farming:melontige_7"}, 5.8014, 35)
|
||||
|
||||
-- Register actual melon, connected stems and stem-to-melon growth
|
||||
mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 25, 15, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127")
|
||||
mcl_farming:add_gourd("mcl_farming:melontige_unconnect", "mcl_farming:melontige_linked", "mcl_farming:melontige_unconnect", stem_def, stem_drop, "mcl_farming:melon", melon_base_def, 5.8015, 35, "mcl_farming_melon_stem_connected.png^[colorize:#FFA800:127")
|
||||
|
||||
-- Items and crafting
|
||||
minetest.register_craftitem("mcl_farming:melon_item", {
|
||||
|
||||
@ -135,7 +135,7 @@ minetest.register_craft({
|
||||
cooktime = 10,
|
||||
})
|
||||
|
||||
mcl_farming:add_plant("plant_potato", "mcl_farming:potato", {"mcl_farming:potato_1", "mcl_farming:potato_2", "mcl_farming:potato_3", "mcl_farming:potato_4", "mcl_farming:potato_5", "mcl_farming:potato_6", "mcl_farming:potato_7"}, 19.75, 20)
|
||||
mcl_farming:add_plant("plant_potato", "mcl_farming:potato", {"mcl_farming:potato_1", "mcl_farming:potato_2", "mcl_farming:potato_3", "mcl_farming:potato_4", "mcl_farming:potato_5", "mcl_farming:potato_6", "mcl_farming:potato_7"}, 5.8016, 35)
|
||||
|
||||
minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
|
||||
|
||||
@ -180,10 +180,10 @@ if minetest.get_modpath("mcl_armor") then
|
||||
end
|
||||
|
||||
-- Register stem growth
|
||||
mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 30, 5)
|
||||
mcl_farming:add_plant("plant_pumpkin_stem", "mcl_farming:pumpkintige_unconnect", {"mcl_farming:pumpkin_1", "mcl_farming:pumpkin_2", "mcl_farming:pumpkin_3", "mcl_farming:pumpkin_4", "mcl_farming:pumpkin_5", "mcl_farming:pumpkin_6", "mcl_farming:pumpkin_7"}, 5.8017, 35)
|
||||
|
||||
-- Register actual pumpkin, connected stems and stem-to-pumpkin growth
|
||||
mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 30, 15, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127")
|
||||
mcl_farming:add_gourd("mcl_farming:pumpkintige_unconnect", "mcl_farming:pumpkintige_linked", "mcl_farming:pumpkintige_unconnect", stem_def, stem_drop, "mcl_farming:pumpkin", pumpkin_base_def, 5.8018, 35, "mcl_farming_pumpkin_stem_connected.png^[colorize:#FFA800:127")
|
||||
|
||||
-- Steal function to properly disconnect a carved pumpkin
|
||||
pumpkin_face_base_def.after_destruct = minetest.registered_nodes["mcl_farming:pumpkin"].after_destruct
|
||||
|
||||
@ -5,73 +5,99 @@
|
||||
--
|
||||
local math = math
|
||||
local vector = vector
|
||||
local random = math.random
|
||||
local floor = math.floor
|
||||
|
||||
local plant_lists = {}
|
||||
mcl_farming.plant_lists = plant_lists -- export
|
||||
local plant_nodename_to_id_list = {}
|
||||
local plant_nodename_to_id = {} -- map nodes to plants
|
||||
local plant_step_from_name = {} -- map nodes to growth steps
|
||||
|
||||
local time_speed = tonumber(minetest.settings:get("time_speed")) or 72
|
||||
local time_multiplier = time_speed > 0 and (86400 / time_speed) or 0
|
||||
local growth_factor = tonumber(minetest.settings:get("vl_plant_growth")) or 1.0
|
||||
|
||||
local function get_intervals_counter(pos, interval, chance)
|
||||
if time_multiplier == 0 then return 0 end
|
||||
-- "wall clock time", so plants continue to grow while sleeping
|
||||
local current_game_time = (minetest.get_day_count() + minetest.get_timeofday()) * time_multiplier
|
||||
local approx_interval = math.max(interval, 1) * math.max(chance, 1)
|
||||
|
||||
local meta = minetest.get_meta(pos)
|
||||
local last_game_time = meta:get_float("last_gametime")
|
||||
if last_game_time < 1 then
|
||||
last_game_time = current_game_time - approx_interval * 0.5
|
||||
elseif last_game_time == current_game_time then
|
||||
current_game_time = current_game_time + approx_interval
|
||||
-- wetness of the surroundings
|
||||
-- dry farmland = 1 point
|
||||
-- wet farmland = 3 points
|
||||
-- center point gives + 1 point, so 2 resp. 4
|
||||
-- neighbors only 25%
|
||||
local function get_moisture_level(pos)
|
||||
local n = vector.offset(pos, 0, -1, 0)
|
||||
local totalm = 1
|
||||
for z = -1,1 do
|
||||
n.z = pos.z + z
|
||||
for x = -1,1 do
|
||||
n.x = pos.x + x
|
||||
local ndef = minetest.registered_nodes[minetest.get_node(n).name]
|
||||
local soil = ndef and ndef.groups.soil
|
||||
if soil and soil >= 2 then
|
||||
local m = soil > 2 and 3 or 1
|
||||
-- corners have less weight
|
||||
if x ~= 0 or z ~= 0 then m = m * 0.25 end
|
||||
totalm = totalm + m
|
||||
end
|
||||
end
|
||||
end
|
||||
meta:set_float("last_gametime", current_game_time)
|
||||
return (current_game_time - last_game_time) / approx_interval
|
||||
return totalm
|
||||
end
|
||||
|
||||
local function get_avg_light_level(pos)
|
||||
local meta = minetest.get_meta(pos)
|
||||
-- EWMA would use a single variable:
|
||||
-- local avg = meta:get_float("avg_light")
|
||||
-- avg = avg + (node_light - avg) * 0.985
|
||||
-- meta.set_float("avg_light", avg)
|
||||
local summary = meta:get_int("avg_light_summary")
|
||||
local counter = meta:get_int("avg_light_count")
|
||||
if counter > 99 then
|
||||
summary, counter = math.ceil(summary * 0.5), 50
|
||||
-- moisture penalty function:
|
||||
-- 0.5 if both on the x axis and the z axis at least one of the same plants grows
|
||||
-- 0.5 if at least one diagonal neighbor is the same
|
||||
-- 1.0 otherwise
|
||||
-- we cannot use the names directly, because growth is encoded in the names
|
||||
local function get_same_crop_penalty(pos)
|
||||
local name = minetest.get_node(pos).name
|
||||
local plant = plant_nodename_to_id[name]
|
||||
if not plant then return 1 end
|
||||
local n = vector.copy(pos)
|
||||
-- check adjacent positions, avoid vector allocations and reduce node accesses
|
||||
n.x = pos.x - 1
|
||||
local dx = plant_nodename_to_id[minetest.get_node(n).name] == plant
|
||||
n.x = pos.x + 1
|
||||
dx = dx or plant_nodename_to_id[minetest.get_node(n).name] == plant
|
||||
if dx then -- no need to check z otherwise
|
||||
n.x = pos.x
|
||||
n.z = pos.z - 1
|
||||
local dz = plant_nodename_to_id[minetest.get_node(n).name] == plant
|
||||
n.z = pos.z + 1
|
||||
dz = dz or plant_nodename_to_id[minetest.get_node(n).name] == plant
|
||||
if dz then return 0.5 end
|
||||
end
|
||||
local node_light = minetest.get_node_light(pos)
|
||||
if node_light ~= nil then
|
||||
summary, counter = summary + node_light, counter + 1
|
||||
meta:set_int("avg_light_summary", summary)
|
||||
meta:set_int("avg_light_count", counter)
|
||||
end
|
||||
return math.ceil(summary / counter)
|
||||
-- check diagonals, clockwise
|
||||
n.x, n.z = pos.x - 1, pos.z - 1
|
||||
if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
|
||||
n.x = pos.x + 1
|
||||
if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
|
||||
n.z = pos.z + 1
|
||||
if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
|
||||
n.x = pos.x - 1
|
||||
if plant_nodename_to_id[minetest.get_node(n).name] == plant then return 0.5 end
|
||||
return 1
|
||||
end
|
||||
|
||||
function mcl_farming:add_plant(identifier, full_grown, names, interval, chance)
|
||||
interval = growth_factor > 0 and (interval / growth_factor) or 0
|
||||
local plant_info = {}
|
||||
plant_info.full_grown = full_grown
|
||||
plant_info.names = names
|
||||
plant_info.interval = interval
|
||||
plant_info.chance = chance
|
||||
plant_nodename_to_id[full_grown] = identifier
|
||||
for _, nodename in pairs(names) do
|
||||
plant_nodename_to_id_list[nodename] = identifier
|
||||
plant_nodename_to_id[nodename] = identifier
|
||||
end
|
||||
plant_info.step_from_name = {}
|
||||
for i, name in ipairs(names) do
|
||||
plant_info.step_from_name[name] = i
|
||||
plant_step_from_name[name] = i
|
||||
end
|
||||
plant_lists[identifier] = plant_info
|
||||
if interval == 0 then return end -- growth disabled
|
||||
minetest.register_abm({
|
||||
label = string.format("Farming plant growth (%s)", identifier),
|
||||
nodenames = names,
|
||||
interval = interval,
|
||||
chance = chance,
|
||||
action = function(pos, node)
|
||||
local low_speed = minetest.get_node(vector.offset(pos, 0, -1, 0)).name ~= "mcl_farming:soil_wet"
|
||||
mcl_farming:grow_plant(identifier, pos, node, 1, false, low_speed)
|
||||
mcl_farming:grow_plant(identifier, pos, node, 1, false)
|
||||
end,
|
||||
})
|
||||
end
|
||||
@ -81,40 +107,30 @@ end
|
||||
-- pos: Position
|
||||
-- node: Node table
|
||||
-- stages: Number of stages to advance (optional, defaults to 1)
|
||||
-- ignore_light: if true, ignore light requirements for growing
|
||||
-- low_speed: grow more slowly (not wet), default false
|
||||
-- ignore_light_water: if true, ignore light and water requirements for growing
|
||||
-- Returns true if plant has been grown by 1 or more stages.
|
||||
-- Returns false if nothing changed.
|
||||
function mcl_farming:grow_plant(identifier, pos, node, stages, ignore_light, low_speed)
|
||||
stages = stages or 1
|
||||
function mcl_farming:grow_plant(identifier, pos, node, stages, ignore_light_water)
|
||||
-- number of missed interval ticks, for catch-up in block loading
|
||||
local plant_info = plant_lists[identifier]
|
||||
local intervals_counter = get_intervals_counter(pos, plant_info.interval, plant_info.chance)
|
||||
if stages > 0 then intervals_counters = intervals_counter - 1 end
|
||||
if low_speed then -- 10% speed approximately
|
||||
if intervals_counter < 1.01 and math.random(0, 9) > 0 then return false end
|
||||
intervals_counter = intervals_counter / 10
|
||||
end
|
||||
if not ignore_light and intervals_counter < 1.5 then
|
||||
local light = minetest.get_node_light(pos)
|
||||
if not light or light < 10 then return false end
|
||||
end
|
||||
|
||||
if intervals_counter >= 1.5 then
|
||||
local average_light_level = get_avg_light_level(pos)
|
||||
if average_light_level < 0.1 then return false end
|
||||
if average_light_level < 10 then
|
||||
intervals_counter = intervals_counter * average_light_level / 10
|
||||
if not plant_info then return end
|
||||
if not ignore_light_water then
|
||||
if (minetest.get_node_light(pos, 0.5) or 0) < 0 then return false end -- day light
|
||||
local odds = floor(25 / (get_moisture_level(pos) * get_same_crop_penalty(pos))) + 1
|
||||
for i = 1,stages do
|
||||
-- compared to info from the MC wiki, our ABM runs a third as often, hence we use triple the chance
|
||||
if random() * odds >= 3 then stages = stages - 1 end
|
||||
end
|
||||
end
|
||||
|
||||
local step = plant_info.step_from_name[node.name]
|
||||
if step == nil then return false end
|
||||
stages = stages + math.floor(intervals_counter)
|
||||
if stages == 0 then return false end
|
||||
local new_node = { name = plant_info.names[step + stages] or plant_info.full_grown }
|
||||
new_node.param = node.param
|
||||
new_node.param2 = node.param2
|
||||
minetest.set_node(pos, new_node)
|
||||
local step = plant_step_from_name[node.name]
|
||||
if step == nil then return false end
|
||||
minetest.set_node(pos, {
|
||||
name = plant_info.names[step + stages] or plant_info.full_grown,
|
||||
param = node.param,
|
||||
param2 = node.param2,
|
||||
})
|
||||
return true
|
||||
end
|
||||
|
||||
@ -157,40 +173,13 @@ end
|
||||
|
||||
|
||||
function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, stem_itemstring, stem_def, stem_drop, gourd_itemstring, gourd_def, grow_interval, grow_chance, connected_stem_texture)
|
||||
grow_interval = growth_factor > 0 and (grow_interval / growth_factor) or 0
|
||||
local connected_stem_names = {
|
||||
connected_stem_basename .. "_r",
|
||||
connected_stem_basename .. "_l",
|
||||
connected_stem_basename .. "_t",
|
||||
connected_stem_basename .. "_b" }
|
||||
|
||||
-- Connect the stem at stempos to the first neighboring gourd block.
|
||||
-- No-op if not a stem or no gourd block found
|
||||
local function try_connect_stem(stempos)
|
||||
local stem = minetest.get_node(stempos)
|
||||
if stem.name ~= full_unconnected_stem then return false end
|
||||
-- four directions, but avoid table allocation
|
||||
local neighbor = vector.offset(stempos, 1, 0, 0)
|
||||
if minetest.get_node(neighbor).name == gourd_itemstring then
|
||||
minetest.swap_node(stempos, { name = connected_stem_names[1] })
|
||||
return true
|
||||
end
|
||||
local neighbor = vector.offset(stempos, -1, 0, 0)
|
||||
if minetest.get_node(neighbor).name == gourd_itemstring then
|
||||
minetest.swap_node(stempos, { name = connected_stem_names[2] })
|
||||
return true
|
||||
end
|
||||
local neighbor = vector.offset(stempos, 0, 0, 1)
|
||||
if minetest.get_node(neighbor).name == gourd_itemstring then
|
||||
minetest.swap_node(stempos, { name = connected_stem_names[3] })
|
||||
return true
|
||||
end
|
||||
local neighbor = vector.offset(stempos, 0, 0, -1)
|
||||
if minetest.get_node(neighbor).name == gourd_itemstring then
|
||||
minetest.swap_node(stempos, { name = connected_stem_names[4] })
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
-- Register gourd
|
||||
if not gourd_def.after_destruct then
|
||||
gourd_def.after_destruct = function(blockpos, oldnode)
|
||||
@ -200,34 +189,21 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
|
||||
local stempos = vector.offset(blockpos, -1, 0, 0)
|
||||
if minetest.get_node(stempos).name == connected_stem_names[1] then
|
||||
minetest.swap_node(stempos, { name = full_unconnected_stem })
|
||||
try_connect_stem(stempos)
|
||||
end
|
||||
local stempos = vector.offset(blockpos, 1, 0, 0)
|
||||
if minetest.get_node(stempos).name == connected_stem_names[2] then
|
||||
minetest.swap_node(stempos, { name = full_unconnected_stem })
|
||||
try_connect_stem(stempos)
|
||||
end
|
||||
local stempos = vector.offset(blockpos, 0, 0, -1)
|
||||
if minetest.get_node(stempos).name == connected_stem_names[3] then
|
||||
minetest.swap_node(stempos, { name = full_unconnected_stem })
|
||||
try_connect_stem(stempos)
|
||||
end
|
||||
local stempos = vector.offset(blockpos, 0, 0, 1)
|
||||
if minetest.get_node(stempos).name == connected_stem_names[4] then
|
||||
minetest.swap_node(stempos, { name = full_unconnected_stem })
|
||||
try_connect_stem(stempos)
|
||||
end
|
||||
end
|
||||
end
|
||||
if not gourd_def.on_construct then
|
||||
function gourd_def.on_construct(blockpos)
|
||||
-- Connect all unconnected stems at full size
|
||||
try_connect_stem(vector.offset(blockpos, 1, 0, 0))
|
||||
try_connect_stem(vector.offset(blockpos, -1, 0, 0))
|
||||
try_connect_stem(vector.offset(blockpos, 0, 0, 1))
|
||||
try_connect_stem(vector.offset(blockpos, 0, 0, -1))
|
||||
end
|
||||
end
|
||||
minetest.register_node(gourd_itemstring, gourd_def)
|
||||
|
||||
-- Register unconnected stem
|
||||
@ -243,8 +219,8 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
|
||||
stem_def.drop = stem_def.drop or stem_drop
|
||||
stem_def.groups = stem_def.groups or { dig_immediate = 3, not_in_creative_inventory = 1, plant = 1, attached_node = 1, dig_by_water = 1, destroy_by_lava_flow = 1 }
|
||||
stem_def.sounds = stem_def.sounds or mcl_sounds.node_sound_leaves_defaults()
|
||||
stem_def.on_construct = stem_def.on_construct or try_connect_stem
|
||||
minetest.register_node(stem_itemstring, stem_def)
|
||||
plant_nodename_to_id[stem_itemstring] = stem_itemstring
|
||||
|
||||
-- Register connected stems
|
||||
|
||||
@ -307,22 +283,14 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
|
||||
sounds = mcl_sounds.node_sound_leaves_defaults(),
|
||||
_mcl_blast_resistance = 0,
|
||||
})
|
||||
plant_nodename_to_id[connected_stem_names[i]] = stem_itemstring
|
||||
|
||||
if minetest.get_modpath("doc") then
|
||||
doc.add_entry_alias("nodes", full_unconnected_stem, "nodes", connected_stem_names[i])
|
||||
end
|
||||
end
|
||||
|
||||
-- Check for a suitable spot to grow
|
||||
local function check_neighbor_soil(blockpos)
|
||||
if minetest.get_node(blockpos).name ~= "air" then return false end
|
||||
local floorpos = vector.offset(blockpos, 0, -1, 0)
|
||||
local floorname = minetest.get_node(floorpos).name
|
||||
if floorname == "mcl_core:dirt" then return true end
|
||||
local floordef = minetest.registered_nodes[floorname]
|
||||
return floordef.groups.grass_block or floordef.groups.dirt or (floordef.groups.soil or 0) >= 2
|
||||
end
|
||||
|
||||
if grow_interval == 0 then return end
|
||||
minetest.register_abm({
|
||||
label = "Grow gourd stem to gourd (" .. full_unconnected_stem .. " → " .. gourd_itemstring .. ")",
|
||||
nodenames = { full_unconnected_stem },
|
||||
@ -330,39 +298,27 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
|
||||
interval = grow_interval,
|
||||
chance = grow_chance,
|
||||
action = function(stempos)
|
||||
local light = minetest.get_node_light(stempos)
|
||||
if not light or light <= 10 then return end
|
||||
-- Check the four neighbors and filter out neighbors where gourds can't grow
|
||||
local neighbor, dir, nchance = nil, -1, 1 -- reservoir sampling
|
||||
if nchance == 1 or math.random(1, nchance) == 1 then
|
||||
local blockpos = vector.offset(stempos, 1, 0, 0)
|
||||
if check_neighbor_soil(blockpos) then
|
||||
neighbor, dir, nchance = blockpos, 1, nchance + 1
|
||||
end
|
||||
end
|
||||
if nchance == 1 or math.random(1, nchance) == 1 then
|
||||
local blockpos = vector.offset(stempos, -1, 0, 0)
|
||||
if check_neighbor_soil(blockpos) then
|
||||
neighbor, dir, nchance = blockpos, 2, nchance + 1
|
||||
end
|
||||
end
|
||||
if nchance == 1 or math.random(1, nchance) == 1 then
|
||||
local blockpos = vector.offset(stempos, 0, 0, 1)
|
||||
if check_neighbor_soil(blockpos) then
|
||||
neighbor, dir, nchance = blockpos, 3, nchance + 1
|
||||
end
|
||||
end
|
||||
if nchance == 1 or math.random(1, nchance) == 1 then
|
||||
local blockpos = vector.offset(stempos, 0, 0, -1)
|
||||
if check_neighbor_soil(blockpos) then
|
||||
neighbor, dir, nchance = blockpos, 4, nchance + 1
|
||||
end
|
||||
end
|
||||
local light = minetest.get_node_light(stempos, 0.5)
|
||||
if not light or light < 9 then return end
|
||||
-- Pick one neighbor and check if it can be used to grow
|
||||
local dir = random(1, 4) -- pick direction at random
|
||||
local neighbor = (dir == 1 and vector.offset(stempos, 1, 0, 0))
|
||||
or (dir == 2 and vector.offset(stempos, -1, 0, 0))
|
||||
or (dir == 3 and vector.offset(stempos, 0, 0, 1))
|
||||
or vector.offset(stempos, 0, 0, -1)
|
||||
if minetest.get_node(neighbor).name ~= "air" then return end -- occupied
|
||||
-- check for suitable floor -- in contrast to MC, we think everything solid is fine
|
||||
local floorpos = vector.offset(neighbor, 0, -1, 0)
|
||||
local floorname = minetest.get_node(floorpos).name
|
||||
local floordef = minetest.registered_nodes[floorname]
|
||||
if not floordef or not floordef.walkable then return end
|
||||
|
||||
-- check moisture level
|
||||
local odds = floor(25 / (get_moisture_level(stempos) * get_same_crop_penalty(stempos))) + 1
|
||||
-- we triple the odds, and rather call the ABM less often
|
||||
if random() * odds >= 3 then return end
|
||||
|
||||
-- Gourd needs at least 1 free neighbor to grow
|
||||
if not neighbor then return end
|
||||
minetest.swap_node(stempos, { name = connected_stem_names[dir] })
|
||||
-- Place the gourd
|
||||
if gourd_def.paramtype2 == "facedir" then
|
||||
local p2 = (dir == 1 and 3) or (dir == 2 and 1) or (dir == 3 and 2) or 0
|
||||
minetest.add_node(neighbor, { name = gourd_itemstring, param2 = p2 })
|
||||
@ -371,8 +327,7 @@ function mcl_farming:add_gourd(full_unconnected_stem, connected_stem_basename, s
|
||||
end
|
||||
|
||||
-- Reset farmland, etc. to dirt when the gourd grows on top
|
||||
local floorpos = vector.offset(neighbor, 0, -1, 0)
|
||||
if minetest.get_item_group(minetest.get_node(floorpos).name, "dirtifies_below_solid") == 1 then
|
||||
if (floordef.groups.dirtifies_below_solid or 0) > 0 then
|
||||
minetest.set_node(floorpos, { name = "mcl_core:dirt" })
|
||||
end
|
||||
end,
|
||||
@ -409,10 +364,21 @@ minetest.register_lbm({
|
||||
nodenames = { "group:plant" },
|
||||
run_at_every_load = true,
|
||||
action = function(pos, node, dtime_s)
|
||||
local identifier = plant_nodename_to_id_list[node.name]
|
||||
local identifier = plant_nodename_to_id[node.name]
|
||||
if not identifier then return end
|
||||
local low_speed = minetest.get_node(vector.offset(pos, 0, -1, 0)).name ~= "mcl_farming:soil_wet"
|
||||
mcl_farming:grow_plant(identifier, pos, node, 0, false, low_speed)
|
||||
|
||||
local plant_info = plant_lists[identifier]
|
||||
if not plant_info then return end
|
||||
local rolls = floor(dtime_s / plant_info.interval)
|
||||
if rolls <= 0 then return end
|
||||
-- simulate how often the block will be ticked
|
||||
local stages = 0
|
||||
for i = 1,rolls do
|
||||
if random(1, plant_info.chance) == 1 then stages = stages + 1 end
|
||||
end
|
||||
if stages > 0 then
|
||||
mcl_farming:grow_plant(identifier, pos, node, stages, false)
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
|
||||
@ -15,10 +15,6 @@ minetest.register_node("mcl_farming:soil", {
|
||||
{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
|
||||
}
|
||||
},
|
||||
on_construct = function(pos)
|
||||
local meta = minetest.get_meta(pos)
|
||||
meta:set_int("wet", 0)
|
||||
end,
|
||||
groups = {handy=1,shovely=1, dirtifies_below_solid=1, dirtifier=1, soil=2, soil_sapling=1, deco_block=1 },
|
||||
sounds = mcl_sounds.node_sound_dirt_defaults(),
|
||||
_mcl_blast_resistance = 0.6,
|
||||
@ -38,10 +34,6 @@ minetest.register_node("mcl_farming:soil_wet", {
|
||||
{-0.5, -0.5, -0.5, 0.5, 0.4375, 0.5},
|
||||
}
|
||||
},
|
||||
on_construct = function(pos)
|
||||
local meta = minetest.get_meta(pos)
|
||||
meta:set_int("wet", 7)
|
||||
end,
|
||||
groups = {handy=1,shovely=1, not_in_creative_inventory=1, dirtifies_below_solid=1, dirtifier=1, soil=3, soil_sapling=1 },
|
||||
sounds = mcl_sounds.node_sound_dirt_defaults(),
|
||||
_mcl_blast_resistance = 0.6,
|
||||
@ -51,75 +43,54 @@ minetest.register_node("mcl_farming:soil_wet", {
|
||||
minetest.register_abm({
|
||||
label = "Farmland hydration",
|
||||
nodenames = {"mcl_farming:soil", "mcl_farming:soil_wet"},
|
||||
interval = 15,
|
||||
chance = 4,
|
||||
interval = 2.73,
|
||||
chance = 25,
|
||||
action = function(pos, node)
|
||||
-- Get wetness value
|
||||
local meta = minetest.get_meta(pos)
|
||||
local wet = meta:get_int("wet")
|
||||
if not wet then
|
||||
if node.name == "mcl_farming:soil" then
|
||||
wet = 0
|
||||
else
|
||||
wet = 7
|
||||
end
|
||||
end
|
||||
|
||||
-- Turn back into dirt when covered by solid node
|
||||
local above_node = minetest.get_node_or_nil({x=pos.x,y=pos.y+1,z=pos.z})
|
||||
if above_node then
|
||||
if minetest.get_item_group(above_node.name, "solid") ~= 0 then
|
||||
node.name = "mcl_core:dirt"
|
||||
minetest.set_node(pos, node)
|
||||
return
|
||||
end
|
||||
local above_node = minetest.get_node_or_nil(vector.offset(pos, 0, 1, 0))
|
||||
if above_node and minetest.get_item_group(above_node.name, "solid") ~= 0 then
|
||||
node.name = "mcl_core:dirt"
|
||||
minetest.set_node(pos, node)
|
||||
return
|
||||
end
|
||||
|
||||
-- Check an area of 9×2×9 around the node for nodename (9×9 on same level and 9×9 below)
|
||||
local function check_surroundings(pos, nodename)
|
||||
local nodes = minetest.find_nodes_in_area({x=pos.x-4,y=pos.y,z=pos.z-4}, {x=pos.x+4,y=pos.y+1,z=pos.z+4}, {nodename})
|
||||
return #nodes > 0
|
||||
end
|
||||
|
||||
if check_surroundings(pos, "group:water") then
|
||||
if node.name ~= "mcl_farming:soil_wet" then
|
||||
-- Make it wet
|
||||
-- in rain, become wet, do not decay
|
||||
if mcl_weather and mcl_weather.rain.raining and mcl_weather.is_outdoor(pos) then
|
||||
if node.name == "mcl_farming:soil" then
|
||||
node.name = "mcl_farming:soil_wet"
|
||||
minetest.set_node(pos, node)
|
||||
end
|
||||
else -- No water nearby.
|
||||
-- The decay branch (make farmland dry or turn back to dirt)
|
||||
return
|
||||
end
|
||||
|
||||
-- Don't decay while it's raining
|
||||
if mcl_weather.rain.raining then
|
||||
if mcl_weather.is_outdoor(pos) then
|
||||
return
|
||||
end
|
||||
end
|
||||
-- No decay near unloaded areas since these might include water.
|
||||
if not check_surroundings(pos, "ignore") then
|
||||
if wet <= 0 then
|
||||
--local n_def = minetest.registered_nodes[node.name] or nil
|
||||
local nn = minetest.get_node_or_nil({x=pos.x,y=pos.y+1,z=pos.z})
|
||||
if not nn or not nn.name then
|
||||
return
|
||||
end
|
||||
local nn_def = minetest.registered_nodes[nn.name] or nil
|
||||
-- Check an area of 9x2x9 around the node for nodename (9x9 on same level and 9x9 above)
|
||||
-- include "ignore" to detect unloaded blocks
|
||||
local nodes, counts = minetest.find_nodes_in_area(vector.offset(pos, -4, 0, -4), vector.offset(pos, 4, 1, 4), {"group:water", "ignore"})
|
||||
local ignore = counts.ignore or 0
|
||||
local has_water, fully_loaded = #nodes > ignore, ignore == 0
|
||||
|
||||
if nn_def and minetest.get_item_group(nn.name, "plant") == 0 then
|
||||
node.name = "mcl_core:dirt"
|
||||
minetest.set_node(pos, node)
|
||||
return
|
||||
end
|
||||
else
|
||||
if wet == 7 then
|
||||
node.name = "mcl_farming:soil"
|
||||
minetest.swap_node(pos, node)
|
||||
end
|
||||
-- Slowly count down wetness
|
||||
meta:set_int("wet", wet-1)
|
||||
end
|
||||
-- Hydrate by rain or water, do not decay
|
||||
if has_water then
|
||||
if node.name == "mcl_farming:soil" then
|
||||
node.name = "mcl_farming:soil_wet"
|
||||
minetest.set_node(pos, node)
|
||||
end
|
||||
return
|
||||
end
|
||||
-- No decay near unloaded areas (ignore) since these might include water.
|
||||
if not fully_loaded then return end
|
||||
|
||||
-- Decay: make wet farmland dry up
|
||||
if node.name == "mcl_farming:soil_wet" then
|
||||
node.name = "mcl_farming:soil"
|
||||
minetest.set_node(pos, node)
|
||||
return
|
||||
end
|
||||
-- Revert to dirt if wetness is 0, and no plant above
|
||||
local above = minetest.get_node_or_nil(vector.offset(pos, 0, 1, 0))
|
||||
if minetest.get_item_group(above.name, "plant") == 0 then
|
||||
node.name = "mcl_core:dirt"
|
||||
minetest.set_node(pos, node)
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
@ -99,8 +99,8 @@ minetest.register_craftitem("mcl_farming:sweet_berry", {
|
||||
})
|
||||
minetest.register_alias("mcl_sweet_berry:sweet_berry", "mcl_farming:sweet_berry")
|
||||
|
||||
-- TODO: Find proper interval and chance values for sweet berry bushes. Current interval and chance values are copied from mcl_farming:beetroot which has similar growth stages.
|
||||
mcl_farming:add_plant("plant_sweet_berry_bush", "mcl_farming:sweet_berry_bush_3", {"mcl_farming:sweet_berry_bush_0", "mcl_farming:sweet_berry_bush_1", "mcl_farming:sweet_berry_bush_2"}, 68, 3)
|
||||
-- TODO: Find proper interval and chance values for sweet berry bushes. Current interval and chance values are copied from mcl_farming:beetroot which has similar growth stages, 2/3rd of the default.
|
||||
mcl_farming:add_plant("plant_sweet_berry_bush", "mcl_farming:sweet_berry_bush_3", {"mcl_farming:sweet_berry_bush_0", "mcl_farming:sweet_berry_bush_1", "mcl_farming:sweet_berry_bush_2"}, 8.7019, 35)
|
||||
|
||||
local function berry_damage_check(obj)
|
||||
local p = obj:get_pos()
|
||||
|
||||
@ -99,7 +99,7 @@ minetest.register_node("mcl_farming:wheat", {
|
||||
}
|
||||
})
|
||||
|
||||
mcl_farming:add_plant("plant_wheat", "mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3", "mcl_farming:wheat_4", "mcl_farming:wheat_5", "mcl_farming:wheat_6", "mcl_farming:wheat_7"}, 25, 20)
|
||||
mcl_farming:add_plant("plant_wheat", "mcl_farming:wheat", {"mcl_farming:wheat_1", "mcl_farming:wheat_2", "mcl_farming:wheat_3", "mcl_farming:wheat_4", "mcl_farming:wheat_5", "mcl_farming:wheat_6", "mcl_farming:wheat_7"}, 5.8020, 35)
|
||||
|
||||
minetest.register_craftitem("mcl_farming:wheat_item", {
|
||||
description = S("Wheat"),
|
||||
|
||||
@ -45,6 +45,9 @@ mcl_disabled_structures (Disabled structures) string
|
||||
# Comma separated list of disabled event names
|
||||
mcl_disabled_events (Disabled events) string
|
||||
|
||||
# Control the relative plant growth speed (default: 1)
|
||||
vl_plant_growth (Plant growth factor) float 1.0 0 100
|
||||
|
||||
[Players]
|
||||
# If enabled, players respawn at the bed they last lay on instead of normal
|
||||
# spawn.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user