WoWInterface SVN bdCore

Compare Revisions

  • This comparison shows the changes necessary to convert path
    /
    from Rev 5 to Rev 6
    Reverse comparison

Rev 5 → Rev 6

trunk/config/defaults.lua
16,6 → 16,7
 
bdCore.media = {
flat = "Interface\\Buttons\\WHITE8x8",
arial = "fonts\\ARIALN.ttf",
font = "Interface\\Addons\\bdCore\\media\\font.ttf",
arrow = "Interface\\Addons\\bdCore\\media\\arrow.blp",
arrowup = "Interface\\Addons\\bdCore\\media\\arrowup.blp",
28,6 → 29,27
green = {.1, .7, 0.3, 1},
}
 
<<<<<<< .mine
 
-- if our font doesn't load for some reason, default to arial.
-- local fonttest = bdCore:CreateFontString()
-- fonttest:SetFont(bdCore.media.font,12)
-- if (not fonttest:GetFont()) then
-- bdCore.media.font = bdCore.media.arial
-- end
 
bdCore.general = {}
bdCore.general[#bdCore.general+1] = {border = {
type = "slider",
value = 2,
min = 0,
max = 2,
step = 1,
callback = function() bdCore:triggerEvent("bdcore_redraw") end
}}
 
||||||| .r4
=======
bdCore.generalconfig = {}
bdCore.generalconfig[#bdCore.generalconfig+1] = {border = {
type = "slider",
39,6 → 61,7
--callback = function() bdCore:redraw() end
}}
 
