Cooking: code cleaning and add more ingredients

[xdecor.git] / hive.lua

diff --git a/hive.lua b/hive.lua
index 911fb04f6bca2f8ebebf62d3953f3f6c42831e65..be2dc3ee722b175a8fa6337ee4225dc5206d5162 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -20,18 +20,16 @@ end
 
 xdecor.register("hive", {
        description = "Artificial Hive",
-       tiles = {
-               "xdecor_hive_top.png", "xdecor_hive_top.png",
-               "xdecor_hive_side.png", "xdecor_hive_side.png",
-               "xdecor_hive_side.png", "xdecor_hive_front.png"
-       },
+       tiles = {"xdecor_hive_top.png", "xdecor_hive_top.png",
+                "xdecor_hive_side.png", "xdecor_hive_side.png",
+                "xdecor_hive_side.png", "xdecor_hive_front.png"},
        groups = {choppy=3, oddly_breakable_by_hand=2, flammable=1},
        on_construct = hive.construct,
-       can_dig = function(pos, _)
+       can_dig = function(pos)
                return minetest.get_meta(pos):get_inventory():is_empty("honey")
        end,
        on_punch = function(_, _, puncher)
-               puncher:set_hp(puncher:get_hp()-4)
+               puncher:set_hp(puncher:get_hp() - 2)
        end,
        allow_metadata_inventory_put = function() return 0 end
 })
@@ -39,7 +37,10 @@ xdecor.register("hive", {
 minetest.register_abm({
        nodenames = {"xdecor:hive"},
        interval = 30, chance = 10,
-       action = function(pos, _, _, _)
+       action = function(pos)
+               local time = (minetest.get_timeofday() or 0) * 24000
+               if time < 5500 or time > 18500 then return end
+
                local inv = minetest.get_meta(pos):get_inventory()
                local honeystack = inv:get_stack("honey", 1)
                local honey = honeystack:get_count()
@@ -47,9 +48,9 @@ minetest.register_abm({
                local radius = 4
                local minp = vector.add(pos, -radius)
                local maxp = vector.add(pos, radius)
-               local flowers = minetest.find_nodes_in_area(minp, maxp, "group:flower")
+               local flowers = minetest.find_nodes_in_area_under_air(minp, maxp, "group:flower")
 
-               if #flowers >= 2 and honey < 16 then
+               if #flowers > 2 and honey < 16 then
                        inv:add_item("honey", "xdecor:honey")
                end
        end