- Added Bard Pull Ability Boastful Bellow

- Added More Necro Swarm Pets
- Added SK ForPower Pull Ability
- Fixed Sham Focus Stacking Check
- Added Ability to pull with AAs

class_configs/brd_class_config.lua

@@ -1346,7 +1346,18 @@ local _ClassConfig = {
 
         },
     },
-
+    ['PullAbilities'] = {
+        {
+            id = 'Boastful Bellow',
+            Type = "AA",
+            DisplayName = 'Boastful Bellow',
+            AbilityName = 'Boastful Bellow',
+            AbilityRange = 250,
+            cond = function(self)
+                return mq.TLO.Me.AltAbility('Boastful Bellow')
+            end,
+        },
+    },
     ['DefaultConfig'] = {
         ['Mode']             = { DisplayName = "Mode", Category = "Combat", Tooltip = "Select the Combat Mode for this Toon", Type = "Custom", RequiresLoadoutChange = true, Default = 1, Min = 1, Max = 4, },
         ['UseAASelo']        = { DisplayName = "Use AA Selo", Category = "Buffs", Tooltip = "Do Selo's AAs", Default = true, },

class_configs/nec_class_config.lua

@@ -114,6 +114,10 @@ local _ClassConfig = {
         },
         ['SwarmPet'] = {
             ---SwarmPet >= LVL85
+            "Call Relentless Skeleton",
+            "Call Ruthless Skeleton",
+            "Call Ruinous Skeleton",
+            "Call Rumbling Skeleton",
             "Call Skeleton Thrall",
             "Call Skeleton Mass",
             "Call Skeleton Horde",

class_configs/shd_class_config.lua

@@ -1273,6 +1273,18 @@ local _ClassConfig = {
                 return mq.TLO.Me.Gem(resolvedSpell.RankName.Name() or "")() ~= nil
             end,
         },
+        {
+            id = 'ForPower',
+            Type = "Spell",
+            DisplayName = function() return RGMercUtils.GetResolvedActionMapItem('ForPower')() or "" end,
+            AbilityName = function() return RGMercUtils.GetResolvedActionMapItem('ForPower')() or "" end,
+            AbilityRange = 150,
+            cond = function(self)
+                local resolvedSpell = RGMercUtils.GetResolvedActionMapItem('ForPower')
+                if not resolvedSpell then return false end
+                return mq.TLO.Me.Gem(resolvedSpell.RankName.Name() or "")() ~= nil
+            end,
+        },
     },
     ['DefaultConfig']   = {
         ['Mode']         = { DisplayName = "Mode", Category = "Combat", Tooltip = "Select the Combat Mode for this Toon", Type = "Custom", RequiresLoadoutChange = true, Default = 1, Min = 1, Max = 2, },

class_configs/shm_class_config.lua

@@ -1309,7 +1309,12 @@ local _ClassConfig = {
                 cond = function(self, spell, target, uiCheck)
                     -- force the target for StacksTarget to work.
                     if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
-                    return not RGMercUtils.TargetHasBuff(spell, target) and spell.StacksTarget()
+                    local stacks = spell.StacksTarget()
+                    local numEffects = spell.NumEffects()
+                    for i = 1, numEffects do
+                        stacks = stacks and spell.Trigger(i).StacksTarget()
+                    end
+                    return not RGMercUtils.TargetHasBuff(spell, target) and stacks
                 end,
             },
             {

extras/version.lua

@@ -1 +1 @@
-return { commitId = '7dc951c 2024-02-24' }
+return { commitId = '7e56697 2024-02-24' }

modules/pull.lua

@@ -1382,6 +1382,10 @@ function Module:GiveTime(combat_state)
                         local abilityName = pullAbility.AbilityName
                         if type(abilityName) == 'function' then abilityName = abilityName() end
                         RGMercUtils.UseSpell(abilityName, self.TempSettings.PullID, false)
+                    elseif pullAbility.Type:lower() == "aa" then
+                        local aaName = pullAbility.AbilityName
+                        if type(aaName) == 'function' then aaName = aaName() end
+                        RGMercUtils.UseAA(aaName, self.TempSettings.PullID)
                     else
                         RGMercsLogger.log_error("\arInvalid PullAbilityType: %s :: %s", pullAbility.Type, pullAbility.id)
                     end