Skip to content
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

refactor forward/backwards loop #54

Merged
merged 11 commits into from
Oct 24, 2024
Merged

refactor forward/backwards loop #54

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
13ae1d0
refactor forward/backwards loop
jetersen Oct 22, 2024
5d9f818
pass table data and correct mage flyout update
jetersen Oct 22, 2024
12c2fea
use xOffset to reverse spells rather insert order
jetersen Oct 23, 2024
0aa0bf6
add local function to avoid duplicate code
jetersen Oct 23, 2024
c84f8d6
simplify xOffset in update mage fly outs
jetersen Oct 23, 2024
7ddf099
safely handle updateFlyoutButtons
jetersen Oct 23, 2024
f4518cf
fix condition
jetersen Oct 23, 2024
2afef21
remove yOffset parameter
jetersen Oct 24, 2024
28a92f3
fix CreateFlyout call
jetersen Oct 24, 2024
c7dbdaa
Merge branch 'main' into fix/forwardbackwardloop
jetersen Oct 24, 2024
17108f4
fix translation key
jetersen Oct 24, 2024
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
2 changes: 2 additions & 0 deletions Locales/enUS.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ L["None"] = "None"
L["Random"] = "Random"
L["ButtonText"] = "Show text"
L["ButtonText Tooltip"] = "When enabled, an abbreviated name of the dungeon will be added to dungeon teleports."
L["Reverse Mage Flyouts"] = "Reverse Mage Flyouts"
L["Reverse Mage Flyouts Tooltip"] = "Reverse order of flyouts for mage abilities to make most recent expansion teleports appear first"
2 changes: 1 addition & 1 deletion Options.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function tpm:LoadOptions()

do
local optionsKey = "reverseMageFlyouts"
local tooltip = L["Reverse order of flyouts for mage abilities to make most recent expansion teleports appear first"]
local tooltip = L["Reverse Mage Flyouts Tooltip"]
local setting = Settings.RegisterAddOnSetting(optionsCategory, "reverseMageFlyouts_Checkbox", optionsKey, db, type(defaultsDB[optionsKey]), L["Reverse Mage Flyouts"], defaultsDB[optionsKey])
Settings.SetOnValueChangedCallback("reverseMageFlyouts_Checkbox", OnSettingChanged)
Settings.CreateCheckbox(optionsCategory, setting, tooltip)
Expand Down
135 changes: 61 additions & 74 deletions TeleportMenu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ local tpTable = {
-- Engineering
{type = "wormholes", iconId = 4620673}, -- Engineering Wormholes
-- Class Teleports
{id = 1, type = "flyout", iconId = 237509}, -- Teleport (Mage)
{id = 8, type = "flyout", iconId = 237509}, -- Teleport (Mage)
{id = 11, type = "flyout", iconId = 135744}, -- Portals (Mage)
{id = 12, type = "flyout", iconId = 135748}, -- Portals (Mage)
{id = 1, type = "flyout", iconId = 237509, subtype = "mage"}, -- Teleport (Mage) (Horde)
{id = 8, type = "flyout", iconId = 237509, subtype = "mage"}, -- Teleport (Mage) (Alliance)
{id = 11, type = "flyout", iconId = 135744, subtype = "mage"}, -- Portals (Mage) (Horde)
{id = 12, type = "flyout", iconId = 135748, subtype = "mage"}, -- Portals (Mage) (Alliance)
{id = 126892, type = "spell"}, -- Zen Pilgrimage (Monk)
{id = 50977, type = "spell"}, -- Death Gate (Death Knight)
{id = 193753, type = "spell"}, -- Dreamwalk (Druid)
Expand Down Expand Up @@ -351,11 +351,11 @@ function tpm:checkQuestCompletion(quest)
end
end

function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
if db.showOnlySeasonalHerosPath and subtype == "path" then
function tpm:CreateFlyout(flyoutData, yOffset)
jetersen marked this conversation as resolved.
Show resolved Hide resolved
if db.showOnlySeasonalHerosPath and flyoutData.subtype == "path" then
return
end
local _, _, spells, flyoutKnown = GetFlyoutInfo(flyoutId)
local _, _, spells, flyoutKnown = GetFlyoutInfo(flyoutData.id)
if not flyoutKnown then
return
end
Expand All @@ -364,7 +364,7 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
yOffset = yOffset or -40 * TeleportMeButtonsFrame:GetButtonAmount()

button:SetSize(40, 40)
button:SetNormalTexture(iconId)
button:SetNormalTexture(flyoutData.iconId)
button:SetPoint("TOPLEFT", TeleportMeButtonsFrame, "TOPRIGHT", 0, yOffset)
button:EnableMouse(true)
button:RegisterForClicks("AnyDown", "AnyUp")
Expand All @@ -377,7 +377,7 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
tpm:setCombatTooltip(self)
return
end
tpm:setToolTip(self, "flyout", flyoutId)
tpm:setToolTip(self, "flyout", flyoutData.id)
self.flyOutFrame:Show()
end
)
Expand All @@ -388,11 +388,11 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
end
)

