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 25, 2024
2 parents 6a76535 + eafe7dd commit 1c8cd6d
Show file tree
Hide file tree
Showing 29 changed files with 320 additions and 159 deletions.
4 changes: 2 additions & 2 deletions class_configs/ber_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ return {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -332,7 +332,7 @@ return {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
8 changes: 4 additions & 4 deletions class_configs/brd_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ local _ClassConfig = {
name = 'Debuff',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -741,7 +741,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -751,7 +751,7 @@ local _ClassConfig = {
name = 'DPSDynamic',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning() and
RGMercUtils.GetSetting('UseDynamicMelody')
Expand All @@ -761,7 +761,7 @@ local _ClassConfig = {
name = 'DPSProcedural',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning() and
not RGMercUtils.GetSetting('UseDynamicMelody')
Expand Down
6 changes: 3 additions & 3 deletions class_configs/bst_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ return {
name = 'Debuff',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -687,7 +687,7 @@ return {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -696,7 +696,7 @@ return {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
4 changes: 2 additions & 2 deletions class_configs/clr_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and RGMercUtils.IsModeActive("Hybrid") and not RGMercUtils.Feigning()
Expand All @@ -1038,7 +1038,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and RGMercUtils.IsModeActive("Hybrid") and not RGMercUtils.Feigning()
end,
Expand Down
6 changes: 3 additions & 3 deletions class_configs/dru_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ local _ClassConfig = {
name = 'Debuff',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -854,7 +854,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -864,7 +864,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
6 changes: 3 additions & 3 deletions class_configs/enc_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ local _ClassConfig = {
name = 'Debuff',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -819,7 +819,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
end,
Expand All @@ -828,7 +828,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
24 changes: 13 additions & 11 deletions class_configs/mag_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ _ClassConfig = {
RGMercConfig:GetSettings().AllowMezBreak = true
else
RGMercUtils.DoCmd("/pet taunt off")
RGMercConfig:GetSettings().AutoAssistAt = 98
if RGMercUtils.GetSetting('AutoAssistAt') == 100 then
RGMercConfig:GetSettings().AutoAssistAt = 98
end
RGMercConfig:GetSettings().StayOnTarget = true
end
end,
Expand Down Expand Up @@ -884,7 +886,7 @@ _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -894,7 +896,7 @@ _ClassConfig = {
name = 'Debuff',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand All @@ -903,14 +905,14 @@ _ClassConfig = {
name = 'DPS PET',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning() and RGMercUtils.IsModeActive("PetTank")
end,
},
{
name = 'Weaves',
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
mq.TLO.Me.SpellInCooldown()
Expand All @@ -920,7 +922,7 @@ _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down Expand Up @@ -980,18 +982,18 @@ _ClassConfig = {
local petToyResolvedSpell = self.ResolvedActionMap[string.format("Pet%sSummon", type)]

if not petToyResolvedSpell or not petToyResolvedSpell() then
RGMercsLogger.log_debug("summon_pet_toy() ==> \arFailed to resolve Pet%sSummon item type!", type)
RGMercsLogger.log_super_verbose("summon_pet_toy() ==> \arFailed to resolve Pet%sSummon item type!", type)
return false
end

if mq.TLO.Me.Level() < petToyResolvedSpell.Level() then
RGMercsLogger.log_debug("summon_pet_toy() ==> \arFailed your level is below the pet toy spell(%s) level: %d!", petToyResolvedSpell.RankName(),
RGMercsLogger.log_super_verbose("summon_pet_toy() ==> \arFailed your level is below the pet toy spell(%s) level: %d!", petToyResolvedSpell.RankName(),
petToyResolvedSpell.Level())
return false
end

if not RGMercUtils.PCSpellReady(petToyResolvedSpell) then
RGMercsLogger.log_debug("summon_pet_toy() ==> \arFailed PCSpellReady() Check!", type)
RGMercsLogger.log_super_verbose("summon_pet_toy() ==> \arFailed PCSpellReady() Check!", type)
return false
end

Expand All @@ -1005,11 +1007,11 @@ _ClassConfig = {
end

if openSlot == 0 then
RGMercsLogger.log_debug("summon_pet_toy() ==> \arFailed to find open top level inv slot!", openSlot)
RGMercsLogger.log_super_verbose("summon_pet_toy() ==> \arFailed to find open top level inv slot!", openSlot)
return
end

RGMercsLogger.log_debug("summon_pet_toy() ==> \agUsing PackID=%d", openSlot)
RGMercsLogger.log_super_verbose("summon_pet_toy() ==> \agUsing PackID=%d", openSlot)

RGMercUtils.UseSpell(petToyResolvedSpell.RankName(), mq.TLO.Me.ID(), RGMercUtils.GetXTHaterCount() == 0)

Expand Down
4 changes: 2 additions & 2 deletions class_configs/mnk_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -208,7 +208,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
4 changes: 2 additions & 2 deletions class_configs/nec_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
Expand All @@ -692,7 +692,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.Feigning()
end,
Expand Down
6 changes: 3 additions & 3 deletions class_configs/pal_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ return {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck()
Expand All @@ -741,7 +741,7 @@ return {
name = 'Tank DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and RGMercUtils.IsModeActive("Tank")
end,
Expand All @@ -750,7 +750,7 @@ return {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and RGMercUtils.IsModeActive("DPS")
end,
Expand Down
8 changes: 4 additions & 4 deletions class_configs/rng_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ local _ClassConfig = {
name = 'Burn',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and
RGMercUtils.BurnCheck()
Expand All @@ -896,7 +896,7 @@ local _ClassConfig = {
name = 'DPS',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and not RGMercUtils.IsModeActive("Healer")
end,
Expand All @@ -905,7 +905,7 @@ local _ClassConfig = {
name = 'Defense',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat"
end,
Expand All @@ -914,7 +914,7 @@ local _ClassConfig = {
name = 'Tank',
state = 1,
steps = 1,
targetId = function(self) return { RGMercConfig.Globals.AutoTargetID, } end,
targetId = function(self) return mq.TLO.Target.ID() == RGMercConfig.Globals.AutoTargetID and { RGMercConfig.Globals.AutoTargetID, } or {} end,
cond = function(self, combat_state)
return combat_state == "Combat" and RGMercUtils.IsTanking()
end,
Expand Down

0 comments on commit 1c8cd6d

Please sign in to comment.