diff --git a/data-otservbr-global/monster/reptiles/two-headed_turtle.lua b/data-otservbr-global/monster/reptiles/two-headed_turtle.lua index 2d1c2090b37..50b49aa8cc5 100644 --- a/data-otservbr-global/monster/reptiles/two-headed_turtle.lua +++ b/data-otservbr-global/monster/reptiles/two-headed_turtle.lua @@ -70,7 +70,7 @@ monster.loot = { { name = "two-headed turtle heads", chance = 8700 }, { name = "strong mana potion", chance = 13373 }, { name = "hydrophytes", chance = 11000 }, - { id = 1047, chance = 6388 }, -- bone + { id = 3115, chance = 6388 }, -- bone { name = "glacier shoes", chance = 4650 }, { id = 281, chance = 3582 }, -- giant shimmering pearl (green) { name = "small tropical fish", chance = 3582 }, diff --git a/data/libs/functions/container.lua b/data/libs/functions/container.lua index f932b37dfe4..824a12f5e02 100644 --- a/data/libs/functions/container.lua +++ b/data/libs/functions/container.lua @@ -20,7 +20,7 @@ function Container:addLoot(loot) local countToAdd = math.min(remainingCount, stackSize) local tmpItem = self:addItem(itemId, countToAdd, INDEX_WHEREEVER, FLAG_NOLIMIT) if not tmpItem then - logger.warn("Container:addLoot: failed to add stackable item: {}, to corpse {} with id {}", ItemType(itemId):getName(), self:getName(), self:getId()) + logger.warn("Container:addLoot: failed to add stackable item: {} with id {}, to corpse {} with id {}", ItemType(itemId):getName(), itemId, self:getName(), self:getId()) goto continue end remainingCount = remainingCount - countToAdd @@ -28,13 +28,13 @@ function Container:addLoot(loot) elseif iType:getCharges() ~= 0 then local tmpItem = self:addItem(itemId, item.count, INDEX_WHEREEVER, FLAG_NOLIMIT) if not tmpItem then - logger.warn("Container:addLoot: failed to add charge item: {}, to corpse {} with id {}", ItemType(itemId):getName(), self:getName(), self:getId()) + logger.warn("Container:addLoot: failed to add charge item: {} with id {}, to corpse {} with id {}", ItemType(itemId):getName(), itemId, self:getName(), self:getId()) end else for i = 1, item.count do local tmpItem = self:addItem(itemId, 1, INDEX_WHEREEVER, FLAG_NOLIMIT) if not tmpItem then - logger.warn("Container:addLoot: failed to add item: {}, to corpse {} with id {}", ItemType(itemId):getName(), self:getName(), self:getId()) + logger.warn("Container:addLoot: failed to add item: {} with id {}, to corpse {} with id {}", ItemType(itemId):getName(), itemId, self:getName(), self:getId()) goto continue end diff --git a/src/lua/functions/items/container_functions.cpp b/src/lua/functions/items/container_functions.cpp index a2251de641c..30eb26c6801 100644 --- a/src/lua/functions/items/container_functions.cpp +++ b/src/lua/functions/items/container_functions.cpp @@ -166,6 +166,7 @@ int ContainerFunctions::luaContainerAddItem(lua_State* L) { setItemMetatable(L, -1, item); } else { reportErrorFunc(fmt::format("Cannot add item to container, error code: '{}'", getReturnMessage(ret))); + pushBoolean(L, false); } return 1; }