fixes for classic 11503

eltreum0 · Jul 9, 2024 · 411c6f5 · 411c6f5
1 parent 4bbdbc5
commit 411c6f5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 50 deletions.
diff --git a/ElvUI_EltreumUI/ElvUI_EltreumUI_Vanilla.toc b/ElvUI_EltreumUI/ElvUI_EltreumUI_Vanilla.toc
@@ -1,4 +1,4 @@
-## Interface: 11502
+## Interface: 11503
 ## Author: Eltreum
 ## Version: 4.1.7.1
 ## Title: |cff1784d1ElvUI|r |cff587AADE|r|cff5D81B2l|r|cff6289B7t|r|cff6790BCr|r|cff6C98C1u|r|cff719FC6i|r|cff76A7CBs|r|cff7BAED0m|r |cff86BDDBC|r|cff8BC5E0l|r|cff90CCE5a|r|cff95D4EAs|r|cff9ADBEFs|r|cff9FE3F4i|r|cffA4EAF9c|r
@@ -8,7 +8,7 @@
 ## RequiredDeps: Blizzard_CombatText
 ## OptionalDeps: ProjectAzilroka, AddOnSkins
 ## DefaultState: enabled
-## X-Interface: 11502
+## X-Interface: 11503
 ## X-ElvUI: 13.67
 ## X-Tukui-ProjectID: 49
 ## X-Curse-Project-ID: 459494

diff --git a/ElvUI_EltreumUI/Modules/DataTexts/Stats.lua b/ElvUI_EltreumUI/Modules/DataTexts/Stats.lua
@@ -168,14 +168,9 @@ local function EltruismStatsDatatextOnEnter()
 			end
 			DT.tooltip:AddDoubleLine(ITEM_MOD_SPIRIT_SHORT..":", ElvUI[1].media.hexvaluecolor..UnitStat("player", 5).."|r",1,1,1)
 		elseif E.myclass == "SHAMAN" or E.myclass == "DRUID" or E.myclass == "PALADIN" then
-			local _, _, spent1, _, cataspent1 = _G.GetTalentTabInfo(1)
-			local _, _, spent2, _, cataspent2 = _G.GetTalentTabInfo(2)
-			local _, _, spent3, _, cataspent3 = _G.GetTalentTabInfo(3)
-			if E.Cata then
-				spent1 = cataspent1
-				spent2 = cataspent2
-				spent3 = cataspent3
-			end
+			local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+			local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+			local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 			if E.myclass == "SHAMAN" or E.myclass == "DRUID" then
 				if spent2 > spent3 and spent2 > spent1 then
 					if E.Classic then
@@ -295,14 +290,9 @@ local function EltruismStatsDatatext1(dt)
 				crit = CRIT_ABBR..": "..ElvUI[1].media.hexvaluecolor..string.format("%.1f%%", spellcrit).."|r"
 			end
 		elseif E.myclass == "SHAMAN" or E.myclass == "DRUID" or E.myclass == "PALADIN" then
-			local _, _, spent1, _, cataspent1 = _G.GetTalentTabInfo(1)
-			local _, _, spent2, _, cataspent2 = _G.GetTalentTabInfo(2)
-			local _, _, spent3, _, cataspent3 = _G.GetTalentTabInfo(3)
-			if E.Cata then
-				spent1 = cataspent1
-				spent2 = cataspent2
-				spent3 = cataspent3
-			end
+			local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+			local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+			local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 			if E.myclass == "SHAMAN" or E.myclass == "DRUID" then
 				if spent2 > spent3 and spent2 > spent1 then
 					haste = STAT_HASTE..": "..ElvUI[1].media.hexvaluecolor..string.format("%.1f%%", GetHaste()).."|r"
@@ -393,14 +383,9 @@ local function EltruismStatsDatatext2(dt)
 				dt.text:SetFormattedText('%s %s|r',mastery,tspellhit)
 			end
 		elseif E.myclass == "SHAMAN" or E.myclass == "DRUID" or E.myclass == "PALADIN" then
