From 8ce12dd7137687b831541a47dc2ca7b83106a88e Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Sat, 23 Jan 2021 20:58:51 -0300 Subject: [PATCH] Added covenant into the Raid Check plugin --- Libs/DF/spells.lua | 2 +- Libs/LibRaidStatus/LibRaidStatus.lua | 42 ++++++++++++++------------ Libs/LibRaidStatus/ThingsToMantain.lua | 9 ++++++ boot.lua | 3 ++ functions/profiles.lua | 8 +++++ startup.lua | 9 ++++++ 6 files changed, 52 insertions(+), 21 deletions(-) diff --git a/Libs/DF/spells.lua b/Libs/DF/spells.lua index 66f358c9..23d75bcf 100644 --- a/Libs/DF/spells.lua +++ b/Libs/DF/spells.lua @@ -990,7 +990,7 @@ DF.FeastIDs = { } DF.RuneIDs = { - + [347901] = true, --Veiled Augmentation } -- /dump UnitAura ("player", 1) diff --git a/Libs/LibRaidStatus/LibRaidStatus.lua b/Libs/LibRaidStatus/LibRaidStatus.lua index 7d855291..5c1ecea7 100644 --- a/Libs/LibRaidStatus/LibRaidStatus.lua +++ b/Libs/LibRaidStatus/LibRaidStatus.lua @@ -1,6 +1,6 @@ local major = "LibRaidStatus-1.0" -local CONST_LIB_VERSION = 13 +local CONST_LIB_VERSION = 14 LIB_RAID_STATUS_CAN_LOAD = false --declae the library within the LibStub @@ -1285,6 +1285,7 @@ end) playerInfo = { specId = 0, renown = 1, + covenantId = 0, talents = {}, conduits = {}, } @@ -1293,11 +1294,12 @@ end) return playerInfo end - function raidStatusLib.playerInfoManager.AddPlayerInfo(playerName, specId, renown, talentsTableUnpacked, conduitsTableUnpacked) + function raidStatusLib.playerInfoManager.AddPlayerInfo(playerName, specId, renown, covenantId, talentsTableUnpacked, conduitsTableUnpacked) local playerInfoTable = raidStatusLib.playerInfoManager.GetPlayerInfoTable(playerName, true) playerInfoTable.specId = specId playerInfoTable.renown = renown + playerInfoTable.covenantId = covenantId playerInfoTable.talents = talentsTableUnpacked playerInfoTable.conduits = conduitsTableUnpacked @@ -1311,31 +1313,31 @@ end) --Details:Dump(data) local specId = tonumber(data[1]) local renown = tonumber(data[2]) - local talentsSize = tonumber(data[3]) - local conduitsTableIndex = tonumber((talentsSize + 1) + 2) + 1 -- +2 = specIndex renowIndex | talentSizeIndex + talentSize | +1 + local covenantId = tonumber(data[3]) + local talentsSize = tonumber(data[4]) + local conduitsTableIndex = tonumber((talentsSize + 1) + 3) + 1 -- +3 = specIndex renowIndex covenantIdIndex | talentSizeIndex + talentSize | +1 local conduitsSize = data[conduitsTableIndex] - --unpack the enchant data as a ipairs table + --unpack the talents data as a ipairs table local talentsTableUnpacked = raidStatusLib.UnpackTable(data, 3, false, false, talentsSize) - - --unpack the enchant data as a ipairs table + + --unpack the conduits data as a ipairs table local conduitsTableUnpacked = raidStatusLib.UnpackTable(data, conduitsTableIndex, false, false, conduitsSize) --add to the list of player information - raidStatusLib.playerInfoManager.AddPlayerInfo(source, specId, renown, talentsTableUnpacked, conduitsTableUnpacked) + raidStatusLib.playerInfoManager.AddPlayerInfo(source, specId, renown, covenantId, talentsTableUnpacked, conduitsTableUnpacked) end raidStatusLib.commHandler.RegisterComm(CONST_COMM_PLAYER_INFO_PREFIX, raidStatusLib.playerInfoManager.OnReceivePlayerFullInfo) - - function raidStatusLib.playerInfoManager.SendAllPlayerInfo() local playerInfo = raidStatusLib.playerInfoManager.GetPlayerFullInfo() - + local dataToSend = CONST_COMM_PLAYER_INFO_PREFIX .. "," dataToSend = dataToSend .. playerInfo[1] .. "," --spec id dataToSend = dataToSend .. playerInfo[2] .. "," --renown - dataToSend = dataToSend .. raidStatusLib.PackTable(playerInfo[3]) .. "," --talents - dataToSend = dataToSend .. raidStatusLib.PackTable(playerInfo[4]) .. "," --conduits + dataToSend = dataToSend .. playerInfo[3] .. "," --covenantId + dataToSend = dataToSend .. raidStatusLib.PackTable(playerInfo[4]) .. "," --talents + dataToSend = dataToSend .. raidStatusLib.PackTable(playerInfo[5]) .. "," --conduits --send the data raidStatusLib.commHandler.SendCommData(dataToSend) @@ -1351,16 +1353,16 @@ function raidStatusLib.playerInfoManager.GetPlayerFullInfo() if (selectedSpecialization) then specId = GetSpecializationInfo(selectedSpecialization) or 0 end - playerInfo[1] = specId - --covenant - - --renown local renown = C_CovenantSanctumUI.GetRenownLevel() or 1 playerInfo[2] = renown + --covenant + local covenant = C_Covenants.GetActiveCovenantID() + playerInfo[3] = covenant + --talents local talents = {0, 0, 0, 0, 0, 0, 0} for talentTier = 1, 7 do @@ -1373,7 +1375,7 @@ function raidStatusLib.playerInfoManager.GetPlayerFullInfo() end end - playerInfo[3] = talents + playerInfo[4] = talents --conduits local conduits = {} @@ -1414,12 +1416,12 @@ function raidStatusLib.playerInfoManager.GetPlayerFullInfo() --local link = C_Soulbinds.GetConduitHyperlink( conduitId, conduitRank ) --print(link) end - end + end end end end - playerInfo[4] = conduits + playerInfo[5] = conduits return playerInfo diff --git a/Libs/LibRaidStatus/ThingsToMantain.lua b/Libs/LibRaidStatus/ThingsToMantain.lua index 0247fadb..dc16a826 100644 --- a/Libs/LibRaidStatus/ThingsToMantain.lua +++ b/Libs/LibRaidStatus/ThingsToMantain.lua @@ -5,6 +5,15 @@ if (not LIB_RAID_STATUS_CAN_LOAD) then return end +LIB_RAID_STATUS_AUGMENTATED_RUNE = 347901 + +LIB_RAID_STATUS_COVENANT_ICONS = { + [[Interface\ICONS\UI_Sigil_Kyrian]], --kyrian + [[Interface\ICONS\UI_Sigil_Venthyr]], --venthyr + [[Interface\ICONS\UI_Sigil_NightFae]], --nightfae + [[Interface\ICONS\UI_Sigil_Necrolord]], --necrolords +} + --which gear slots can be enchanted on the latest retail version of the game --when the value is a number, the slot only receives enchants for a specific attribute LIB_RAID_STATUS_ENCHANT_SLOTS = { diff --git a/boot.lua b/boot.lua index 6f5fdf7b..0a382747 100644 --- a/boot.lua +++ b/boot.lua @@ -28,6 +28,9 @@ do local Loc = _G.LibStub("AceLocale-3.0"):GetLocale( "Details" ) local news = { + --{"v9.0.2.8162.144", "January ??th, 2021"}, + --"Added covenant into the Raid Check plugin.", + {"v9.0.2.8156.144", "January 21th, 2021"}, "Added more foods into the Ready Check plugin.", "Fixed some issues with the coach fearure.", diff --git a/functions/profiles.lua b/functions/profiles.lua index f65f2554..680eb206 100644 --- a/functions/profiles.lua +++ b/functions/profiles.lua @@ -1238,6 +1238,14 @@ local default_global_data = { immersion_pets_on_solo_play = false, --pets showing when solo play damage_scroll_auto_open = true, damage_scroll_position = {}, + data_wipes_exp = { + ["9"] = false, + ["10"] = false, + ["11"] = false, + ["12"] = false, + ["13"] = false, + ["14"] = false, + }, --> death log show_totalhitdamage_on_overkill = false, diff --git a/startup.lua b/startup.lua index 2b484b74..70b6feb8 100644 --- a/startup.lua +++ b/startup.lua @@ -502,6 +502,15 @@ function Details:StartMeUp() --I'll never stop! Details.cached_specs[UnitGUID("player")] = GetSpecializationInfo(GetSpecialization() or 0) + if (not Details.data_wipes_exp["9"]) then + wipe(Details.encounter_spell_pool or {}) + wipe(Details.boss_mods_timers or {}) + wipe(Details.spell_school_cache or {}) + wipe(Details.spell_pool or {}) + wipe(Details.npcid_pool or {}) + Details.data_wipes_exp["9"] = true + end + function Details:InstallOkey() return true end