Merge pull request #15 from MT-Modder/globalize-worktable-nodelist

[xdecor.git] / hive.lua

diff --git a/hive.lua b/hive.lua
index baea94222cce276b916f2022e68743f3b53fa6e0..e5666b0a2a263fd2183bdec5231b855c7d699315 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -2,22 +2,19 @@ local hive = {}
 
 function hive.construct(pos)
        local meta = minetest.get_meta(pos)
-       meta:set_string("formspec", "size[8,5;]"..xbg..
-               "label[1.35,0;Bees are making honey\nwith pollen around...]"..
-               "image[0.2,-0.1;1,1;flowers_dandelion_white.png]"..
-               "image[7,0.1;1,1;flowers_viola.png]"..
-               "image[6,0;1,1;xdecor_bee.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 xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
+
+       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[current_name;honey;5,0;1,1;]list[current_player;main;0,1.35;8,4;]"
+
+       meta:set_string("formspec", formspec)
+       meta:set_string("infotext", "Artificial Hive")
        inv:set_size("honey", 1)
 end
 
 function hive.dig(pos, _)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-
+       local inv = minetest.get_meta(pos):get_inventory()
        if not inv:is_empty("honey") then return false end
        return true
 end
@@ -36,6 +33,10 @@ xdecor.register("hive", {
                local health = puncher:get_hp()
                puncher:set_hp(health - 4)
        end,
+       on_rightclick = function(_, _, clicker)
+               local health = clicker:get_hp()
+               clicker:set_hp(health - 1)
+       end,
        allow_metadata_inventory_put = function(_, listname, _, stack, _)
                if listname == "honey" then return 0 end
                return stack:get_count()
@@ -44,16 +45,18 @@ xdecor.register("hive", {
 
 minetest.register_abm({
        nodenames = {"xdecor:hive"},
-       interval = 10, chance = 4,
+       interval = 10, chance = 5,
        action = function(pos, _, _, _)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
+               local inv = minetest.get_meta(pos):get_inventory()
+               local honeystack = inv:get_stack("honey", 1)
+               local honey = honeystack:get_count()
 
                local radius = 8
                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 >= 4 then inv:add_item("honey", "xdecor:honey") end
+               if #flowers >= 4 and honey < 16 then
+                       inv:add_item("honey", "xdecor:honey") end
        end
 })