Skip to content

Commit 4da93fd

Browse files
PuresynPuresyn
authored
Merge pull request #83 from Puresyn/development
Development
2 parents ab17ca8 + 4cb26ae commit 4da93fd

File tree

6 files changed

+78
-32
lines changed

6 files changed

+78
-32
lines changed

‎Core/Localization/Localization.deDE.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ L.MAPNAMES[375] = { name = "Die Nebel von Tirna Scithe", abbr = "MTS" }
5050
L.MAPNAMES[376] = { name = "Die Nekrotische Schneise", abbr = "NW" }
5151
--TWW S2
5252
L.MAPNAMES[500] = { name = "Die Brutstätte", abbr = "Brut" }
53-
L.MAPNAMES[525] = { name = "Fluttor", abbr = "Flut" }
53+
L.MAPNAMES[525] = { name = "Schleuse", abbr = "Schl" }
5454
L.MAPNAMES[247] = { name = "Das RIESENFLÖZ!!", abbr = "Flöz" }
5555
L.MAPNAMES[370] = { name = "Mechagon - Werkstatt", abbr = "WERK" }
5656
L.MAPNAMES[504] = { name = "Dunkelflammenspalt", abbr = "DFS" }

‎Core/Localization/Localization.zhCN.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ L.MAPNAMES[507] = { name = "The Grim Batol", abbr = "格瑞" }
4949
L.MAPNAMES[375] = { name = "Mists of Tirna Scithe", abbr = "仙林" }
5050
L.MAPNAMES[376] = { name = "The Necrotic Wake", abbr = "通灵" }
5151
--TWW S2
52-
L.MAPNAMES[500] = { name = "The Rookery", abbr = "RKY" }
53-
L.MAPNAMES[525] = { name = "Floodgate", abbr = "FG" }
54-
L.MAPNAMES[247] = { name = "The MOTHERLODE!!", abbr = "ML" }
55-
L.MAPNAMES[370] = { name = "Mechagon - Workshop", abbr = "WORK" }
56-
L.MAPNAMES[504] = { name = "Darkflame Cleft", abbr = "DFC" }
57-
L.MAPNAMES[382] = { name = "Theater of Pain", abbr = "ToP" }
58-
L.MAPNAMES[506] = { name = "Cinderbrew Meadery", abbr = "CBM" }
59-
L.MAPNAMES[499] = { name = "Priory of the Sacred Flame", abbr = "PoSF" }
52+
L.MAPNAMES[500] = { name = "The Rookery", abbr = "驭雷" }
53+
L.MAPNAMES[525] = { name = "Floodgate", abbr = "水闸" }
54+
L.MAPNAMES[247] = { name = "The MOTHERLODE!!", abbr = "暴富" }
55+
L.MAPNAMES[370] = { name = "Mechagon - Workshop", abbr = "麦卡贡" }
56+
L.MAPNAMES[504] = { name = "Darkflame Cleft", abbr = "暗焰" }
57+
L.MAPNAMES[382] = { name = "Theater of Pain", abbr = "剧场" }
58+
L.MAPNAMES[506] = { name = "Cinderbrew Meadery", abbr = "酒庄" }
59+
L.MAPNAMES[499] = { name = "Priory of the Sacred Flame", abbr = "圣焰" }
6060

6161
L.XPAC = {}
6262
L.XPAC[0] = { enum = "LE_EXPANSION_CLASSIC", desc = "经典旧世" }

