Fix spender usable checks.

ClassModules/Druid.lua

@@ -934,7 +934,7 @@ local function RefreshLookupData_Balance()
 	local currentAstralPowerColor = specSettings.colors.text.current
 	local castingAstralPowerColor = specSettings.colors.text.casting
 
-	local astralPowerThreshold = math.min(TRB.Data.character.starsurgeThreshold, TRB.Data.character.starfallThreshold)
+	local astralPowerThreshold = math.min(spells.starsurge:GetPrimaryResourceCost(), spells.starfall:GetPrimaryResourceCost())
 
 	if TRB.Functions.Class:IsValidVariableForSpec("$inCombat") then
 		if specSettings.colors.text.overcapEnabled and overcap then 
@@ -2336,9 +2336,6 @@ local function UpdateSnapshot_Balance()
 	local snapshotData = TRB.Data.snapshotData --[[@as TRB.Classes.SnapshotData]]
 	local currentTime = GetTime()
 
-	TRB.Data.character.starsurgeThreshold = spells.starsurge:GetPrimaryResourceCost()
-	TRB.Data.character.starfallThreshold = spells.starfall:GetPrimaryResourceCost()
-
 	snapshotData.snapshots[spells.moonkinForm.id].buff:Refresh()
 	snapshotData.snapshots[spells.furyOfElune.id].buff:UpdateTicks(currentTime)
 	snapshotData.snapshots[spells.sunderedFirmament.id].buff:UpdateTicks(currentTime)
@@ -2539,7 +2536,7 @@ local function UpdateResourceBar()
 									showThreshold = false
 								elseif snapshots[spells.starweaversWeft.id].buff.isActive then
 									thresholdColor = specSettings.colors.threshold.over
-								elseif currentResource >= TRB.Data.character.starsurgeThreshold then
+								elseif currentResource >= spells.starsurge:GetPrimaryResourceCost() then
 									thresholdColor = specSettings.colors.threshold.over
 								else
 									thresholdColor = specSettings.colors.threshold.under
@@ -2588,7 +2585,7 @@ local function UpdateResourceBar()
 							elseif spell.id == spells.starfall.id then
 								if spell.isTalent and not talents:IsTalentActive(spell) then -- Talent not selected
 									showThreshold = false
-								elseif currentResource >= TRB.Data.character.starfallThreshold then
+								elseif currentResource >= spells.starfall:GetPrimaryResourceCost() then
 									if snapshots[spells.starfall.id].buff.isActive and (snapshots[spells.starfall.id].buff.remaining) > (TRB.Data.character.pandemicModifier * spells.starfall.pandemicTime) then
 										thresholdColor = specSettings.colors.threshold.starfallPandemic
 									else
@@ -4078,12 +4075,12 @@ function TRB.Functions.Class:IsValidVariableForSpec(var)
 			end
 		elseif var == "$pulsarNextStarsurge" then
 			if talents:IsTalentActive(spells.primordialArcanicPulsar) and
-				(((spells.primordialArcanicPulsar.attributes.maxResource or 0) - (snapshots[spells.primordialArcanicPulsar.id].buff.customProperties["currentResource"])) <= TRB.Data.character.starsurgeThreshold) then
+				(((spells.primordialArcanicPulsar.attributes.maxResource or 0) - (snapshots[spells.primordialArcanicPulsar.id].buff.customProperties["currentResource"])) <= spells.starsurge:GetPrimaryResourceCost()) then
 				valid = true
 			end
 		elseif var == "$pulsarNextStarfall" then
 			if talents:IsTalentActive(spells.primordialArcanicPulsar) and
-				(((spells.primordialArcanicPulsar.attributes.maxResource or 0) - (snapshots[spells.primordialArcanicPulsar.id].buff.customProperties["currentResource"])) <= TRB.Data.character.starfallThreshold) then
+				(((spells.primordialArcanicPulsar.attributes.maxResource or 0) - (snapshots[spells.primordialArcanicPulsar.id].buff.customProperties["currentResource"])) <= spells.starsurge:GetPrimaryResourceCost()) then
 				valid = true
 			end
 		end

ClassModules/Priest.lua

@@ -1958,11 +1958,7 @@ local function RefreshLookupData_Shadow()
 	local currentInsanityColor = specSettings.colors.text.currentInsanity
 	local castingInsanityColor = specSettings.colors.text.castingInsanity
 
-	local insanityThreshold = TRB.Data.character.devouringPlagueThreshold
-
-	if snapshots[spells.mindDevourer.id].buff.isActive then
-		insanityThreshold = 0
-	end
+	local insanityThreshold = spells.devouringPlague:GetPrimaryResourceCost()
 
 	if TRB.Functions.Class:IsValidVariableForSpec("$inCombat") then
 		if specSettings.colors.text.overcapEnabled and overcap then
@@ -3836,8 +3832,7 @@ local function UpdateResourceBar()
 					passiveFrame:SetStatusBarColor(TRB.Functions.Color:GetRGBAFromString(specSettings.colors.bar.passive, true))
 				end
 
-
-				if snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= TRB.Data.character.devouringPlagueThreshold then
+				if snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= spells.devouringPlague:GetPrimaryResourceCost() then
 					castingFrame:SetStatusBarColor(TRB.Functions.Color:GetRGBAFromString(specSettings.colors.bar.devouringPlagueUsableCasting, true))
 				else
 					castingFrame:SetStatusBarColor(TRB.Functions.Color:GetRGBAFromString(specSettings.colors.bar.casting, true))
@@ -3865,13 +3860,13 @@ local function UpdateResourceBar()
 
 					if useEndOfVoidformColor and timeLeft <= timeThreshold then
 						barColor = specSettings.colors.bar.inVoidform1GCD
