WidgetWarlock/ArtSummons.lua WidgetWarlock/FadeIn.lua WidgetWarlock/LibStub.lua WidgetWarlock/Summons.lua WidgetWarlock/TextureTables.lua WidgetWarlock/Tooltips.lua WidgetWarlock/WidgetWarlock.xml @@ -5,8 +5,7 @@ if not ControlFreak then return end local DongleFrames = DongleStub("DongleFrames-1.0") -local ww = WidgetWarlock -WidgetWarlock = nil +local ww = LibStub("WidgetWarlock-Alpha1") local ControlFreak = ControlFreak @@ -25,52 +24,24 @@ function ControlFreak:CreatePanel() frame:SetScript("OnHide", function() self:UnregisterEvent("PLAYER_REGEN_DISABLED") end) - local lockpos, lockposlabel = ww.SummonLabeledCheckBox("Lock frame", 22, frame, "TOPLEFT", 15, -10) - ww.EnslaveTooltip(lockpos, "Locks the frame to prevent accidental movement") + local lockpos = ww:SummonCheckBox(frame, nil, "TOPLEFT", 15, -10) + ww:EnslaveLabel(lockpos, "Lock frame") + lockpos:SetHitRectInsets(0, -100, 0, 0) + ww:EnslaveTooltip(lockpos, "Locks the frame to prevent accidental movement") lockpos:SetScript("OnClick", function() self.db.profile.frameopts.locked = not self.db.profile.frameopts.locked end) lockpos:SetChecked(self.db.profile.frameopts.locked) - local showtip = ww.SummonLabeledCheckBox("Show tooltip", 22, frame, "TOPLEFT", lockpos, "TOPLEFT", 133, 0) - ww.EnslaveTooltip(showtip, "Show help tooltip on hover") + local showtip = ww:SummonCheckBox(frame, nil, "TOPLEFT", lockpos, "TOPLEFT", 133, 0) + showtip:SetHitRectInsets(0, -100, 0, 0) + ww:EnslaveLabel(showtip, "Show tooltip") + ww:EnslaveTooltip(showtip, "Show help tooltip on hover") showtip:SetScript("OnClick", function() self.db.profile.showtooltip = not self.db.profile.showtooltip end) showtip:SetChecked(self.db.profile.showtooltip) - local editbox = CreateFrame("EditBox", nil, frame) - editbox:SetWidth(620) editbox:SetHeight(200) - editbox:SetPoint("BOTTOMLEFT", 5, 5) - editbox:SetFontObject(GameFontHighlight) - editbox:SetTextInsets(8,8,8,8) - editbox:SetBackdrop(ww.TooltipBorderBG) - editbox:SetBackdropColor(.1,.1,.1,.3) - editbox:SetMultiLine(true) - editbox:SetAutoFocus(false) - editbox:SetText(self.db.profile.macrotext or "/script ChatFrame1:AddMessage(\"Error loading macro!\")") - editbox:SetScript("OnTextChanged", function() - self.db.profile.macrotext = editbox:GetText() - self.macroupdated = true - if not InCombatLockdown() then self:PLAYER_REGEN_ENABLED() end - end) - editbox:SetScript("OnEscapePressed", function(self) self:ClearFocus() end) - local macrolabel = ww.EnslaveLabel(editbox, "Macro", "BOTTOMLEFT", editbox, "TOPLEFT", 5, 0) - self.combatwarn = ww.EnslaveLabel(editbox, "|cffff0000Macro changes will not apply until combat ends!", "BOTTOMRIGHT", editbox, "TOPRIGHT", -5, 0) - - local debuff = CreateFrame("EditBox", nil, frame) - debuff:SetPoint("BOTTOMRIGHT", editbox, "TOPRIGHT", 0, 15) debuff:SetWidth(200) debuff:SetHeight(22) - debuff:SetFontObject(GameFontHighlight) - debuff:SetTextInsets(8,8,8,8) - debuff:SetBackdrop(ww.TooltipBorderBG) - debuff:SetBackdropColor(.1,.1,.1,.3) - debuff:SetAutoFocus(false) - debuff:SetText(self.db.profile.spellname) - debuff:SetScript("OnTextChanged", function() self.db.profile.spellname = debuff:GetText() end) - debuff:SetScript("OnEscapePressed", function(self) self:ClearFocus() end) - ww.EnslaveLabel(debuff, "Debuff", "RIGHT", debuff, "LEFT", -5, 0) - - - local threshslider, threshslidertext = ww.SummonSlider(frame, "Break Threshold: "..self.db.profile.breakthreshold.." sec", 0, 10, "TOPLEFT", lockpos, "BOTTOMLEFT", -5, -15) - ww.EnslaveTooltip(threshslider, "Time (in seconds) before spell breaks to unfade frame.") + local threshslider, threshslidertext = ww:SummonSlider(frame, "Break Threshold: "..self.db.profile.breakthreshold.." sec", 0, 10, "TOPLEFT", lockpos, "BOTTOMLEFT", -5, -15) + ww:EnslaveTooltip(threshslider, "Time (in seconds) before spell breaks to unfade frame.") threshslider:SetValue(self.db.profile.breakthreshold) threshslider:SetValueStep(1) threshslider:SetScript("OnValueChanged", function() @@ -80,8 +51,8 @@ function ControlFreak:CreatePanel() local alpha = math.floor(self.db.profile.alpha*100 + .5) - local alphaslider, alphaslidertext = ww.SummonSlider(frame, "Alpha: "..alpha.."%", "0%", "100%", "LEFT", threshslider, "RIGHT", 10, 0) - ww.EnslaveTooltip(alphaslider, "Alpha level to fade frame to when focus is controlled, dead, or not set.") + local alphaslider, alphaslidertext = ww:SummonSlider(frame, "Alpha: "..alpha.."%", "0%", "100%", "LEFT", threshslider, "RIGHT", 10, 0) + ww:EnslaveTooltip(alphaslider, "Alpha level to fade frame to when focus is controlled, dead, or not set.") alphaslider:SetValue(self.db.profile.alpha) alphaslider:SetValueStep(0.05) alphaslider:SetScript("OnValueChanged", function() @@ -92,6 +63,34 @@ function ControlFreak:CreatePanel() end) + local debuff = ww:SummonEditBox(frame, 200, "BOTTOMLEFT", threshslider, "TOPLEFT", 5, -55) + debuff:SetText(self.db.profile.spellname) + debuff:SetScript("OnTextChanged", function() self.db.profile.spellname = debuff:GetText() end) + debuff:SetScript("OnEscapePressed", function(self) self:ClearFocus() end) + ww:EnslaveLabel(debuff, "Debuff") + + + local editbox = CreateFrame("EditBox", nil, frame) + editbox:SetWidth(620) + editbox:SetPoint("BOTTOMLEFT", 5, 5) + editbox:SetPoint("TOP", frame, "BOTTOM", 0, 170) + editbox:SetFontObject(GameFontHighlight) + editbox:SetTextInsets(8,8,8,8) + editbox:SetBackdrop(ww.TooltipBorderBG) + editbox:SetBackdropColor(.1,.1,.1,.3) + editbox:SetMultiLine(true) + editbox:SetAutoFocus(false) + editbox:SetText(self.db.profile.macrotext or "/script ChatFrame1:AddMessage(\"Error loading macro!\")") + editbox:SetScript("OnTextChanged", function() + self.db.profile.macrotext = editbox:GetText() + self.macroupdated = true + if not InCombatLockdown() then self:PLAYER_REGEN_ENABLED() end + end) + editbox:SetScript("OnEscapePressed", function(self) self:ClearFocus() end) + local macrolabel = ww:EnslaveLabel(editbox, "Macro", "BOTTOMLEFT", editbox, "TOPLEFT", 5, 0) + self.combatwarn = ww:EnslaveLabel(editbox, "|cffff0000Macro changes will not apply until combat ends!", "BOTTOMRIGHT", editbox, "TOPRIGHT", -5, 0) + + local resetmacro = CreateFrame("Button", name.."ResetMacro", frame, "UIPanelButtonGrayTemplate") resetmacro:SetPoint("TOPRIGHT", -5, -5) resetmacro:SetWidth(120) resetmacro:SetHeight(22) resetmacro:SetText("Reset Defaults") Config.lua @@ -27,6 +27,7 @@ local L = { local LegoBlock = DongleStub("LegoBlock-Beta0") local OptionHouse = DongleStub("OptionHouse-1.0") ControlFreak = DongleStub("Dongle-1.0"):New("ControlFreak") +if tekDebug then ControlFreak:EnableDebug(1, tekDebug:GetFrame("ControlFreak")) end function ControlFreak:Initialize() @@ -141,12 +142,19 @@ end function ControlFreak:PLAYER_FOCUS_CHANGED() focusexists = UnitExists("focus") + self:Debug(1, "PLAYER_FOCUS_CHANGED", focusexists) focusisenemy = focusexists and UnitIsEnemy("player", "focus") focusdead = focusexists and UnitIsDead("focus") isvalid.focus = targtypes[UnitCreatureType("focus")] lasthp, lasthptime = focusexists and UnitHealth("focus"), 0 + if focusexists then self:UNIT_AURA("UNIT_AURA", "focus") + else + controlled.focus = nil + self:OnUpdate(true) + end + if (not focusexists and not targetexists) or focusdead and not targetexists or targetdead and not focusexists @@ -159,10 +167,12 @@ end function ControlFreak:UNIT_AURA(event, unit) if unit ~= "focus" then return end + self:Debug(1, "UNIT_AURA", controlled[unit]) local wascontrolled = (controlled[unit] ~= nil) controlled[unit] = nil for i=1,maxdebuffs do - if UnitDebuff(unit, i) == spellname then controlled[unit] = i end + self:Debug(1, UnitDebuff(unit, i)) + if UnitDebuff(unit, i) == self.db.profile.spellname then controlled[unit] = i end end if wascontrolled ~= (controlled[unit]~= nil) then self:OnUpdate(true) end @@ -189,7 +199,7 @@ function ControlFreak:OnUpdate(elapsed) if unit then if not isvalid[unit] then color, note, tiptext = "grey", "Invalid" else - if IsSpellInRange(spellname, unit) == 0 then range = "*" end + if IsSpellInRange(self.db.profile.spellname, unit) == 0 then range = "*" end if lasthptime and lasthptime >= (GetTime()-damageinterval) then alpha, color, note = 1.0, "red", "Damage" elseif controlled[unit] then local _, _, _, _, _, _, timeLeft = UnitDebuff(unit, controlled[unit]) ControlFreak.lua @@ -12,11 +12,15 @@ ## OptionalDeps: Dongle, OptionHouse +## LoadManagers: AddonLoader +## X-LoadOn-NotResting: true +## X-LoadOn-Slash: /freak + Dongle.lua OptionHouse.lua DongleFrames.lua LegoBlock.lua -WidgetWarlock.lua +WidgetWarlock\WidgetWarlock.xml ClassMacrotexts.lua ControlFreak.lua ControlFreak.toc WidgetWarlock.lua 349ecc5309e1eaa83e2345d153e8914dd61dcc3e Tekkub Stoutwrithe tekkub@gmail.com http://github.com/tekkub/controlfreak/commit/e9599786fb788a3f442e028de3cfffcba6593713 e9599786fb788a3f442e028de3cfffcba6593713 2007-09-14T02:10:10-07:00 2007-09-14T02:10:10-07:00 ControlFreak - Addon loader support! - Added new WidgetWarlock - Some debug bits - Hopefully fixed issues with "controlled" detection, specifically when the focus is set AFTER the unit is controlled. - Fixed debuff name setting not actually getting used git-svn-id: http://tekkub-wow.googlecode.com/svn/trunk/ControlFreak@530 86fe6d9a-1522-0410-a387-bf9db416f0a0 8d7324a244d61724c7e84d53c76ab5a18d222e43 Tekkub Stoutwrithe tekkub@gmail.com