‎Core/UI/WhatsNew.lua

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ local function setWhatsNewContent(parent)
3333
<br/>
3434
<h2>|cff]]..h2Color..[[Updates:|r</h2>
3535
<br/>
36-
<p>]]..textBullet..[[Updated to interface version 11.1</p>
36+
<p>]]..textBullet..[[Added simplified Chinese translations for S2 dungeons. (Thanks vj234013 on github)</p>
3737
<br/>
38-
<p>]]..textBullet..[[Will be loosing CN translation next release due to lack of translator participation.</p>
38+
<h2>|cff]]..h2Color..[[Fixes:|r</h2>
3939
<br/>
40-
<p>]]..textBullet..[[Updates for TWW S2.</p>
40+
<p>]]..textBullet..[[Fixed score calulations for TWW S2 (special thanks to OMGTotem).</p>
4141
<br/>
42-
<h2>|cff]]..h2Color..[[Fixes:|r</h2>
42+
<p>]]..textBullet..[[Fixed chest ++ calculation for dungeons since the 90s addition to dungeon timers is gone.</p>
4343
<br/>
44-
<p>]]..textBullet..[[None.</p>
44+
<p>]]..textBullet..[[Fixed portal spell ids for Motherlode and Operation: Floodgate dungeons. (Thanks snaysix on github)</p>
4545
<br/>
4646
<br/>
4747
<h2>|cff]]..h2Color..[[Known Bugs/Issues:|r</h2>

‎KeyMaster.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## X-Max-Interface: 110100
33
## X-Min-Interface: 110002
44

5-
## Version: 1.4.0
5+
## Version: 1.4.2
66
## Title: |cffb09c60Key Master|r
77
## Title-ptBR: |cffb09c60Key Master|r
88
## Title-ruRU: |cffb09c60Key Master|r [|cffe6b080Мастер ключей|r]

‎Libs/Internal/DungeonTools.lua

+35-16
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ local portalSpellIds = {
5757
[375] = 354464, -- Mists of Tirna Scithe - 348533
5858
[376] = 354462, -- The Necrotic Wake - 348529
5959
-- TWW S2
60-
[500] = 445443, -- The Rookery - 445443
61-
[525] = 1218105, -- Floodgate - 1218105
62-
[247] = 272268, -- The MOTHERLODE!! - 272268
63-
[370] = 373274, -- Mechagon - Workshop - 373274
64-
[504] = 445441, -- Darkflame Cleft - 445441
65-
[382] = 354467, -- Theater of Pain - 354467
66-
[506] = 445440, -- Cinderbrew Meadery - 445440
67-
[499] = 445444 -- Priory of the Sacred Flame - 445444
60+
[500] = 445443, -- The Rookery
61+
[525] = 1216786, -- Floodgate
62+
[247] = 467553, -- The MOTHERLODE!!
63+
[370] = 373274, -- Mechagon - Workshop
64+
[504] = 445441, -- Darkflame Cleft
65+
[382] = 354467, -- Theater of Pain
66+
[506] = 445440, -- Cinderbrew Meadery
67+
[499] = 445444 -- Priory of the Sacred Flame
6868
}
6969

7070
-- add only horde specific portals here.
@@ -388,6 +388,26 @@ local function getRatingCalcValues()
388388
twoChestSpeed = 0.8, -- timer % at which a dungeon is 2 chested.
389389
threeChestSpeed = 0.6, -- timer % at which a dungeon is 3 chested
390390
bonusTimerRating = 15 -- Bonus/Penalty for timers
391+
},
392+
[14] = { -- TWW S2 --- TO BE VERIFIED ------
393+
baseRating = 125, -- Base score for dungeon completion
394+
firstAffixLevel = 4, -- lowest M+ Key possible
395+
fistAffixValue = 15, -- Value of the first affix
396+
secondAffixLevel = 7, -- Key level the second affix is added
397+
secondAffixValue = 15, -- Value of the second affix
398+
thirdAffixLevel = 10, -- Key level the third affix is added
399+
thirdAffixValue = 15, -- Value of the thrid affix
400+
fourthAffixLevel = 12, -- Key level the third affix is added
401+
fourthAffixValue = 15, -- Value of the thrid affix
402+
fifthAffixLevel = 12, -- Key level the third affix is added
403+
fifthAffixValue = 0, -- Value of the thrid affix
404+
thresholdLevel = 1, -- Threshold after which the value of the key changes due to level
405+
preThresholdValue = 15, -- Value of the pre-threshold levels
406+
postThresholdValue = 15, -- Value of the post threshold levels
407+
untimedBaseLevel = 10, -- The level after which untimed keys have no additional value
408+
twoChestSpeed = 0.8, -- timer % at which a dungeon is 2 chested.
409+
threeChestSpeed = 0.6, -- timer % at which a dungeon is 3 chested
410+
bonusTimerRating = 15 -- Bonus/Penalty for timers
391411
}
392412
}
393413

