display true dmg

diasurgical · Sep 23, 2024 · 99df4f2 · 99df4f2
1 parent d1e8442
commit 99df4f2
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 25 deletions.
diff --git a/Source/items.cpp b/Source/items.cpp
@@ -43,7 +43,6 @@
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/log.hpp"
-#include "utils/math.h"
 #include "utils/str_case.hpp"
 #include "utils/str_cat.hpp"
 #include "utils/utf8.hpp"
@@ -2472,20 +2471,6 @@ void InitItems()
 	initItemGetRecords();
 }
 
-int GetBonusAC(const Item &item)
-{
-	if (item._iPLAC != 0) {
-		int tempAc = item._iAC;
-		tempAc *= item._iPLAC;
-		tempAc /= 100;
-		if (tempAc == 0)
-			tempAc = math::Sign(item._iPLAC);
-		return tempAc;
-	}
-
-	return 0;
-}
-
 void CalcPlrDamage(Player &player, int minDamage, int maxDamage)
 {
 	const uint8_t playerLevel = player.getCharacterLevel();
@@ -2817,7 +2802,7 @@ void CalcPlrItemVals(Player &player, bool loadgfx)
 			if (item._iMagical == ITEM_QUALITY_NORMAL || item._iIdentified) {
 				dam += item._iPLDam;
 				toHit += item._iPLToHit;
-				bonusAc += GetBonusAC(item);
+				bonusAc += item.getBonusAC();
 				flags |= item._iFlags;
 				damAcFlags |= item._iDamAcFlags;
 				strength += item._iPLStr;
@@ -4097,22 +4082,23 @@ void PrintItemDetails(const Item &item)
 		return;
 
 	if (item._iClass == ICLASS_WEAPON) {
+		std::pair<int, int> realDamage = item.getFinalDamage(showItemBaseStats || !item._iIdentified);
 		if (item._iMinDam == item._iMaxDam) {
 			if (item._iMaxDur == DUR_INDESTRUCTIBLE)
-				AddInfoBoxString(fmt::format(fmt::runtime(_("damage: {:d}  Indestructible")), item._iMinDam));
+				AddInfoBoxString(fmt::format(fmt::runtime(_("damage: {:d}  Indestructible")), realDamage.first));
 			else
-				AddInfoBoxString(fmt::format(fmt::runtime(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}  Dur: {:d}/{:d}")), item._iMinDam, item._iDurability, item._iMaxDur));
+				AddInfoBoxString(fmt::format(fmt::runtime(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}  Dur: {:d}/{:d}")), realDamage.first, item._iDurability, item._iMaxDur));
 		} else {
 			if (item._iMaxDur == DUR_INDESTRUCTIBLE)
-				AddInfoBoxString(fmt::format(fmt::runtime(_("damage: {:d}-{:d}  Indestructible")), item._iMinDam, item._iMaxDam));
+				AddInfoBoxString(fmt::format(fmt::runtime(_("damage: {:d}-{:d}  Indestructible")), realDamage.first, realDamage.second));
 			else
-				AddInfoBoxString(fmt::format(fmt::runtime(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}-{:d}  Dur: {:d}/{:d}")), item._iMinDam, item._iMaxDam, item._iDurability, item._iMaxDur));
+				AddInfoBoxString(fmt::format(fmt::runtime(_(/* TRANSLATORS: Dur: is durability */ "damage: {:d}-{:d}  Dur: {:d}/{:d}")), realDamage.first, realDamage.second, item._iDurability, item._iMaxDur));
 		}
 	}
 	if (item._iClass == ICLASS_ARMOR) {
 		int realAC = item._iAC;
 		if (!showItemBaseStats && item._iIdentified) {
-			realAC += GetBonusAC(item);
+			realAC += item.getBonusAC();
 		}
 		if (item._iMaxDur == DUR_INDESTRUCTIBLE)
 			AddInfoBoxString(fmt::format(fmt::runtime(_("armor: {:d}  Indestructible")), realAC));

diff --git a/Source/items.h b/Source/items.h
@@ -15,6 +15,7 @@
 #include "engine/point.hpp"
 #include "itemdat.h"
 #include "monster.h"
+#include "utils/math.h"
 #include "utils/string_or_view.hpp"
 
 namespace devilution {
@@ -420,6 +421,33 @@ struct Item {
 		return _iSeed == seed && IDidx == itemIndex && _iCreateInfo == createInfo;
 	}
 
+	int getBonusAC() const
+	{
+		if (_iPLAC != 0) {
+			int tempAc = _iAC;
+			tempAc *= _iPLAC;
+			tempAc /= 100;
+			if (tempAc == 0)
+				tempAc = math::Sign(_iPLAC);
+			return tempAc;
+		}
+
+		return 0;
+	}
+
+	std::pair<int, int> getFinalDamage(bool baseDamage) const
+	{
+		int minDmg = _iMinDam;
+		int maxDmg = _iMaxDam;
+		if (!baseDamage) {
+			minDmg += minDmg * _iPLDam / 100;
+			maxDmg += maxDmg * _iPLDam / 100;
+			minDmg += _iPLDamMod;
+			maxDmg += _iPLDamMod;
+		}
+		return {minDmg, maxDmg};
+	}
+
 	UiFlags getTextColor() const
 	{
 		switch (_iMagical) {

diff --git a/Source/stores.cpp b/Source/stores.cpp
@@ -305,10 +305,17 @@ void PrintStoreItem(const Item &item, int l, UiFlags flags, bool cursIndent = fa
 	}
 
 	if (item._itype != ItemType::Misc) {
-		if (item._iClass == ICLASS_WEAPON)
-			productLine = fmt::format(fmt::runtime(_("Damage: {:d}-{:d}  ")), item._iMinDam, item._iMaxDam);
-		else if (item._iClass == ICLASS_ARMOR)
-			productLine = fmt::format(fmt::runtime(_("Armor: {:d}  ")), item._iAC);
+		if (item._iClass == ICLASS_WEAPON) {
+			std::pair<int, int> realDamage = item.getFinalDamage(showItemBaseStats || !item._iIdentified);
+			productLine = fmt::format(fmt::runtime(_("Damage: {:d}-{:d}  ")), realDamage.first, realDamage.second);
+		}
+		else if (item._iClass == ICLASS_ARMOR) {
+			int realAC = item._iAC;
+			if (!showItemBaseStats && item._iIdentified) {
+				realAC += item.getBonusAC();
+			}
+			productLine = fmt::format(fmt::runtime(_("Armor: {:d}  ")), realAC);
+		}
 		if (item._iMaxDur != DUR_INDESTRUCTIBLE && item._iMaxDur != 0)
 			productLine += fmt::format(fmt::runtime(_("Dur: {:d}/{:d}")), item._iDurability, item._iMaxDur);
 		else