From c053d7cdaeff4bb8a4b1738c9ca649a6da309acd Mon Sep 17 00:00:00 2001 From: OldManAlpha <60587722+OldManAlpha@users.noreply.github.com> Date: Fri, 15 Aug 2025 08:43:59 -0700 Subject: [PATCH] Update for TWoW 1.18/Small Changes --- Puppeteer.toc | 2 +- PuppeteerSettings.lua | 2 +- core/OverrideBindings.lua | 5 ++++- gui/Settings.lua | 2 +- gui/component/SpellLine.lua | 3 ++- libs/AuraTracker.lua | 3 ++- libs/PTUnit.lua | 8 ++++---- libs/Util.lua | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Puppeteer.toc b/Puppeteer.toc index 855e807..31448e0 100644 --- a/Puppeteer.toc +++ b/Puppeteer.toc @@ -1,5 +1,5 @@ ## Interface: 11200 -## Version: 1.0.1 +## Version: 1.0.2 ## Title: Puppeteer ## Notes: Unit frames addon tailored for healers ## Author: OldManAlpha, Richard Truax(i2ichardt) diff --git a/PuppeteerSettings.lua b/PuppeteerSettings.lua index f60d545..e3d4b86 100644 --- a/PuppeteerSettings.lua +++ b/PuppeteerSettings.lua @@ -348,7 +348,7 @@ DefaultClassTrackedBuffs = { "Greater Blessing of Light", "Daybreak", "Blessing of Freedom", "Hand of Freedom", "Redoubt", "Holy Shield"}, ["PRIEST"] = {"Prayer of Fortitude", "Power Word: Fortitude", "Prayer of Spirit", "Divine Spirit", "Prayer of Shadow Protection", "Shadow Protection", "Holy Champion", "Champion's Grace", "Empower Champion", - "Fear Ward", "Inner Fire", "Renew", "Greater Heal", "Lightwell Renew", "Inspiration", + "Champion's Bond", "Fear Ward", "Inner Fire", "Renew", "Greater Heal", "Lightwell Renew", "Inspiration", "Fade", "Spirit Tap", "Enlighten", "Enlightened"}, ["WARRIOR"] = {"Battle Shout"}, ["DRUID"] = {"Gift of the Wild", "Mark of the Wild", "Thorns", "Rejuvenation", "Regrowth"}, diff --git a/core/OverrideBindings.lua b/core/OverrideBindings.lua index 5ef923f..b6d53be 100644 --- a/core/OverrideBindings.lua +++ b/core/OverrideBindings.lua @@ -91,7 +91,10 @@ AddUpdateBindingsFrame("MainMenuMicroButton") AddUpdateBindingsFrame("QuestLogMicroButton") AddUpdateBindingsFrame("SocialsMicroButton") AddUpdateBindingsFrame("WorldMapMicroButton") -AddUpdateBindingsFrame("pfActionBar") -- pfUI +util.RunLater(function() + AddUpdateBindingsFrame("pfActionBar") -- pfUI + AddUpdateBindingsFrame("DFRL_HotkeyBinding") -- Dragonflight Reloaded +end) local function StopUpdateBindingsUpdates() if holdingFunctionsHostage then diff --git a/gui/Settings.lua b/gui/Settings.lua index 85e39df..9b357f1 100644 --- a/gui/Settings.lua +++ b/gui/Settings.lua @@ -830,7 +830,7 @@ function CreateTab_Customize() add(createDropdown("Health Display", "What kind of text is displayed as health", "HealthDisplay", {"Health", "Health/Max Health", "% Health", "Hidden"})) add(createDropdown("Missing Health Display", "What kind of text is displayed as missing health", "MissingHealthDisplay", {"Hidden", "-Health", "-% Health"})) add(createDropdown("Power Bar Texture", nil, "PowerBarStyle", barStyles)) - add(createDropdown("Power Display", "What kind of text is displayed as missing", "PowerDisplay", {"Power", "Power/Max Power", "% Power", "Hidden"})) + add(createDropdown("Power Display", "What kind of text is displayed as power", "PowerDisplay", {"Power", "Power/Max Power", "% Power", "Hidden"})) add(createDropdown("Name Text Color", "'Default' is default Blizzard yellow text", "NameText.Color", {"Class", "Default"})) add(createDropdown("Show Debuff Colors On", nil, "ShowDebuffColorsOn", {"Health Bar", "Name", "Health", "Hidden"})) add(createDropdown("Sort Units By", "The sorting algorithm for units in a group", "SortUnitsBy", {"ID", "Name", "Class Name"})) diff --git a/gui/component/SpellLine.lua b/gui/component/SpellLine.lua index f760c5d..09439fa 100644 --- a/gui/component/SpellLine.lua +++ b/gui/component/SpellLine.lua @@ -323,7 +323,8 @@ function PTSpellLine:Update() self:SetEnabledContent("editbox") self:GetTypeDropdown():SetText("Macro") self:GetContentEditbox():SetText(binding.Data or "") - self:GetContentEditbox():ApplyTooltip("Enter the name of one of your macros") + self:GetContentEditbox():ApplyTooltip("Enter the name of one of your macros", + "Note that macro binds won't target unless you enable", "\"Target While Casting\" in this binding's settings or globally") self:ApplySearchableEditbox("MACRO", SearchMacros, 1) elseif binding.Type == "ITEM" then self:SetEnabledContent("editbox") diff --git a/libs/AuraTracker.lua b/libs/AuraTracker.lua index c4ed1e0..6996d0e 100644 --- a/libs/AuraTracker.lua +++ b/libs/AuraTracker.lua @@ -9,7 +9,7 @@ local turtle = PTUtil.IsTurtleWow() local trackedCastedAuras = { -- Druid ["Rejuvenation"] = 12, - ["Regrowth"] = 21, + ["Regrowth"] = turtle and 20 or 21, ["Mark of the Wild"] = 30 * 60, ["Gift of the Wild"] = 60 * 60, ["Thorns"] = 10 * 60, @@ -33,6 +33,7 @@ local trackedCastedAuras = { ["Fear Ward"] = 10 * 60, ["Champion's Grace"] = 30 * 60, ["Empower Champion"] = 10 * 60, + ["Champion's Bond"] = 10 * 60, ["Spirit of Redemption"] = 10, ["Abolish Disease"] = 20, ["Inner Fire"] = 10 * 60, diff --git a/libs/PTUnit.lua b/libs/PTUnit.lua index 007e7cc..6674150 100644 --- a/libs/PTUnit.lua +++ b/libs/PTUnit.lua @@ -304,12 +304,12 @@ function PTUnit:HasBuff(name) return self.BuffsMap[name] ~= nil end --- SuperWoW only +-- SuperWoW/Turtle WoW only function PTUnit:HasBuffID(id) return self.BuffsIDSet[id] ~= nil end --- Looks for ID if SuperWoW is present, otherwise searches by name +-- Looks for ID if SuperWoW/Turtle WoW is present, otherwise searches by name function PTUnit:HasBuffIDOrName(id, name) if superwow then return self:HasBuffID(id) @@ -321,12 +321,12 @@ function PTUnit:HasDebuff(name) return self.DebuffsMap[name] ~= nil end --- SuperWoW only +-- SuperWoW/Turtle WoW only function PTUnit:HasDebuffID(id) return self.DebuffsIDSet[id] ~= nil end --- Looks for ID if SuperWoW is present, otherwise searches by name +-- Looks for ID if SuperWoW/Turtle WoW is present, otherwise searches by name function PTUnit:HasDebuffIDOrName(id, name) if superwow then return self:HasDebuffID(id) diff --git a/libs/Util.lua b/libs/Util.lua index 9afeb3d..dbddc07 100644 --- a/libs/Util.lua +++ b/libs/Util.lua @@ -35,7 +35,7 @@ if SUPERWOW_VERSION then end Nampower = QueueSpellByName ~= nil -TurtleWow = true +TurtleWow = TURTLE_WOW_VERSION ~= nil PowerColors = { ["mana"] = {0.1, 0.25, 1}, --{r = 0, g = 0, b = 0.882}, Not accurate, changed color to make brighter