Add weekly reward buckets and world boss tracking

* Fixed a lot of the weekly rewards
* Fixed how the Delves are tracking
* Fixed how the Vault is tracking
* Corrected World Boss Tracking

Author: LoyalFTW

Core.lua

@@ -170,6 +170,38 @@ function MR:RegisterModule(def)
     self._orderedModulesCache = nil
 end
 
+function MR:GetWeeklyRewardActivityBuckets()
+    local buckets = {
+        dungeon = {},
+        raid = {},
+        world = {},
+    }
+
+    if not (C_WeeklyRewards and C_WeeklyRewards.GetActivities) then
+        return buckets
+    end
+
+    local activities = C_WeeklyRewards.GetActivities()
+    if not activities then
+        return buckets
+    end
+
+    for _, activity in ipairs(activities) do
+        if activity.type == 1 then
+            table.insert(buckets.dungeon, activity)
+        elseif activity.type == 3 then
+            table.insert(buckets.raid, activity)
+        elseif activity.type == 6 then
+            table.insert(buckets.world, activity)
+        elseif activity.type == 4 and #buckets.world == 0 then
+            -- Fallback for older clients/builds where delves/world vault data used type 4.
+            table.insert(buckets.world, activity)
+        end
+    end
+
+    return buckets
+end
+
 function MR:GetProgress(moduleKey, rowKey)
     local m = self.db.char.progress[moduleKey]
     return m and m[rowKey] or 0
@@ -729,14 +761,26 @@ function MR:Scan()
 
     for _, mod in ipairs(self.modules) do
         for _, row in ipairs(mod.rows) do
-            if row.questIds then
+            if row.questIds and not row.turnInTracked then
                 local done = 0
                 for _, qid in ipairs(row.questIds) do
                     if C_QuestLog.IsQuestFlaggedCompleted(qid) then done = done + 1 end
                 end
                 if WriteProgress(progress, mod.key, row.key, math.min(done, row.max or done), self.db.char.manualOverrides) then
                     dirty = true
                 end
+            elseif row.questIds and row.turnInTracked and row.allowQuestFlagBackfill then
+                local currentValue = progress[mod.key] and progress[mod.key][row.key] or 0
+                if currentValue <= 0 then
+                    for _, qid in ipairs(row.questIds) do
+                        if C_QuestLog.IsQuestFlaggedCompleted(qid) then
+                            if WriteProgress(progress, mod.key, row.key, 1, self.db.char.manualOverrides) then
+                                dirty = true
+                            end
+                            break
+                        end
+                    end
+                end
             end
             if row.currencyId then
                 local info = C_CurrencyInfo.GetCurrencyInfo(row.currencyId)
@@ -827,17 +871,12 @@ end
 local TURN_IN_COMPLETIONS = {
     [89268] = { mod = "s1_weekly",           row = "lost_legends"        },
     [89289] = { mod = "s1_weekly",           row = "saltherils_soiree"   },
-    [93889] = { mod = "s1_weekly",           row = "saltherils_soiree"   },
     [91966] = { mod = "s1_weekly",           row = "saltherils_soiree"   },
     [90573] = { mod = "s1_weekly",           row = "fortify_runestones"  },
     [90574] = { mod = "s1_weekly",           row = "fortify_runestones"  },
     [90575] = { mod = "s1_weekly",           row = "fortify_runestones"  },
     [90576] = { mod = "s1_weekly",           row = "fortify_runestones"  },
     [93744] = { mod = "s1_weekly",           row = "unity_against_void"  },
-    [93909] = { mod = "s1_weekly",           row = "unity_against_void"  },
-    [93911] = { mod = "s1_weekly",           row = "unity_against_void"  },
-    [93912] = { mod = "s1_weekly",           row = "unity_against_void"  },
-    [93910] = { mod = "s1_weekly",           row = "unity_against_void"  },
     [90962] = { mod = "midnight_activities", row = "stormarion_assault"  },
     [94835] = { mod = "pvp_weeklies",        row = "early_training"      },
 }
@@ -850,7 +889,35 @@ local WEEKLY_RESET_SCHEDULE = {
     [5] = { weekday = 4, hour = 3 }, 
 }
 
+local DAY_SECONDS = 24 * 60 * 60
+local WEEK_SECONDS = 7 * DAY_SECONDS
+
+local function GetResetTimestampFromCountdown(secondsUntilReset, cycleSeconds)
+    if type(secondsUntilReset) ~= "number" then
+        return nil
+    end
+
+    secondsUntilReset = math.floor(secondsUntilReset)
+    if secondsUntilReset < 0 then
+        return nil
+    end
+
+    local maxExpected = cycleSeconds + (2 * 60 * 60)
+    if secondsUntilReset > maxExpected then
+        return nil
+    end
+
+    return GetServerTime() + secondsUntilReset - cycleSeconds
+end
+
 function MR:GetLastDailyTimestamp()
