Skip to content

Commit

Permalink
- Added End Pct for pulling
Browse files Browse the repository at this point in the history
  • Loading branch information
DerpleMQ2 committed Mar 8, 2024
1 parent 5b39ad3 commit dd07497
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion extras/version.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
return { commitId = '1f9df03 2024-03-08' }
return { commitId = '5b39ad3 2024-03-08' }
6 changes: 6 additions & 0 deletions modules/pull.lua
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ Module.DefaultConfig = {
['GroupWatchStopPct'] = { DisplayName = "Group Watch Stop %", Category = "Group Watch", Tooltip = "If your group member is below [X]% resource, stop pulls.", Default = 40, Min = 1, Max = 100, },
['PullHPPct'] = { DisplayName = "Pull HP %", Category = "Group Watch", Tooltip = "Make sure you have at least this much HP %", Default = 60, Min = 1, Max = 100, },
['PullManaPct'] = { DisplayName = "Pull Mana %", Category = "Group Watch", Tooltip = "Make sure you have at least this much Mana %", Default = 60, Min = 1, Max = 100, },
['PullEndPct'] = { DisplayName = "Pull End %", Category = "Group Watch", Tooltip = "Make sure you have at least this much Endurance %", Default = 30, Min = 1, Max = 100, },
['FarmWayPoints'] = { DisplayName = "Farming Waypoints", Category = "", Tooltip = "", Type = "Custom", Default = {}, },
['PullAllowList'] = { DisplayName = "Allow List", Category = "", Tooltip = "", Type = "Custom", Default = {}, },
['PullDenyList'] = { DisplayName = "Deny List", Category = "", Tooltip = "", Type = "Custom", Default = {}, },
Expand Down Expand Up @@ -664,6 +665,11 @@ function Module:ShouldPull()
return false, string.format("PctHPs < %d", self.settings.PullHPPct)
end

if me.PctEndurance() < self.settings.PullEndPct then
RGMercsLogger.log_super_verbose("\ay::PULL:: \arAborted!\ax PctEnd < %d", self.settings.PullEndPct)
return false, string.format("PctEnd < %d", self.settings.PullEndPct)
end

if me.MaxMana() > 0 and me.PctMana() < self.settings.PullManaPct then
RGMercsLogger.log_super_verbose("\ay::PULL:: \arAborted!\ax PctMana < %d", self.settings.PullManaPct)
return false, string.format("PctMana < %d", self.settings.PullManaPct)
Expand Down

0 comments on commit dd07497

Please sign in to comment.