fix: items description

opentibiabr · Sep 23, 2024 · 9f9eae9 · 9f9eae9
1 parent bbc48f9
commit 9f9eae9
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 19 deletions.
diff --git a/src/items/item.cpp b/src/items/item.cpp
@@ -1182,12 +1182,17 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr
 			}
 			descriptions.emplace_back("Attack", ss.str());
 		} else if (!it.isRanged()) {
+			std::string attackDescription;
 			if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) {
-				ss.str("");
-				ss << attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
-				descriptions.emplace_back("Attack", ss.str());
-			} else if (it.attack != 0) {
-				descriptions.emplace_back("Attack", std::to_string(attack));
+				attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
+			}
+
+			if (it.attack != 0) {
+				attackDescription = fmt::format("{} physical + {}", attack, attackDescription);
+			}
+
+			if (!attackDescription.empty()) {
+				descriptions.emplace_back("Attack", attackDescription);
 			}
 		}
 
@@ -1595,12 +1600,17 @@ Item::getDescriptions(const ItemType &it, std::shared_ptr<Item> item /*= nullptr
 			}
 			descriptions.emplace_back("Attack", ss.str());
 		} else if (!it.isRanged()) {
+			std::string attackDescription;
 			if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) {
-				ss.str("");
-				ss << attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
-				descriptions.emplace_back("Attack", ss.str());
-			} else if (it.attack != 0) {
-				descriptions.emplace_back("Attack", std::to_string(attack));
+				attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
+			}
+
+			if (it.attack != 0) {
+				attackDescription = fmt::format("{} physical + {}", attack, attackDescription);
+			}
+
+			if (!attackDescription.empty()) {
+				descriptions.emplace_back("Attack", attackDescription);
 			}
 		}
 
@@ -2642,14 +2652,19 @@ std::string Item::getDescription(const ItemType &it, int32_t lookDistance, std::
 					s << "Vol:" << volume;
 				}
 			}
-			if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) {
-				begin = false;
-				s << " (Atk:" << attack << " physical + " << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
-			} else if (attack != 0) {
+
+			if (attack != 0) {
 				begin = false;
 				s << " (Atk:" << attack;
 			}
 
+			if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0 && !begin) {
+				s << " physical + " << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
+			} else if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0 && begin) {
+				begin = false;
+				s << " (" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
+			}
+
 			if (defense != 0 || extraDefense != 0 || it.isMissile()) {
 				if (begin) {
 					begin = false;

diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp
@@ -5741,12 +5741,17 @@ void ProtocolGame::sendMarketDetail(uint16_t itemId, uint8_t tier) {
 		}
 		msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()");
 	} else if (!it.isRanged()) {
+		std::string attackDescription;
 		if (it.abilities && it.abilities->elementType != COMBAT_NONE && it.abilities->elementDamage != 0) {
-			std::ostringstream ss;
-			ss << it.attack << " physical +" << it.abilities->elementDamage << ' ' << getCombatName(it.abilities->elementType);
-			msg.addString(ss.str(), "ProtocolGame::sendMarketDetail - ss.str()");
-		} else if (it.attack != 0) {
-			msg.addString(std::to_string(it.attack), "ProtocolGame::sendMarketDetail - std::to_string(it.attack)");
+			attackDescription = fmt::format("{} {}", it.abilities->elementDamage, getCombatName(it.abilities->elementType));
+		}
+
+		if (it.attack != 0) {
+			attackDescription = fmt::format("{} physical + {}", it.attack, attackDescription);
+		}
+
+		if (!attackDescription.empty()) {
+			msg.addString(attackDescription, "ProtocolGame::sendMarketDetail - attackDescription");
 		}
 	} else {
 		msg.add<uint16_t>(0x00);