Merge pull request #65 from Puresyn/development

Development

Author: Puresyn

Assets/Images/KeyMaster-Interface-Clean.tga

@@ -87,7 +87,7 @@ function CharacterData:GetCharacterDataByGUID(playerGUID)
         return nil
     end
 
-    local encodedCharacterData = KeyMaster_C_DB[playerGUID].data
+    local encodedCharacterData = KeyMaster_C_DB[playerGUID].data --saved variable
     if not encodedCharacterData then return nil end
 
     local decoded = LibDeflate:DecodeForWoWAddonChannel(encodedCharacterData)

Core/CharacterData.lua

@@ -79,55 +79,6 @@ local function fetchCharacterMythicPlusData(mapId, retryCount)
     end
 end
 
-function CharacterInfo:GetMplusScoreForMap(mapid, weeklyAffix)
-    if (weeklyAffix ~= KeyMasterLocals.TYRANNICAL and weeklyAffix ~= KeyMasterLocals.FORTIFIED) then
-       KeyMaster:_ErrorMsg("GetMplusScoreForMap", "CharacterInfo", "Incorrect weeklyAffix value provided.")
-       return nil
-    end
-    
-    local emptyData = {
-       name = weeklyAffix, --WeeklyAffix Name (e.g.; Tyran/Fort)
-       score = 0, -- io gained
-       level = 0, -- keystone level
-       durationSec = 0, -- how long took to complete map
-       overTime = false -- was completion overtime
-    }
-    
-    local mapScore, bestOverallScore = C_MythicPlus.GetSeasonBestAffixScoreInfoForMap(mapid)
-    -- this is true when a character has not ran a key for this map on either weekly affix.
-    if (mapScore == nil) then
-       return emptyData
-    end
-    -- No data means no keys ran on either weekly affix
-    if mapScore[1] == nil and mapScore[2] == nil then
-        KeyMaster:_ErrorMsg("GetMplusScoreForMap", "CharacterInfo.lua", "Failed to fetch score data for mapid "..mapid)
-        return emptyData
-    end
-    
-    -- This is setup this way because blizzard returns the data in a table with the first index being the weekly affix
-    -- So on a tyrannical week mapScore[1] is for Tyrannical information and mapScore[2] is for Fortified information
-    -- on a fortified week mapScore[1] is for Fortified information and mapScore[2] is for Tyrannical information
-    if mapScore[1].name == weeklyAffix then
-        if mapScore[1].name == KeyMasterLocals.FORTIFIED then
-            mapScore[1].name = "Fortified"
-        else
-            mapScore[1].name = "Tyrannical"
-        end
-        return mapScore[1]
-    else
-        if mapScore[2] == nil then
-            return emptyData
-        else
-            if mapScore[2].name == KeyMasterLocals.FORTIFIED then
-                mapScore[2].name = "Fortified"
-            else
-                mapScore[2].name = "Tyrannical"
-            end
-            return mapScore[2]
-        end
-    end
-end
-
 function CharacterInfo:GetPlayerSpecialization(unitId)
     if (unitId == "player") then
         local specId = GetSpecialization()
@@ -177,32 +128,32 @@ function CharacterInfo:GetMyCharacterInfo()
     for mapid, v in pairs(seasonMaps) do
         local keyRun = {}
 
