1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-24 17:50:37 +01:00

Updated plantlife

- Added `if` statements to avoid populating areas when lag is too high
This commit is contained in:
LeMagnesium 2015-02-09 18:20:35 +01:00
parent 6237c70e77
commit 47bf36a8c3
5 changed files with 80 additions and 54 deletions

View File

@ -1,21 +1,4 @@
-- Blossom -- Blossoms and such
local BLOSSOM_NODE = "nature:blossom"
local BLOSSOM_LEAVES = "default:leaves"
local BLOSSOM_TEXTURES = { "default_leaves.png^nature_blossom.png" }
if minetest.get_modpath("moretrees") then
BLOSSOM_NODE = "moretrees:apple_blossoms"
BLOSSOM_LEAVES = "moretrees:apple_tree_leaves"
BLOSSOM_TEXTURES = { "moretrees_apple_tree_leaves.png^nature_blossom.png" }
minetest.register_alias("nature:blossom", "default:leaves")
end
local BLOSSOM_CHANCE = 15
local BLOSSOM_DELAY = 3600
local APPLE_CHANCE = 10
local APPLE_SPREAD = 2
local function spawn_apple_under(pos) local function spawn_apple_under(pos)
local below = { local below = {
@ -28,10 +11,10 @@ local function spawn_apple_under(pos)
end end
end end
minetest.register_node(":"..BLOSSOM_NODE, { minetest.register_node(":"..nature.blossom_node, {
description = "Apple blossoms", description = "Apple blossoms",
drawtype = "allfaces_optional", drawtype = "allfaces_optional",
tiles = BLOSSOM_TEXTURES, tiles = nature.blossom_textures,
paramtype = "light", paramtype = "light",
groups = { snappy = 3, leafdecay = 3, flammable = 2 }, groups = { snappy = 3, leafdecay = 3, flammable = 2 },
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),
@ -40,42 +23,42 @@ minetest.register_node(":"..BLOSSOM_NODE, {
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",
recipe = BLOSSOM_NODE, recipe = nature.blossom_node,
burntime = 2, burntime = 2,
}) })
-- Blossoming -- these ABMs can get heavy, so just enqueue the nodes
-- Adding Blossoms
minetest.register_abm({ minetest.register_abm({
nodenames = { BLOSSOM_LEAVES }, nodenames = { nature.blossom_leaves },
interval = BLOSSOM_DELAY, interval = nature.blossom_delay,
chance = BLOSSOM_CHANCE, chance = nature.blossom_chance,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
if nature:is_near_water(pos) then nature.enqueue_node(pos, node, true)
nature:grow_node(pos, BLOSSOM_NODE)
end
end end
}) })
-- Removing blossom -- Removing blossoms
minetest.register_abm({ minetest.register_abm({
nodenames = { BLOSSOM_NODE }, nodenames = { nature.blossom_node },
interval = BLOSSOM_DELAY, interval = nature.blossom_delay,
chance = BLOSSOM_CHANCE, chance = nature.blossom_chance,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
nature:grow_node(pos, BLOSSOM_LEAVES) nature.enqueue_node(pos, node, false)
end end
}) })
-- Spawning apples -- Spawning apples
minetest.register_abm({ minetest.register_abm({
nodenames = { BLOSSOM_NODE }, nodenames = { nature.blossom_node },
interval = BLOSSOM_DELAY, interval = nature.blossom_delay,
chance = APPLE_CHANCE, chance = nature.apple_chance,
action = function(pos, node, active_object_count, active_object_count_wider) action = function(pos, node, active_object_count, active_object_count_wider)
if not minetest.find_node_near(pos, APPLE_SPREAD, { "default:apple" }) then if nature.dtime < 0.2 and not minetest.find_node_near(pos, nature.apple_spread, { "default:apple" }) then
spawn_apple_under(pos) spawn_apple_under(pos)
end end
end end

View File

@ -1,6 +1,6 @@
-- Set on which distance from water can the tree still grow. -- Set on which distance from water can the tree still grow.
-- Grows anywhere if set to -1. -- Grows anywhere if set to -1.
DISTANCE_FROM_WATER = 20 nature.distance_from_water = 20
-- Minimum light level needed to grow. Default is 8, which means daylight. -- Minimum light level needed to grow. Default is 8, which means daylight.
MINIMUM_GROWTH_LIGHT = 8 nature.minimum_growth_light = 8

View File

@ -1,20 +1,35 @@
local NODE_YOUNG = "young" -- helper functions
local SETTING_TRUE = "true" minetest.register_globalstep(function(dtime)
local SETTING_FALSE = "false" nature.dtime = dtime
if #nature.blossomqueue > 0 and dtime < 0.2 then
local pos = nature.blossomqueue[1][1]
local node = nature.blossomqueue[1][2]
if (nature.blossomqueue[1][3] and not nature:is_near_water(pos)) then
table.remove(nature.blossomqueue, 1) -- don't grow if it's not near water, pop from queue.
return
end
nature:grow_node(pos, nature.blossom_node) -- now actually grow it.
table.remove(nature.blossomqueue, 1)
end
end)
local YOUTH_DELAY = 5 function nature.enqueue_node(pos, node, fcn)
local idx = #nature.blossomqueue
nature = {} nature.blossomqueue[idx+1] = {}
nature.blossomqueue[idx+1][1] = pos
nature.blossomqueue[idx+1][2] = node
nature.blossomqueue[idx+1][3] = fcn
end
local function set_young_node(pos) local function set_young_node(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string(NODE_YOUNG, SETTING_TRUE) meta:set_string(nature.node_young, nature.setting_true)
minetest.after(YOUTH_DELAY, minetest.after(nature.youth_delay,
function(pos) function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string(NODE_YOUNG, SETTING_FALSE) meta:set_string(nature.node_young, nature.setting_false)
end, end,
pos) pos)
end end
@ -22,14 +37,14 @@ end
local function is_not_young(pos) local function is_not_young(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local young = meta:get_string(NODE_YOUNG) local young = meta:get_string(nature.node_young)
return young ~= SETTING_TRUE return young ~= nature.setting_true
end end
function nature:grow_node(pos, nodename) function nature:grow_node(pos, nodename)
if pos ~= nil then if pos ~= nil then
local light_enough = minetest.get_node_light(pos, nil) local light_enough = minetest.get_node_light(pos, nil)
>= MINIMUM_GROWTH_LIGHT >= nature.minimum_growth_light
if is_not_young(pos) and light_enough then if is_not_young(pos) and light_enough then
minetest.remove_node(pos) minetest.remove_node(pos)
@ -43,6 +58,6 @@ function nature:grow_node(pos, nodename)
end end
function nature:is_near_water(pos) function nature:is_near_water(pos)
return DISTANCE_FROM_WATER == -1 or minetest.find_node_near(pos, DISTANCE_FROM_WATER, return nature.distance_from_water == -1 or minetest.find_node_near(pos, nature.distance_from_water,
{ "default:water_source" }) ~= nil { "default:water_source" }) ~= nil
end end

View File

@ -5,6 +5,34 @@
local current_mod_name = minetest.get_current_modname() local current_mod_name = minetest.get_current_modname()
nature = {}
nature.blossomqueue = {}
nature.blossom_node = "nature:blossom"
nature.blossom_leaves = "default:leaves"
nature.blossom_textures = { "default_leaves.png^nature_blossom.png" }
if minetest.get_modpath("moretrees") then
nature.blossom_node = "moretrees:apple_blossoms"
nature.blossom_leaves = "moretrees:apple_tree_leaves"
nature.blossom_textures = { "moretrees_apple_tree_leaves.png^nature_blossom.png" }
minetest.register_alias("nature:blossom", "default:leaves")
end
nature.blossom_chance = 15
nature.blossom_delay = 3600
nature.apple_chance = 10
nature.apple_spread = 2
nature.node_young = "young"
nature.setting_true = "true"
nature.setting_false = "false"
nature.youth_delay = 5
function dumppos(pos)
return "("..pos.x..","..pos.y..","..pos.z..")"
end
dofile(minetest.get_modpath(current_mod_name) .. "/config.lua") dofile(minetest.get_modpath(current_mod_name) .. "/config.lua")
dofile(minetest.get_modpath(current_mod_name) .. "/global_function.lua") dofile(minetest.get_modpath(current_mod_name) .. "/global_function.lua")
dofile(minetest.get_modpath(current_mod_name) .. "/blossom.lua") dofile(minetest.get_modpath(current_mod_name) .. "/blossom.lua")

View File

@ -326,7 +326,7 @@ end
-- a surface during the initial map read stage. -- a surface during the initial map read stage.
function plantslib:generate_block_with_air_checking(dtime) function plantslib:generate_block_with_air_checking(dtime)
if dtime > 0.2 then return end -- don't attempt to populate if lag is too high
if #plantslib.blocklist_aircheck > 0 then if #plantslib.blocklist_aircheck > 0 then
local minp = plantslib.blocklist_aircheck[1][1] local minp = plantslib.blocklist_aircheck[1][1]
@ -376,7 +376,7 @@ end
-- checking for air during the initial map read stage. -- checking for air during the initial map read stage.
function plantslib:generate_block_no_aircheck(dtime) function plantslib:generate_block_no_aircheck(dtime)
if dtime > 0.2 then return end
if #plantslib.blocklist_no_aircheck > 0 then if #plantslib.blocklist_no_aircheck > 0 then
local minp = plantslib.blocklist_no_aircheck[1][1] local minp = plantslib.blocklist_no_aircheck[1][1]