fix:extract egg from nest when the wielded item is an egg

petz/api/api_breed.lua

@@ -107,10 +107,10 @@ petz.childbirth = function(self)
 			baby_entity.owner = self.owner
 			mobkit.remember(baby_entity, "owner", baby_entity.owner)
 		end
+		return baby_entity
 	else
 		return nil
 	end
-	return baby_entity
 end
 
 petz.pregnant_timer = function(self, dtime)

petz/api/api_eggs.lua

@@ -39,12 +39,17 @@ petz.lay_egg = function(self)
 end
 
 --Extract Egg from a Nest
-petz.extract_egg_from_nest = function(pos, player, egg_type)
+petz.extract_egg_from_nest = function(pos, player, itemstack, egg_type)
 	local inv = player:get_inventory()
 	if inv:room_for_item("main", egg_type) then
-		inv:add_item("main", egg_type) --add the egg to the player's inventory
+		if itemstack:get_name() == egg_type then
+			itemstack:add_item(egg_type)
+		else
+			inv:add_item("main", egg_type) --add the egg to the player's inventory
+		end
 		minetest.set_node(pos, {name= "petz:ducky_nest"}) --Replace the node to a empty nest
 	else
 		minetest.chat_send_player(player:get_player_name(), "No room in your inventory for the egg.")
 	end
+	return itemstack
 end

petz/misc/nodes.lua

@@ -181,7 +181,8 @@ minetest.register_node("petz:ducky_nest_egg", {
         end
     end,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		petz.extract_egg_from_nest(pos, player, "petz:ducky_egg") --extract the egg
+		itemstack = petz.extract_egg_from_nest(pos, player, itemstack, "petz:ducky_egg") --extract the egg
+		return itemstack
 	end,
 })
 
@@ -223,7 +224,8 @@ minetest.register_node("petz:chicken_nest_egg", {
 		end
 	end,
 	on_rightclick = function(pos, node, player, itemstack, pointed_thing)
-		petz.extract_egg_from_nest(pos, player, "petz:chicken_egg") --extract the egg
+		itemstack = petz.extract_egg_from_nest(pos, player, itemstack, "petz:chicken_egg") --extract the egg
+		return itemstack
 	end,
 })
 

petz/petz/calf_mobkit.lua

@@ -9,7 +9,7 @@ local scale_model = 4.5
 local scale_baby = 0.5
 local visual_size = {x=petz.settings.visual_size.x*scale_model, y=petz.settings.visual_size.y*scale_model}
 local visual_size_baby = {x=petz.settings.visual_size.x*scale_model*scale_baby, y=petz.settings.visual_size.y*scale_model*scale_baby}
-local skin_colors = {"black_white", "brown_white", "brown", "white_black", "white_brown"}
+local skin_colors = {"black_white", "brown_white", "brown", "white_black", "white_brown", "wine"}
 local textures = {}
 for n = 1, #skin_colors do
 	textures[n] = "petz_"..pet_name.."_"..skin_colors[n]..".png"

petz/petz/foxy_mobkit.lua

@@ -7,7 +7,7 @@ local pet_name = "foxy"
 local scale_model = 1.5
 petz.foxy = {}
 local mesh = 'petz_foxy.b3d'
-local textures = {"petz_foxy.png"}
+local textures = {"petz_foxy.png", "petz_foxy_light_brown.png"}
 local p1 = {x= -0.1875, y = -0.5, z = -0.25}
 local p2 = {x= 0.1875, y = -0.0625, z = 0.375}
 local collisionbox = petz.get_collisionbox(p1, p2, scale_model, nil)