More Druid TBC / Shaman TBC updates

Author: CuteOne

Rotations/Druid/Druid/Druid-Classic_TBC.lua

@@ -25,7 +25,7 @@ br.api.units = function(self)
         units[dynString] = thisUnit
         return thisUnit -- Backwards compatability for old way
     end
-    
+
     --- Custom target weight function that profiles can override to add coefficient bonuses for dynamic targeting.
     -- This allows profiles to customize target prioritization beyond the default coefficient system.
     -- Return a number to add to the unit's coefficient (higher = more priority).

Rotations/Druid/Druid/Druid-TBC.lua

@@ -24,14 +24,20 @@ function engines:Main()
 end
 
 -- Object Manager Engine
-local function ObjectManagerUpdate(self)
+local function ObjectManagerUpdate(self, elapsed)
     if br.unlocked then
         if br.data ~= nil and br.data.settings ~= nil and br.data.settings[br.loader.selectedSpec] ~= nil
             and br.data.settings[br.loader.selectedSpec].toggles ~= nil
         then
             if br.data.settings[br.loader.selectedSpec].toggles["Power"] ~= nil
                 and br.data.settings[br.loader.selectedSpec].toggles["Power"] == 1
             then
+                self.omElapsed = (self.omElapsed or 0) + (elapsed or 0)
+                local omInterval = math.max(0.05, engines:getUpdateRate())
+                if self.omElapsed < omInterval then
+                    return
+                end
+                self.omElapsed = 0
                 -- attempt to update objects every frame
                 -- updates for each object will be spread out randomly
                 engines.enemiesEngineFunctions:updateOM()
@@ -50,14 +56,20 @@ function engines:ObjectManager()
 end
 
 -- Object Tracker
-local function ObjectTrackerUpdate(self)
+local function ObjectTrackerUpdate(self, elapsed)
     if br.unlocked then
         if br.data ~= nil and br.data.settings ~= nil and br.data.settings[br.loader.selectedSpec] ~= nil
             and br.data.settings[br.loader.selectedSpec].toggles ~= nil
         then
             if br.data.settings[br.loader.selectedSpec].toggles["Power"] ~= nil
                 and br.data.settings[br.loader.selectedSpec].toggles["Power"] == 1
             then
+                self.trackerElapsed = (self.trackerElapsed or 0) + (elapsed or 0)
+                local trackerInterval = math.max(0.10, engines:getUpdateRate())
+                if self.trackerElapsed < trackerInterval then
+                    return
+                end
+                self.trackerElapsed = 0
                 -- Tracker
                 engines.tracker:objectTracker()
             end

Rotations/Druid/Druid/Druid-Classic.lua Rotations/Druid/Druid/Druid-Vanilla.luaRotations/Druid/Druid/Druid-Classic.lua renamed to Rotations/Druid/Druid/Druid-Vanilla.lua

@@ -7,6 +7,30 @@ local function shouldPrintCastDebug()
 	return br.functions.misc and (br.functions.misc:isChecked("Cast Debug") or br.functions.misc:isChecked("Display Failcasts"))
 end
 
+local function setCastIntentLock(spellID, duration)
+	if spellID == nil then return end
+	if duration == nil then duration = 0.15 end
+	castIntentLocks[spellID] = br._G.GetTime() + duration
+end
+
+local function isCastIntentLocked(spellID)
+	if spellID == nil then return false end
+	return castIntentLocks[spellID] ~= nil and br._G.GetTime() < castIntentLocks[spellID]
+end
+
+local function getSameSpellCastRemain(spellID)
+	local now = br._G.GetTime()
+	local _, _, _, _, castEndTime, _, _, _, castingSpellID = br._G.UnitCastingInfo("player")
+	if castingSpellID == spellID and castEndTime and castEndTime > 0 then
+		return math.max(0, (castEndTime / 1000) - now)
+	end
+	local _, _, _, _, channelEndTime, _, _, channelingSpellID = br._G.UnitChannelInfo("player")
+	if channelingSpellID == spellID and channelEndTime and channelEndTime > 0 then
+		return math.max(0, (channelEndTime / 1000) - now)
+	end
+	return 0
+end
+
 local function takeCastStartSnapshot(spellID)
 	local spellCdBefore = 0
 	if br.functions.spell and br.functions.spell.getSpellCD then
