@@ -48,9 +48,15 @@ frame:SetScript("OnShow", function(frame) compactmode:SetChecked(ControlFreak.db.char.compactmode) + local textpopup = tekcheck.new(frame, nil, "Expiration warning", "TOPLEFT", compactmode, "BOTTOMLEFT", 0, -GAP) + textpopup.tiptext = "Show warning text when spell is about to break. Uses the value set for break threshold." + textpopup:SetScript("OnClick", function(self) checksound(self); ControlFreak.db.char.textpopup = not ControlFreak.db.char.textpopup end) + textpopup:SetChecked(ControlFreak.db.char.textpopup) + + local threshslider, threshslidertext, threshcontainer = tekslider.new(frame, "Break Threshold: "..ControlFreak.db.char.breakthreshold.." sec", 0, 50, "LEFT", frame, "TOP", GAP, 0) threshcontainer:SetPoint("TOP", lockpos, "TOP", 0, 0) - threshslider.tiptext = "Time (in seconds) before spell breaks to unfade frame." + threshslider.tiptext = "Time (in seconds) before spell breaks to unfade frame. Also shows warning text if enabled." threshslider:SetValue(ControlFreak.db.char.breakthreshold) threshslider:SetValueStep(1) threshslider:SetScript("OnValueChanged", function() Config.lua @@ -235,7 +235,7 @@ function ControlFreak:StopTimer() end -local shortnotes = {["Control Freak"] = "CF", Invalid = "Inv", Controlled = "Ctr", Damage = "Dmg", Loose = "L", Ready = "Rdy", Dead = "D"} +local pastthreshold, shortnotes = false, {["Control Freak"] = "CF", Invalid = "Inv", Controlled = "Ctr", Damage = "Dmg", Loose = "L", Ready = "Rdy", Dead = "D"} function ControlFreak:OnUpdate(elapsed) local self = ControlFreak self.elapsed = self.elapsed or 0 @@ -261,7 +261,7 @@ function ControlFreak:OnUpdate(elapsed) timeLeft = select(7, UnitDebuff(unit, controlled[unit])) if timeLeft then timeLeft = timeLeft - GetTime() end color, note = "cyan", timeLeft and string.format("Controlled (%ds)", timeLeft) or "Controlled" - if timeLeft and timeLeft <= self.db.char.breakthreshold then alpha = 1.0 end + if timeLeft and timeLeft <= (self.db.char.breakthreshold + .5) then alpha = 1.0 end elseif lasthptime and lasthptime >= (GetTime()-damageinterval) then alpha, color, note = 1.0, "red", "Damage" elseif UnitAffectingCombat(unit) then alpha, color, note = 1.0, "orange", "Loose" else alpha, color, note = 1.0, "green", "Ready" end @@ -283,6 +283,12 @@ function ControlFreak:OnUpdate(elapsed) (clearfocus1 and L["Click to clear focus\n"] or "").. (clearfocus2 and L["Shift-click to clear focus\n"] or "").. L["Type /freak or right-click to open config"]) + local nowpastthreshold = timeLeft and timeLeft <= (self.db.char.breakthreshold + .5) + if nowpastthreshold and not pastthreshold and self.db.char.textpopup then + PlaySound("RaidBossEmoteWarning") + RaidNotice_AddMessage(RaidBossEmoteFrame, "Crowd control will expire in "..math.floor(timeLeft).." seconds", ChatTypeInfo["RAID_BOSS_EMOTE"]) + end + pastthreshold = nowpastthreshold lego:SetAlpha(alpha) lego:SetBackdropBorderColor(unpack(colors[color])) if self.db.char.compactmode then note = timeLeft and string.format("%ds", timeLeft) or shortnotes[note] end ControlFreak.lua ae3841936295255ebf1f0bc54ebf2dad8703a6dd Tekkub tekkub@gmail.com http://github.com/tekkub/controlfreak/commit/fa827916bffdd4c72e6bc6d0c757ef2ee3823ddd fa827916bffdd4c72e6bc6d0c757ef2ee3823ddd 2008-12-21T13:29:53-08:00 2008-12-21T13:29:53-08:00 Add text popup warning when CC is about to expire a29092c23bf9a2d0154d75bdd2e9aa674251b044 Tekkub tekkub@gmail.com