Merge upstream changes

nozzlegear · Jan 25, 2023 · b34ac63 · b34ac63
2 parents 7487c89 + 18fc850
commit b34ac63
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 5 deletions.
diff --git a/BigDebuffs.lua b/BigDebuffs.lua
@@ -455,6 +455,36 @@ local GetAnchor = {
             return frame, frame, true
         end
     end,
+    PitBull = function(anchor)
+        local frame = _G[anchor]
+        if not frame then return end
+        if frame.Portrait and frame.Portrait:IsShown() then
+            return frame.Portrait, frame
+        else
+            return frame, frame, true
+        end
+    end,
+    Cell = function(anchor)
+        local anchors, unit = BigDebuffs.anchors
+
+        for u, configAnchor in pairs(anchors.Cell.units) do
+            if anchor == configAnchor then
+                unit = u
+                break
+            end
+        end
+
+        if unit and (unit:match("party") or unit:match("player")) then
+            if Cell then
+                local guid = UnitGUID(unit)
+                local frame = Cell.funcs:GetUnitButtonByGUID(guid)
+                if frame then
+                    return frame, frame, true
+                end
+            end
+            return
+        end
+    end,
 }
 
 local GetNameplateAnchor = {
@@ -689,6 +719,31 @@ local anchors = {
             arena5 = "sArenaEnemyFrame5",
         },
     },
+    ["Pitbull"] = {
+        func = GetAnchor.PitBull,
+        units = {
+            player = "PitBull4_Frames_Player",
+            pet = "PitBull4_Frames_Player's pet",
+            target = "PitBull4_Frames_Target",
+            focus = "PitBull4_Frames_Focus",
+            party1 = "PitBull4_Groups_PartyUnitButton1",
+            party2 = "PitBull4_Groups_PartyUnitButton2",
+            party3 = "PitBull4_Groups_PartyUnitButton3",
+            party4 = "PitBull4_Groups_PartyUnitButton4",
+        },
+    },
+    ["Cell"] = {
+        noPortait = true,
+        alignLeft = true,
+        func = GetAnchor.Cell,
+        units = {
+            player = "CellPartyFrameMember1",
+            party1 = "CellPartyFrameMember2",
+            party2 = "CellPartyFrameMember3",
+            party3 = "CellPartyFrameMember4",
+            party4 = "CellPartyFrameMember5",
+        },
+    },
     ["Blizzard"] = {
         units = {
             player = "PlayerPortrait",

diff --git a/BigDebuffs_Mainline.lua b/BigDebuffs_Mainline.lua
@@ -243,7 +243,7 @@ addon.Spells = {
     [212638] = { type = ROOT }, -- Tracker's Net
     [213691] = { type = CROWD_CONTROL }, -- Scatter Shot
     [357021] = { type = CROWD_CONTROL }, -- Consecutive Concussion
-    [260402] = { type = BUFF_OFFENSIVE }, -- Double Tap
+    [400456] = { type = BUFF_OFFENSIVE }, -- Salvo
     [266779] = { type = BUFF_OFFENSIVE }, -- Coordinated Assault
 	[360966] = { type = BUFF_OFFENSIVE }, -- Spearhead
     [288613] = { type = BUFF_OFFENSIVE }, -- Trueshot
@@ -441,10 +441,11 @@ addon.Spells = {
     [15286] = { type = BUFF_DEFENSIVE }, -- Vampiric Embrace
     [19236] = { type = BUFF_DEFENSIVE }, -- Desperate Prayer
     [111759] = { type = BUFF_OTHER }, -- Levitate
-    [325013] = { type = BUFF_OFFENSIVE }, -- Boon of the Ascended (Kyrian)
+    [322105] = { type = BUFF_OFFENSIVE }, -- Shadow Covenant
     [65081] = { type = BUFF_SPEED_BOOST }, -- Body and Soul
     [121557] = { type = BUFF_SPEED_BOOST }, -- Angelic Feather
     [199845] = { type = DEBUFF_OFFENSIVE, nounitFrames = true, nonameplates = true }, -- Psyflay (Psyfiend) debuff
+	[214621] = { type = DEBUFF_OFFENSIVE, nonameplates = true }, -- Schism
     [358861] = { type = CROWD_CONTROL }, -- Void Volley: Horrify (Shadow PvP Talent)
     [114404] = { type = ROOT }, -- Void Tendrils
 
@@ -540,7 +541,7 @@ addon.Spells = {
 	[356738] = { type = ROOT }, -- Earth Unleashed
 	[285515] = { type = ROOT }, -- Surge of Power (Root)
 	[356824] = { type = DEBUFF_OFFENSIVE }, -- Water Unleashed
-	[188389] = { type = DEBUFF_OFFENSIVE }, -- Flame Shock
+	[188389] = { type = DEBUFF_OFFENSIVE, nounitframes = true, nonameplates = true }, -- Flame Shock
 
     -- Warlock
 
@@ -578,7 +579,7 @@ addon.Spells = {
     [387633] = { type = BUFF_SPEED_BOOST }, -- Demonic Momentum (Soulburn)
     [199890] = { type = DEBUFF_OFFENSIVE, nounitframes = true, nonameplates = true }, -- Curse of Tongues
     [199954] = { type = DEBUFF_OFFENSIVE, nounitFrames = true, nonameplates = true }, -- Bane of Fragility
-	[702] = { type = DEBUFF_OFFENSIVE }, -- Curse of Weakness
+	[702] = { type = DEBUFF_OFFENSIVE, nounitframes = true, nonameplates = true }, -- Curse of Weakness
 
     -- Warrior
 

diff --git a/DjuxDebuffs_Wrath.toc b/DjuxDebuffs_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: BigDebuffs
 ## Notes: Increases the debuff size of crowd control effects on the Blizzard raid frames
 ## Version: @project-version@