- Shm contantly buff fixes

DerpleMQ2 · Feb 25, 2024 · 0cadba5 · 0cadba5
1 parent 6b1768d
commit 0cadba5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/class_configs/shm_class_config.lua b/class_configs/shm_class_config.lua
@@ -1227,15 +1227,25 @@ local _ClassConfig = {
             {
                 name = "GroupFocusSpell",
                 type = "Spell",
+                active_cond = function(self, spell)
+                    local havebuff = RGMercUtils.BuffActiveByID(spell.ID())
+                    local numEffects = spell.NumEffects()
+                    for i = 1, numEffects do
+                        havebuff = havebuff or RGMercUtils.BuffActiveByID(spell.Trigger(i).ID())
+                    end
+                    return havebuff
+                end,
                 cond = function(self, spell, target, uiCheck)
                     -- force the target for StacksTarget to work.
                     if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
+                    local havebuff = RGMercUtils.BuffActiveByID(spell.ID())
                     local stacks = spell.StacksTarget()
                     local numEffects = spell.NumEffects()
                     for i = 1, numEffects do
                         stacks = stacks and spell.Trigger(i).StacksTarget()
+                        havebuff = havebuff or RGMercUtils.BuffActiveByID(spell.Trigger(i).ID())
                     end
-                    return not RGMercUtils.TargetHasBuff(spell, target) and stacks
+                    return stacks and not havebuff
                 end,
             },
         },

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '897311e 2024-02-25' }
+return { commitId = '6b1768d 2024-02-25' }
diff --git a/modules/pull.lua b/modules/pull.lua
@@ -747,11 +747,11 @@ function Module:CheckGroupForPull(classes, resourceStartPct, resourceStopPct, ca
                     RGMercUtils.PrintGroupMessage("%s is low on hp - Holding pulls!", member.CleanName())
                     return false, string.format("%s Low HP", member.CleanName())
                 end
-                if member.Class.CanCast() and member.PctMana() < resourcePct then
+                if member.Class.CanCast() and member.Class.ShortName() ~= "BRD" and member.PctMana() < resourcePct then
                     RGMercUtils.PrintGroupMessage("%s is low on mana - Holding pulls!", member.CleanName())
                     return false, string.format("%s Low Mana", member.CleanName())
                 end
-                if member.PctEndurance() < resourcePct then
+                if member.Class.ShortName() ~= "BRD" and member.PctEndurance() < resourcePct then
                     RGMercUtils.PrintGroupMessage("%s is low on endurance - Holding pulls!", member.CleanName())
                     return false, string.format("%s Low End", member.CleanName())
                 end