From d2d3cedf05a2ab7dd68435e7e4ffa0b7e5e07aa5 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Jun 2022 09:28:16 +0200 Subject: [PATCH] fix:egg dissapears while holding a full stack of the same eggs; eggs max stack set to 64 --- kitz/api/api_log.lua | 2 -- petz/api/api_eggs.lua | 5 +++-- petz/brains/bh_breed.lua | 2 +- petz/misc/food.lua | 2 ++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kitz/api/api_log.lua b/kitz/api/api_log.lua index 8ba7368..2456390 100644 --- a/kitz/api/api_log.lua +++ b/kitz/api/api_log.lua @@ -1,5 +1,3 @@ -local _id = 0 - function kitz.logon_mob(self) table.insert(kitz.active_mobs, self.object) end diff --git a/petz/api/api_eggs.lua b/petz/api/api_eggs.lua index 1974229..a92eef1 100644 --- a/petz/api/api_eggs.lua +++ b/petz/api/api_eggs.lua @@ -42,8 +42,9 @@ end 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 - if itemstack:get_name() == egg_type or itemstack:get_name() == "" then - itemstack:add_item(egg_type) + if ((itemstack:get_name() == egg_type) and not(itemstack:get_count() >= itemstack:get_stack_max())) + or (itemstack:get_name() == "") then + itemstack:add_item(egg_type) else inv:add_item("main", egg_type) --add the egg to the player's inventory end diff --git a/petz/brains/bh_breed.lua b/petz/brains/bh_breed.lua index afded0f..31a7de1 100644 --- a/petz/brains/bh_breed.lua +++ b/petz/brains/bh_breed.lua @@ -5,7 +5,7 @@ function petz.bh_breed(self, pos) if self.breed and self.is_rut and self.is_male then --search a couple for a male! local couple_name = "petz:"..self.type - if self.type == "elephant" then + if self.type == "elephant" then couple_name = couple_name.."_female" end local couple_obj = kitz.get_closest_entity(self, couple_name) -- look for a couple diff --git a/petz/misc/food.lua b/petz/misc/food.lua index 5f7e223..4c29208 100644 --- a/petz/misc/food.lua +++ b/petz/misc/food.lua @@ -6,6 +6,7 @@ minetest.register_craftitem("petz:ducky_egg", { description = S("Ducky Egg"), inventory_image = "petz_ducky_egg.png", wield_image = "petz_ducky_egg.png", + stack_max = 64, on_use = minetest.item_eat(2), groups = {flammable = 2, food = 2, food_egg = 1}, }) @@ -14,6 +15,7 @@ minetest.register_craftitem("petz:chicken_egg", { description = S("Chicken Egg"), inventory_image = "petz_chicken_egg.png", wield_image = "petz_chicken_egg.png", + stack_max = 64, on_use = minetest.item_eat(2), groups = {flammable = 2, food = 2, food_egg = 1}, })