Group Buff TEsting

DerpleMQ2 · Jan 13, 2024 · 6a443ca · 6a443ca
1 parent e4b4148
commit 6a443ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/class_configs/enc_class_config.lua b/class_configs/enc_class_config.lua
@@ -944,17 +944,22 @@ local _ClassConfig = {
                 active_cond = function(self, spell) return mq.TLO.Me.FindBuff("id " .. tostring(spell.ID()))() ~= nil end,
                 cond = function(self, spell, target)
                     if not target or not target() then return false end
-                    -- dont handle mercs for now.
-                    if target.Type():lower() == "mercenary" then return false end
-
-                    if target.ID() == mq.TLO.Me.ID() then return mq.TLO.Me.FindBuff("id " .. tostring(spell.ID()))() == nil end
 
                     if not RGMercConfig.Constants.RGCasters:contains(target.Class.ShortName()) then return false end
 
-                    -- need to rely on DanNet for this next part.
-                    local needBuff = DanNet.query(target.CleanName(), string.format("Me.FindBuff[id %d]", spell.ID()), 1000)
+                    return RGMercUtils.CheckPCNeedsBuff(spell, target.ID(), target.CleanName())
+                end,
+            },
+            {
+                name = "HasteBuff",
+                type = "Spell",
+                active_cond = function(self, spell) return mq.TLO.Me.FindBuff("id " .. tostring(spell.ID()))() ~= nil end,
+                cond = function(self, spell, target)
+                    if not target or not target() then return false end
 
-                    return needBuff == "NULL"
+                    if not RGMercConfig.Constants.RGMelee:contains(target.Class.ShortName()) then return false end
+
+                    return RGMercUtils.CheckPCNeedsBuff(spell, target.ID(), target.CleanName())
                 end,
             },
             {
@@ -971,7 +976,8 @@ local _ClassConfig = {
                     if not RGMercConfig.Constants.RGMelee:contains(target.Class.ShortName()) then return false end
 
                     -- need to rely on DanNet for this next part.
-                    local needBuff = DanNet.query(target.CleanName(), string.format("Me.FindBuff[id %d]", spell.ID()), 1000)
+                    local needBuff = false
+                    DanNet.query(target.CleanName(), string.format("Me.FindBuff[id %d]", spell.ID()), 1000)
 
                     return needBuff == "NULL"
                 end,

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '805895e 2024-01-13' }
+return { commitId = 'e4b4148 2024-01-13' }