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 2ff37c7f8f9b8decd8932fb5d64842af0cf8de8c..604313512f3811ded7cbc48e7b1c339ed8d1553b 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -1,59 +1,69 @@
-local function hive_construct(pos)
+local hive = {}
+local honey_max = 16
+
+function hive.construct(pos)
        local meta = minetest.get_meta(pos)
-       meta:set_string("formspec", "size[8,5;]"..xdecor.fancy_gui..
-               "label[1.25,0;Bees are making honey\nwith pollen around...]"..
-               "image[0,0;0.9,0.9;xdecor_bee3.png]".. -- Bees textures by Charles Sanchez and Mark Weyer.
-               "image[6,0;0.9,0.9;xdecor_bee2.png]"..
-               "image[7,0.35;0.8,0.8;xdecor_bee1.png]"..
-               "list[current_name;honey;5,0;1,1;]"..
-               "list[current_player;main;0,1.35;8,4;]")
-       meta:set_string("infotext", "Artificial Hive")
        local inv = meta:get_inventory()
+
+       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
 
-local function hive_dig(pos, player)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       if not inv:is_empty("honey") then
-               return false
+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()
+       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",
-       },
-       groups = {choppy=3, flammable=1},
-       on_construct = hive_construct,
-       can_dig = hive_dig,
-       on_punch = function(pos, node, puncher, pointed_thing)
-               local health = puncher:get_hp()
-               puncher:set_hp(health-4)
-       end
-})
-
-minetest.register_abm({
-       nodenames = {"xdecor:hive"},
-       interval = 4, chance = 4,
-       action = function(pos, node, active_object_count, active_object_count_wider)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
-
-               local radius = 16
-               local minp = {x=pos.x-radius, y=pos.y-radius, z=pos.z-radius}
-               local maxp = {x=pos.x+radius, y=pos.y+radius, z=pos.z+radius}
-               local flowers = minetest.find_nodes_in_area(minp, maxp, "group:flower")
-
-               if #flowers >= 4 then
-                       inv:add_item("honey", "xdecor:honey")
+       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,
+       on_timer = hive.timer,
+       can_dig = function(pos)
+               local inv = minetest.get_meta(pos):get_inventory()
+               return inv:is_empty("honey")
+       end,
+       on_punch = function(_, _, puncher)
+               puncher:set_hp(puncher:get_hp() - 2)
+       end,
+       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
 })
+