Changes Classic Wrath interface to 30401. Corrects problem where atte…

…mpting to use modern achievement name in Classic causes crash.
smaitch · Feb 6, 2023 · 6bf0f3b · 6bf0f3b
1 parent 0efc354
commit 6bf0f3b
Show file tree

Hide file tree

Showing 33 changed files with 39 additions and 35 deletions.
diff --git a/Grail-Achievements/Grail-Achievements_Wrath.toc b/Grail-Achievements/Grail-Achievements_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |r|cff69ccf0Achievements|r
 ## Author: Scott M Harrison
 ## Notes: Provides achievement information to Grail

diff --git a/Grail-NPCs-deDE/Grail-NPCs-deDE_Wrath.toc b/Grail-NPCs-deDE/Grail-NPCs-deDE_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 deDE|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized deDE NPCs to Grail for Classic

diff --git a/Grail-NPCs-enUS/Grail-NPCs-enUS_Wrath.toc b/Grail-NPCs-enUS/Grail-NPCs-enUS_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 enUS|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized enUS NPCs to Grail for Classic

diff --git a/Grail-NPCs-esES/Grail-NPCs-esES_Wrath.toc b/Grail-NPCs-esES/Grail-NPCs-esES_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 esES|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized esES NPCs to Grail for Classic

diff --git a/Grail-NPCs-esMX/Grail-NPCs-esMX_Wrath.toc b/Grail-NPCs-esMX/Grail-NPCs-esMX_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 esMX|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized esMX NPCs to Grail for Classic

diff --git a/Grail-NPCs-frFR/Grail-NPCs-frFR_Wrath.toc b/Grail-NPCs-frFR/Grail-NPCs-frFR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 frFR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized frFR NPCs to Grail for Classic

diff --git a/Grail-NPCs-itIT/Grail-NPCs-itIT_Wrath.toc b/Grail-NPCs-itIT/Grail-NPCs-itIT_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 itIT|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized itIT NPCs to Grail for Classic

diff --git a/Grail-NPCs-koKR/Grail-NPCs-koKR_Wrath.toc b/Grail-NPCs-koKR/Grail-NPCs-koKR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 koKR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized koKR NPCs to Grail for Classic

diff --git a/Grail-NPCs-ptBR/Grail-NPCs-ptBR_Wrath.toc b/Grail-NPCs-ptBR/Grail-NPCs-ptBR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 ptBR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized ptBR NPCs to Grail for Classic

diff --git a/Grail-NPCs-ruRU/Grail-NPCs-ruRU_Wrath.toc b/Grail-NPCs-ruRU/Grail-NPCs-ruRU_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 ruRU|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized ruRU NPCs to Grail for Classic

diff --git a/Grail-NPCs-zhCN/Grail-NPCs-zhCN_Wrath.toc b/Grail-NPCs-zhCN/Grail-NPCs-zhCN_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 zhCN|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized zhCN NPCs to Grail for Classic

diff --git a/Grail-NPCs-zhTW/Grail-NPCs-zhTW_Wrath.toc b/Grail-NPCs-zhTW/Grail-NPCs-zhTW_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic|r|cff69ccf0 zhTW|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized zhTW NPCs to Grail for Classic

diff --git a/Grail-NPCs/Grail-NPCs_Wrath.toc b/Grail-NPCs/Grail-NPCs_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0NPCs |r|cffeda55fClassic (WotLK)|r
 ## Author: Scott M Harrison
 ## Notes: Provides NPCs to Grail for Classic

diff --git a/Grail-Quests-deDE/Grail-Quests-deDE_Wrath.toc b/Grail-Quests-deDE/Grail-Quests-deDE_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 deDE|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized deDE quest names to Grail for Classic

diff --git a/Grail-Quests-enUS/Grail-Quests-enUS_Wrath.toc b/Grail-Quests-enUS/Grail-Quests-enUS_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 enUS|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized enUS quest names to Grail for Classic

diff --git a/Grail-Quests-esES/Grail-Quests-esES_Wrath.toc b/Grail-Quests-esES/Grail-Quests-esES_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 esES|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized esES quest names to Grail for Classic

diff --git a/Grail-Quests-esMX/Grail-Quests-esMX_Wrath.toc b/Grail-Quests-esMX/Grail-Quests-esMX_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 esMX|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized esMX quest names to Grail for Classic

diff --git a/Grail-Quests-frFR/Grail-Quests-frFR_Wrath.toc b/Grail-Quests-frFR/Grail-Quests-frFR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 frFR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized frFR quest names to Grail for Classic

diff --git a/Grail-Quests-itIT/Grail-Quests-itIT_Wrath.toc b/Grail-Quests-itIT/Grail-Quests-itIT_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 itIT|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized itIT quest names to Grail for Classic

diff --git a/Grail-Quests-koKR/Grail-Quests-koKR_Wrath.toc b/Grail-Quests-koKR/Grail-Quests-koKR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 koKR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized koKR quest names to Grail for Classic

diff --git a/Grail-Quests-ptBR/Grail-Quests-ptBR_Wrath.toc b/Grail-Quests-ptBR/Grail-Quests-ptBR_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 ptBR|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized ptBR quest names to Grail for Classic

diff --git a/Grail-Quests-ruRU/Grail-Quests-ruRU_Wrath.toc b/Grail-Quests-ruRU/Grail-Quests-ruRU_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 ruRU|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized ruRU quest names to Grail for Classic

