X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=hive.lua;h=40c18573753ed5153032b0639b61276c24a79eaf;hb=640c03c9bc332530769f738f85328691b222e5f3;hp=b310ef7161f14939f494741f80e018a89c0db683;hpb=b3f9a68c1677186730d1c8264bffa70f7ae730a3;p=xdecor.git

diff --git a/hive.lua b/hive.lua
index b310ef7..40c1857 100644
--- a/hive.lua
+++ b/hive.lua
@@ -1,66 +1,55 @@
-local 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()
-	inv:set_size("honey", 1)
-end
+local hive = {}
 
-local function hive_dig(pos, player)
+function hive.construct(pos)
 	local meta = minetest.get_meta(pos)
 	local inv = meta:get_inventory()
 
-	if not inv:is_empty("honey") then
-		return false
-	end
-	return true
+	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
 
 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, 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)
+	groups = {choppy=3, oddly_breakable_by_hand=2, flammable=1},
+	on_construct = hive.construct,
+	can_dig = function(pos)
+		return minetest.get_meta(pos):get_inventory():is_empty("honey")
 	end,
-	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-		local meta = minetest.get_meta(pos)
-		local inv = meta:get_inventory()
-
-		if listname == "honey" then return 0 end
-		return stack:get_count()
+	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 = 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 = 30, chance = 10,
+	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 = 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 >= 4 then
+		if #flowers >= 2 and honey < 16 then
 			inv:add_item("honey", "xdecor:honey")
 		end
 	end