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

[xdecor.git] / hive.lua

diff --git a/hive.lua b/hive.lua
index 26ad37faaba404cc8189b4a1592a26421dddbf50..e5666b0a2a263fd2183bdec5231b855c7d699315 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -1,66 +1,62 @@
-local function hive_construct(pos)
+local hive = {}
+
+function hive.construct(pos)
        local meta = minetest.get_meta(pos)
-       meta:set_string("formspec", "size[8,5;]"..xdecor.fancy_gui..
-               "label[1.35,0;Bees are making honey\nwith pollen around...]"..
-               "image[-0.1,-0.2;1,1;flowers_tulip.png]"..
-               "image[0.5,0.2;1,1;flowers_dandelion_yellow.png]"..
-               "image[6.6,0.1;1,1;flowers_geranium.png]"..
-               "image[7.2,-0.1;1,1;flowers_rose.png]"..
-               "image[6,0;0.9,0.9;xdecor_bee.png]".. -- Bee texture by Charles Sanchez and Mark Weyer.
-               "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
 
-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
-       end
+function hive.dig(pos, _)
+       local inv = minetest.get_meta(pos):get_inventory()
+       if not inv:is_empty("honey") then return false 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",
+               "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 = {snappy=3, flammable=1},
-       on_construct = hive_construct,
-       can_dig = hive_dig,
-       on_punch = function(pos, node, puncher, pointed_thing)
+       on_construct = hive.construct,
+       can_dig = hive.dig,
+       on_punch = function(_, _, puncher, _)
                local health = puncher:get_hp()
-               puncher:set_hp(health-4)
+               puncher:set_hp(health - 4)
        end,
-       allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+       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()
-       end,
+       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()
+       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 = 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 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
 })