-        -- Overall Dungeon Score
-        keyRun["bestOverall"] = CharacterInfo:GetDungeonOverallScore(mapid)
-
-        -- Tyrannical Key Score
-        local tyrannicalScoreInfo = CharacterInfo:GetMplusScoreForMap(mapid, KeyMasterLocals.TYRANNICAL)
-        local dungeonDetails = {
-            ["Rating"] = DungeonTools:CalculateRating(mapid, tyrannicalScoreInfo.level, tyrannicalScoreInfo.durationSec),
-            ["Level"] = tyrannicalScoreInfo.level,
-            ["DurationSec"] = tyrannicalScoreInfo.durationSec,
-            ["IsOverTime"] = tyrannicalScoreInfo.overTime
+        -- empty data set
+        local emptyData = {
+            Rating = 0, -- rating
+            Level = 0, -- keystone level
+            DurationSec = 0, -- how long took to complete map
+            overTime = false -- was completion overtime
         }
-        keyRun["Tyrannical"] = dungeonDetails
-        
-        -- Fortified Key Score
-        local fortifiedScoreInfo = CharacterInfo:GetMplusScoreForMap(mapid, KeyMasterLocals.FORTIFIED)
-        local dungeonDetails = {
-            ["Rating"] = DungeonTools:CalculateRating(mapid, fortifiedScoreInfo.level, fortifiedScoreInfo.durationSec),
-            ["Level"] = fortifiedScoreInfo.level,
-            ["DurationSec"] = fortifiedScoreInfo.durationSec,
-            ["IsOverTime"] = fortifiedScoreInfo.overTime
-        }
-        keyRun["Fortified"] = dungeonDetails
-        
-        myCharacterInfo.DungeonRuns[mapid] = keyRun
+
+        local mapScore, bestOverallScore = C_MythicPlus.GetSeasonBestAffixScoreInfoForMap(mapid)
+        if (mapScore == nil or mapScore[1] == nil) then
+            keyRun["bestOverall"] = 0
+            keyRun["DungeonData"] = emptyData            
+        else
+            local dungeonDetails = {
+                ["Rating"] = DungeonTools:CalculateRating(mapid, mapScore[1].level, mapScore[1].durationSec),
+                ["Level"] = mapScore[1].level,
+                ["DurationSec"] = mapScore[1].durationSec,
+                ["overTime"] = mapScore[1].overTime
+            }
+            keyRun["bestOverall"] = bestOverallScore
+            keyRun["DungeonData"] = dungeonDetails
+        end 
+
+        myCharacterInfo.DungeonRuns[mapid] = keyRun       
     end
 
-    KeyMaster:_DebugMsg("GetMyCharacterInfo", "CharacterInfo", "Character data fetched.")
+    KeyMaster:_DebugMsg("GetCharInfo", "CharacterInfo", "Character data fetched.")
     return myCharacterInfo
 end

Core/CharacterInfo.lua

@@ -228,6 +228,9 @@ local function processKM2Data(payload, sender)
         if (major1 == 0 and minor1 == 0 and patch1 < 94) then
             KeyMaster:_DebugMsg("processKM2Data", "Coms", sender.." has incompatible ("..buildVersion..") data. Aborting mapping.")
             return
+        elseif (major1 == 1 and minor1 < 3) then -- TWW S1 Changed mythic score data significantly
+            KeyMaster:_DebugMsg("processKM2Data", "Coms", sender.." has incompatible ("..buildVersion..") data. Aborting mapping.")
+            return
         end
         checkVersion(data)
     end

Core/Coms.lua

@@ -78,6 +78,10 @@ local CHALLENGERSPERIL_ID = 152 -- not sure if this is needed?
 KeyMasterLocals.TYRANNICAL, _, _ = C_ChallengeMode.GetAffixInfo(TYRANNICAL_ID)
 KeyMasterLocals.FORTIFIED, _, _ = C_ChallengeMode.GetAffixInfo(FORTIFIED_ID)
 KeyMasterLocals.CHALLENGERSPERIL, _, _ = C_ChallengeMode.GetAffixInfo(CHALLENGERSPERIL_ID)  -- not sure if this is needed?
+KeyMasterLocals.ASCENDANT = C_ChallengeMode.GetAffixInfo(KM_XBASCENDANT_ID)
+KeyMasterLocals.VOIDBOUND = C_ChallengeMode.GetAffixInfo(KM_XBVOIDBOUND_ID)
+KeyMasterLocals.OBLIVION = C_ChallengeMode.GetAffixInfo(KM_XBOBLIVION_ID)
+KeyMasterLocals.DEVOUR = C_ChallengeMode.GetAffixInfo(KM_XBDEVOUR_ID)
 KeyMasterLocals.BUILDRELEASE = "release" -- must remain in ENGLISH - DO NOT TRANSLATE
 KeyMasterLocals.BUILDBETA = "beta" -- must remain in ENGLISH - DO NOT TRANSLATE
 KeyMasterLocals.ADDONNAME = "Key Master" -- do not translate

Core/Localization/Localization.lua

@@ -32,11 +32,11 @@ function HeaderFrame:CreateHeaderRegion(parentFrame)
     topBar.bgTexture:SetTexture("Interface/Addons/KeyMaster/Assets/Images/"..Theme.style)
     topBar.bgTexture:SetTexCoord(2/1024, 856/1024, 841/1024, 945/1024)
 
-    topBar.displayBG = topBar:CreateTexture(nil, "BACKGROUND", nil, 0)
+    --[[ topBar.displayBG = topBar:CreateTexture(nil, "BACKGROUND", nil, 0)
     topBar.displayBG:SetPoint("BOTTOMRIGHT", topBar, "BOTTOMRIGHT", 0, -2)
     topBar.displayBG:SetSize(320, 77)
     topBar.displayBG:SetTexture("Interface/Addons/KeyMaster/Assets/Images/"..Theme.style)
-    topBar.displayBG:SetTexCoord(662/1024, 1, 946/1024, 1)
+    topBar.displayBG:SetTexCoord(662/1024, 1, 946/1024, 1) ]]
 
     return headerRegion
 end
@@ -107,64 +107,15 @@ end
 
 function HeaderFrame:CreatePlayerInfoBox(parentFrame)
     local headerPlayerInfoBox = CreateFrame("Frame", "KeyMaster_PlayerInfobox", parentFrame)
-    headerPlayerInfoBox:SetSize(198, 80)
+    headerPlayerInfoBox:SetSize(4, 80)
     headerPlayerInfoBox:SetPoint("BOTTOMRIGHT", parentFrame, "BOTTOMRIGHT", 0, 6)
 
-    return headerPlayerInfoBox
-
-end
+    --------------------------------
+    -- todo: remove box - hide for now
+    headerPlayerInfoBox:Hide()
+    --------------------------------
 
---------------------------------
--- Weekly Affix
---------------------------------
-function HeaderFrame:CreateAffixFrames(parentFrame)
-    if (parentFrame == nil) then 
-        KeyMaster:_ErrorMsg("createAffixFrames", "HeaderFrame", "Parameter Null - No parent frame passed to this function.")
-        return
-    end
-    local seasonalAffixes = KeyMaster.DungeonTools:GetAffixes()
-    if (seasonalAffixes == nil) then 
-        KeyMaster:_DebugMsg("createAffixFrames", "HeaderFrame", "No active weekly affix was found.")
-        return 
-    end    
-    for i=1, #seasonalAffixes, 1 do
-        local affixName = seasonalAffixes[i].name
-        local temp_frame = CreateFrame("Frame", "KeyMaster_AffixFrame"..tostring(i), parentFrame)
-        temp_frame:SetSize(50, 50)
-        if (i == 1) then
-            temp_frame:SetPoint("BOTTOMLEFT", parentFrame, "BOTTOMLEFT", 0, 0)
-        else
-            local a = i - 1
-            temp_frame:SetPoint("TOPLEFT", "KeyMaster_AffixFrame"..tostring(a), "TOPRIGHT", 20, 0)
-        end
-        
-        -- Affix Icon
-        local tex = temp_frame:CreateTexture()
-        tex:SetAllPoints(temp_frame)
-        tex:SetTexture(seasonalAffixes[i].filedataid)
-        
-        -- Affix Name
-        local affixNameFrame = CreateFrame("Frame", nil, temp_frame)
-        affixNameFrame:SetSize(50, 15)
-        affixNameFrame:SetPoint("BOTTOMLEFT", temp_frame, "BOTTOMLEFT")
-        local myText = affixNameFrame:CreateFontString(nil, "OVERLAY", "KeyMasterFontSmall")
-        local path, _, flags = myText:GetFont()
-        myText:SetFont(path, 9, flags)
-        myText:SetPoint("LEFT", -12, -9)
-        myText:SetTextColor(1,1,1)
-        myText:SetJustifyH("LEFT")
-        myText:SetText(affixName)
-        myText:SetRotation(math.pi/2)
-
-        -- Affix name background
-        local affixBGFrame = CreateFrame("Frame", nil, temp_frame)
-        affixBGFrame:SetFrameLevel(affixBGFrame:GetParent():GetFrameLevel()-1)
-        affixBGFrame:SetSize(26, temp_frame:GetHeight())
-        affixBGFrame:SetPoint("BOTTOMRIGHT", temp_frame, "BOTTOMLEFT", 10, 0)
-        affixBGFrame.texture = affixBGFrame:CreateTexture(nil, "BACKGROUND",nil)
-        affixBGFrame.texture:SetAllPoints(affixBGFrame)
-        affixBGFrame.texture:SetColorTexture(0, 0, 0, 0.7)
-    end
+    return headerPlayerInfoBox
 
 end
 
@@ -174,7 +125,7 @@ end
 function HeaderFrame:CreateHeaderKeyFrame(parentFrame, anchorFrame)
     local key_frame = CreateFrame("Frame", "KeyMaster_MythicKeyHeader", parentFrame)
     key_frame:SetSize(anchorFrame:GetHeight(), anchorFrame:GetHeight())
-    key_frame:SetPoint("RIGHT", anchorFrame, "LEFT", -20, 0)
+    key_frame:SetPoint("RIGHT", anchorFrame, "LEFT", -20, 20)
 
     key_frame.keyLevelText = key_frame:CreateFontString(nil, "OVERLAY", "KeyMasterFontBig")
     local path, _, flags = key_frame.keyLevelText:GetFont()
@@ -277,7 +228,7 @@ function HeaderFrame:Initialize(parentFrame)
     local addonVersionNotify = _G["KM_AddonOutdated"] or HeaderFrame:AddonVersionNotify(parentFrame)
     local headerContent = _G["KeyMaster_HeaderFrame"] or HeaderFrame:CreateHeaderContent(headerRegion)    
     local headerInfoBox = _G["KeyMaster_PlayerInfobox"] or HeaderFrame:CreatePlayerInfoBox(headerContent)
-    local headerAffixFrame = HeaderFrame:CreateAffixFrames(headerInfoBox)
+    --local headerAffixFrame = HeaderFrame:CreateAffixFrames(headerInfoBox)
     local headerKey = _G["KeyMaster_MythicKeyHeader"] or HeaderFrame:CreateHeaderKeyFrame(headerContent, headerInfoBox)
 
     -- System Message

Core/UI/HeaderFrame.lua

@@ -27,5 +27,5 @@ end
 
 function HeaderFrameMapping:NewVersionAlert()
     local versionAlertFrame = _G["KM_AddonOutdated"]
-    versionAlertFrame:Show()
+    if(versionAlertFrame) then versionAlertFrame:Show() end
 end

Core/UI/HeaderFrameMapping.lua

@@ -398,14 +398,19 @@ function PartyFrame:CreatePartyDataFrame(parentFrame)
 
         -- Tyrannical Scores
         local tempText1 = mapDataFrame:CreateFontString("KM_MapLevelT"..playerNumber..mapid, "OVERLAY", "KeyMasterFontNormal")
-        tempText1:SetPoint("CENTER", mapDataFrame, "TOP", 0, -10)
+        tempText1:SetPoint("CENTER", mapDataFrame, "TOP", 0, -14)
         prevAnchor = tempText1
 
         -- Fortified Scores
         local tempText4 = mapDataFrame:CreateFontString("KM_MapLevelF"..playerNumber..mapid, "OVERLAY", "KeyMasterFontNormal")
         tempText4:SetPoint("CENTER", prevAnchor, "BOTTOM", 0, -8)
         prevAnchor = tempText4
 
+        --------------------------------
+        -- todo: Remove this data - Hide Fortified Data for now
+        tempText4:Hide()
+        --------------------------------
+
         -- Member Point Gain From Key
         local tempText5 = mapDataFrame:CreateFontString("KM_PointGain"..playerNumber..mapid, "OVERLAY", "KeyMasterFontSmall")
         tempText5:SetPoint("CENTER", prevAnchor, "BOTTOM", 0, -10)
@@ -416,7 +421,7 @@ function PartyFrame:CreatePartyDataFrame(parentFrame)
 
         -- Map Total Score
         local tempText6 = mapDataFrame:CreateFontString("KM_MapTotalScore"..playerNumber..mapid, "OVERLAY", "KeyMasterFontBig")
-        tempText6:SetPoint("CENTER", mapDataFrame, "BOTTOM", 0, 10)
+        tempText6:SetPoint("CENTER", mapDataFrame, "BOTTOM", 0, 14)
         local MapScoreTotalColor = {}
         MapScoreTotalColor.r, MapScoreTotalColor.g, MapScoreTotalColor.b, _ = Theme:GetThemeColor("color_HEIRLOOM")
         tempText6:SetTextColor(MapScoreTotalColor.r, MapScoreTotalColor.g, MapScoreTotalColor.b, 1)
@@ -445,12 +450,18 @@ function PartyFrame:CreatePartyDataFrame(parentFrame)
 
     local PartyTitleText = mapLegendFrame:CreateFontString("KM_TyranTitle"..playerNumber, "OVERLAY", "KeyMasterFontNormal")
     PartyTitleText:SetPoint("RIGHT", _G["KM_MapLevelT"..playerNumber..prevMapId], "CENTER", xOffset, 0)
-    PartyTitleText:SetText(KeyMasterLocals.TYRANNICAL..":")
+    --PartyTitleText:SetText(KeyMasterLocals.TYRANNICAL..":")
+    PartyTitleText:SetText(KeyMasterLocals.PLAYERFRAME["KeyLevel"].name..":")
 
     local FortTitleText = mapLegendFrame:CreateFontString("KM_FortTitle"..playerNumber, "OVERLAY", "KeyMasterFontNormal")
     FortTitleText:SetPoint("RIGHT", _G["KM_MapLevelF"..playerNumber..prevMapId], "CENTER", xOffset, 0)
     FortTitleText:SetText(KeyMasterLocals.FORTIFIED..":")
 
+    --------------------------------
+    -- todo: Remove data - hide for now
+    FortTitleText:Hide()
+    --------------------------------
+
     local PointGainTitleText = mapLegendFrame:CreateFontString("KM_PiontGainTitle"..playerNumber, "OVERLAY", "KeyMasterFontSmall")
     PointGainTitleText:SetPoint("RIGHT", _G["KM_PointGain"..playerNumber..prevMapId], "CENTER", xOffset, 0)
     local PointGainTitleColor = {}
@@ -460,7 +471,8 @@ function PartyFrame:CreatePartyDataFrame(parentFrame)
 
     local OverallRatingTitleText = mapLegendFrame:CreateFontString(nil, "OVERLAY", "KeyMasterFontSmall")
     OverallRatingTitleText:SetPoint("RIGHT",  _G["KM_MapTotalScore"..playerNumber..prevMapId], "CENTER", xOffset, 0)
-    OverallRatingTitleText:SetText(KeyMasterLocals.PARTYFRAME["OverallRating"].name..":")
+    --OverallRatingTitleText:SetText(KeyMasterLocals.PARTYFRAME["OverallRating"].name..":")
+    OverallRatingTitleText:SetText(KeyMasterLocals.TOOLTIPS["MythicRating"].name..":")
 
 end
 
@@ -546,7 +558,7 @@ function PartyFrame:CreatePartyScoreTallyFooter()
 
         local mapTallyFrame = CreateFrame("Frame", "KM_MapTally"..mapid, parentFrame)
         mapTallyFrame:ClearAllPoints()
-
+        
         -- Dynamicly set map data frame anchors
         if (firstItem) then
             mapTallyFrame:SetPoint("TOPRIGHT", partyTallyFrame, "TOPRIGHT", 0, 0)