Skip to content

Added a Pulltimer and Readycheck to keystone window #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnlxh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added a Pulltimer and Readycheck to keystone window #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 201 additions & 0 deletions EUI_QoL.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,207 @@ qolFrame:SetScript("OnEvent", function(self)
end
end

---------------------------------------------------------------------------
-- Mythic+ Pull Timer Button
---------------------------------------------------------------------------
do
local function CreatePullTimerButton()
if not (EllesmereUIDB and EllesmereUIDB.enablePullTimer ~= false) then return end
if not ChallengesKeystoneFrame then return end
if ChallengesKeystoneFrame.EUI_PullButton then return end

-- Get EUI accent color
local accentR, accentG, accentB = 12/255, 210/255, 157/255 -- EllesmereUI teal
if EllesmereUIDB and EllesmereUIDB.accentColor then
local ac = EllesmereUIDB.accentColor
accentR, accentG, accentB = ac.r, ac.g, ac.b
end

local btn = CreateFrame("Button", nil, ChallengesKeystoneFrame)
btn:SetSize(90, 32)
btn:SetPoint("TOPRIGHT", ChallengesKeystoneFrame, "TOPRIGHT", 95, -24)

-- Background
local bg = btn:CreateTexture(nil, "BACKGROUND")
bg:SetAllPoints()
bg:SetColorTexture(0.061, 0.095, 0.120, 1)
btn.bg = bg

-- Border - Top
local borderTop = btn:CreateTexture(nil, "OVERLAY")
borderTop:SetPoint("TOPLEFT")
borderTop:SetPoint("TOPRIGHT")
borderTop:SetHeight(1)
borderTop:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Bottom
local borderBot = btn:CreateTexture(nil, "OVERLAY")
borderBot:SetPoint("BOTTOMLEFT")
borderBot:SetPoint("BOTTOMRIGHT")
borderBot:SetHeight(1)
borderBot:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Left
local borderLeft = btn:CreateTexture(nil, "OVERLAY")
borderLeft:SetPoint("TOPLEFT")
borderLeft:SetPoint("BOTTOMLEFT")
borderLeft:SetWidth(1)
borderLeft:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Right
local borderRight = btn:CreateTexture(nil, "OVERLAY")
borderRight:SetPoint("TOPRIGHT")
borderRight:SetPoint("BOTTOMRIGHT")
borderRight:SetWidth(1)
borderRight:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Text
local text = btn:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
text:SetPoint("CENTER", 0, 0)
text:SetText("Pull 10s")
text:SetTextColor(accentR, accentG, accentB, 1)
btn.text = text

-- Hover effect
btn:SetScript("OnEnter", function()
bg:SetColorTexture(0.10, 0.14, 0.18, 1)
text:SetTextColor(1, 1, 1, 1)
borderTop:SetColorTexture(accentR, accentG, accentB, 1)
borderBot:SetColorTexture(accentR, accentG, accentB, 1)
borderLeft:SetColorTexture(accentR, accentG, accentB, 1)
borderRight:SetColorTexture(accentR, accentG, accentB, 1)
end)

btn:SetScript("OnLeave", function()
bg:SetColorTexture(0.061, 0.095, 0.120, 1)
text:SetTextColor(accentR, accentG, accentB, 1)
borderTop:SetColorTexture(accentR, accentG, accentB, 0.7)
borderBot:SetColorTexture(accentR, accentG, accentB, 0.7)
borderLeft:SetColorTexture(accentR, accentG, accentB, 0.7)
borderRight:SetColorTexture(accentR, accentG, accentB, 0.7)
end)

btn:SetScript("OnClick", function()
local editBox = DEFAULT_CHAT_FRAME.editBox
editBox:SetText("/cd 10")
ChatEdit_SendText(editBox)
end)

ChallengesKeystoneFrame.EUI_PullButton = btn
end

local function CreateReadyCheckButton()
if not (EllesmereUIDB and EllesmereUIDB.enableReadyCheckButton ~= false) then return end
if not ChallengesKeystoneFrame then return end
if ChallengesKeystoneFrame.EUI_ReadyCheckButton then return end

