Compare commits

..

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

5 changed files with 13 additions and 19 deletions

View File

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

View File

@ -330,12 +330,12 @@ function Rekt:CreateDRFrames(which)
frame:SetScript("OnUpdate", function() self:VOnDRTimerUpdate(wh) end) frame:SetScript("OnUpdate", function() self:VOnDRTimerUpdate(wh) end)
end end
local text = frame:CreateTexture(); local text = frame:CreateTexture();
--text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink") text:SetTexture("Interface\\Icons\\Spell_Arcane_Blink")
text:SetAllPoints(frame); text:SetAllPoints(frame);
frame.texture = text; frame.texture = text;
local CoolDown = CreateFrame("Cooldown", "RektCoolDown" .. i, frame); local CoolDown = CreateFrame("Cooldown", "RektCoolDown" .. i, frame);
CoolDown:SetAllPoints() CoolDown:SetAllPoints()
--CoolDown:SetCooldown(GetTime(), 50); CoolDown:SetCooldown(GetTime(), 50);
local t = frame:CreateFontString(nil, "OVERLAY"); local t = frame:CreateFontString(nil, "OVERLAY");
t:SetNonSpaceWrap(false); t:SetNonSpaceWrap(false);
t:SetPoint("CENTER", frame, "CENTER", 0, 0); t:SetPoint("CENTER", frame, "CENTER", 0, 0);

View File

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

View File

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

View File

@ -164,7 +164,6 @@ Data.spells = {
[18469] = "silence", [18469] = "silence",
-- Spell Lock -- Spell Lock
[19244] = "silence",
[19647] = "silence", [19647] = "silence",
-- Shield of the Templar -- Shield of the Templar