Merge branch 'dev'

DerpleMQ2 · Feb 24, 2024 · 4051bbc · 4051bbc
2 parents 379220c + 42422cc
commit 4051bbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/class_configs/shm_class_config.lua b/class_configs/shm_class_config.lua
@@ -641,7 +641,6 @@ local _ClassConfig = {
         },
     },
     ['HelperFunctions']   = {
-        -- helper function for advanced logic to see if we want to use Dark Lord's Unity
         DoRez = function(self, corpseId)
             if not RGMercUtils.PCSpellReady(mq.TLO.Spell("Incarnate Anew")) and
                 not mq.TLO.FindItem("Staff of Forbidden Rites")() and
@@ -1414,10 +1413,11 @@ local _ClassConfig = {
             cond = function(self, gem) return mq.TLO.Me.NumGems() >= gem end,
             spells = {
                 -- [ HEAL MODE ] --
-                { name = "GrowthBuff",   cond = function(self) return RGMercUtils.IsModeActive("Heal") end, },
+                { name = "GrowthBuff",       cond = function(self) return RGMercUtils.IsModeActive("Heal") end, },
                 -- [ Hybrid MODE ] --
                 { name = "SlowProcBuff", },
                 -- [ TLP FALL BACK ] --
+                { name = "LowLvlAttackBuff", },
                 { name = "CanniSpell", },
                 { name = "PetBuffSpell", },
             },

diff --git a/modules/class.lua b/modules/class.lua
@@ -360,7 +360,7 @@ function Module:SelfCheckAndRez()
         if rezSpawn() then
             if self.ClassConfig.HelperFunctions.DoRez then
                 if (os.clock() - (self.TempSettings.RezTimers[rezSpawn.ID()] or 0)) >= RGMercUtils.GetSetting('RetryRezDelay') then
-                    RGMercUtils.SafeCallFunc(self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
+                    RGMercUtils.SafeCallFunc("SelfCheckAndRez", self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
                     self.TempSettings.RezTimers[rezSpawn.ID()] = os.clock()
                 end
             end
@@ -377,7 +377,8 @@ function Module:IGCheckAndRez()
         if rezSpawn() then
             if self.ClassConfig.HelperFunctions.DoRez then
                 if (os.clock() - (self.TempSettings.RezTimers[rezSpawn.ID()] or 0)) >= RGMercUtils.GetSetting('RetryRezDelay') then
-                    RGMercUtils.SafeCallFunc(self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
+                    RGMercsLogger.log_debug("Attempting to Res: %s", rezSpawn.CleanName())
+                    RGMercUtils.SafeCallFunc("IGCheckAndRez", self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
                     self.TempSettings.RezTimers[rezSpawn.ID()] = os.clock()
                 end
             end
@@ -394,7 +395,7 @@ function Module:OOGCheckAndRez()
         if rezSpawn() and (RGMercUtils.IsSafeName("pc", rezSpawn.DisplayName())) then
             if self.ClassConfig.HelperFunctions.DoRez then
                 if (os.clock() - (self.TempSettings.RezTimers[rezSpawn.ID()] or 0)) >= RGMercUtils.GetSetting('RetryRezDelay') then
-                    RGMercUtils.SafeCallFunc(self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
+                    RGMercUtils.SafeCallFunc("OOGCheckAndRez", self.ClassConfig.HelperFunctions.DoRez, self, rezSpawn.ID())
                     self.TempSettings.RezTimers[rezSpawn.ID()] = os.clock()
                 end
             end