if db.buttonText == true and name then
if db.buttonText == true and flyoutData.name then
button.text = button:CreateFontString(nil, "OVERLAY")
button.text:SetFont("Fonts\\FRIZQT__.TTF", 13, "OUTLINE")
button.text:SetPoint("BOTTOM", button, "BOTTOM", 0, 5)
button.text:SetText(name)
button.text:SetText(flyoutData.name)
button.text:SetTextColor(1, 1, 1, 1)
end

Expand All @@ -418,19 +418,20 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
local flyOutButtons = {}
local flyoutsCreated = 0

-- Check if reverseMageFlyouts is enabled
local reverseMageFlyouts = TeleportMenuDB.reverseMageFlyouts

-- Function to create a flyout button
local function createFlyOutButton(spellID, index)
local function createFlyOutButton(spellID, index, totalKnownSpells)
local spellName = C_Spell.GetSpellName(spellID)
local spellTexture = C_Spell.GetSpellTexture(spellID)
local flyOutButton = CreateFrame("Button", nil, flyOutFrame, "SecureActionButtonTemplate")
local xOffset = 40 + (40 * index)
if TeleportMenuDB.reverseMageFlyouts and flyoutData.subtype == "mage" then
xOffset = 40 + (40 * (totalKnownSpells - index + 1))
end
flyOutButton:SetSize(40, 40)
flyOutButton:SetNormalTexture(spellTexture)
flyOutButton:SetAttribute("type", "spell")
flyOutButton:SetAttribute("spell", spellID)
flyOutButton:SetPoint("RIGHT", flyOutFrame, "LEFT", 40 + (40 * index), 0)
flyOutButton:SetPoint("RIGHT", flyOutFrame, "LEFT", xOffset, 0)
flyOutButton:EnableMouse(true)
flyOutButton:RegisterForClicks("AnyDown", "AnyUp")
flyOutButton:SetFrameStrata("HIGH")
Expand Down Expand Up @@ -458,53 +459,36 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
return flyOutButton
end

-- Loop through spells, either forwards or backwards based on the setting
if reverseMageFlyouts and (flyoutId == 1 or flyoutId == 8 or flyoutId == 11 or flyoutId == 12) then
for i = spells, 1, -1 do
local flyname = nil
local spellID = select(1, GetFlyoutSlotInfo(flyoutId, i))
if IsSpellKnown(spellID) then
for _, v in pairs(dungeons) do
if v.id == spellID then
flyname = v.name
end
end
flyoutsCreated = flyoutsCreated + 1
local flyOutButton = createFlyOutButton(spellID, flyoutsCreated)
if db.buttonText == true and flyname then
flyOutButton.text = flyOutButton:CreateFontString(nil, "OVERLAY")
flyOutButton.text:SetFont("Fonts\\FRIZQT__.TTF", 13, "OUTLINE")
flyOutButton.text:SetPoint("BOTTOM", flyOutButton, "BOTTOM", 0, 5)
flyOutButton.text:SetText(flyname)
flyOutButton.text:SetTextColor(1, 1, 1, 1)
end
table.insert(flyOutButtons, flyOutButton)
end
local totalKnownSpells = 0
for i = 1, spells do
local spellID = select(1, GetFlyoutSlotInfo(flyoutData.id, i))
if IsSpellKnown(spellID) then
totalKnownSpells = totalKnownSpells + 1
jetersen marked this conversation as resolved.
Show resolved Hide resolved
end
else
for i = 1, spells do
local flyname = nil
local spellID = select(1, GetFlyoutSlotInfo(flyoutId, i))
if IsSpellKnown(spellID) then
for _, v in pairs(dungeons) do
if v.id == spellID then
flyname = v.name
end
end
if not flyname then
print(APPEND .. "No short name found for spellID " .. spellID ..", please report this on GitHub")
end
flyoutsCreated = flyoutsCreated + 1
local flyOutButton = createFlyOutButton(spellID, flyoutsCreated)
if db.buttonText == true and flyname then
flyOutButton.text = flyOutButton:CreateFontString(nil, "OVERLAY")
flyOutButton.text:SetFont("Fonts\\FRIZQT__.TTF", 13, "OUTLINE")
flyOutButton.text:SetPoint("BOTTOM", flyOutButton, "BOTTOM", 0, 5)
flyOutButton.text:SetText(flyname)
flyOutButton.text:SetTextColor(1, 1, 1, 1)
end

