Fix doors aliases (finally)

[xdecor.git] / hive.lua

diff --git a/hive.lua b/hive.lua
index e5666b0a2a263fd2183bdec5231b855c7d699315..be2dc3ee722b175a8fa6337ee4225dc5206d5162 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -3,60 +3,55 @@ local hive = {}
 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
 
-       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;]"
+       local formspec = [[ size[8,5;]
+                       label[1.35,0;Bees are making honey]
+                       label[1.35,0.5;with 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;] ]]
+                       ..xbg..default.get_hotbar_bg(0,1.35)
 
        meta:set_string("formspec", formspec)
        meta:set_string("infotext", "Artificial Hive")
        inv:set_size("honey", 1)
 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"
-       },
-       groups = {snappy=3, flammable=1},
+       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)
+       can_dig = function(pos)
+               return minetest.get_meta(pos):get_inventory():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(_, listname, _, stack, _)
-               if listname == "honey" then return 0 end
-               return stack:get_count()
-       end
+       allow_metadata_inventory_put = function() return 0 end
 })
 
 minetest.register_abm({
        nodenames = {"xdecor:hive"},
-       interval = 10, chance = 5,
-       action = function(pos, _, _, _)
+       interval = 30, chance = 10,
+       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()
 
-               local radius = 8
+               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 >= 4 and honey < 16 then
-                       inv:add_item("honey", "xdecor:honey") end
+               if #flowers > 2 and honey < 16 then
+                       inv:add_item("honey", "xdecor:honey")
+               end
        end
 })