- Fix for hunt pull mode not working right.

DerpleMQ2 · Feb 19, 2024 · df86254 · df86254
1 parent 8018e6d
commit df86254
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/modules/pull.lua b/modules/pull.lua
@@ -753,10 +753,18 @@ function Module:CheckGroupForPull(classes, resourceStartPct, resourceStopPct, ca
                 end
 
                 --if (member.Distance() or 0) > math.max(RGMercConfig.SubModuleSettings.Movement.settings.AutoCampRadius, 80) then
-                if RGMercUtils.GetDistance(member.X(), member.Y(), campData.AutoCampX, campData.AutoCampY) > math.max(RGMercConfig.SubModuleSettings.Movement.settings.AutoCampRadius, 50) then
-                    RGMercUtils.PrintGroupMessage("%s is too far away - Holding pulls!", member.CleanName())
-                    return false,
-                        string.format("%s Too Far (%d)", member.CleanName(), RGMercUtils.GetDistance(member.X(), member.Y(), campData.AutoCampX, campData.AutoCampY))
+                if returnToCamp then
+                    if RGMercUtils.GetDistance(member.X(), member.Y(), campData.AutoCampX, campData.AutoCampY) > math.max(RGMercConfig.SubModuleSettings.Movement.settings.AutoCampRadius, 50) then
+                        RGMercUtils.PrintGroupMessage("%s is too far away - Holding pulls!", member.CleanName())
+                        return false,
+                            string.format("%s Too Far (%d)", member.CleanName(), RGMercUtils.GetDistance(member.X(), member.Y(), campData.AutoCampX, campData.AutoCampY))
+                    end
+                else
+                    if (member.Distance() or 0) > math.max(RGMercConfig.SubModuleSettings.Movement.settings.AutoCampRadius, 80) then
+                        RGMercUtils.PrintGroupMessage("%s is too far away - Holding pulls!", member.CleanName())
+                        return false,
+                            string.format("%s Too Far (%d)", member.CleanName(), RGMercUtils.GetDistance(member.X(), member.Y(), campData.AutoCampX, campData.AutoCampY))
+                    end
                 end
 
                 if self.Constants.PullModes[self.settings.PullMode] == "Chain" then

diff --git a/utils/rgmercs_utils.lua b/utils/rgmercs_utils.lua
@@ -1446,6 +1446,12 @@ function Utils.GetTargetPctHPs(target)
     return (target and target.PctHPs() or (mq.TLO.Target.PctHPs() or 0))
 end
 
+---@param target MQTarget|nil
+---@return boolean
+function Utils.GetTargetDead(target)
+    return (target and target.Dead() or (mq.TLO.Target.Dead() or true))
+end
+
 ---@param target MQTarget|nil
 ---@return string
 function Utils.GetTargetName(target)
@@ -1987,7 +1993,7 @@ function Utils.EngageTarget(autoTargetId, preEngageRoutine)
                 mq.TLO.Me.Stand()
             end
 
-            if (Utils.GetTargetPctHPs() <= config.AutoAssistAt or Utils.IAmMA()) and Utils.GetTargetPctHPs() > 0 then
+            if (Utils.GetTargetPctHPs() <= config.AutoAssistAt or Utils.IAmMA()) and not Utils.GetTargetDead() then
                 if target.Distance() > Utils.GetTargetMaxRangeTo(target) then
                     RGMercsLogger.log_debug("Target is too far! %d>%d attempting to nav to it.", target.Distance(),
                         target.MaxRangeTo())