diff --git a/Vect.lua b/Vect.lua index cc183c5..8a14a24 100644 --- a/Vect.lua +++ b/Vect.lua @@ -5,6 +5,7 @@ --fix libdrdata, its dr groups are bad --spec detection --Way to show pet cds on the master -> currently looks impossible +--add every version for arcane torrent (BE racial) --"Globals" local aceDB = LibStub("AceDB-3.0"); diff --git a/data/drs.lua b/data/drs.lua index 0661656..adc1315 100644 --- a/data/drs.lua +++ b/data/drs.lua @@ -145,11 +145,18 @@ function Vect:ReassignDRs(which) local text = Vect.frames[which][i]["texture"]; text:SetTexture(v["spellIcon"]); local CoolDown = Vect.frames[which][i]["cooldown"]; + local t = Vect.frames[which][i]["text"]; if v["isDiminishingStarted"] then CoolDown:SetCooldown(v["currentTime"], v["cd"]); else CoolDown:SetCooldown(v["currentTime"], 0); end + + --print it out, if we need to + if db[which]["drnumsize"] > 0 then + t:SetText(v["diminished"]); + end + frame:Show(); i = i + 1; end @@ -243,7 +250,9 @@ function Vect:MoveDRTimersStop(which) local y = db[which]["yPos"]; local size = db[which]["size"]; local growOrder = db[which]["growOrder"]; - + local drNumSize = db[which]["drnumsize"]; + local drNumPos = db[which]["drnumposition"]; + for i = 1, 18 do local frame = Vect.frames[which][i]["frame"]; frame:ClearAllPoints(); @@ -263,6 +272,31 @@ function Vect:MoveDRTimersStop(which) else --Left frame:SetPoint("BOTTOMLEFT", x - ((i - 1) * size), y); end + + local t = Vect.frames[which][i]["text"]; + t:ClearAllPoints(); + + --check if we need numbers + if (drNumSize > 0) then + local xOSet = 0; + local yOSet = 0; + + t:SetFont("Fonts\\FRIZQT__.TTF", drNumSize, "OUTLINE, MONOCHROME") + + --position it + if (drNumPos == "1") then --["1"] = "Up", + yOSet = ((drNumSize / 2) + (size / 2) + 2); + elseif (drNumPos == "2") then --["2"] = "Right", + xOSet = ((size / 2) + 5); + elseif (drNumPos == "3") then --["3"] = "Down", + yOSet = -((drNumSize / 2) + (size / 2) + 2); + elseif (drNumPos == "4") then --["4"] = "Left", + xOSet = -((size / 2) + 5); + end --["5"] = "Middle" + + t:SetPoint("CENTER", frame, "CENTER", xOSet, yOSet); + end + local CoolDown = Vect.frames[which][i]["cooldown"]; CoolDown:SetAllPoints(); --frame:Show(); @@ -287,3 +321,17 @@ function Vect:VOnDRTimerUpdate(which) end end end + +function Vect:getDRNumXOffset(size, drNumSize, drNumPos) + local db = Vect.db.profile; + + + return 0; +end + +function Vect:getDRNumYOffset(size, drNumSize, drNumPos) + local db = Vect.db.profile; + + + return 0; +end diff --git a/lib/DRData-1.0/DRData-1.0.lua b/lib/DRData-1.0/DRData-1.0.lua index 8dd1691..f60632c 100644 --- a/lib/DRData-1.0/DRData-1.0.lua +++ b/lib/DRData-1.0/DRData-1.0.lua @@ -82,13 +82,6 @@ Data.spells = { [36213] = "taunt", --[[ DISORIENTS ]]-- - -- Dragon's Breath - [31661] = "disorient", - [33041] = "disorient", - [33042] = "disorient", - [33043] = "disorient", - [42949] = "disorient", - [42950] = "disorient", -- Hungering Cold [49203] = "disorient", @@ -417,9 +410,17 @@ Data.spells = { [64044] = "horror", --[[ MISC ]]-- + -- Dragon's Breath + [31661] = "scatters", + [33041] = "scatters", + [33042] = "scatters", + [33043] = "scatters", + [42949] = "scatters", + [42950] = "scatters", + -- Scatter Shot [19503] = "scatters", - + -- Cheap Shot [1833] = "cheapshot",