Implemented a new 'onlyShowDRCountDown' option. If enabled it will cause the dr icons to only show up when a dr's countdown actually starts. Closes #1.

This commit is contained in:
Relintai 2020-08-30 22:05:47 +02:00
parent cad1f50161
commit 26b6b27413
4 changed files with 82 additions and 35 deletions

View File

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

View File

@ -228,27 +228,40 @@ function Rekt:ReassignDRs(which)
--let's fill them up --let's fill them up
local i = 1; local i = 1;
for k, v in ipairs(tmp) do for k, v in ipairs(tmp) do
--self:Print(v["diminished"]); if db[which]["onlyShowDRCountDown"] then
local frame = Rekt.frames[which][i]["frame"]; if v["isDiminishingStarted"] then
local text = Rekt.frames[which][i]["texture"]; Rekt:SetupDRIcon(which, i, v, v["cd"])
text:SetTexture(v["spellIcon"]); i = i + 1;
local CoolDown = Rekt.frames[which][i]["cooldown"]; end
local t = Rekt.frames[which][i]["text"];
if v["isDiminishingStarted"] then
CoolDown:SetCooldown(v["currentTime"], v["cd"]);
else else
CoolDown:SetCooldown(v["currentTime"], 0); if v["isDiminishingStarted"] then
Rekt:SetupDRIcon(which, i, v, v["cd"])
else
Rekt:SetupDRIcon(which, i, v, 0)
end
i = i + 1;
end 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 end
--self:Print("--------"); 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();
end end
function Rekt:SortDRs(which) function Rekt:SortDRs(which)

View File

@ -455,4 +455,14 @@ end
function Rekt:setDRTime(v) function Rekt:setDRTime(v)
local db = Rekt.db.profile; local db = Rekt.db.profile;
db["drtime"] = v; 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 end

View File

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