- Updated Warrior Self Buffs to combat only

DerpleMQ2 · Mar 8, 2024 · 5b39ad3 · 5b39ad3
1 parent 1f9df03
commit 5b39ad3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/class_configs/war_class_config.lua b/class_configs/war_class_config.lua
@@ -256,6 +256,15 @@ local _ClassConfig = {
                     RGMercUtils.BurnCheck() and not RGMercUtils.Feigning()
             end,
         },
+        {
+            name = 'Warrior Buffs',
+            state = 1,
+            steps = 1,
+            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.BurnCheck()
+            end,
+        },
         {
             name = 'DPS',
             state = 1,
@@ -608,45 +617,47 @@ local _ClassConfig = {
                 end,
             },
         },
-        ['Downtime'] = {
+        ['Warrior Buffs'] = {
             {
-                name = "defenseac",
+                name = "groupac",
                 type = "Disc",
                 active_cond = function(self, discSpell)
-                    return mq.TLO.Me.ActiveDisc.ID() == discSpell.ID()
+                    return RGMercUtils.SongActive(discSpell)
                 end,
                 cond = function(self, discSpell)
-                    return not mq.TLO.Me.ActiveDisc.ID() and RGMercUtils.PCDiscReady(discSpell)
+                    return RGMercUtils.PCDiscReady(discSpell) and not RGMercUtils.SongActive(discSpell)
                 end,
             },
             {
-                name = "waraura",
+                name = "groupdodge",
                 type = "Disc",
                 active_cond = function(self, discSpell)
-                    return RGMercUtils.AuraActiveByName(discSpell.RankName.Name())
+                    return RGMercUtils.SongActive(discSpell)
                 end,
                 cond = function(self, discSpell)
-                    return not mq.TLO.Me.Aura(1).ID() and mq.TLO.Me.CombatAbility(discSpell.RankName.Name())() and mq.TLO.Me.PctEndurance() > 10
+                    return RGMercUtils.PCDiscReady(discSpell) and not RGMercUtils.SongActive(discSpell)
                 end,
             },
+        },
+        ['Downtime'] = {
             {
-                name = "groupac",
+                name = "defenseac",
                 type = "Disc",
                 active_cond = function(self, discSpell)
-                    return RGMercUtils.SongActive(discSpell)
+                    return mq.TLO.Me.ActiveDisc.ID() == discSpell.ID()
                 end,
                 cond = function(self, discSpell)
-                    return RGMercUtils.PCDiscReady(discSpell) and not RGMercUtils.SongActive(discSpell)
+                    return not mq.TLO.Me.ActiveDisc.ID() and RGMercUtils.PCDiscReady(discSpell)
                 end,
             },
             {
-                name = "groupdodge",
+                name = "waraura",
                 type = "Disc",
                 active_cond = function(self, discSpell)
-                    return RGMercUtils.SongActive(discSpell)
+                    return RGMercUtils.AuraActiveByName(discSpell.RankName.Name())
                 end,
                 cond = function(self, discSpell)
-                    return RGMercUtils.PCDiscReady(discSpell) and not RGMercUtils.SongActive(discSpell)
+                    return not mq.TLO.Me.Aura(1).ID() and mq.TLO.Me.CombatAbility(discSpell.RankName.Name())() and mq.TLO.Me.PctEndurance() > 10
                 end,
             },
             {

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '7fb5324 2024-03-08' }
+return { commitId = '1f9df03 2024-03-08' }