-- Get EUI accent color
local accentR, accentG, accentB = 12/255, 210/255, 157/255 -- EllesmereUI teal
if EllesmereUIDB and EllesmereUIDB.accentColor then
local ac = EllesmereUIDB.accentColor
accentR, accentG, accentB = ac.r, ac.g, ac.b
end

local btn = CreateFrame("Button", nil, ChallengesKeystoneFrame)
btn:SetSize(90, 32)
btn:SetPoint("TOPRIGHT", ChallengesKeystoneFrame, "TOPRIGHT", 95, -64)

-- Background
local bg = btn:CreateTexture(nil, "BACKGROUND")
bg:SetAllPoints()
bg:SetColorTexture(0.061, 0.095, 0.120, 1)
btn.bg = bg

-- Border - Top
local borderTop = btn:CreateTexture(nil, "OVERLAY")
borderTop:SetPoint("TOPLEFT")
borderTop:SetPoint("TOPRIGHT")
borderTop:SetHeight(1)
borderTop:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Bottom
local borderBot = btn:CreateTexture(nil, "OVERLAY")
borderBot:SetPoint("BOTTOMLEFT")
borderBot:SetPoint("BOTTOMRIGHT")
borderBot:SetHeight(1)
borderBot:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Left
local borderLeft = btn:CreateTexture(nil, "OVERLAY")
borderLeft:SetPoint("TOPLEFT")
borderLeft:SetPoint("BOTTOMLEFT")
borderLeft:SetWidth(1)
borderLeft:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Border - Right
local borderRight = btn:CreateTexture(nil, "OVERLAY")
borderRight:SetPoint("TOPRIGHT")
borderRight:SetPoint("BOTTOMRIGHT")
borderRight:SetWidth(1)
borderRight:SetColorTexture(accentR, accentG, accentB, 0.7)

-- Text
local text = btn:CreateFontString(nil, "OVERLAY", "GameFontNormalSmall")
text:SetPoint("CENTER", 0, 0)
text:SetText("Ready Check")
text:SetTextColor(accentR, accentG, accentB, 1)
btn.text = text

-- Hover effect
btn:SetScript("OnEnter", function()
bg:SetColorTexture(0.10, 0.14, 0.18, 1)
text:SetTextColor(1, 1, 1, 1)
borderTop:SetColorTexture(accentR, accentG, accentB, 1)
borderBot:SetColorTexture(accentR, accentG, accentB, 1)
borderLeft:SetColorTexture(accentR, accentG, accentB, 1)
borderRight:SetColorTexture(accentR, accentG, accentB, 1)
end)

btn:SetScript("OnLeave", function()
bg:SetColorTexture(0.061, 0.095, 0.120, 1)
text:SetTextColor(accentR, accentG, accentB, 1)
borderTop:SetColorTexture(accentR, accentG, accentB, 0.7)
borderBot:SetColorTexture(accentR, accentG, accentB, 0.7)
borderLeft:SetColorTexture(accentR, accentG, accentB, 0.7)
borderRight:SetColorTexture(accentR, accentG, accentB, 0.7)
end)

btn:SetScript("OnClick", function()
local editBox = DEFAULT_CHAT_FRAME.editBox
editBox:SetText("/rc")
ChatEdit_SendText(editBox)
end)

ChallengesKeystoneFrame.EUI_ReadyCheckButton = btn
end

local initBtn = CreateFrame("Frame")
initBtn:RegisterEvent("ADDON_LOADED")
initBtn:RegisterEvent("CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN")
initBtn:SetScript("OnEvent", function(self, event, arg1)
if event == "ADDON_LOADED" and arg1 == "Blizzard_ChallengesUI" then
CreatePullTimerButton()
CreateReadyCheckButton()
elseif event == "CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN" then
CreatePullTimerButton()
CreateReadyCheckButton()
end
end)