@@ -434,9 +454,9 @@ function DungeonTools:CalculateChest(dungeonID, keyLevel, timeCompleted)
434454
end
435455
local timeLimit = currentSeasonMaps[dungeonID].timeLimit
436456
if keyLevel >= seasonVars.thirdAffixLevel then
437-
if(timeCompleted <= (timeLimit * seasonVars.threeChestSpeed)+90) then return "+++" end
438-
if(timeCompleted <= (timeLimit * seasonVars.twoChestSpeed)+90) then return "++" end
439-
if(timeCompleted <= timeLimit+90) then return "+" end
457+
if(timeCompleted <= (timeLimit * seasonVars.threeChestSpeed)) then return "+++" end
458+
if(timeCompleted <= (timeLimit * seasonVars.twoChestSpeed)) then return "++" end
459+
if(timeCompleted <= timeLimit) then return "+" end
440460
else
441461
if(timeCompleted <= (timeLimit * seasonVars.threeChestSpeed)) then return "+++" end
442462
if(timeCompleted <= (timeLimit * seasonVars.twoChestSpeed)) then return "++" end
@@ -531,18 +551,17 @@ function DungeonTools:CalculateRating(dungeonID, keyLevel, runTime)
531551
return 0
532552
end
533553

534-
if (keyLevel < seasonVars.firstAffixLevel) then
554+
-- In Season 2 of TWW they moved based affix to level 4. So this is removed.
555+
--[[ if (keyLevel < seasonVars.firstAffixLevel) then
535556
return 0
536-
end
557+
end ]]
537558

538559
if currentSeasonMaps == nil then
539560
currentSeasonMaps = DungeonTools:GetCurrentSeasonMaps()
540561
end
541562
local bonusRating = 0
542563
local dungeonTimeLimit = currentSeasonMaps[dungeonID].timeLimit
543-
if keyLevel >= seasonVars.thirdAffixLevel then
544-
dungeonTimeLimit = dungeonTimeLimit + 90
545-
end
564+
546565
-- Runs over time by 40% are a 0 score.
547566
if(runTime > (dungeonTimeLimit + (dungeonTimeLimit * maxModifier))) then
548567
return 0

‎PatchNotes.txt

+28-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,33 @@ Key Master AddOn for World of Warcraft
22
(c) 2024 – Released under the GNU General Public License
33

44
PATCH NOTES:
5+
--------------------------------------------------
6+
Key Master v1.4.2
7+
--------------------------------------------------
8+
Updates:
9+
- Added simplified Chinese translations for S2 dungeons. (Thanks vj234013 on github)
10+
- Updated DE localization
11+
12+
Fixes:
13+
- Fixed score calulations for TWW S2 (special thanks to OMGTotem)
14+
- Fixed chest ++ calculation for dungeons since the 90s addition to dungeon timers is gone.
15+
- Fixed portal spell ids for Motherlode and Operation: Floodgate dungeons. (Thanks snaysix on github)
16+
17+
Known Bugs/Issues:
18+
- A player's vault display may not update immediately. Changing tabs should correct the display if inaccurate.
19+
20+
--------------------------------------------------
21+
Key Master v1.4.1
22+
--------------------------------------------------
23+
Updates:
24+
- None
25+
26+
Fixes:
27+
- None
28+
29+
Known Bugs/Issues:
30+
- A player's vault display may not update immediately. Changing tabs should correct the display if inaccurate.
31+
532
--------------------------------------------------
633
Key Master v1.4.0
734
--------------------------------------------------
@@ -22,7 +49,7 @@ Fixes:
2249

2350
Known Bugs/Issues:
2451
- A player's vault display may not update immediately. Changing tabs should correct the display if inaccurate.
25-
PATCH NOTES:
52+
2653
--------------------------------------------------
2754
Key Master v1.3.9
2855
--------------------------------------------------

0 commit comments

Comments
 (0)