+    if C_DateAndTime and C_DateAndTime.GetSecondsUntilDailyReset then
+        local ts = GetResetTimestampFromCountdown(C_DateAndTime.GetSecondsUntilDailyReset(), DAY_SECONDS)
+        if ts then
+            return ts
+        end
+    end
+
     local cal = C_DateAndTime.GetCurrentCalendarTime()
     if not cal then return nil end
     local now = GetServerTime()
@@ -886,6 +953,13 @@ function MR:DoDailyReset()
 end
 
 function MR:GetLastResetTimestamp()
+    if C_DateAndTime and C_DateAndTime.GetSecondsUntilWeeklyReset then
+        local ts = GetResetTimestampFromCountdown(C_DateAndTime.GetSecondsUntilWeeklyReset(), WEEK_SECONDS)
+        if ts then
+            return ts
+        end
+    end
+
     local region    = GetCurrentRegion() or 1
     local resetInfo = WEEKLY_RESET_SCHEDULE[region]
     if not resetInfo then return nil end
@@ -1134,6 +1208,7 @@ function MR:OnEnable()
 
     self:RegisterEvent("UNIT_SPELLCAST_SUCCEEDED", "OnSpellCast")
     self:RegisterEvent("ENCOUNTER_END",            "OnEncounterEnd")
+    self:RegisterEvent("BOSS_KILL",                "OnBossKill")
     self:RegisterEvent("PLAYER_ENTERING_WORLD",    "OnEnteringWorld")
 
     self:ScheduleRepeatingTimer("CheckWeeklyReset", 60)
@@ -1147,6 +1222,17 @@ function MR:OnEnable()
             local entry = TURN_IN_COMPLETIONS[questID]
             if not entry or not addon.db then return end
             local ch = addon.db.char
+            local modProgress = ch.progress and ch.progress[entry.mod]
+            if entry.mod == "s1_weekly" and entry.row == "saltherils_soiree" then
+                if not modProgress or modProgress["soiree_active_quest"] ~= questID then
+                    return
+                end
+                modProgress["soiree_completed_name"] = modProgress["soiree_active_name"]
+            elseif entry.mod == "s1_weekly" and entry.row == "unity_against_void" then
+                if modProgress then
+                    modProgress["uatv_completed_branch_name"] = modProgress["uatv_branch_name"]
+                end
+            end
             if not ch.progress[entry.mod] then ch.progress[entry.mod] = {} end
             ch.progress[entry.mod][entry.row] = 1
             addon:RefreshUI()
@@ -1247,8 +1333,18 @@ function MR:OnZoneChanged()
     end
 end
 
-function MR:OnEncounterEnd(_, _, _, _, _, success)
+function MR:OnEncounterEnd(_, _, encounterName, _, _, success)
     if success == 1 then
+        if encounterName and self.SyncCurrentWorldBossKillByName then
+            self:SyncCurrentWorldBossKillByName(encounterName)
+        end
+        self:ScheduleTimer(function() self:Scan() end, 1.5)
+    end
+end
+
+function MR:OnBossKill(_, bossName)
+    if bossName and self.SyncCurrentWorldBossKillByName then
+        self:SyncCurrentWorldBossKillByName(bossName)
         self:ScheduleTimer(function() self:Scan() end, 1.5)
     end
 end
@@ -1266,8 +1362,8 @@ SlashCmdList["MIDROUTE"] = function(msg)
         end
     end
 
-    if     msg == "reset"   then MR:DoWeeklyReset()
-    elseif msg == "lock"    then
+      if     msg == "reset"   then MR:DoWeeklyReset()
+      elseif msg == "lock"    then
         MR.db.profile.locked = true
         if MR.frame then MR.frame:SetMovable(false) end
         print(L["Frame_Locked"])

Locales/enUS.lua

@@ -145,7 +145,7 @@ L["Vault_Dungeon_Label"]     = "|cff00ccffDungeon:|r"
 L["Vault_TT_Dungeon_Header"] = "Dungeons this week: %d"
 L["Vault_World_Label"]       = "|cffc8956cWorld:|r"
 L["Vault_TT_World_Header"]   = "World activities this week: %d"
-L["Vault_TT_Slot_Unlocked"]  = "  Slot %d  |cff40e080✓ Unlocked|r"
+L["Vault_TT_Slot_Unlocked"]  = "  Slot %d  |cff40e080Unlocked|r"
 L["Vault_TT_Slot_Progress"]  = "  Slot %d  %d / %d needed"
 L["Myth"] = "Myth"
 L["Hero"] = "Hero"