diff --git a/Grail-Quests-zhCN/Grail-Quests-zhCN_Wrath.toc b/Grail-Quests-zhCN/Grail-Quests-zhCN_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 zhCN|r
 ## Author: Scott M Harrison
 ## Notes: Provides localized zhCN quest names to Grail for Classic

diff --git a/Grail-Quests-zhTW/Grail-Quests-zhTW_Wrath.toc b/Grail-Quests-zhTW/Grail-Quests-zhTW_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic|r|cff69ccf0 zhTW |r
 ## Author: Scott M Harrison
 ## Notes: Provides localized zhTW quest names to Grail for Classic

diff --git a/Grail-Quests/Grail-Quests_Wrath.toc b/Grail-Quests/Grail-Quests_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Quests |r|cffeda55fClassic (WotLK)|r
 ## Author: Scott M Harrison
 ## Notes: Provides quests to Grail for Classic

diff --git a/Grail-Reputations/Grail-Reputations_Wrath.toc b/Grail-Reputations/Grail-Reputations_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |cff69ccf0Reputations |r|cffeda55fClassic|r
 ## Author: Scott M Harrison
 ## Notes: Provides reputation award information to Grail for Classic

diff --git a/Grail-Rewards/Grail-Rewards_Wrath.toc b/Grail-Rewards/Grail-Rewards_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |r|cff69ccf0Rewards|r
 ## Author: Scott M Harrison
 ## Notes: Provides (non-reputation) reward award information to Grail

diff --git a/Grail-When/Grail-When_Wrath.toc b/Grail-When/Grail-When_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail |r|cff69ccf0When|r
 ## Author: Scott M Harrison
 ## Notes: Provides completion date information to Grail

diff --git a/Grail/Grail.lua b/Grail/Grail.lua
@@ -565,6 +565,8 @@
 --			Adds support for items with specific counts as prerequisites.
 --			Changes retail interface to 100005.
 --			Adds support group membership completion counts being exact (to support Dragon Isles Waygate quests).
+--		121 Changes Classic Wrath interface to 30401.
+--			Corrects problem where attempting to use modern achievement name in Classic causes crash.
 --
 --	Known Issues
 --
@@ -606,7 +608,6 @@ local C_PetJournal						= C_PetJournal
 local CreateFrame						= CreateFrame
 local debugprofilestop					= debugprofilestop
 local GetAchievementCriteriaInfoByID	= GetAchievementCriteriaInfoByID
-local GetAchievementInfo				= GetAchievementInfo
 local GetAddOnMetadata					= GetAddOnMetadata
 local GetAverageItemLevel				= GetAverageItemLevel
 local GetBuildInfo						= GetBuildInfo
@@ -3609,6 +3610,9 @@ end,
 											},
 
 		GetBasicAchievementInfo = function(self, achievementId)
+			if not GetAchievementInfo then
+				return nil, false, false
+			end
 			local id, name, points, completed, month, day, year, description, flags, icon, rewardText, isGuild, wasEarnedByMe, earnedBy = GetAchievementInfo(achievementId)
 			if nil == id then
 				-- Attempt to look up the achievement in our own limited list of supported achievements.
@@ -8610,7 +8614,7 @@ end
 			self.quest.name[62019]=SPELL_FAILED_CUSTOM_ERROR_521	-- Night Fae
 			self.quest.name[62020]=SPELL_FAILED_CUSTOM_ERROR_520	-- Venthyr
 			self.quest.name[62023]=SPELL_FAILED_CUSTOM_ERROR_522	-- Kyrian
-			self.quest.name[70872]="~ " .. self:GetBasicAchievementInfo(16409) .. " ~"	-- Let's Get Quacking
+			self.quest.name[70872]="~ " .. (self:GetBasicAchievementInfo(16409) or "") .. " ~"	-- Let's Get Quacking
 		end,
 
 		---

diff --git a/Grail/Grail.toc b/Grail/Grail.toc
@@ -2,7 +2,7 @@
 ## Title: Grail
 ## Author: Scott M Harrison
 ## Notes: Knows about quests
-## Version: 120
+## Version: 121
 ## SavedVariables: GrailDatabase
 ## SavedVariablesPerCharacter: GrailDatabasePlayer
 

diff --git a/Grail/Grail_BCC.toc b/Grail/Grail_BCC.toc
@@ -2,7 +2,7 @@
 ## Title: Grail
 ## Author: Scott M Harrison
 ## Notes: Knows about quests
-## Version: 120
+## Version: 121
 ## SavedVariables: GrailDatabase
 ## SavedVariablesPerCharacter: GrailDatabasePlayer
 

diff --git a/Grail/Grail_Vanilla.toc b/Grail/Grail_Vanilla.toc
@@ -2,7 +2,7 @@
 ## Title: Grail
 ## Author: Scott M Harrison
 ## Notes: Knows about quests
-## Version: 120
+## Version: 121
 ## SavedVariables: GrailDatabase
 ## SavedVariablesPerCharacter: GrailDatabasePlayer
 

diff --git a/Grail/Grail_Wrath.toc b/Grail/Grail_Wrath.toc
@@ -1,8 +1,8 @@
-## Interface: 30400
+## Interface: 30401
 ## Title: Grail
 ## Author: Scott M Harrison
 ## Notes: Knows about quests
-## Version: 120
+## Version: 121
 ## SavedVariables: GrailDatabase
 ## SavedVariablesPerCharacter: GrailDatabasePlayer