Update plugins

xmyno · Jul 20, 2018 · 92aa70c · 92aa70c
1 parent c8e3487
commit 92aa70c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 25 deletions.
diff --git a/embeds/oUF_ArtifactPower/oUF_ArtifactPower.lua b/embeds/oUF_ArtifactPower/oUF_ArtifactPower.lua
@@ -73,7 +73,7 @@ for tag, func in next, {
 			if (azeriteItemLocation) then
 				local link = GetInventoryItemLink('player', azeriteItemLocation.equipmentSlotIndex)
 				return link and link:match('%[(.+)%]')
-			elseif (HasArtifactEquipped()) then
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
 				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
 				local _, power = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
 				return power
@@ -86,11 +86,10 @@ for tag, func in next, {
 			if (azeriteItemLocation) then
 				local power = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
 				return power
-			-- elseif (HasArtifactEquipped()) then
-			-- 	local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
-			-- 	local _, power = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
-			-- 	return power
-
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
+				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
+				local _, power = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
+				return power
 			end
 		end
 	end,
@@ -100,10 +99,10 @@ for tag, func in next, {
 			if (azeriteItemLocation) then
 				local power, max = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
 				return max - power
-			-- elseif (HasArtifactEquipped()) then
-			-- 	local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
-			-- 	local _, power, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
-			-- 	return powerForNextTrait - power
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
+				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
+				local _, power, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
+				return powerForNextTrait - power
 			end
 		end
 	end,
@@ -113,10 +112,10 @@ for tag, func in next, {
 			if (azeriteItemLocation) then
 				local power, max = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
 				return math.floor(power / max * 100 + 0.5)
-			-- elseif (HasArtifactEquipped()) then
-			-- 	local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
-			-- 	local _, power, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
-			-- 	return math.floor(power / powerForNextTrait * 100 + 0.5)
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
+				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
+				local _, power, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
+				return math.floor(power / powerForNextTrait * 100 + 0.5)
 			end
 		end
 	end,
@@ -126,31 +125,31 @@ for tag, func in next, {
 			if (azeriteItemLocation) then
 				local _, max = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
 				return max
-			-- elseif (HasArtifactEquipped()) then
-			-- 	local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
-			-- 	local _, _, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
-			-- 	return powerForNextTrait
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
+				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
+				local _, _, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
+				return powerForNextTrait
 			end
 		end
 	end,
 	['artifactpower:unspent_power'] = function() -- was total
-		if (not HasArtifactEquipped() or UnitHasVehicleUI('player')) then return end
+		if (not HasArtifactEquipped() or UnitHasVehicleUI('player') or C_ArtifactUI.IsEquippedArtifactDisabled()) then return end
 		local _, _, _, _, unspentPower = C_ArtifactUI.GetEquippedArtifactInfo()
 		return unspentPower
 	end,
 	['artifactpower:traits_learnable'] = function()
-		if (not HasArtifactEquipped() or UnitHasVehicleUI('player')) then return end
+		if (not HasArtifactEquipped() or UnitHasVehicleUI('player') or C_ArtifactUI.IsEquippedArtifactDisabled()) then return end
 		local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
 		local numTraitsLearnable = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
 		return numTraitsLearnable
 	end,
 	['artifactpower:traits_learned'] = function()
-		if (not HasArtifactEquipped() or UnitHasVehicleUI('player')) then return end
+		if (not HasArtifactEquipped() or UnitHasVehicleUI('player') or C_ArtifactUI.IsEquippedArtifactDisabled()) then return end
 		local _, _, _, _, _, numTraitsLearned = C_ArtifactUI.GetEquippedArtifactInfo()
 		return numTraitsLearned
 	end,
 	['artifactpower:tier'] = function()
-		if (not HasArtifactEquipped() or UnitHasVehicleUI('player')) then return end
+		if (not HasArtifactEquipped() or UnitHasVehicleUI('player') or C_ArtifactUI.IsEquippedArtifactDisabled()) then return end
 		local _, _, _, _, _, _, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
 		return tier
 	end,
@@ -159,7 +158,7 @@ for tag, func in next, {
 			local azeriteItemLocation = C_AzeriteItem and C_AzeriteItem.FindActiveAzeriteItem()
 			if (azeriteItemLocation) then
 				return C_AzeriteItem.GetPowerLevel(azeriteItemLocation)
-			elseif (HasArtifactEquipped()) then
+			elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
 				local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
 				local numTraitsLearnable = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
 				return numTraitsLearnable + numTraitsLearned
@@ -266,7 +265,7 @@ local function Update(self, event, arg)
 			current, max = C_AzeriteItem.GetAzeriteItemXPInfo(azeriteItemLocation)
 			level = C_AzeriteItem.GetPowerLevel(azeriteItemLocation)
 			show = true
-		elseif (HasArtifactEquipped()) then
+		elseif (HasArtifactEquipped() and not C_ArtifactUI.IsEquippedArtifactDisabled()) then
 			local _, _, _, _, unspentPower, numTraitsLearned, _, _, _, _, _, _, tier = C_ArtifactUI.GetEquippedArtifactInfo()
 			local numTraitsLearnable, power, powerForNextTrait = GetNumTraitsLearnable(numTraitsLearned, unspentPower, tier)
 			current = power

diff --git a/embeds/oUF_Experience/oUF_Experience.lua b/embeds/oUF_Experience/oUF_Experience.lua
@@ -159,7 +159,7 @@ local function ElementEnable(self)
 	end
 
 	element:Show()
-	element:SetAlpha(element.outAlpha)
+	element:SetAlpha(element.outAlpha or 1)
 
 	Path(self, 'ElementEnable', 'player')
 end