@@ -395,9 +395,9 @@ L["Weekly_SeasonTitle"] = "Season 1 Weeklies"
 L["Weekly_Abundance_Label"] = "|cff2ae7c6Weekly: Abundance:|r"
 L["Weekly_Legends_Label"] = "|cff2ae7c6Lost Legends:|r"
 L["Weekly_Soiree_Label"] = "|cff2ae7c6Saltheril's Soiree:|r"
-L["Weekly_Soiree_Note"] = "Attend Saltheril's Soiree and complete 2 favors for the nobles. Rewards a Spark of Radiance or Weekly Cache."
+L["Weekly_Soiree_Note"] = "Attend Saltheril's Soiree and complete 2 favors for the nobles."
 L["Weekly_Fortify_Label"] = "|cff2ae7c6Fortify the Runestones:|r"
-L["Weekly_Fortify_Note"] = "Complete the Fortify the Runestones quest matching your chosen subfaction."
+L["Weekly_Fortify_Note"] = "Complete the Fortify the Runestones quest matching your chosen subfaction. Rewards a Weekly Cache."
 L["Weekly_Unity_Label"] = "|cff2ae7c6Unity Against the Void:|r"
 L["Weekly_Unity_Note"] = "Choose one activity per week. Completing it rewards an Apex Cache."
 L["Weekly_SA_Label"] = "|cff2ae7c6Special Assignment:|r"
@@ -582,3 +582,16 @@ L["Currency_VoidlightMarl_Label"] = "|cffc792ffVoidlight Marl:|r"
 L["Currency_RestoredCofferKey_Label"] = "|cffe8c96eRestored Coffer Key:|r"
 L["Currency_SparkRadiance_Label"] = "|cffffb347Spark of Radiance:|r"
 L["Currency_Undercoin_Label"] = "|cffd8c36aUndercoin:|r"
+L["WB_Luashal_Label"] = "|cffff4444Lu'ashal:|r"
+L["WB_Luashal_Note"] = "World Boss - Eversong Woods"
+L["WB_Cragpine_Label"] = "|cffff4444Cragpine:|r"
+L["WB_Cragpine_Note"] = "World Boss - Zul'Aman"
+L["WB_Thormbelan_Label"] = "|cffff4444Thorm'belan:|r"
+L["WB_Thormbelan_Note"] = "World Boss - Harandar"
+L["WB_Predaxas_Label"] = "|cffff4444Predaxas:|r"
+L["WB_Predaxas_Note"] = "World Boss - Voidstorm"
+L["WB_Timer_Active"] = "Active - %s"
+L["WB_Timer_Done"] = "Done - %s"
+L["WB_Timer_Next"] = "Next - %s"
+L["WB_Timer_DaysHours"] = "%dd %dh"
+L["WB_Timer_HoursMins"] = "%dh %dm"

Modules/Activities.lua

