Skip to content

Commit

Permalink
Removed finished TODOs
Browse files Browse the repository at this point in the history
  • Loading branch information
DerpleMQ2 committed Jan 4, 2024
1 parent cf644e9 commit 3d27bfa
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion modules/pull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ function Module:CheckForAbort(pullID)

if pullID == 0 then return true end

RGMercsLogger.log_debug("Checking for abort on spawn id: %d", pullID)
RGMercsLogger.log_verbose("Checking for abort on spawn id: %d", pullID)
local spawn = mq.TLO.Spawn(pullID)

if not spawn or spawn.Dead() or not spawn.ID() or spawn.ID() == 0 then
Expand Down
9 changes: 2 additions & 7 deletions utils/rgmercs_utils.lua
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@ function Utils.HandleDeath()

RGMercModules:execAll("OnDeath")

-- TODO: Cancel pulling in OnDeath

while mq.TLO.Me.Hovering() do
if mq.TLO.Window("RespawnWnd").Open() and RGMercConfig:GetSettings().InstantRelease then
mq.TLO.Window("RespawnWnd").Child("RW_OptionsList").Select(1)
Expand Down Expand Up @@ -1394,9 +1392,6 @@ function Utils.FindTarget()
end

-- Handle cases where our autotarget is no longer valid because it isn't a valid spawn or is dead.

-- TODO: Add pulling code here.

if RGMercConfig.Globals.AutoTargetID ~= 0 then
local autoSpawn = mq.TLO.Spawn(string.format("id %d", RGMercConfig.Globals.AutoTargetID))
if not autoSpawn() or autoSpawn.Type():lower() == "corpse" then
Expand Down Expand Up @@ -1583,7 +1578,7 @@ function Utils.FindTargetCheck()

RGMercsLogger.log_verbose("FindTargetCheck(%d, %s, %s, %s)", Utils.GetXTHaterCount(), Utils.IAmMA() and "TRUE" or "FALSE", config.FollowMarkTarget and "TRUE" or "FALSE",
RGMercConfig.Globals.BackOffFlag and "FALSE" or "TRUE")
-- TODO: Add Do Pull logic

return (Utils.GetXTHaterCount() > 0 or Utils.IAmMA() or config.FollowMarkTarget) and not RGMercConfig.Globals.BackOffFlag
end

Expand All @@ -1608,7 +1603,7 @@ function Utils.OkToEngage(autoTargetId)
return false
end

if Utils.GetXTHaterCount() > 0 then -- TODO: or AutoTargetID and !BackOffFlag
if Utils.GetXTHaterCount() > 0 and not RGMercConfig.Globals.BackOffFlag then
if Utils.GetTargetDistance() < config.AssistRange and (Utils.GetTargetPctHPs() < config.AutoAssistAt or RGMercConfig.Globals.IsTanking or assistId == mq.TLO.Me.ID()) then
if not mq.TLO.Me.Combat() then
RGMercsLogger.log_debug("\ay%d < %d and %d < %d or Tanking or %d == %d --> \agOK To Engage!",
Expand Down
2 changes: 1 addition & 1 deletion version.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
return { commitId = 'da69a93 2024-01-03' }
return { commitId = 'cf644e9 2024-01-04' }

0 comments on commit 3d27bfa

Please sign in to comment.