From 0a27a168b0b10eaeef18de093f3cdea6e4b3d1d4 Mon Sep 17 00:00:00 2001 From: Eduardo Augusto Date: Sat, 22 Apr 2023 13:49:35 -0300 Subject: [PATCH] Fix: icon id imbuement backpack and remove server log message empty --- data/XML/imbuements.xml | 6 +++--- src/creatures/players/player.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/XML/imbuements.xml b/data/XML/imbuements.xml index c8bac77c053..9fcf8ca653d 100644 --- a/data/XML/imbuements.xml +++ b/data/XML/imbuements.xml @@ -409,18 +409,18 @@ - + - + - + diff --git a/src/creatures/players/player.cpp b/src/creatures/players/player.cpp index ccee8b2d178..1157b0a8971 100644 --- a/src/creatures/players/player.cpp +++ b/src/creatures/players/player.cpp @@ -1251,8 +1251,9 @@ void Player::onApplyImbuement(Imbuement* imbuement, Item* item, uint8_t slot, bo return; } - std::stringstream withdrawItemMessage; for (auto &[key, value] : items) { + std::stringstream withdrawItemMessage; + uint32_t inventoryItemCount = getItemTypeCount(key); if (inventoryItemCount >= value) { removeItemOfType(key, value, -1, true); @@ -1268,10 +1269,9 @@ void Player::onApplyImbuement(Imbuement* imbuement, Item* item, uint8_t slot, bo withdrawItemMessage << "Using " << mathItemCount << "x " << itemType.name << " from your supply stash. "; withdrawItem(itemType.id, mathItemCount); + sendTextMessage(MESSAGE_STATUS, withdrawItemMessage.str()); } - sendTextMessage(MESSAGE_STATUS, withdrawItemMessage.str()); - if (!protectionCharm && uniform_random(1, 100) > baseImbuement->percent) { openImbuementWindow(item); sendImbuementResult("Oh no!\n\nThe imbuement has failed. You have lost the astral sources and gold you needed for the imbuement.\n\nNext time use a protection charm to better your chances.");