Merge pull request #55 from Puresyn/development

Released 1.2.0

Author: jcorrington

Core/CharacterData.lua

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

Core/UI/PartyFrame.lua

@@ -26,14 +26,18 @@ end
 
 local function portalButton_mouseover(self, event)
     local spellNameToCheckCooldown = self:GetParent():GetAttribute("portalSpellName")
-    local start, dur, _ = GetSpellCooldown(spellNameToCheckCooldown);
-    if (start == 0) then
+    local cooldown = C_Spell.GetSpellCooldown(spellNameToCheckCooldown);
+    if cooldown == nil then
+        KeyMaster:_ErrorMsg("portalButton_mouseover", "PartyFrame", "Invalid spell name for portal button.")
+        return
+    end
+    if (cooldown["startTime"] == 0) then
         local animFrame = self:GetParent():GetAttribute("portalFrame")
         animFrame.textureportal:SetTexture("Interface\\AddOns\\KeyMaster\\Assets\\Images\\portal-texture1", false)
         animFrame.animg:Play()
     else
         local cdFrame = self:GetParent():GetAttribute("portalCooldownFrame")
-        cdFrame:SetCooldown(start ,dur)
+        cdFrame:SetCooldown(cooldown["startTime"] ,cooldown["duration"])
     end
 
 end
@@ -108,7 +112,7 @@ function PartyFrame:UpdatePortals(mapId)
             pButton:SetPoint("TOPLEFT", parent, "TOPLEFT", 0, 0)
             pButton:SetScript("OnEnter", portalButton_mouseover)
             pButton:SetScript("OnLeave", portalButton_mouseoout)
-
+            
             parent:SetAttribute("portalSpellName", portalSpellName)
         end
 

Core/UI/WhatsNew.lua

@@ -26,12 +26,11 @@ local function setWhatsNewContent(parent)
                 <p>]]..KeyMasterLocals.DISPLAYVERSION..KM_AUTOVERSION.." "..KM_VERSION_STATUS..[[</p>
                 <br/>
                 <h2>|cff]]..h2Color..[[Updates:|r</h2>
-                <p>Added 简体中文 (CN) - Chinese Translation</p>
-                <p>Added preliminary TWW S1 Data</p>
-                <p>Updated to WoW Build version 11.0.0Updated to WoW Build version 11.0.0</p>
+                <p>Added ability to auto insert mythic keystone in a mythic plus dungeon</p>
+                <p>Updated to Wow Build version 11.0.2</p>
                 <br/>
                 <h2>|cff]]..h2Color..[[Fixes:|r</h2>
-                <p>Fixed bug where fortified ratings on the party screen did not correctly display decimal places.</p>
+                <p>None</p>
                 <br/>
                 <h2>|cff]]..h2Color..[[Open Items:|r</h2>
                 <p>None</p>

Core/UnitData.lua

@@ -95,7 +95,9 @@ function UnitData:SetUnitData(unitData)
     unitInformation[unitData.GUID] = unitData
 
     -- Store/Update Unit Data in Saved Variables
-    if unitData.GUID == UnitGUID("player") and UnitLevel("PLAYER") == GetMaxPlayerLevel() then
+    local maxLevel = 70
+    -- local maxLevel = GetMaxPlayerLevel()
+    if unitData.GUID == UnitGUID("player") and UnitLevel("PLAYER") == maxLevel then
         CharacterData:SetCharacterData(unitData.GUID, unitData)
         UnitData:UpdateListCharacter(unitData.GUID, unitData) -- todo: move out of this file 
     end

KeyMaster.lua

@@ -16,8 +16,10 @@ local PartyFrame = KeyMaster.PartyFrame
 
 -- Global Variables
 KM_ADDON_NAME = KeyMasterLocals.ADDONNAME
-KM_AUTOVERSION = GetAddOnMetadata("KeyMaster", "Version")
-KM_VERSION_STATUS = KeyMasterLocals.BUILDRELEASE -- BUILDALPHA BUILDBETA BUILDRELEASE - for display and update notification purposes
+--KM_AUTOVERSION = GetAddOnMetadata("KeyMaster", "Version") GetAddOnMetadata is depreciated in "The War Within" expansion.
+KM_AUTOVERSION = C_AddOns.GetAddOnMetadata("KeyMaster", "Version")
+
+KM_VERSION_STATUS = KeyMasterLocals.BUILDBETA -- BUILDALPHA BUILDBETA BUILDRELEASE - for display and update notification purposes
 
 --------------------------------
 -- Slash Commands and command menu
@@ -254,4 +256,45 @@ end
 
 local playerEnterEvents = CreateFrame("Frame")
 playerEnterEvents:RegisterEvent("PLAYER_ENTERING_WORLD")
-playerEnterEvents:SetScript("OnEvent", onEvent_PlayerEnterWorld)
+playerEnterEvents:SetScript("OnEvent", onEvent_PlayerEnterWorld)
+
+local function OnEvent_OnKeystoneOpen(ev)
+    KeyMaster:_DebugMsg("OnKeystoneOpen", "DungeonTools", "Keystone frame opened.")
+    
+    local difficulty = select(3, GetInstanceInfo())
+    if difficulty ~= 8 and difficulty ~= 23 then
+      return
+    end
+  
+    local found = nil
+    for bagIndex = 0, NUM_BAG_SLOTS do
+      for invIndex = 1, C_Container.GetContainerNumSlots(bagIndex) do
+        local itemID = C_Container.GetContainerItemID(bagIndex, invIndex)
+  
+        if itemID and C_Item.IsItemKeystoneByID(itemID) then
+          KeyMaster:_DebugMsg("OnKeystoneOpen", "DungeonTools", "Key found at ("
+            .. bagIndex .. "," .. invIndex .. ")")
+  
+          found = {
+            bagIndex = bagIndex,
+            invIndex = invIndex
+          }
+  
+          break
+        end
+      end
+  
+      if found ~= nil then break end
+    end
+  
+    if found ~= nil then
+      KeyMaster:_DebugMsg("OnKeystoneOpen", "DungeonTools", "Slotting keystone from ("
+        .. found.bagIndex .. "," .. found.invIndex .. ")")
+  
+      C_Container.UseContainerItem(found.bagIndex, found.invIndex)
+    end
+end
+
+local keystoneOpenEvents = CreateFrame("Frame")
+keystoneOpenEvents:RegisterEvent("CHALLENGE_MODE_KEYSTONE_RECEPTABLE_OPEN")
+keystoneOpenEvents:SetScript("OnEvent", OnEvent_OnKeystoneOpen)

KeyMaster.toc

@@ -1,8 +1,8 @@
-## Interface: 110000
-## X-Max-Interface: 110000
+## Interface: 110002
+## X-Max-Interface: 110002
 ## X-Min-Interface: 100205
 
-## Version: 1.1.8
+## Version: 1.2.0
 ## Title: |cffb09c60Key Master|r
 ## Title-ptBR: |cffb09c60Key Master|r
 ## Title-ruRU: |cffb09c60Key Master|r [|cffe6b080Мастер ключей|r]