Merge pull request #76 from Puresyn/development

Updated to 1.3.7 from Dev

Author: jcorrington

Core/Localization/Languages.xml

@@ -9,5 +9,5 @@
 <!--<Script file='Core\Localization\Localization.ruRU.lua'/> -->
     <Script file='Core\Localization\Localization.zhTW.lua'/>
     <Script file='Core\Localization\Localization.koKR.lua'/>
-<!--<Script file='Core\Localization\Localization.zhCN.lua'/> -->
+    <Script file='Core\Localization\Localization.zhCN.lua'/>
 </Ui>

Core/UI/PartyFrameMapping.lua

@@ -208,7 +208,7 @@ function PartyFrameMapping:UpdateUnitFrameData(unitId, playerData)
     local mapTable = DungeonTools:GetCurrentSeasonMaps()
     if KeyMaster:GetTableLength(playerData.DungeonRuns) ~= 0 then        
         for mapid, v in pairs(mapTable) do
-            local chestCount = DungeonTools:CalculateChest(mapid, playerData.DungeonRuns[mapid]["DungeonData"].DurationSec)
+            local chestCount = DungeonTools:CalculateChest(mapid, playerData.ownedKeyLevel, playerData.DungeonRuns[mapid]["DungeonData"].DurationSec)
             local keyLevel = "0"
             if playerData.DungeonRuns[mapid]["DungeonData"].Level ~= nil then
                 keyLevel = chestCount .. playerData.DungeonRuns[mapid]["DungeonData"].Level    

Core/UI/PlayerFrameMapping.lua

@@ -153,7 +153,7 @@ function PlayerFrameMapping:RefreshData(fetchNew)
         playerMapDataFrame.tyrannicalLevel:SetText(tyrannicalLevel or defaultString)
 
         -- Dungeon Bonus Time
-        local tyrannicalBonusTime = DungeonTools:CalculateChest(mapId, playerData.DungeonRuns[mapId]["DungeonData"].DurationSec)
+        local tyrannicalBonusTime = DungeonTools:CalculateChest(mapId, playerData.DungeonRuns[mapId]["DungeonData"].Level, playerData.DungeonRuns[mapId]["DungeonData"].DurationSec)
         playerMapDataFrame.tyrannicalBonus:SetText(tyrannicalBonusTime)
 
         -- Dungeon Run Time

Core/UI/WhatsNew.lua

@@ -33,12 +33,13 @@ local function setWhatsNewContent(parent)
                 <br/>
                 <h2>|cff]]..h2Color..[[Updates:|r</h2>
                 <br/>
-                <p>]]..textBullet..[[Updated to WoW Interface version 11.0.5</p>          
+                <p>]]..textBullet..[[None</p>          
                 <br/>
                 <br/>
                 <h2>|cff]]..h2Color..[[Fixes:|r</h2>
                 <br/>
-                <p>]]..textBullet..[[None</p>
+                <p>]]..textBullet..[[Fixed an error with Simplified Chinese that stoped KM from loading.</p>
+                <p>]]..textBullet..[[Fixed miscalculations with IO and chest levels (+1, +2, +3) for dungeon runs due to addition of 90s to level 7 affix.</p>
                 <br/>
                 <br/>
                 <h2>|cff]]..h2Color..[[Known Bugs/Issues:|r</h2>

KeyMaster.lua

@@ -18,7 +18,7 @@ local PartyFrame = KeyMaster.PartyFrame
 KM_ADDON_NAME = KeyMasterLocals.ADDONNAME
 KM_AUTOVERSION = C_AddOns.GetAddOnMetadata("KeyMaster", "Version")
 
-KM_VERSION_STATUS = KeyMasterLocals.BUILDRELEASE -- BUILDALPHA BUILDBETA BUILDRELEASE - for display and update notification purposes
+KM_VERSION_STATUS = KeyMasterLocals.BUILDBETA -- BUILDALPHA BUILDBETA BUILDRELEASE - for display and update notification purposes
 
 --------------------------------
 -- Slash Commands and command menu

KeyMaster.toc

@@ -2,7 +2,7 @@
 ## X-Max-Interface: 110005
 ## X-Min-Interface: 110002
 
-## Version: 1.3.6
+## Version: 1.3.7
 ## Title: |cffb09c60Key Master|r
 ## Title-ptBR: |cffb09c60Key Master|r
 ## Title-ruRU: |cffb09c60Key Master|r [|cffe6b080Мастер ключей|r]

Libs/Internal/DungeonTools.lua

@@ -411,7 +411,7 @@ end
 ---@param dungeonID integer - the id of the dungeon
 ---@param timeCompleted integer - the runs time in seconds
 ---@return string - string of the performance i.e. + or +++
-function DungeonTools:CalculateChest(dungeonID, timeCompleted)
+function DungeonTools:CalculateChest(dungeonID, keyLevel, timeCompleted)
 
     local seasonVars = getRatingCalcValues()
     if (not seasonVars) then
@@ -424,6 +424,9 @@ function DungeonTools:CalculateChest(dungeonID, timeCompleted)
         currentSeasonMaps = DungeonTools:GetCurrentSeasonMaps()
     end
     local timeLimit = currentSeasonMaps[dungeonID].timeLimit
+    if keyLevel >= seasonVars.thirdAffixLevel then
+        timeLimit = timeLimit + 90
+    end
     if(timeCompleted <= (timeLimit * seasonVars.threeChestSpeed)) then return "+++" end
     if(timeCompleted <= (timeLimit * seasonVars.twoChestSpeed)) then return "++" end
     if(timeCompleted <= timeLimit) then return "+" end
@@ -525,6 +528,9 @@ function DungeonTools:CalculateRating(dungeonID, keyLevel, runTime)
     end
     local bonusRating = 0
     local dungeonTimeLimit = currentSeasonMaps[dungeonID].timeLimit
+    if keyLevel >= seasonVars.thirdAffixLevel then
+        dungeonTimeLimit = dungeonTimeLimit + 90
+    end
     -- Runs over time by 40% are a 0 score.
     if(runTime > (dungeonTimeLimit + (dungeonTimeLimit * maxModifier))) then
         return 0

PatchNotes.txt

@@ -2,6 +2,19 @@ Key Master AddOn for World of Warcraft
 (c) 2024 – Released under the GNU General Public License
 
 PATCH NOTES:
+--------------------------------------------------
+Key Master v1.3.7
+--------------------------------------------------
+Updates:
+- None
+
+Fixes:
+- Fixed an error with Simplified Chinese that stoped KM from loading.
+- Fixed miscalculations with IO and chest levels (+1, +2, +3) for dungeon runs due to addition of 90s to level 7 affix.
+
+Known Bugs/Issues:
+- A player's vault display may not update immediately. Changing tabs should correct the display if inaccurate.
+
 --------------------------------------------------
 Key Master v1.3.6
 --------------------------------------------------