-			local _, _, spent1, _, cataspent1 = _G.GetTalentTabInfo(1)
-			local _, _, spent2, _, cataspent2 = _G.GetTalentTabInfo(2)
-			local _, _, spent3, _, cataspent3 = _G.GetTalentTabInfo(3)
-			if E.Cata then
-				spent1 = cataspent1
-				spent2 = cataspent2
-				spent3 = cataspent3
-			end
+			local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+			local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+			local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 			if E.myclass == "SHAMAN" or E.myclass == "DRUID" then
 				if spent2 > spent3 and spent2 > spent1 then
 					if E.Classic then

diff --git a/ElvUI_EltreumUI/Modules/Misc/PartyRaid.lua b/ElvUI_EltreumUI/Modules/Misc/PartyRaid.lua
@@ -219,14 +219,9 @@ function ElvUI_EltreumUI:SetGroupRoleClassic()
 				UnitSetRole("player","DAMAGER")
 			end
 		else
-			local _, _, spent1, _, cataspent1 = _G.GetTalentTabInfo(1)
-			local _, _, spent2, _, cataspent2 = _G.GetTalentTabInfo(2)
-			local _, _, spent3, _, cataspent3 = _G.GetTalentTabInfo(3)
-			if E.Cata then
-				spent1 = cataspent1
-				spent2 = cataspent2
-				spent3 = cataspent3
-			end
+			local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+			local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+			local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 			--print(isDPS,isTank,isHealer,E.myclass,spent1,spent2,spent3)
 			if E.myclass == 'SHAMAN' then
 				if spent3 < spent1 and spent3 < spent2 then

diff --git a/ElvUI_EltreumUI/Modules/Skins/Character/CharacterPanelSkin.lua b/ElvUI_EltreumUI/Modules/Skins/Character/CharacterPanelSkin.lua
@@ -305,20 +305,11 @@ function ElvUI_EltreumUI:GetPlayerSpec()
 	points = 0
 	spec = ""
 
-	local _, _, spent1, _, cataspent1 = _G.GetTalentTabInfo(1)
-	local _, _, spent2, _, cataspent2 = _G.GetTalentTabInfo(2)
-	local _, _, spent3, _, cataspent3 = _G.GetTalentTabInfo(3)
-	if E.Cata then
-		spent1 = cataspent1
-		spent2 = cataspent2
-		spent3 = cataspent3
-	end
+	local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+	local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+	local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 	for i=1, _G.GetNumTalentTabs() do
-		if not E.Cata then
-			name, _, spent = _G.GetTalentTabInfo(i)
-		else
-			_, name, _, _, spent = _G.GetTalentTabInfo(i)
-		end
+		_, name, _, _, spent = _G.GetTalentTabInfo(i)
 		if spent > 0 and (not points or spent > points) then
 			spec, points = name, spent
 		end
@@ -2052,9 +2043,9 @@ function ElvUI_EltreumUI:ExpandedCharacterStats()
 
 			--set the tabs
 			if E.db.ElvUI_EltreumUI.skins.classicarmoryautostats and E.Classic then
-				local _, _, spent1 = _G.GetTalentTabInfo(1)
-				local _, _, spent2 = _G.GetTalentTabInfo(2)
-				local _, _, spent3 = _G.GetTalentTabInfo(3)
+				local _, _, _, _, spent1 = _G.GetTalentTabInfo(1)
+				local _, _, _, _, spent2 = _G.GetTalentTabInfo(2)
+				local _, _, _, _, spent3 = _G.GetTalentTabInfo(3)
 				SetCVar("playerStatLeftDropdown", "PLAYERSTAT_BASE_STATS")
 				if E.myclass == 'WARLOCK' or E.myclass == 'MAGE' or E.myclass == 'PRIEST' then
 					SetCVar("playerStatRightDropdown", "PLAYERSTAT_SPELL_COMBAT")