@@ -1014,12 +1038,12 @@ function cast:createCastFunction(thisUnit, castType, minUnits, effectRng, spellI
 			-- Hard CC (stun/fear/silence/etc): don't spam cast attempts for spells that can't be used.
 			if br.functions.combat and br.functions.combat.cannotCast and br.functions.combat:cannotCast(spellID) then
 				castTimers[spellID] = br._G.GetTime() + 0.50
-				castIntentLocks[spellID] = br._G.GetTime() -- Lock intent during hard CC
+				setCastIntentLock(spellID, 0.50) -- Lock intent during hard CC
 				return printReport(false, "No Control")
 			end
 
 			-- Set cast intent lock to prevent rapid re-casting attempts
-			castIntentLocks[spellID] = br._G.GetTime()
+			setCastIntentLock(spellID, 0.20)
 
 			local snapshot = takeCastStartSnapshot(spellID)
 
@@ -1042,7 +1066,18 @@ function cast:createCastFunction(thisUnit, castType, minUnits, effectRng, spellI
 			if castSucceeded then
 				-- add to cast timer
 				castTimers[spellID] = br._G.GetTime() + 1
-				castIntentLocks[spellID] = br._G.GetTime() -- Lock intent on successful cast
+				local sameSpellCastRemain = getSameSpellCastRemain(spellID)
+				if sameSpellCastRemain > 0 then
+					setCastIntentLock(spellID, sameSpellCastRemain + 0.12)
+				else
+					local settleLock = 0.12
+					if spellType == "Helpful" then
+						settleLock = 0.30
+					elseif spellType == "Harmful" and not br._G.UnitAffectingCombat("player") then
+						settleLock = 0.30
+					end
+					setCastIntentLock(spellID, settleLock)
+				end
 				-- change main button icon
 				br.ui.toggles.mainButton:SetNormalTexture(icon)
 				-- Update Last Cast
@@ -1055,13 +1090,13 @@ function cast:createCastFunction(thisUnit, castType, minUnits, effectRng, spellI
 				-- Cast may have been queued/started but signals didn't update yet.
 				-- Throttle quick retries, but don't emit CAST_FAILED spam.
 				castTimers[spellID] = br._G.GetTime() + 0.10
-				castIntentLocks[spellID] = br._G.GetTime() -- Lock intent on inconclusive result
+				setCastIntentLock(spellID, 0.20) -- Lock intent on inconclusive result
 				return true
 			end
 
 			-- Failed to start casting: allow a quick retry, but don't lock out for 1s.
 			castTimers[spellID] = br._G.GetTime() + 0.10
-			castIntentLocks[spellID] = br._G.GetTime() -- Lock intent on failed cast
+			setCastIntentLock(spellID, 0.20) -- Lock intent on failed cast
 			-- if shouldPrintCastDebug() and not debug then
 			-- 	printCastFailedDetails("[CAST FAIL][CAST_FAILED] ", spellID, spellName, snapshot, details)
 			-- end
@@ -1093,9 +1128,13 @@ function cast:createCastFunction(thisUnit, castType, minUnits, effectRng, spellI
 		br.functions.lastCast.lastCastTable.castTime[spellID] = br._G.GetTime() -
 			(br.functions.spell:getGlobalCD(true) + (select(3, br._G.GetNetStats()) / 100))
 	end
+	-- Never allow same-spell recast while it's currently being cast/channelled.
+	if cast:isCastingSpell(spellID, "player") then
+		return false
+	end
 	-- Cast Intent Lock: Prevent multiple cast attempts in rapid succession
 	-- Only check when NOT in debug mode (actual casting, not ability checking)
-	if not debug and castIntentLocks[spellID] and (br._G.GetTime() - castIntentLocks[spellID]) < 0.15 then
+	if not debug and isCastIntentLocked(spellID) then
 		return false
 	end
 	if (baseSpellID == spellID or overrideSpellID == spellID) and (br.empowerID == nil or br.empowerID == 0)

Rotations/Shaman/Shaman/Shaman-TBC.lua

@@ -1334,36 +1334,41 @@ function misc:addonDebug(msg, system)
 	if msg == nil then
 		return
 	end
+	local msgText = tostring(msg)
 	-- Prefer the dropdown value for Addon Debug Messages. Some configs
 	-- may not include a separate checkbox, so rely on the dropdown being
-	-- set (1=System Only, 2=Profile Only, 3=All).
+	-- set.
 	local addonDebugValue = br.functions.misc:getValue("Addon Debug Messages")
-	if addonDebugValue and addonDebugValue > 0 then
+	if br.functions.misc:isChecked("Addon Debug Messages") and addonDebugValue then
+		local showSystem = addonDebugValue == 1 or addonDebugValue == 2
+		local showProfile = addonDebugValue == 1 or addonDebugValue == 3
+
 		-- Use a per-message short timer key so different messages printed
 		-- within a short interval aren't suppressed by the same global key.
-		local msgKey = tostring(msg)
+		local msgKey = msgText
 		if #msgKey > 40 then msgKey = msgKey:sub(1, 40) end
 
 		-- Immediate-print for casting-related messages to avoid them being
 		-- swallowed by simultaneous 'Combat Started' messages. Use a
 		-- short per-message guard so we don't spam identical lines.
-		if string.find(msg, "Casting") then
+		-- Respect configured channel filtering (System/Profile/All).
+		if showProfile and system ~= true and string.find(msgText, "Casting") then
 			local castKey = "Casting Immediate:" .. msgKey
 			if br.debug.timer:useTimer(castKey, 0.05) then
-				print(br.ui.colors.class .. "[BadRotations] Profile Debug: |cffFFFFFF" .. tostring(msg))
+				print(br.ui.colors.class .. "[BadRotations] Profile Debug: |cffFFFFFF" .. msgText)
 			end
 			return
 		end
 
-		if system == true and (addonDebugValue == 1 or addonDebugValue == 3) then
+		if system == true and showSystem then
 			local timerKey = "System Delay:" .. msgKey
 			if br.debug.timer:useTimer(timerKey, 0.1) then
-				print(br.ui.colors.class .. "[BadRotations] System Debug: |cffFFFFFF" .. tostring(msg))
+				print(br.ui.colors.class .. "[BadRotations] System Debug: |cffFFFFFF" .. msgText)
 			end
-		elseif system ~= true and (addonDebugValue == 2 or addonDebugValue == 3) then
+		elseif system ~= true and showProfile then
 			local timerKey = "Profile Delay:" .. msgKey
 			if br.debug.timer:useTimer(timerKey, 0.1) then
-				print(br.ui.colors.class .. "[BadRotations] Profile Debug: |cffFFFFFF" .. tostring(msg))
+				print(br.ui.colors.class .. "[BadRotations] Profile Debug: |cffFFFFFF" .. msgText)
 			end
 		end
 	end

System/API/Units.lua

@@ -592,6 +592,7 @@ function spell:getRacial(thisRace)
     }
 	local classicRacialSpells = {
         -- Alliance
+		Draenei            = DraeneiRacial,  -- Gift of the Naaru
         -- Dwarf              = 20594,          -- Stoneform
         -- Gnome              = 20589,          -- Escape Artist
         -- Human              = 59752,          -- Every Man for Himself