Don't crash on nil-player in can_dig and check the right players for attachment in...

[xdecor.git] / hive.lua

diff --git a/hive.lua b/hive.lua
index 2bb12ed7389d0ba29cd5c4f20ddf9d088e156297..604313512f3811ded7cbc48e7b1c339ed8d1553b 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -1,63 +1,69 @@
 local hive = {}
+local honey_max = 16
 
 function hive.construct(pos)
        local meta = minetest.get_meta(pos)
        local inv = meta:get_inventory()
-       local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots..default.get_hotbar_bg(0,1.35)
 
-       local formspec = "size[8,5;]"..xbg..
-                       "label[1.35,0;Bees are making honey\nwith pollen around...]"..
-                       "image[6,0;1,1;hive_bee.png]"..
-                       "image[5,0;1,1;hive_layout.png]"..
-                       "list[context;honey;5,0;1,1;]"..
-                       "list[current_player;main;0,1.35;8,4;]"
+       local formspec = [[ size[8,5;]
+                       label[0.5,0;Bees are busy making honey...]
+                       image[6,0;1,1;hive_bee.png]
+                       image[5,0;1,1;hive_layout.png]
+                       list[context;honey;5,0;1,1;]
+                       list[current_player;main;0,1.35;8,4;] ]]
+                       ..xbg..default.get_hotbar_bg(0,1.35)
 
        meta:set_string("formspec", formspec)
        meta:set_string("infotext", "Artificial Hive")
        inv:set_size("honey", 1)
+
+       local timer = minetest.get_node_timer(pos)
+       timer:start(math.random(64, 128))
 end
 
-function hive.dig(pos, _)
+function hive.timer(pos)
+       local time = (minetest.get_timeofday() or 0) * 24000
+       if time < 5500 or time > 18500 then return true end
+
        local inv = minetest.get_meta(pos):get_inventory()
-       return inv:is_empty("honey")
+       local honeystack = inv:get_stack("honey", 1)
+       local honey = honeystack:get_count()
+
+       local radius = 4
+       local minp = vector.add(pos, -radius)
+       local maxp = vector.add(pos, radius)
+       local flowers = minetest.find_nodes_in_area_under_air(minp, maxp, "group:flower")
+
+       if #flowers > 2 and honey < honey_max then
+               inv:add_item("honey", "xdecor:honey")
+       elseif honey == honey_max then
+               local timer = minetest.get_node_timer(pos)
+               timer:stop() return true
+       end
+       return true
 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 = hive.dig,
-       on_punch = function(_, _, puncher, _)
-               local health = puncher:get_hp()
-               puncher:set_hp(health - 4)
+       on_timer = hive.timer,
+       can_dig = function(pos)
+               local inv = minetest.get_meta(pos):get_inventory()
+               return inv:is_empty("honey")
        end,
-       on_rightclick = function(_, _, clicker)
-               local health = clicker:get_hp()
-               clicker:set_hp(health - 1)
+       on_punch = function(_, _, puncher)
+               puncher:set_hp(puncher:get_hp() - 2)
        end,
-       allow_metadata_inventory_put = function(...) return 0 end
-})
-
-minetest.register_abm({
-       nodenames = {"xdecor:hive"},
-       interval = 10, chance = 5,
-       action = function(pos, _, _, _)
-               local inv = minetest.get_meta(pos):get_inventory()
-               local honeystack = inv:get_stack("honey", 1)
-               local honey = honeystack:get_count()
-
-               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")
-
-               if #flowers >= 2 and honey < 12 then
-                       inv:add_item("honey", "xdecor:honey")
+       allow_metadata_inventory_put = function() return 0 end,
+       on_metadata_inventory_take = function(pos, _, _, stack)
+               if stack:get_count() == honey_max then
+                       local timer = minetest.get_node_timer(pos)
+                       timer:start(math.random(64, 128))
                end
        end
 })
+