modules/Combine.lua @@ -54,3 +54,5 @@ modules\Repairs.lua modules\Talents.lua modules\Shucks.lua modules\Tracking.lua +modules\Combine.lua + Cork.toc @@ -121,9 +121,7 @@ frame:SetScript("OnShow", function() local enabled = tekcheck.new(frame, nil, "Enabled", "TOPLEFT", subtitle, "BOTTOMLEFT", -2, -GAP) enabled.tiptext = "Toggle this module." - local checksound = enabled:GetScript("OnClick") local function toggle(self) - checksound(self) Cork.dbpc["Blessings-"..self.sv] = not Cork.dbpc["Blessings-"..self.sv] dataobj:Scan() end modules/PaladinBlessings.lua @@ -9,13 +9,6 @@ Cork.defaultspc["Shuck Clams-enabled"] = true local dataobj = LibStub:GetLibrary("LibDataBroker-1.1"):NewDataObject("Cork Shuck Clams", {type = "cork"}) -local function Test() - if min >= Cork.dbpc["Shuck Clams-threshold"] then return end - - local r,g,b = RYGColorGradient(min) - return IconLine(ICON, string.format("Your equipment is damaged |cff%02x%02x%02x(%d%%)", r*255, g*255, b*255, min*100)) -end - function dataobj:Scan() if not Cork.dbpc["Shuck Clams-enabled"] then dataobj.player = nil modules/Shucks.lua @@ -52,9 +52,7 @@ frame:SetScript("OnShow", function() local enabled = tekcheck.new(frame, nil, "Enabled", "TOPLEFT", subtitle, "BOTTOMLEFT", -2, -GAP) enabled.tiptext = "Toggle this module." - local checksound = enabled:GetScript("OnClick") enabled:SetScript("OnClick", function(self) - checksound(self) Cork.dbpc["Shout-enabled"] = not Cork.dbpc["Shout-enabled"] dataobj:Scan() end) modules/WarriorShout.lua @@ -1,5 +1,5 @@ -local lib, oldminor = LibStub:NewLibrary("tekKonfig-Checkbox", 1) +local lib, oldminor = LibStub:NewLibrary("tekKonfig-Checkbox", 2) if not lib then return end @@ -36,6 +36,7 @@ function lib.new(parent, size, label, ...) -- Sound check:SetScript("OnClick", OnClick) + check:SetScript("PostClick", OnClick) -- So we don't have to hook OnClick to get the sound -- Label local fs = check:CreateFontString(nil, "ARTWORK", "GameFontHighlight") tekKonfig/tekKonfigCheckbox.lua @@ -68,7 +68,7 @@ end local raidunits = {} for i=1,40 do raidunits["raid"..i] = i end function Cork:ValidUnit(unit, nopets) - if blist[unit] or not UnitExists(unit) or (UnitIsPlayer(unit) and not UnitIsConnected(unit)) + if blist[unit] or not UnitExists(unit) or (UnitIsPlayer(unit) and (not UnitIsConnected(unit) or UnitIsDeadOrGhost(unit) or UnitInVehicle(unit))) or (Cork.petunits[unit] and (nopets or not Cork.dbpc.castonpets)) or (unit ~= "player" and UnitIsUnit(unit, "player")) or (unit == "target" and (UnitIsUnit("target", "focus") or not UnitCanAssist("player", unit) or not UnitPlayerControlled(unit) or UnitIsEnemy("player", unit))) @@ -80,7 +80,12 @@ end function Cork:RegisterRaidEvents(spellname, dataobj, Test) - ae.RegisterEvent("Cork "..spellname, "UNIT_AURA", function(event, unit) dataobj[unit] = Test(unit) end) + local function TestUnit(event, unit) dataobj[unit] = Test(unit) end + ae.RegisterEvent("Cork "..spellname, "UNIT_AURA", TestUnit) + ae.RegisterEvent("Cork "..spellname, "UNIT_DYNAMIC_FLAGS", TestUnit) + ae.RegisterEvent("Cork "..spellname, "UNIT_ENTERED_VEHICLE", TestUnit) + ae.RegisterEvent("Cork "..spellname, "UNIT_EXITED_VEHICLE", TestUnit) + ae.RegisterEvent("Cork "..spellname, "UNIT_FLAGS", TestUnit) ae.RegisterEvent("Cork "..spellname, "PARTY_MEMBERS_CHANGED", function() for i=1,4 do dataobj["party"..i], dataobj["partypet"..i] = Test("party"..i), Test("partypet"..i) end end) ae.RegisterEvent("Cork "..spellname, "RAID_ROSTER_UPDATE", function() for i=1,40 do dataobj["raid"..i], dataobj["raidpet"..i] = Test("raid"..i), Test("raidpet"..i) end end) ae.RegisterEvent("Cork "..spellname, "UNIT_PET", function(event, unit) if Cork.petmappings[unit] then dataobj[Cork.petmappings[unit]] = Test(Cork.petmappings[unit]) end end) templates/RaidBuffer.lua 62f41a0197dc2b68b511acd8775a17e04a68f79f 8bb4c9fd1fda288183688c58087c563a556da36f tekkub tekkub@gmail.com http://github.com/tekkub/cork/commit/19a80e4c8b1d4834ba3c5c0ec04234944040a4ad 19a80e4c8b1d4834ba3c5c0ec04234944040a4ad 2009-10-21T23:50:57-07:00 2009-10-21T23:50:57-07:00 Merge commit 'origin/master' f66c5689bdbc4e264f3da5b2f22cb8b8a6719f32 tekkub tekkub@gmail.com