@@ -13,7 +13,7 @@ MR:RegisterModule({
             label         = L["Act_Stormarion_Label"],
             max           = 1,
             note          = L["Act_Stormarion_Note"],
-            questIds      = { 90962 }, 
+            questIds      = { 90962 },
             timerEpoch    = 1772370083,
             timerInterval = 1800,
             timerDuration = 900,

Modules/Delves.lua

@@ -1,5 +1,4 @@
 local SCAN_THROTTLE       = 2
-local DELVE_ACTIVITY_TYPE = 4
 local DELVE_T8_MIN_LEVEL  = 8
 local DELVERS_BOUNTY_ITEM = 233071
 
@@ -114,19 +113,25 @@ MR:RegisterModule({
         if (now - lastScan) < SCAN_THROTTLE then return end
         lastScan = now
 
-        if C_WeeklyRewards and C_WeeklyRewards.GetActivities then
-            local activities = C_WeeklyRewards.GetActivities()
-            if activities then
-                for _, act in ipairs(activities) do
-                    if act.type == DELVE_ACTIVITY_TYPE then
-                        local runs = act.progress or 0
-                        local t8   = ((act.level or 0) >= DELVE_T8_MIN_LEVEL) and 1 or 0
-                        if mdb["delve_runs"] ~= runs then mdb["delve_runs"] = runs end
-                        if mdb["delve_t8"]   ~= t8   then mdb["delve_t8"]   = t8   end
-                        break
-                    end
+        local buckets = MR.GetWeeklyRewardActivityBuckets and MR:GetWeeklyRewardActivityBuckets() or nil
+        if buckets and buckets.world and buckets.world[1] then
+            local bestRuns = 0
+            local bestLevel = 0
+            for _, act in ipairs(buckets.world) do
+                if (act.progress or 0) > bestRuns then
+                    bestRuns = act.progress or 0
+                end
+                if (act.level or 0) > bestLevel then
+                    bestLevel = act.level or 0
                 end
             end
+
+            local t8 = (bestLevel >= DELVE_T8_MIN_LEVEL) and 1 or 0
+            if mdb["delve_runs"] ~= bestRuns then mdb["delve_runs"] = bestRuns end
+            if mdb["delve_t8"]   ~= t8       then mdb["delve_t8"]   = t8 end
+        else
+            if mdb["delve_runs"] ~= 0 then mdb["delve_runs"] = 0 end
+            if mdb["delve_t8"]   ~= 0 then mdb["delve_t8"] = 0 end
         end
 
         local bountyCount = C_Item.GetItemCount and C_Item.GetItemCount(DELVERS_BOUNTY_ITEM) or 0

Modules/GreatVault.lua

@@ -5,7 +5,7 @@ local DUNGEON_TIERS = {
     {  7, L["Hero"],     "#0070dd" },
     {  4, L["Champion"], "#f1c232" },
     {  2, L["Veteran"],  "#1eff00" },
-    {  0, L["Follower"], "#b7b7b7" },
+    {  0, L["Mythic"],   "#b7b7b7" },
 }
 
 local RAID_DIFF = {
@@ -17,6 +17,10 @@ local RAID_DIFF = {
 
 local DIFF_RANK = { [17]=1, [14]=2, [15]=3, [16]=4 }
 
+local function UpdateMax(current, candidate)
+    return math.max(current or 0, candidate or 0)
+end
+
 local function GetDungeonTier(level)
     level = level or 0
     for _, t in ipairs(DUNGEON_TIERS) do
@@ -27,7 +31,7 @@ end
 
 local function GetRaidDiffName(diffId)
     local d = RAID_DIFF[diffId]
-    return d and d[1] or L["Normal"], d and d[2] or "#1eff00"
+    return d and d[1] or L["LFR"], d and d[2] or "#b7b7b7"
 end
 
 local function SlotLine(tt, slotNum, count, threshold)
@@ -46,37 +50,43 @@ MR:RegisterModule({
     defaultOpen = true,
 
     onScan = function(mod)
-        if not C_WeeklyRewards or not C_WeeklyRewards.GetActivities then return end
-        local activities = C_WeeklyRewards.GetActivities()
-        if not activities then return end
         local db = MR.db.char.progress
         if not db[mod.key] then db[mod.key] = {} end
         local vd = db[mod.key]
+        local buckets = MR.GetWeeklyRewardActivityBuckets and MR:GetWeeklyRewardActivityBuckets() or nil
+        if not buckets then return end
 
         vd["vault_d_progress"]  = 0
         vd["vault_d_max_level"] = 0
         vd["vault_r_progress"]  = 0
-        vd["vault_r_diff_id"]   = 14
+        vd["vault_r_diff_id"]   = nil
         vd["vault_w_progress"]  = 0
 
-        for _, act in ipairs(activities) do
-            if act.type == 1 then
-                vd["vault_d_progress"] = act.progress or 0
-                if (act.level or 0) > (vd["vault_d_max_level"] or 0) then
-                    vd["vault_d_max_level"] = act.level or 0
-                end
-            elseif act.type == 3 then
-                local prog = act.progress or 0
-                if prog > vd["vault_r_progress"] then
-                    vd["vault_r_progress"] = prog
-                end
-                local newRank = DIFF_RANK[act.difficultyId]
-                if newRank and newRank > (DIFF_RANK[vd["vault_r_diff_id"]] or 0) then
-                    vd["vault_r_diff_id"] = act.difficultyId
-                end
-            elseif act.type == 4 then
-                vd["vault_w_progress"] = act.progress or 0
+        for _, act in ipairs(buckets.dungeon) do
+            vd["vault_d_progress"] = UpdateMax(vd["vault_d_progress"], act.progress)
+            if (act.level or 0) > (vd["vault_d_max_level"] or 0) then
+                vd["vault_d_max_level"] = act.level or 0
+            end
+        end
+
+        for _, act in ipairs(buckets.raid) do
+            local prog = act.progress or 0
+            vd["vault_r_progress"] = UpdateMax(vd["vault_r_progress"], prog)
+            local difficultyId = act.difficultyId
+            if (not difficultyId) and C_WeeklyRewards and C_WeeklyRewards.GetDifficultyIDForActivityTier and act.activityTierID then
+                difficultyId = C_WeeklyRewards.GetDifficultyIDForActivityTier(act.activityTierID)
             end
+            if (not difficultyId or not DIFF_RANK[difficultyId]) and DIFF_RANK[act.level] then
+                difficultyId = act.level
+            end
+            local newRank = DIFF_RANK[difficultyId]
+            if newRank and newRank > (DIFF_RANK[vd["vault_r_diff_id"]] or 0) then
+                vd["vault_r_diff_id"] = difficultyId
+            end
+        end
+
+        for _, act in ipairs(buckets.world) do
+            vd["vault_w_progress"] = UpdateMax(vd["vault_w_progress"], act.progress)
         end
 
         if vd["vault_r_progress"] > 0 then