Merge pull request #18 from wowsims/tharre/fix-mage-talent-export

Fix mage talent exports being broken
wowsims · Jun 10, 2024 · 191ab67 · 191ab67
2 parents 50e445e + 1d64415
commit 191ab67
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/ExportStructures/Misc.lua b/ExportStructures/Misc.lua
@@ -55,6 +55,7 @@ end
 ---@return string
 function Env.CreateTalentString()
     local GetTalentRank = Env.GetTalentRankOrdered
+    local GetNumTalents = Env.GetNumTalentsFixed
     local tabs = {}
     for tab = 1, GetNumTalentTabs() do
         local talents = {}

diff --git a/extras.lua b/extras.lua
@@ -14,19 +14,23 @@ do
             temp[tab] = {}
             local products = {}
             for i = 1, GetNumTalents(tab) do
-                local name, _, tier, column = GetTalentInfo(tab, i)
-                local product = (tier - 1) * 4 + column
-                temp[tab][product] = i
-                table.insert(products, product)
+                local name, _, tier, column, _, _, _, avail, _ = GetTalentInfo(tab, i)
+                if avail then -- sometimes indices are empty ...
+                    local product = (tier - 1) * 4 + column
+                    temp[tab][product] = i
+                    table.insert(products, product)
+                end
             end
 
             table.sort(products)
 
             orderedTalentCache[tab] = {}
             local j = 1
             for _, product in ipairs(products) do
-                orderedTalentCache[tab][j] = temp[tab][product]
-                j = j + 1
+                if product then
+                    orderedTalentCache[tab][j] = temp[tab][product]
+                    j = j + 1
+                end
             end
         end
         f:UnregisterEvent("SPELLS_CHANGED")
@@ -41,6 +45,10 @@ function Env.GetTalentRankOrdered(tab, num)
     return select(5, GetTalentInfo(tab, orderedTalentCache[tab][num]))
 end
 
+function Env.GetNumTalentsFixed(tab)
+    return #orderedTalentCache[tab]
+end
+
 -- table extension contains
 function table.contains(table, element)
     for _, value in pairs(table) do