KAge Loading fix

DerpleMQ2 · Jan 10, 2024 · 9d2fdd8 · 9d2fdd8
1 parent 1bd7f42
commit 9d2fdd8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/class_configs/mag_class_config.lua b/class_configs/mag_class_config.lua
@@ -1541,7 +1541,7 @@ _ClassConfig      = {
                 name = "SelfManaRodSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1)() or "") == 0 and (mq.TLO.Cursor.ID() or 0) == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0 and (mq.TLO.Cursor.ID() or 0) == 0
                 end,
             },
             {
@@ -1576,21 +1576,21 @@ _ClassConfig      = {
                 name = "FireOrbSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
                 name = "EarthPetItemSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
                 name = "FirePetItemSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
@@ -1604,7 +1604,7 @@ _ClassConfig      = {
                 name = "PetManaConv",
                 type = "Spell",
                 cond = function(self, spell)
-                    return RGMercUtils.BuffActiveByName(mq.TLO.Spell(spell.AutoCast()() or "").Name() or "") and mq.TLO.Me.Pet.ID() > 0
+                    return RGMercUtils.BuffActiveByName(mq.TLO.Spell(spell.AutoCast() or "").Name() or "") and mq.TLO.Me.Pet.ID() > 0
                 end,
             },
             {
@@ -1737,7 +1737,7 @@ _ClassConfig      = {
                 name = "SelfManaRodSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1)() or "") == 0 and (mq.TLO.Cursor.ID() or 0) == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0 and (mq.TLO.Cursor.ID() or 0) == 0
                 end,
             },
             {
@@ -1772,21 +1772,21 @@ _ClassConfig      = {
                 name = "FireOrbSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
                 name = "EarthPetItemSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
                 name = "FirePetItemSummon",
                 type = "Spell",
                 cond = function(self, spell)
-                    return mq.TLO.FindItemCount(spell.Base(1).Name() or "") == 0
+                    return mq.TLO.FindItemCount(spell.Base(1) or "") == 0
                 end,
             },
             {
@@ -1800,7 +1800,7 @@ _ClassConfig      = {
                 name = "PetManaConv",
                 type = "Spell",
                 cond = function(self, spell)
-                    return RGMercUtils.BuffActiveByName(mq.TLO.Spell(spell.AutoCast()() or "").Name() or "") and mq.TLO.Me.Pet.ID() > 0
+                    return RGMercUtils.BuffActiveByName(mq.TLO.Spell(spell.AutoCast() or "").Name() or "") and mq.TLO.Me.Pet.ID() > 0
                 end,
             },
             {

diff --git a/extras/version.lua b/extras/version.lua
@@ -1 +1 @@
-return { commitId = '7fe6ee1 2024-01-10' }
+return { commitId = '1bd7f42 2024-01-10' }
diff --git a/utils/rgmercs_utils.lua b/utils/rgmercs_utils.lua
@@ -305,9 +305,7 @@ function Utils.GetBestSpell(spellList, alreadyResolvedMap)
                         -- make sure we havent already found this one.
                         local alreadyUsed = false
                         for unresolvedName, resolvedSpell in pairs(alreadyResolvedMap) do
-                            RGMercsLogger.log_debug("Checking if unresolvedItem(%s) with spell(%s) matches new spell(%s)",
-                                unresolvedName, resolvedSpell() or "None", spell() or "None")
-                            if resolvedSpell.ID() == spell.ID() then
+                            if type(resolvedSpell) ~= string and resolvedSpell.ID() == spell.ID() then
                                 alreadyUsed = true
                             end
                         end
@@ -319,7 +317,7 @@ function Utils.GetBestSpell(spellList, alreadyResolvedMap)
                     end
                 else
                     Utils.PrintGroupMessage(string.format(
-                        "%s \aw [%s] \ax \ar ! MISSING SPELL ! \ax -- \ag %s \ax -- \aw LVL: %d \ax", mq.TLO.Me.CleanName(), s,
+                        "%s \aw [%s] \ax \ar ! MISSING SPELL ! \ax -- \ag %s \ax -- \aw LVL: %d \ax", mq.TLO.Me.CleanName(), spellName,
                         spell.RankName(), spell.Level()))
                 end
             end