Merge branch 'dev'

DerpleMQ2 · Feb 25, 2024 · e9c21ba · e9c21ba
2 parents 1c8cd6d + 11e0a61
commit e9c21ba
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 10 deletions.
diff --git a/class_configs/wiz_class_config.lua b/class_configs/wiz_class_config.lua
@@ -680,6 +680,20 @@ return {
                     return not RGMercUtils.TargetHasBuffByName("Mana Burn") and RGMercUtils.GetSetting('DoManaBurn')
                 end,
             },
+            {
+                name = "Harvest of Druzzil",
+                type = "AA",
+                cond = function(self)
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and RGMercUtils.AAReady("Harvest of Druzzil")
+                end,
+            },
+            {
+                name = "HarvestSpell",
+                type = "Spell",
+                cond = function(self, spell)
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and mq.TLO.Me.SpellReady(spell.RankName())
+                end,
+            },
         },
         ['DPS'] = {
             {
@@ -748,6 +762,13 @@ return {
                     return RGMercUtils.DetGOMCheck(spell)
                 end,
             },
+            {
+                name = "Harvest of Druzzil",
+                type = "AA",
+                cond = function(self)
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and RGMercUtils.AAReady("Harvest of Druzzil")
+                end,
+            },
             {
                 name = "IceEtherealNuke",
                 type = "Spell",
@@ -790,6 +811,13 @@ return {
                     return mq.TLO.Me.Buff("Twincast").ID() == 0
                 end,
             },
+            {
+                name = "HarvestSpell",
+                type = "Spell",
+                cond = function(self, spell)
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and mq.TLO.Me.SpellReady(spell.RankName())
+                end,
+            },
             {
                 name = "VortexNuke",
                 type = "Spell",
@@ -941,14 +969,14 @@ return {
                 name = "Harvest of Druzzil",
                 type = "AA",
                 cond = function(self)
-                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('ModRodManaPct') and RGMercUtils.AAReady("Harvest of Druzzil")
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and RGMercUtils.AAReady("Harvest of Druzzil")
                 end,
             },
             {
                 name = "HarvestSpell",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('ModRodManaPct') and mq.TLO.Me.SpellReady(spell.RankName())
+                    return mq.TLO.Me.PctMana() < RGMercUtils.GetSetting('HavestManaPct') and mq.TLO.Me.SpellReady(spell.RankName())
                 end,
             },
             {
@@ -1098,12 +1126,13 @@ return {
         },
     },
     ['DefaultConfig'] = {
-        ['Mode']         = { DisplayName = "Mode", Category = "Combat", Tooltip = "Select the Combat Mode for this Toon", Type = "Custom", RequiresLoadoutChange = true, Default = 3, Min = 1, Max = 4, },
-        ['DoChestClick'] = { DisplayName = "Do Check Click", Category = "Utilities", Tooltip = "Click your chest item", Default = false, },
-        ['JoltAggro']    = { DisplayName = "Jolt Aggro %", Category = "Combat", Tooltip = "Aggro at which to use Jolt", Default = 65, Min = 1, Max = 100, },
-        ['WeaveAANukes'] = { DisplayName = "Weave AA Nukes", Category = "Combat", Tooltip = "Weave in AA Nukes", Default = true, },
-        ['DoManaBurn']   = { DisplayName = "Use Mana Burn AA", Category = "Combat", Tooltip = "Enable usage of Mana Burn", Default = true, },
-        ['DoSnare']      = { DisplayName = "Use Snare Spells", Category = "Combat", Tooltip = "Enable usage of Snares", Default = true, },
-        ['DoRain']       = { DisplayName = "Use Rain Spells", Category = "Combat", Tooltip = "Enable usage of Rain Spells", Default = true, },
+        ['Mode']          = { DisplayName = "Mode", Category = "Combat", Tooltip = "Select the Combat Mode for this Toon", Type = "Custom", RequiresLoadoutChange = true, Default = 3, Min = 1, Max = 4, },
+        ['DoChestClick']  = { DisplayName = "Do Check Click", Category = "Utilities", Tooltip = "Click your chest item", Default = false, },
+        ['JoltAggro']     = { DisplayName = "Jolt Aggro %", Category = "Combat", Tooltip = "Aggro at which to use Jolt", Default = 65, Min = 1, Max = 100, },
+        ['WeaveAANukes']  = { DisplayName = "Weave AA Nukes", Category = "Combat", Tooltip = "Weave in AA Nukes", Default = true, },
+        ['DoManaBurn']    = { DisplayName = "Use Mana Burn AA", Category = "Combat", Tooltip = "Enable usage of Mana Burn", Default = true, },
+        ['DoSnare']       = { DisplayName = "Use Snare Spells", Category = "Combat", Tooltip = "Enable usage of Snares", Default = true, },
+        ['DoRain']        = { DisplayName = "Use Rain Spells", Category = "Combat", Tooltip = "Enable usage of Rain Spells", Default = true, },
+        ['HavestManaPct'] = { DisplayName = "Harvest Mana %", Category = "Utilities", Tooltip = "What Mana % to hit before using a harvest spell or aa.", Default = 85, Min = 1, Max = 99, },
     },
 }
diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = 'cd144fd 2024-02-25' }
+return { commitId = 'eafe7dd 2024-02-25' }