for i = 1, spells do
local flyname = nil
local spellID = select(1, GetFlyoutSlotInfo(flyoutData.id, i))
if IsSpellKnown(spellID) then
for _, v in pairs(dungeons) do
if v.id == spellID then
flyname = v.name
end
table.insert(flyOutButtons, flyOutButton)
end
if not flyname then
print(APPEND .. "No short name found for spellID " .. spellID ..", please report this on GitHub")
end
flyoutsCreated = flyoutsCreated + 1
local flyOutButton = createFlyOutButton(spellID, flyoutsCreated, totalKnownSpells)
if db.buttonText == true and flyname then
flyOutButton.text = flyOutButton:CreateFontString(nil, "OVERLAY")
flyOutButton.text:SetFont("Fonts\\FRIZQT__.TTF", 13, "OUTLINE")
flyOutButton.text:SetPoint("BOTTOM", flyOutButton, "BOTTOM", 0, 5)
flyOutButton.text:SetText(flyname)
flyOutButton.text:SetTextColor(1, 1, 1, 1)
end
table.insert(flyOutButtons, flyOutButton)
end
end

Expand All @@ -514,21 +498,24 @@ function tpm:CreateFlyout(flyoutId, iconId, yOffset, name)
end

function tpm:updateMageFlyouts()
local teleportButton = TeleportMeButtonsFrame.mageTeleportButton
local portalButton = TeleportMeButtonsFrame.magePortalButton
local _, _, _, _, teleportYOffset = teleportButton:GetPoint()
local _, _, _, _, portalYOffset = portalButton:GetPoint()

if select(4, GetFlyoutInfo(12)) then -- Player is Alliance
local updatedTeleportButton = tpm:CreateFlyout(1, 237509, teleportYOffset)
local updatedPortalButton = tpm:CreateFlyout(11, 135748, portalYOffset)
jetersen marked this conversation as resolved.
Show resolved Hide resolved
else -- Player is Horde
local updatedTeleportButton = tpm:CreateFlyout(8, 237509, teleportYOffset)
local updatedPortalButton = tpm:CreateFlyout(12, 135748, portalYOffset)
local function updateFlyoutButtons(button)
if not button then return end
local frame = button.flyOutFrame
local buttons = button.flyOutButtons
if not buttons or not frame then return end

local totalButtons = #buttons
for i = 1, totalButtons do
local xOffset = 40 + (40 * i)
if TeleportMenuDB.reverseMageFlyouts then
xOffset = 40 + (40 * (totalButtons - i + 1))
end
buttons[i]:SetPoint("RIGHT", frame, "LEFT", xOffset, 0)
end
end

TeleportMeButtonsFrame.mageTeleportButton = updatedTeleportButton
TeleportMeButtonsFrame.magePortalButton = updatedPortalButton
updateFlyoutButtons(TeleportMeButtonsFrame.mageTeleportButton)
updateFlyoutButtons(TeleportMeButtonsFrame.magePortalButton)
end

function tpm:CreateSeasonalTeleportFlyout()
Expand Down Expand Up @@ -1083,7 +1070,7 @@ local function createAnchors()
TeleportMeButtonsFrame:IncrementButtons()
end
elseif teleport.type == "flyout" then
local created = tpm:CreateFlyout(teleport.id, teleport.iconId, nil, teleport.name or nil)
local created = tpm:CreateFlyout(teleport, nil)
if created then
-- Save Teleport button for replacement later
if teleport.id == 1 or teleport.id == 8 then
Expand Down