Added support for hidden Perks

imevul · Jul 4, 2024 · 5dadab2 · 5dadab2
1 parent b5d0e00
commit 5dadab2
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/src/SynastriaCoreLib/SynastriaCoreLib-1.0/Modules/Perks.lua b/src/SynastriaCoreLib/SynastriaCoreLib-1.0/Modules/Perks.lua
@@ -1,5 +1,5 @@
 local _, NS = ...
-local MODULE_NAME, MODULE_VERSION = 'Perks', 3
+local MODULE_NAME, MODULE_VERSION = 'Perks', 4
 -- TODO: Still a work in progress! Use at your own risk!
 
 NS.DebugLog(MODULE_NAME, MODULE_VERSION, 'Start')
@@ -51,28 +51,33 @@ function SynastriaCoreLib.Perks.GetActiveTasks()
     for perkId, pivotId in SynastriaCoreLib.AllCustomGameData(SynastriaCoreLib.CustomDataTypes.PERK_TASKASSIGN1) do
         if GetPerkActive(perkId) then
             local perk = PerkMgrPerks[perkId]
-            local taskId = GetPerkTaskAssign2(pivotId or 0)
-            local task = PerkMgrTaskAll[taskId or 0]
-            local color = ('|cff%s%s|r'):format(SynastriaCoreLib.Perks.CategoryColors[perk.cat] or 'ffffff', '%s')
-
-            if task then
-                local progress = ''
-                if (task.req0 or 0) > 0 then
-                    progress = ('    %d / %d'):format(SynastriaCoreLib.Perks.GetTaskProgress(pivotId), task.req0 or 0)
+            if perk then
+                if bit.band(perk.flags, 0x400) ~= 0x400 then
+                    local taskId = GetPerkTaskAssign2(pivotId or 0)
+                    local task = PerkMgrTaskAll[taskId or 0]
+                    local color = ('|cff%s%s|r'):format(SynastriaCoreLib.Perks.CategoryColors[perk.cat] or 'ffffff', '%s')
+
+                    if task then
+                        local progress = ''
+                        if (task.req0 or 0) > 0 then
+                            progress = ('    %d / %d'):format(SynastriaCoreLib.Perks.GetTaskProgress(pivotId), task.req0 or 0)
+                        end
+
+                        table.insert(ret, {
+                            cat = perk.cat,
+                            perkId = perkId,
+                            perk = perk,
+                            perkName = perk.name,
+                            perkNameColored = color:format(perk.name),
+                            --perkNameColored = ('%d %s'):format(perkId, color:format(perk.name)),
+                            perkLevel = GetCustomGameData(SynastriaCoreLib.CustomDataTypes.PERK_ACQUIRED, perkId),
+                            taskId = taskId,
+                            task = task,
+                            text = SynastriaCoreLib.Perks.GetPerkTaskText(perkId, task),
+                            progress = progress,
+                        })
+                    end
                 end
-
-                table.insert(ret, {
-                    cat = perk.cat,
-                    perkId = perkId,
-                    perk = perk,
-                    perkName = perk.name,
-                    perkNameColored = color:format(perk.name),
-                    perkLevel = GetCustomGameData(SynastriaCoreLib.CustomDataTypes.PERK_ACQUIRED, perkId),
-                    taskId = taskId,
-                    task = task,
-                    text = SynastriaCoreLib.Perks.GetPerkTaskText(perkId, task),
-                    progress = progress,
-                })
             end
         end
     end

diff --git a/src/SynastriaCoreLib/SynastriaCoreLib-1.0/SynastriaCoreLib-1.0.lua b/src/SynastriaCoreLib/SynastriaCoreLib-1.0/SynastriaCoreLib-1.0.lua
@@ -1,5 +1,5 @@
 local wowAddonName, NS = ...
-local SYNASTRIACORELIB_MAJOR, SYNASTRIACORELIB_MINOR = 'SynastriaCoreLib-1.0', 13
+local SYNASTRIACORELIB_MAJOR, SYNASTRIACORELIB_MINOR = 'SynastriaCoreLib-1.0', 14
 NS.SYNASTRIACORELIB_MINOR = SYNASTRIACORELIB_MINOR
 
 if not SCL then SCL = {} end

diff --git a/src/SynastriaCoreLib/SynastriaCoreLib.toc b/src/SynastriaCoreLib/SynastriaCoreLib.toc
@@ -2,7 +2,7 @@
 ## Title: SynastriaCoreLib-1.0
 ## Notes: A library of functions from Synastria
 ## Author: Imevul, meh321
-## Version: 1.0.13-Release
+## Version: 1.0.14-Release
 ## X-Category: Imevul
 
 #@no-lib-strip@