if IsAddOnLoaded and IsAddOnLoaded("Blizzard_ChallengesUI") then
if ChallengesKeystoneFrame then
CreatePullTimerButton()
CreateReadyCheckButton()
else
-- Frame exists but not yet ready, hook OnShow instead
hooksecurefunc("ChallengesKeystoneFrame_Show", function()
CreatePullTimerButton()
CreateReadyCheckButton()
end)
end
end
end

---------------------------------------------------------------------------
-- Quick Signup (double-click to sign up)
---------------------------------------------------------------------------
Expand Down
35 changes: 32 additions & 3 deletions EUI__General_Options.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,8 +1117,8 @@ initFrame:SetScript("OnEvent", function(self)
"trainAllButton", "ahCurrentExpansion", "quickLoot",
"autoFillDelete", "skipCinematics", "skipCinematicsAuto",
"autoAcceptRoleCheck", "autoAcceptRoleCheckShift",
"sortByMythicScore", "autoInsertKeystone", "quickSignup",
"persistSignupNote", "hideBlizzardPartyFrame",
"sortByMythicScore", "autoInsertKeystone", "enablePullTimer",
"enableReadyCheckButton", "quickSignup", "persistSignupNote", "hideBlizzardPartyFrame",
"instanceResetAnnounce", "instanceResetAnnounceMsg",
"healthMacroEnabled", "healthMacroPrio1", "healthMacroPrio2",
"healthMacroPrio3", "foodMacroEnabled", "macroFactory",
Expand Down Expand Up @@ -3257,6 +3257,28 @@ initFrame:SetScript("OnEvent", function(self)
end }
); y = y - h

local qolRow
qolRow, h = W:DualRow(parent, y,
{ type="toggle", text="M+ Pull Timer",
tooltip="Adds a pull timer button to the Keystone window for quick /cd 10 commands.",
getValue=function()
return EllesmereUIDB and EllesmereUIDB.enablePullTimer ~= false
end,
setValue=function(v)
if not EllesmereUIDB then EllesmereUIDB = {} end
EllesmereUIDB.enablePullTimer = v
end },
{ type="toggle", text="Ready Check Button",
tooltip="Adds a ready check button next to the pull timer for quick /rc commands.",
getValue=function()
return EllesmereUIDB and EllesmereUIDB.enableReadyCheckButton ~= false
end,
setValue=function(v)
if not EllesmereUIDB then EllesmereUIDB = {} end
EllesmereUIDB.enableReadyCheckButton = v
end }
); y = y - h

local quickSignupRow
quickSignupRow, h = W:DualRow(parent, y,
{ type="toggle", text="Quick Signup",
Expand All @@ -3268,6 +3290,10 @@ initFrame:SetScript("OnEvent", function(self)
if not EllesmereUIDB then EllesmereUIDB = {} end
EllesmereUIDB.quickSignup = v
end },
{ type="label", text="" }
); y = y - h

_, h = W:DualRow(parent, y,
{ type="toggle", text="Persistent Signup Note",
tooltip="Keeps your note text in the Sign Up dialog instead of clearing it each time you open it.",
getValue=function()
Expand All @@ -3279,7 +3305,8 @@ initFrame:SetScript("OnEvent", function(self)
if EllesmereUI._applyPersistSignupNote then
EllesmereUI._applyPersistSignupNote()
end
end }
end },
{ type="label", text="" }
); y = y - h

_, h = W:Spacer(parent, y, 20); y = y - h
Expand Down Expand Up @@ -4822,6 +4849,8 @@ initFrame:SetScript("OnEvent", function(self)
EllesmereUIDB.autoFillDelete = false
EllesmereUIDB.sortByMythicScore = false
EllesmereUIDB.autoInsertKeystone = false
EllesmereUIDB.enablePullTimer = true
EllesmereUIDB.enableReadyCheckButton = true
EllesmereUIDB.instanceResetAnnounce = false
EllesmereUIDB.instanceResetAnnounceMsg = ""
EllesmereUIDB.quickSignup = false
Expand Down