v1.6.0 keystone updates

serkanyazicioglu · Sep 26, 2024 · 3cc98c1 · 3cc98c1
1 parent e05d9b0
commit 3cc98c1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/Core.lua b/Core.lua
@@ -1982,30 +1982,35 @@ function Core:SetRosterInfo()
 						officerNote = officernote
 					};
 
-					if (getGowGameVersionId() == 1) then
+					if (getGowGameVersionId() == 1 and C_MythicPlus.IsMythicPlusActive()) then
 						local keystoneLevel = nil;
 						local keystoneMapId = nil;
 
-						if (C_AddOns.IsAddOnLoaded("AstralKeys") and AstralKeys) then
-							if (level >= _G['AstralEngine'].EXPANSION_LEVEL) then
-								keystoneLevel = _G['AstralEngine'].GetCharacterKeyLevel(name);
-								keystoneMapId = _G['AstralEngine'].GetCharacterMapID(name);
+						if (name == GetCurrentCharacterUniqueKey()) then
+							keystoneLevel = C_MythicPlus.GetOwnedKeystoneLevel();
+							keystoneMapId = C_MythicPlus.GetOwnedKeystoneMapID();
+						else
+							if (C_AddOns.IsAddOnLoaded("AstralKeys") and AstralKeys) then
+								if (level >= _G['AstralEngine'].EXPANSION_LEVEL) then
+									keystoneLevel = _G['AstralEngine'].GetCharacterKeyLevel(name);
+									keystoneMapId = _G['AstralEngine'].GetCharacterMapID(name);
+								end
 							end
-						end
 
-						if (openRaidLib and keystoneData) then
-							if (keystoneData) then
-								for unitName, keystoneInfo in pairs(keystoneData) do
-									if (keystoneInfo.level > 0) then
-										local unitNameToCheck = unitName;
+							if (openRaidLib and keystoneData) then
+								if (keystoneData) then
+									for unitName, keystoneInfo in pairs(keystoneData) do
+										if (keystoneInfo.level > 0) then
+											local unitNameToCheck = unitName;
 
-										if (not string.match(unitNameToCheck, "-")) then
-											unitNameToCheck = unitNameToCheck .. "-" .. GetNormalizedRealmName();
-										end
+											if (not string.match(unitNameToCheck, "-")) then
+												unitNameToCheck = unitNameToCheck .. "-" .. GetNormalizedRealmName();
+											end
 
-										if (unitNameToCheck == name) then
-											keystoneLevel = keystoneInfo.level;
-											keystoneMapId = keystoneInfo.challengeMapID;
+											if (unitNameToCheck == name) then
+												keystoneLevel = keystoneInfo.level;
+												keystoneMapId = keystoneInfo.challengeMapID;
+											end
 										end
 									end
 								end
@@ -2015,7 +2020,8 @@ function Core:SetRosterInfo()
 						if (keystoneLevel and keystoneMapId) then
 							GOW.DB.profile.guilds[guildKey].keystones[name] = {
 								keystoneLevel = keystoneLevel,
-								keystoneMapId = keystoneMapId
+								keystoneMapId = keystoneMapId,
+								date = GetServerTime()
 							};
 
 							anyKeystoneFound = true;

diff --git a/GuildsOfWoW-Cata.toc b/GuildsOfWoW-Cata.toc
@@ -3,7 +3,7 @@
 ## Notes: Guilds of WoW guild herald for Classic Progression servers
 ## X-Website: https://guildsofwow.com
 ## Author: Nhea
-## Version: 1.5.7
+## Version: 1.6.0
 ## SavedVariables: GoWDB
 ## IconTexture: Interface\Icons\vas_guildfactionchange
 

diff --git a/GuildsOfWoW-Classic.toc b/GuildsOfWoW-Classic.toc
@@ -3,7 +3,7 @@
 ## Notes: Guilds of WoW guild herald for Classic Era servers
 ## X-Website: https://guildsofwow.com
 ## Author: Nhea
-## Version: 1.5.7
+## Version: 1.6.0
 ## SavedVariables: GoWDB
 
 embed.xml

diff --git a/GuildsOfWoW.toc b/GuildsOfWoW.toc
@@ -3,7 +3,7 @@
 ## Notes: Guilds of WoW guild herald for retail World of Warcraft
 ## X-Website: https://guildsofwow.com
 ## Author: Nhea
-## Version: 1.5.7
+## Version: 1.6.0
 ## SavedVariables: GoWDB
 ## OptionalDeps: AstralKeys
 ## AddonCompartmentFunc: GuildsOfWow_OnAddonButtonClick