-					elseif snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= TRB.Data.character.devouringPlagueThreshold then
+					elseif snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= spells.devouringPlague:GetPrimaryResourceCost() then
 						barColor = specSettings.colors.bar.devouringPlagueUsable
 					else
 						barColor = specSettings.colors.bar.inVoidform
 					end
 				else
-					if snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= TRB.Data.character.devouringPlagueThreshold then
+					if snapshots[spells.mindDevourer.id].buff.isActive or currentResource >= spells.devouringPlague:GetPrimaryResourceCost() then
 						barColor = specSettings.colors.bar.devouringPlagueUsable
 					else
 						barColor = specSettings.colors.bar.base
@@ -4643,8 +4638,6 @@ function TRB.Functions.Class:CheckCharacter()
 		TRB.Data.character.specName = "shadow"
 ---@diagnostic disable-next-line: missing-parameter
 		TRB.Data.character.maxResource = UnitPowerMax("player", Enum.PowerType.Resource)
-
-		TRB.Data.character.devouringPlagueThreshold = -spells.devouringPlague:GetPrimaryResourceCost()
 
 		if talents:IsTalentActive(spells.mindbender) then
 			snapshots[spells.shadowfiend.id].spell = spells.mindbender

ClassModules/Shaman.lua

@@ -665,7 +665,17 @@ local function RefreshLookupData_Elemental()
 	local currentMaelstromColor = specSettings.colors.text.currentMaelstrom
 	local castingMaelstromColor = specSettings.colors.text.castingMaelstrom
 
-	local maelstromThreshold = spells.earthShock:GetPrimaryResourceCost()
+	local maelstromThreshold = TRB.Data.character.maxResource
+
+	if talents:IsTalentActive(spells.earthquake) then
+		maelstromThreshold = math.min(maelstromThreshold, spells.earthquake:GetPrimaryResourceCost())
+	end
+
+	if talents:IsTalentActive(spells.earthShock) and not talents:IsTalentActive(spells.elementalBlast) then
+		maelstromThreshold = math.min(maelstromThreshold, spells.earthShock:GetPrimaryResourceCost())
+	elseif talents:IsTalentActive(spells.elementalBlast) then
+		maelstromThreshold = math.min(maelstromThreshold, spells.elementalBlast:GetPrimaryResourceCost())
+	end
 
 	if TRB.Functions.Class:IsValidVariableForSpec("$inCombat") then
 		if specSettings.colors.text.overcapEnabled and overcap then
@@ -1569,7 +1579,20 @@ local function UpdateResourceBar()
 					end
 				end
 
-				if currentResource >= spells.earthShock:GetPrimaryResourceCost() then
+				local maelstromThreshold = TRB.Data.character.maxResource
+
+				if talents:IsTalentActive(spells.earthquake) then
+					maelstromThreshold = math.min(maelstromThreshold, spells.earthquake:GetPrimaryResourceCost())
+				end
+
+				if talents:IsTalentActive(spells.earthShock) and not talents:IsTalentActive(spells.elementalBlast) then
+					maelstromThreshold = math.min(maelstromThreshold, spells.earthShock:GetPrimaryResourceCost())
+				elseif talents:IsTalentActive(spells.elementalBlast) then
+					maelstromThreshold = math.min(maelstromThreshold, spells.elementalBlast:GetPrimaryResourceCost())
+				end
+
+				if currentResource >= maelstromThreshold then
+					barColor = specSettings.colors.bar.earthShock
 					if specSettings.colors.bar.flashEnabled then
 						TRB.Functions.Bar:PulseFrame(barContainerFrame, specSettings.colors.bar.flashAlpha, specSettings.colors.bar.flashPeriod)
 					else
@@ -2172,12 +2195,6 @@ function TRB.Functions.Class:CheckCharacter()
 
 		TRB.Functions.Threshold:SetThresholdIcon(resourceFrame.thresholds[1], spells.earthShock, TRB.Data.settings.shaman.elemental)
 		TRB.Functions.Threshold:SetThresholdIcon(resourceFrame.thresholds[2], spells.elementalBlast, TRB.Data.settings.shaman.elemental)
-
-		if (talents:IsTalentActive(spells.elementalBlast) and spells.elementalBlast:GetPrimaryResourceCost() < TRB.Data.character.maxResource) then
-			TRB.Data.character.earthShockThreshold = -spells.elementalBlast:GetPrimaryResourceCost()
-		else
-			TRB.Data.character.earthShockThreshold = -spells.earthShock:GetPrimaryResourceCost()
-		end
 	elseif specId == 2 and TRB.Data.settings.core.experimental.specs.shaman.enhancement then
 		TRB.Data.character.specName = "enhancement"
 		local maxComboPoints = 10

Functions/News.lua

@@ -11,6 +11,13 @@ local content = [====[
 
 ---
 
+# 10.2.7.2-release (2024-05-08)
+## General
+
+- (FIX (Twintop)) Fix bar and primary resource color change when you have enough primary resource to use an ability. Specifically affected specs: Balance Druid, Shadow Priest, and Elemental Shaman.
+
+---
+
 # 10.2.7.1-release (2024-05-08)
 ## General
 

TwintopInsanityBar.toc

@@ -13,7 +13,7 @@
 ## Title-zhTW: Twintop 的資源欄
 ## Author: Twintop
 ## X-AuthorServer: Frostmourne-US/OCE
-## Version: 10.2.7.1
+## Version: 10.2.7.2
 ## X-ReleaseType: release
 ## X-ReleaseDate: 2024-05-08
 ## SavedVariables: TwintopInsanityBarSettings