Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@DerpleMQ2
DerpleMQ2 committed Feb 24, 2024
2 parents 704ef89 + 7330eaa commit 730249b
Show file tree
Hide file tree
Showing 5 changed files with 107 additions and 41 deletions.
36 changes: 25 additions & 11 deletions class_configs/bst_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,10 @@ return {
return
groupIds
end,
cond = function(self, combat_state) return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer') end,
cond = function(self, combat_state)
return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer')
end,
},
{
name = 'Downtime',
Expand Down Expand Up @@ -834,7 +836,9 @@ return {
{
name = "SlowSpell",
type = "Spell",
cond = function(self, spell, target)
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 RGMercUtils.GetSetting('DoSlow') and not RGMercUtils.CanUseAA("Sha's Reprisal") and not RGMercUtils.TargetHasBuffByName(spell.RankName()) and
spell.StacksTarget() and
spell.SlowPct() > (RGMercUtils.GetTargetSlowedPct())
Expand Down Expand Up @@ -1019,47 +1023,57 @@ return {
{
name = "GroupAtkBuff",
type = "Spell",
cond = function(self, spell, target)
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.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
{
name = "SingleAtkHPBuff",
type = "Spell",
cond = function(self, spell, target)
cond = function(self, spell, target, uiCheck)
-- force the target for StacksTarget to work.
if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
local targetClass = target.Class.ShortName()
return (targetClass == "WAR" or targetClass == "PAL" or targetClass == "SHD") and not RGMercUtils.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
{
name = "GroupAtkHPBuff",
type = "Spell",
cond = function(self, spell, target)
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.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
{
name = "SingleAtkHPBuff",
type = "Spell",
cond = function(self, spell, target)
cond = function(self, spell, target, uiCheck)
local targetClass = target.Class.ShortName()

-- force the target for StacksTarget to work.
if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
return (targetClass == "WAR" or targetClass == "PAL" or targetClass == "SHD") and not RGMercUtils.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
{
name = "GroupFocusSpell",
type = "Spell",
cond = function(self, spell, target)
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.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
{
name = "SingleFocusSpell",
type = "Spell",
cond = function(self, spell, target)
cond = function(self, spell, target, uiCheck)
local targetClass = target.Class.ShortName()

-- force the target for StacksTarget to work.
if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
return (targetClass == "WAR" or targetClass == "PAL" or targetClass == "SHD") and not RGMercUtils.TargetHasBuffByName(spell.RankName()) and spell.StacksTarget()
end,
},
Expand Down
32 changes: 23 additions & 9 deletions class_configs/clr_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,23 +810,31 @@ local _ClassConfig = {
{
name = "Celestial Regeneration",
type = "AA",
cond = function(self, spell)
cond = function(self, aaName, target, uiCheck)
-- force the target for StacksTarget to work.
if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
local spell = mq.TLO.AltAbility(aaName).Spell
return RGMercUtils.GetMainAssistPctHPs() <= RGMercUtils.GetSetting('GroupHealPoint') and RGMercUtils.GetSetting('DoHOT') and spell.StacksTarget() and
not RGMercUtils.TargetHasBuff(spell) and (mq.TLO.Group.Injured(RGMercUtils.GetSetting('GroupHealPoint'))() or 0) > RGMercUtils.GetSetting('GroupInjureCnt')
end,
},
{
name = "Exquisite Benediction",
type = "AA",
cond = function(self, aaName) -- note: Is aaName the correct arg here? or should be 'spell'?
return RGMercUtils.GetMainAssistPctHPs() <= RGMercUtils.GetSetting('GroupHealPoint') and RGMercUtils.GetSetting('DoHOT') and aaName.StacksTarget() and
not RGMercUtils.TargetHasBuff(aaName) and (mq.TLO.Group.Injured(RGMercUtils.GetSetting('GroupHealPoint'))() or 0) > RGMercUtils.GetSetting('GroupInjureCnt')
cond = function(self, aaName, target, uiCheck) -- note: Is aaName the correct arg here? or should be 'spell'?
-- force the target for StacksTarget to work.
if not uiCheck then RGMercUtils.SetTarget(target.ID() or 0) end
local spell = mq.TLO.AltAbility(aaName).Spell
return RGMercUtils.GetMainAssistPctHPs() <= RGMercUtils.GetSetting('GroupHealPoint') and RGMercUtils.GetSetting('DoHOT') and spell.StacksTarget() and
not RGMercUtils.TargetHasBuff(spell) and (mq.TLO.Group.Injured(RGMercUtils.GetSetting('GroupHealPoint'))() or 0) > RGMercUtils.GetSetting('GroupInjureCnt')
end,
},
{
name = "groupheal",
type = "spell",
cond = function(self, spell)
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 RGMercUtils.GetMainAssistPctHPs() <= RGMercUtils.GetSetting('GroupHealPoint') and RGMercUtils.GetSetting('DoHOT') and spell.StacksTarget() and
not RGMercUtils.TargetHasBuff(spell) and (mq.TLO.Group.Injured(RGMercUtils.GetSetting('GroupHealPoint'))() or 0) > RGMercUtils.GetSetting('GroupInjureCnt')
end,
Expand Down Expand Up @@ -1001,8 +1009,10 @@ local _ClassConfig = {
return
groupIds
end,
cond = function(self, combat_state) return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer') end,
cond = function(self, combat_state)
return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer')
end,
},
{
name = 'Splash',
Expand Down Expand Up @@ -1176,14 +1186,18 @@ local _ClassConfig = {
{
name = "SymbolBuff",
type = "Spell",
cond = function(self, spell, target)
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 RGMercUtils.GetSetting('DoSymbol') and RGMercUtils.TargetClassIs({ "WAR", "PAL", "SHD", }, target) and spell.StacksTarget()
end,
},
{
name = "AegoBuff",
type = "Spell",
cond = function(self, spell, target)
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 RGMercUtils.GetSetting('DoDruid') and spell.StacksTarget()
end,
},
Expand Down
18 changes: 14 additions & 4 deletions class_configs/dru_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,8 +836,10 @@ local _ClassConfig = {
return
groupIds
end,
cond = function(self, combat_state) return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer') end,
cond = function(self, combat_state)
return combat_state == "Downtime" and RGMercUtils.DoBuffCheck() and
RGMercConfig:GetTimeSinceLastMove() > RGMercUtils.GetSetting('BuffWaitMoveTimer')
end,
},
{
name = 'Debuff',
Expand Down Expand Up @@ -1224,7 +1226,11 @@ local _ClassConfig = {
name = "HPTypeOneGroup",
type = "Spell",
active_cond = function(self, spell) return RGMercUtils.BuffActiveByID(spell.ID()) end,
cond = function(self, spell, target) return not RGMercUtils.TargetHasBuff(spell, target) and spell.StacksTarget() end,
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()
end,
},
{
name = "ReptileCombatInnate",
Expand All @@ -1239,7 +1245,11 @@ local _ClassConfig = {
name = "GroupRegenBuff",
type = "Spell",
active_cond = function(self, spell) return RGMercUtils.BuffActiveByID(spell.ID()) end,
cond = function(self, spell, target) return not RGMercUtils.TargetHasBuff(spell, target) and spell.StacksTarget() end,
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()
end,
},
{
name = "Wrath of the Wild",
Expand Down
6 changes: 5 additions & 1 deletion class_configs/nec_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,11 @@ local _ClassConfig = {
{
name = "ChaoticDebuff",
type = "Spell",
cond = function(self, spell) return not RGMercUtils.TargetHasBuff(spell) and spell.Trigger(2).StacksTarget() end,
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) and spell.Trigger(2).StacksTarget()
end,
},
{
name = "CripplingTap",
Expand Down

0 comments on commit 730249b

Please sign in to comment.