>>>>>>> .r5
bdCore.whitelistconfig = {
[1] = {intro = {
type = "text",
trunk/lib/aurabars.lua
111,7 → 111,7
statusBar.bg = statusBar:CreateTexture(nil, "BORDER")
statusBar.bg:SetAllPoints(statusBar)
statusBar.bg:SetTexture(auraBarParent.auraBarTexture or [[Interface\TargetingFrame\UI-StatusBar]])
--statusBar.bg:SetVertexColor(.5, 1, .5)
--statusBar.bg:SetVertexColor(unpack(auraBarParent.bgColor or {.5, 1, .5}))
--statusBar.bg:SetAlpha(auraBarParent.bgalpha or 1)
 
if auraBarParent.down == true then
trunk/functions.lua
5,6 → 5,7
-- add to our movable list
function bdCore:makeMovable(frame,resize)
if not resize then resize = true end
local border = bdCore.config['General'].border
local name = frame:GetName();
local height = frame:GetHeight()
local width = frame:GetWidth()
17,7 → 18,7
hooksecurefunc(frame,"SetSize",function()
local height = frame:GetHeight()
local width = frame:GetWidth()
moveContainer:SetSize(width+4, height+4)
moveContainer:SetSize(width+2+border, height+2+border)
end)
end
moveContainer:SetSize(width+4, height+4)
27,10 → 28,11
moveContainer:SetFrameStrata("BACKGROUND")
moveContainer:SetClampedToScreen(true)
moveContainer:SetAlpha(0)
bdCore:hookEvent("frames_resized", function()
bdCore:hookEvent("frames_resized,bdcore_redraw", function()
local border = bdCore.config['General'].border
local height = frame:GetHeight()
local width = frame:GetWidth()
moveContainer:SetSize(width+4, height+4)
moveContainer:SetSize(width+border, height+border)
end)
 
function moveContainer.dragStop(self)
97,10 → 99,14
-- custom events/hooks
bdCore.events = {}
function bdCore:hookEvent(event, func)
if (not bdCore.events[event]) then
bdCore.events[event] = {}
local events = split(event,",") or {event}
for i = 1, #events do
e = events[i]
if (not bdCore.events[e]) then
bdCore.events[e] = {}
end
bdCore.events[e][#bdCore.events[e]+1] = func
end
bdCore.events[event][#bdCore.events[event]+1] = func
end
 
function bdCore:triggerEvent(event,...)
154,8 → 160,9
end
 
-- make it purdy
function bdCore:setBackdrop(frame)
function bdCore:setBackdrop(frame,resize)
if (frame.background) then return false end
 
frame.background = CreateFrame('frame', nil, frame)
frame.background:SetBackdrop({
bgFile = bdCore.media.flat,
167,8 → 174,34
frame.background:SetPoint("TOPLEFT", frame, "TOPLEFT", -2, 2)
frame.background:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 2, -2)
frame.background:SetFrameStrata(frame:GetFrameStrata())
frame:SetFrameLevel(frame:GetFrameLevel()+1)
if (frame:GetFrameLevel() < 2) then
frame:SetFrameLevel(frame:GetFrameLevel() + 1)
end
frame.background:SetFrameLevel(frame:GetFrameLevel()-1)
if (resize ~= false) then
bdCore:hookEvent("bdcore_redraw",function()
local border = bdCore.config['General'].border or bdCore.general.border
 
frame.background:SetPoint("TOPLEFT", frame, "TOPLEFT", -border, border)
frame.background:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", border, -border)
 
if (border > 0) then
frame.background:SetPoint("TOPLEFT", frame, "TOPLEFT", -border, border)
frame.background:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", border, -border)
frame.background:SetBackdrop({
bgFile = bdCore.media.flat,
edgeFile = bdCore.media.flat, edgeSize = border,
insets = { left = border, right = border, top = border, bottom = border }
})
frame.background:SetBackdropBorderColor(.06, .08, .09, 1)
else
frame.background:SetBackdrop({bgFile = bdCore.media.flat})
end
 
frame.background:SetBackdropColor(.11,.15,.18, 1)
 
end)
end
end
 
function bdCore:createShadow(f,offset)
trunk/auras.lua
1,5 → 1,142
local bdCore, c, f = select(2, ...):unpack()
bdCore.auras = {}
bdCore.auras.watch = {}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Stats'] = {
1126,
20217,
115921,
116781,
90363,
159988,
160017,
160077,
160206,
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Mastery'] = {
19740, -- Blessing of Might
116956, -- Grace of Air
155522, -- Power of the Grave
24907, -- Moonkin Aura
93435, -- Roar of Courage
128997, -- Spirit Beast Blessing
160039, -- Keeen Senses
160073, -- Plainswalking
160198, -- Lone Wolf: Grace of the Cat
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Crit'] = {
17007, -- Leader of the Pack
1459, -- Arcane Brilliance
61316, -- Dalaran Brilliance
116781, -- Legacy of the White Tiger
126309, -- Still Water
24604, -- Furious Howl
90309, -- Terrifying Roar
126373, -- Fearless Roar
160052, -- Strength of the Pack
90363, -- Embrace of the Shale Spider
160200, -- Lone Wolf: Ferocity of the Raptor
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Haste'] = {
113742,
55610,
49868,
116956,
160003,
135678,
160074,
160203,
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Multistrike'] = {
166916, -- Windflurry
49868, -- Mind Quickening
113742, -- Swiftblade's Cunning
109773, -- Dark Intent
159733, -- Baleful Gaze
54644, -- Frost Breath
58604, -- Double Bite
34889, -- Spry Attacks
160011, -- Agile Reflexes
57386, -- Wild Strength
24844, -- Breath of the Winds
172968, -- Lone Wolf: Quickness of the Dragonhawk
50519, -- Sonic Focus
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Versatility'] = {
55610, -- Unholy Aura
1126, -- Mark of the Wild
167187, -- Sanctity Aura
167188, -- Inspiring Presence
159735, -- Tenacity
35290, -- Indomitable
160045, -- Defensive Quills
50518, -- Chitinous Armor
57386, -- Wild Strength
160077, -- Strength of the Earth
172967, -- Long World: Versatility of the Ravager
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Spell Power'] = {
109773, -- Dark Intent
1459, -- Arcane Brilliance
61316, -- Dalarn Brilliance
126309, -- Still Water
90364, -- Qiraji Fortitiude
160205, -- Lone Wolf: Wisdom of the Serpent
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Attack Power'] = {
6673,
57330,
19506,
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Stamina'] = {
469, --Commanding Shout
21562, -- Power Word: Fortitude
90364, -- Qiraji Fortitude
166928, -- Blood Pact
160014, -- Sturdiness
160003, -- Savage Vigor
160199, -- Lone Wolf: Fortitude of the Bear
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Food TIME'] = {
160883,
160889,
160894,
160898,
160901,
160903,
160846,
160506,
160869,
174303,
160872,
174304,
160879,
174305,
160880,
174306,
160881,
174307,
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Flask TIME'] = {
156064, -- Greater Draenic Agility Flask
156079, -- Greater Draenic Intellect Flask
156084, -- Greater Draenic Stamina Flask
156080, -- Greater Draenic Strength Flask
156073, -- Draenic Agility Flask
156070, -- Draenic Intellect Flask
156077, -- Draenic Stamina Flask
156071, -- Draenic Strength Flask
}}
bdCore.auras.watch[#bdCore.auras.watch+1] = {['Rune TIME'] = {
175457, -- Focus Augment Rune
175439, -- Stout Augment Rune
175456, -- Hyper Augment Rune
}}
 
bdCore.auras.watched = {}
for k, v in pairs(bdCore.auras.watch) do
table.insert(bdCore.auras.watched, v)
end
 
bdCore.auras.raid = {
----------------------------------------------------
-- Highmaul
trunk/loading.lua
3,6 → 3,7
bdCore:RegisterEvent("ADDON_LOADED")
bdCore:RegisterEvent("PLAYER_REGEN_ENABLED")
bdCore:RegisterEvent("PLAYER_REGEN_DISABLED")
bdCore:RegisterEvent("LOADING_SCREEN_DISABLED")
bdCore:SetScript("OnEvent", function(self, event, arg1, arg2, ...)
if (event == "ADDON_LOADED" and arg1 == "bdCore") then
bdCore:triggerEvent('loaded_bdcore')
42,11 → 43,15
end
end
 
bdCore:addModule("General", bdCore.general)
bdCore:addModule("Aura Whitelist", bdCore.whitelistconfig)
bdCore:addModule("Aura Blacklist", bdCore.blacklistconfig)
bdCore:addModule("Personal Auras", bdCore.personalconfig)
 
bdCore:triggerEvent('bdcore_loaded')
 
elseif (event == "LOADING_SCREEN_DISABLED") then
bdCore:triggerEvent("bdcore_redraw")
elseif (event == "PLAYER_REGEN_DISABLED") then
bdCore:triggerEvent('combat_enter')
elseif (event == "PLAYER_REGEN_ENABLED") then