Relintai/Relintais-Enemy-Kooldown-Tracker-WotLK
1
0
Fork 0
mirror of https://github.com/Relintai/Relintais-Enemy-Kooldown-Tracker-WotLK.git synced 2025-04-19 21:43:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Relintai:master
Branches Tags
Relintai:master
Relintai:1.11.8
Relintai:1.11.7
Relintai:1.11.6
Relintai:1.11.5
Relintai:1.11.4
Relintai:1.11.3
Relintai:1.11.2
Relintai:1.11.1
Relintai:1.11
Relintai:1.1
Relintai:1.05-02
Relintai:1.05
..
compare: Relintai:1.11
Branches Tags
Relintai:master
Relintai:1.11.8
Relintai:1.11.7
Relintai:1.11.6
Relintai:1.11.5
Relintai:1.11.4
Relintai:1.11.3
Relintai:1.11.2
Relintai:1.11.1
Relintai:1.11
Relintai:1.1
Relintai:1.05-02
Relintai:1.05

No commits in common. "master" and "1.11" have entirely different histories.
master ... 1.11

8 changed files with 48 additions and 103 deletions
Show Stats Expand all files Collapse all files

9
Rekt.lua
View File

@ -90,8 +90,7 @@ Rekt.defaults = {
growOrder = tostring(2),
sortOrder = tostring(5),
drnumsize = 14,
drnumposition = tostring(1),
onlyShowDRCountDown = false,
drnumposition = tostring(1)
},
focusdr = {
enabled = true,
@ -101,8 +100,7 @@ Rekt.defaults = {
growOrder = tostring(2),
sortOrder = tostring(5),
drnumsize = 14,
drnumposition = tostring(1),
onlyShowDRCountDown = false,
drnumposition = tostring(1)
},
selfdr = {
enabled = true,
@ -112,8 +110,7 @@ Rekt.defaults = {
growOrder = tostring(2),
sortOrder = tostring(5),
drnumsize = 14,
drnumposition = tostring(1),
onlyShowDRCountDown = false,
drnumposition = tostring(1)
},
color = {
gapcloser = {

20
data/cooldowns.lua
View File

@ -187,22 +187,18 @@ function Rekt:SortCDs(which)
local i = 1;
for k, v in pairs(self.cds[self.targets[which]]) do
if not (k == "spec") then
local ttmp = {
tmp[i] = {
currentTime = v[1],
endTime = v[2],
cd = v[3],
spellIcon = v[4],
spellID = v[5],
spellCategory = v[6]
};
if ttmp then
tmp[i] = ttmp;
--self:Print(v[1] .. v[2] .. v[3] .. v[4] .. v[5])
--self:Print(tmp[i]["currentTime"] .. " " .. tmp[i]["endTime"] .. " " .. tmp[i]["cd"]);-- .. " " .. tmp[i][4] .. " " .. tmp[i][5])
i = i + 1;
end
};
--self:Print(v[1] .. v[2] .. v[3] .. v[4] .. v[5])
--self:Print(tmp[i]["currentTime"] .. " " .. tmp[i]["endTime"] .. " " .. tmp[i]["cd"]);-- .. " " .. tmp[i][4] .. " " .. tmp[i][5])
i = i + 1;
end
end
@ -251,12 +247,12 @@ function Rekt:CreateFrames(which)
frame:SetScript("OnUpdate", function() self:VOnTimerUpdate(which) end)
end
local text = frame:CreateTexture();
--text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetAllPoints(frame);
frame.texture = text;
local CoolDown = CreateFrame("Cooldown", "RektCoolDown" .. i, frame);
CoolDown:SetAllPoints()
--CoolDown:SetCooldown(GetTime(), 50);
CoolDown:SetCooldown(GetTime(), 50);
frame:Hide();
local colorframe = CreateFrame("Frame", nil, UIParent, nil);

54
data/drs.lua
View File

@ -228,43 +228,29 @@ function Rekt:ReassignDRs(which)
--let's fill them up
local i = 1;
for k, v in ipairs(tmp) do
if db[which]["onlyShowDRCountDown"] then
if v["isDiminishingStarted"] then
Rekt:SetupDRIcon(which, i, v, v["cd"])
i = i + 1;
end
--self:Print(v["diminished"]);
local frame = Rekt.frames[which][i]["frame"];
local text = Rekt.frames[which][i]["texture"];
text:SetTexture(v["spellIcon"]);
local CoolDown = Rekt.frames[which][i]["cooldown"];
local t = Rekt.frames[which][i]["text"];
if v["isDiminishingStarted"] then
CoolDown:SetCooldown(v["currentTime"], v["cd"]);
else
if v["isDiminishingStarted"] then
Rekt:SetupDRIcon(which, i, v, v["cd"])
else
Rekt:SetupDRIcon(which, i, v, 0)
end
i = i + 1;
CoolDown:SetCooldown(v["currentTime"], 0);
end
end
end
function Rekt:SetupDRIcon(which, i, data, time)
local db = Rekt.db.profile;
local frame = Rekt.frames[which][i]["frame"];
local text = Rekt.frames[which][i]["texture"];
text:SetTexture(data["spellIcon"]);
local CoolDown = Rekt.frames[which][i]["cooldown"];
local t = Rekt.frames[which][i]["text"];
CoolDown:SetCooldown(data["currentTime"], time);
--print it out, if we need to
if db[which]["drnumsize"] > 0 then
t:SetText(data["diminished"]);
end
frame:Show();
--print it out, if we need to
if db[which]["drnumsize"] > 0 then
t:SetText(v["diminished"]);
end
frame:Show();
i = i + 1;
end
--self:Print("--------");
end
function Rekt:SortDRs(which)
local db = Rekt.db.profile;
local tmp = {};
@ -330,12 +316,12 @@ function Rekt:CreateDRFrames(which)
frame:SetScript("OnUpdate", function() self:VOnDRTimerUpdate(wh) end)
end
local text = frame:CreateTexture();
--text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetAllPoints(frame);
frame.texture = text;
local CoolDown = CreateFrame("Cooldown", "RektCoolDown" .. i, frame);
CoolDown:SetAllPoints()
--CoolDown:SetCooldown(GetTime(), 50);
CoolDown:SetCooldown(GetTime(), 50);
local t = frame:CreateFontString(nil, "OVERLAY");
t:SetNonSpaceWrap(false);
t:SetPoint("CENTER", frame, "CENTER", 0, 0);

4
data/interruptbar.lua
View File

@ -38,12 +38,12 @@ function Rekt:CreateInterruptBarFrames()
frame:SetScript("OnUpdate", function() self:OnInterruptBarUpdate() end)
end
local text = frame:CreateTexture();
--text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetAllPoints(frame);
frame.texture = text;
local CoolDown = CreateFrame("Cooldown", "RektIBCoolDown" .. i, frame);
CoolDown:SetAllPoints()
--CoolDown:SetCooldown(GetTime(), 50);
CoolDown:SetCooldown(GetTime(), 50);
frame:Hide();
local colorframe = CreateFrame("Frame", nil, UIParent, nil);

10
data/options.lua
View File

@ -455,14 +455,4 @@ end
function Rekt:setDRTime(v)
local db = Rekt.db.profile;
db["drtime"] = v;
end
function Rekt:isOnlyShowDRCountDown(which)
local db = Rekt.db.profile;
return db[which]["onlyShowDRCountDown"];
end
function Rekt:setOnlyShowDRCountDown(which, enable)
local db = Rekt.db.profile;
db[which]["onlyShowDRCountDown"] = enable;
end

49
data/optiontable.lua
View File

@ -354,25 +354,18 @@ function Rekt:getDROptions()
Rekt:setDRNumPosition("targetdr", v);
end
},
targetdrOnlyShowDRCountDownToggle = {
type = "toggle", name = "Only Show DR CountDown", desc = "If enabled the DR icon will only show up when the DR countdown actually starts.", order = 17,
get = function() return Rekt:isOnlyShowDRCountDown("targetdr") end,
set = function(_, v)
Rekt:setOnlyShowDRCountDown("targetdr", v);
end
},
focusdrHeader = {
type = "header", name = "Focus's settings", order = 18
type = "header", name = "Focus's settings", order = 17
},
focusdrtoggle = {
type = "toggle", name = "Enabled", desc = "Enable/Disable showing the focus's DRs.", order = 19,
type = "toggle", name = "Enabled", desc = "Enable/Disable showing the focus's DRs.", order = 18,
get = function() return Rekt:isPartEnabled("focusdr") end,
set = function(_, v)
Rekt:SetDRPartEnabledOrDisabled("focusdr", v);
end
},
focusdrRange = {
type = "range", name = "Focus's size", order = 20, min = 10, max = 150, step = 1,
type = "range", name = "Focus's size", order = 19, min = 10, max = 150, step = 1,
get = function() return Rekt:getFrameSize("focusdr") end,
set = function(_, v)
Rekt:setFrameSize("focusdr", v);
@ -380,7 +373,7 @@ function Rekt:getDROptions()
},
focusdrGrowSelect = {
type = "select", style = "dropdown", name = "focusDRGrow",
desc = "Change which way the focus's DRs will grow", order = 21,
desc = "Change which way the focus's DRs will grow", order = 20,
values = {
["1"] = "Up",
["2"] = "Right",
@ -394,7 +387,7 @@ function Rekt:getDROptions()
},
focusdrSortSelect = {
type = "select", style = "dropdown", name = "focusDRSortOrder",
desc = "Change the focus's DR's sort order", order = 22,
desc = "Change the focus's DR's sort order", order = 21,
values = {
["1"] = "Ascending (CD left)",
["2"] = "Descending (CD left)",
@ -411,7 +404,7 @@ function Rekt:getDROptions()
},
focusdrnumsizerange = {
type = "range", name = "Number's size", desc = "Focus's DR's Number's size. Set it to 0 to disable it!",
order = 23, min = 1, max = 30, step = 1,
order = 22, min = 1, max = 30, step = 1,
get = function() return Rekt:getDRNumSize("focusdr") end,
set = function(_, v)
Rekt:setDRNumSize("focusdr", v);
@ -420,7 +413,7 @@ function Rekt:getDROptions()
},
focusdrnumposselect = {
type = "select", style = "dropdown", name = "focusDRNumPos",
desc = "Change the focus's DR's number's position.", order = 24,
desc = "Change the focus's DR's number's position.", order = 23,
values = {
["1"] = "Up",
["2"] = "Right",
@ -433,25 +426,18 @@ function Rekt:getDROptions()
Rekt:setDRNumPosition("focusdr", v);
end
},
focusdrOnlyShowDRCountDownToggle = {
type = "toggle", name = "Only Show DR CountDown", desc = "If enabled the DR icon will only show up when the DR countdown actually starts.", order = 25,
get = function() return Rekt:isOnlyShowDRCountDown("focusdr") end,
set = function(_, v)
Rekt:setOnlyShowDRCountDown("focusdr", v);
end
},
selfdrHeader = {
type = "header", name = "Self's settings", order = 26
type = "header", name = "Self's settings", order = 24
},
selfdrtoggle = {
type = "toggle", name = "Enabled", desc = "Enable/Disable showing the your DRs.", order = 27,
type = "toggle", name = "Enabled", desc = "Enable/Disable showing the your DRs.", order = 25,
get = function() return Rekt:isPartEnabled("selfdr") end,
set = function(_, v)
Rekt:SetDRPartEnabledOrDisabled("selfdr", v);
end
},
selfdrrange = {
type = "range", name = "Self's DRs size", order = 28, min = 10, max = 150, step = 1,
type = "range", name = "Self's DRs size", order = 26, min = 10, max = 150, step = 1,
get = function() return Rekt:getFrameSize("selfdr") end,
set = function(_, v)
Rekt:setFrameSize("selfdr", v);
@ -459,7 +445,7 @@ function Rekt:getDROptions()
},
selfdrGrowSelect = {
type = "select", style = "dropdown", name = "selfDRGrow",
desc = "Change which way the your DRs will grow", order = 29,
desc = "Change which way the your DRs will grow", order = 27,
values = {
["1"] = "Up",
["2"] = "Right",
@ -473,7 +459,7 @@ function Rekt:getDROptions()
},
selfdrSortSelect = {
type = "select", style = "dropdown", name = "selfDRSortOrder",
desc = "Change the your DR's sort order", order = 30,
desc = "Change the your DR's sort order", order = 28,
values = {
["1"] = "Ascending (CD left)",
["2"] = "Descending (CD left)",
@ -490,7 +476,7 @@ function Rekt:getDROptions()
},
selfdrnumsizerange = {
type = "range", name = "Number's size", desc = "Your DR's Number's size. Set it to 0 to disable it!",
order = 31, min = 1, max = 30, step = 1,
order = 29, min = 1, max = 30, step = 1,
get = function() return Rekt:getDRNumSize("selfdr") end,
set = function(_, v)
Rekt:setDRNumSize("selfdr", v);
@ -499,7 +485,7 @@ function Rekt:getDROptions()
},
selfdrnumposselect = {
type = "select", style = "dropdown", name = "selfDRNumPos",
desc = "Change your DR's number's position.", order = 32,
desc = "Change your DR's number's position.", order = 30,
values = {
["1"] = "Up",
["2"] = "Right",
@ -512,13 +498,6 @@ function Rekt:getDROptions()
Rekt:setDRNumPosition("selfdr", v);
end
},
selfdrOnlyShowDRCountDownToggle = {
type = "toggle", name = "Only Show DR CountDown", desc = "If enabled the DR icon will only show up when the DR countdown actually starts.", order = 33,
get = function() return Rekt:isOnlyShowDRCountDown("selfdr") end,
set = function(_, v)
Rekt:setOnlyShowDRCountDown("selfdr", v);
end
},
}
return args;
end

3
data/spells.lua
View File

@ -564,8 +564,7 @@ Rekt.spells = {
--Detection
[17962] = {0, nil, 0, 0, 0, 5, "Warlock", "", false, false, false}, --Conflagrate
--Pets
[19244] = {24, nil, 0, 0, 0, 0, "Warlock", "silence", true, true, false}, --Spell Lock r1
[19647] = {24, nil, 0, 0, 0, 0, "Warlock", "silence", true, true, false}, --Spell Lock r2
[19647] = {24, nil, 0, 0, 0, 0, "Warlock", "silence", true, true, false}, --Spell Lock
[47986] = {60, nil, 0, 0, 0, 0, "Warlock", "defensive", true, false, false}, --Sacrifice
--Druid

2
lib/DRData-1.0/DRData-1.0.lua
View File

@ -295,8 +295,6 @@ Data.spells = {
[30283] = "ctrlstun",
[30413] = "ctrlstun",
[30414] = "ctrlstun",
[47846] = "ctrlstun",
[47847] = "ctrlstun",
-- Holy Wrath
[2812] = "ctrlstun",