The mana regen from the Primal Mooncloth set is now included in the calculations

Minor visual fixes

Author: getov

CharacterStatsTBC.toc

@@ -1,6 +1,6 @@
 ## Interface: 20501
 ## Author: Peter Getov
-## Version: 1.1.1
+## Version: 1.1.2
 ## Title: |cff00aeffCharacterStatsTBC|r
 ## Notes: Advanced Character Stats
 ## DefaultState:  enabled

CharacterStatsTbcCallbacks.lua

@@ -188,14 +188,14 @@ function CSC_CharacterHitRatingFrame_OnEnter(self)
 		if unitClassId == CSC_MAGE_CLASS_ID then
 			GameTooltip:AddLine(CSC_SYMBOL_SPACE); -- Blank line.
 			GameTooltip:AddLine(CSC_SPELL_HIT_SUBTOOLTIP_TXT);
-			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_ARCANE_SPELL_HIT_TXT, (self.arcaneHit + self.spellHitGearTalents).."%");
-			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_FIRE_SPELL_HIT_TXT, (self.fireHit + self.spellHitGearTalents).."%");
-			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_FROST_SPELL_HIT_TXT, (self.frostHit + self.spellHitGearTalents).."%");
+			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_ARCANE_SPELL_HIT_TXT, format("%.2F%%", self.arcaneHit + self.spellHitGearTalents));
+			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_FIRE_SPELL_HIT_TXT, format("%.2F%%", self.fireHit + self.spellHitGearTalents));
+			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_FROST_SPELL_HIT_TXT, format("%.2F%%", self.frostHit + self.spellHitGearTalents));
 		elseif unitClassId == CSC_WARLOCK_CLASS_ID then
 			GameTooltip:AddLine(CSC_SYMBOL_SPACE); -- Blank line.
 			GameTooltip:AddLine(CSC_SPELL_HIT_SUBTOOLTIP_TXT);
-			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_DESTRUCTION_SPELL_HIT_TXT, self.spellHitGearTalents.."%");
-			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_AFFLICTION_SPELL_HIT_TXT, (self.afflictionHit + self.spellHitGearTalents).."%");
+			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_DESTRUCTION_SPELL_HIT_TXT, format("%.2F%%", self.spellHitGearTalents));
+			GameTooltip:AddDoubleLine(CSC_SYMBOL_TAB..CSC_AFFLICTION_SPELL_HIT_TXT, format("%.2F%%", self.afflictionHit + self.spellHitGearTalents));
 		end
 	elseif (ratingIndex == CR_HIT_MELEE) then
 		local missChanceVsNPC, missChanceVsBoss, missChanceVsPlayer, dwMissChanceVsNpc, dwMissChanceVsBoss, dwMissChanceVsPlayer = CSC_GetPlayerMissChances(unit, ratingBonus);

CharacterStatsTbcClassUtils.lua

@@ -246,6 +246,35 @@ function CSC_GetMP5FromSetBonus(unit)
     return mp5;
 end
 
+function CSC_GetMP5ModifierFromSetBonus(unit)
+	local unitClassId = select(3, UnitClass(unit));
+	local modifier = 0;
+
+	if unitClassId ~= CSC_DRUID_CLASS_ID and unitClassId ~= CSC_PRIEST_CLASS_ID  and unitClassId ~= CSC_PALADIN_CLASS_ID and unitClassId ~= CSC_SHAMAN_CLASS_ID then
+		return modifier;
+	end
+
+	local firstItemslotIndex = 1;
+	local lastItemslotIndex = 18;
+
+	local equippedSetItems = 0;
+    for itemSlot = firstItemslotIndex, lastItemslotIndex do
+        local itemId = GetInventoryItemID(unit, itemSlot);
+		
+		if (itemId) then
+			if (itemId == g_PrimalMooncloth[itemId]) then
+				equippedSetItems = equippedSetItems + 1;
+			end
+		end
+    end
+
+    if equippedSetItems >= 3 then
+        modifier = 0.05;
+	end
+
+    return modifier;
+end
+
 function CSC_GetShamanT2SpellCrit(unit)
 	local spellCritFromSet = 0;
 	local firstItemslotIndex = 1;

CharacterStatsTbcConstants.lua

@@ -102,6 +102,12 @@ g_TheTenStormsIds = {
     [16950] = 16950
 };
 
+g_PrimalMooncloth = {
+    [21875] = 21875, 
+    [21874] = 21874, 
+    [21873] = 21873
+};
+
 g_AuraIdToMp5 = {
 	-- BOW
 	[19742] = 10,

CharacterStatsTbcCore.lua

@@ -1129,7 +1129,7 @@ function CSC_PaperDollFrame_SetManaRegen(statFrame, unit)
 	g_lastSeenCastingManaRegen = casting;
 
 	local mp5FromGear = CSC_GetMP5FromGear(unit) + CSC_GetMP5FromSetBonus(unit);
-	local mp5ModifierCasting = CSC_GetMP5ModifierFromTalents(unit);
+	local mp5ModifierCasting = CSC_GetMP5ModifierFromTalents(unit) + CSC_GetMP5ModifierFromSetBonus(unit);
 
 	local mp5FromAuras, mp5CombatModifier = CSC_GetMP5FromAuras();
 	if mp5CombatModifier > 0 then