WoWInterface SVN UrbanAchiever

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk
    from Rev 106 to Rev 107
    ↔ Reverse comparison
  •

Rev 106 → Rev 107

Localization.zhCN.lua
35,4 → 35,5
UAReplacementFrame = "更换成就框架";
UAOptions = "选项";
UAAchievementDone = "你已取得这项成就，无法继续追踪。";
UAGuild = "Guild"
end
\ No newline at end of file
Localization.koKR.lua
35,4 → 35,5
UAReplacementFrame = "추적창 초기화";
UAOptions = "설정";
UAAchievementDone = "You already earned this achievement, you can't track it anymore";
UAGuild = "Guild"
end
\ No newline at end of file
Localization.enUS.lua
36,4 → 36,5
UAReplacementFrame = "Replacement Achievement Frame";
UAOptions = "Options";
UAAchievementDone = "You already earned this achievement, you can't track it anymore";
UAGuild = "Guild"
end
\ No newline at end of file
UrbanAchiever.toc
5,7 → 5,7
## Notes-frFR: Fenêtre de Hauts Faits améliorée
## Notes-zhTW:改進成就框架
## Notes-zhCN:改进成就框架
## Version 0.12.11.wowi:revision
## Version 13.0.wowi:revision
## OptionalDeps: Blizzard_AchievementUI
## SavedVariables: UASV
## SavedVariablesPerCharacter: UASVPC
Localization.zhTW.lua
35,4 → 35,5
UAReplacementFrame = "更換成就框架";
UAOptions = "選項";
UAAchievementDone = "你已取得這項成就，無法繼續追蹤。";
UAGuild = "Guild"
end
\ No newline at end of file
Localization.ruRU.lua
35,4 → 35,5
UAReplacementFrame = "Улучшенное окно достижений";
UAOptions = "Настройки";
UAAchievementDone = "Вы уже получили это достижение, отслеживание невозможно.";
UAGuild = "Guild"
end
\ No newline at end of file
Main.lua
21,13 → 21,15
self.categories = {
["achievements"] = {},
["statistics"] = {},
["guild"] = {},
}
 
self.masterList = {}
self.seriesList = {}
self.expandList = {}
 
self.isAchList = {} --Used to see if id's are achievements or statistics
self.isAchList = {} --Used to see if id's are achievements or statistics or guild
self.isGuildList = {} --Used to see if id's are achievements or statistics or guild
 
self.currentTab = "achievements"
self.currentCat = -1
66,12 → 68,12
end,
 
["points d"] = function(a, b)
if self.isAchList[GetAchievementCategory(a)] then
if self.isAchList[GetAchievementCategory(a)] or self.isGuildList[GetAchievementCategory(a)] then
_,_,a = GetAchievementInfo(a)
else
a = GetStatistic(a)
end
if self.isAchList[GetAchievementCategory(b)] then
if self.isAchList[GetAchievementCategory(b)] or self.isGuildList[GetAchievementCategory(b)] then
_,_,b = GetAchievementInfo(b)
else
b = GetStatistic(b)
80,12 → 82,12
end,
 
["points a"] = function(a, b)
if self.isAchList[GetAchievementCategory(a)] then
if self.isAchList[GetAchievementCategory(a)] or self.isGuildList[GetAchievementCategory(a)] then
_,_,a = GetAchievementInfo(a)
else
a = GetStatistic(a)
end
if self.isAchList[GetAchievementCategory(b)] then
if self.isAchList[GetAchievementCategory(b)] or self.isGuildList[GetAchievementCategory(b)] then
_,_,b = GetAchievementInfo(b)
else
b = GetStatistic(b)
118,7 → 120,7
["compare d"] = function(a, b)
if not self.isComparing then return false end
--They're both achievements, go by date
if self.isAchList[GetAchievementCategory(a)] and self.isAchList[GetAchievementCategory(b)] then
if (self.isAchList[GetAchievementCategory(a)] and self.isAchList[GetAchievementCategory(b)]) or (self.isGuildList[GetAchievementCategory(a)] and self.isGuildList[GetAchievementCategory(b)]) then
local _,a1,a2,a3 = GetAchievementComparisonInfo(a,1)
a1, a2, a3 = a1 or 0, a2 or 0, a3 or 0
local _,b1,b2,b3 = GetAchievementComparisonInfo(b,1)
128,14 → 130,14
if a2 ~= b2 then return a2 < b2 end --Finally Days
return false --They're exactly the same, return false
else
if self.isAchList[GetAchievementCategory(a)] then
if self.isAchList[GetAchievementCategory(a)] or self.isGuildList[GetAchievementCategory(a)] then
local _,a1, a2, a3 = GetAchievementComparisonInfo(a,1)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
else
a = GetStatistic(a)
end
 
if self.isAchList[GetAchievementCategory(b)] then
if self.isAchList[GetAchievementCategory(b)] or self.isGuildList[GetAchievementCategory(b)] then
local _,b1, b2, b3 = GetAchievementComparisonInfo(b,1)
b = (b1 or "") .. "/" .. (b2 or "") .. "/" .. (b3 or "")
else
149,7 → 151,7
["compare a"] = function(a, b)
if not self.isComparing then return false end
 
if self.isAchList[GetAchievementCategory(a)] and self.isAchList[GetAchievementCategory(b)] then
if (self.isAchList[GetAchievementCategory(a)] and self.isAchList[GetAchievementCategory(b)]) or (self.isGuildList[GetAchievementCategory(a)] and self.isGuildList[GetAchievementCategory(b)]) then
local _,a1,a2,a3 = GetAchievementComparisonInfo(a,1)
a1, a2, a3 = a1 or 0, a2 or 0, a3 or 0
local _,b1,b2,b3 = GetAchievementComparisonInfo(b,1)
160,14 → 162,14
return false --They're exactly the same, return false
end
 
if self.isAchList[GetAchievementCategory(a)] then
if self.isAchList[GetAchievementCategory(a)] or self.isGuildList[GetAchievementCategory(a)] then
local _,a1, a2, a3 = GetAchievementComparisonInfo(a,1)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
else
a = GetStatistic(a)
end
 
if self.isAchList[GetAchievementCategory(b)] then
if self.isAchList[GetAchievementCategory(b)] or self.isGuildList[GetAchievementCategory(b)] then
local _,b1, b2, b3 = GetAchievementComparisonInfo(b,1)
b = (b1 or "") .. "/" .. (b2 or "") .. "/" .. (b3 or "")
else
230,6 → 232,7
 
self:PopulateCategories("achievements")
self:PopulateCategories("statistics")
self:PopulateCategories("guild")
 
--self:PopulateAchievements("achievements")
--self:PopulateAchievements("statistics")
528,7 → 531,11
if self.isAchList[category] then
self.currentTab = "achievements"
else
self.currentTab = "statistics"
if self.isGuildList[category] then
self.currentTab = "guild"
else
self.currentTab = "statistics"
end
end
 
self.currentCat = category
729,6 → 736,9
self.frame.tabButtons[2] = self:CreateTab("$parentTab1", self.frame, UAStatistic, "statistics")
self.frame.tabButtons[2]:SetPoint("TOPLEFT", self.frame.tabButtons[1], "TOPRIGHT", 5, 0)
 
self.frame.tabButtons[3] = self:CreateTab("$parentTab1", self.frame, UAGuild, "guild")
self.frame.tabButtons[3]:SetPoint("TOPLEFT", self.frame.tabButtons[2], "TOPRIGHT", 5, 0)
 
--self.frame.tabButtons[3] = self:CreateTab("$parentTab1", self.frame, "Search", "search")
--self.frame.tabButtons[3]:SetPoint("TOPLEFT", self.frame.tabButtons[2], "TOPRIGHT", 5, 0)
 
1404,12 → 1414,18
function self:PopulateCategories(tab)
local list, name, parent
local isAch = false
local isGuild = false
--Populate the list from API
if tab == "achievements" then
list = GetCategoryList()
isAch = true
else
list = GetStatisticsCategoryList()
if tab == "guild" then
list = GetGuildCategoryList()
isGuild = true
else
list = GetStatisticsCategoryList()
end
end
 
--Insert summary Category
1424,6 → 1440,11
for _,id in next, list do
name, parent = GetCategoryInfo(id)
self.isAchList[id] = isAch
self.isGuildList[id] = isGuild
DEFAULT_CHAT_FRAME:AddMessage(parent);
if parent == 15076 then
parent = -1
end
if parent == -1 then
tinsert(self.categories[tab], {
["id"] = id,
1481,7 → 1502,7
self.frame.achButtons[button].background:SetTexture("Interface\\AchievementFrame\\UI-Achievement-Parchment-Horizontal")
self.frame.achButtons[button].comparison.background:SetTexture("Interface\\AchievementFrame\\UI-Achievement-Parchment-Horizontal")
 
if self.isAchList[GetAchievementCategory(id)] == false then
if self.isAchList[GetAchievementCategory(id)] == false and self.isGuildList[GetAchievementCategory(id)] == false then
--Its a statistic, no date, no points
self.frame.achButtons[button].stat:SetText(self:FormatString(GetStatistic(id)))
self.frame.achButtons[button].points:SetText("")
1566,7 → 1587,7
self.frame.display.desc:SetText(description)
self.frame.display.compareDate:Hide()
 
if self.isAchList[GetAchievementCategory(id)] == false then
if self.isAchList[GetAchievementCategory(id)] == false and self.isGuildList[GetAchievementCategory(id)] == false then
--Statistic
self.frame.display.icon:Hide()
self.frame.display.icon:SetWidth(1)
1817,9 → 1838,17
if self.currentTab == "achievements" then
self.frame.tabButtons[1]:LockHighlight()
self.frame.tabButtons[2]:UnlockHighlight()
self.frame.tabButtons[3]:UnlockHighlight()
else
self.frame.tabButtons[1]:UnlockHighlight()
self.frame.tabButtons[2]:LockHighlight()
if self.currentTab == "guild" then
self.frame.tabButtons[1]:UnlockHighlight()
self.frame.tabButtons[2]:UnlockHighlight()
self.frame.tabButtons[3]:LockHighlight()
else
self.frame.tabButtons[1]:UnlockHighlight()
self.frame.tabButtons[2]:LockHighlight()
self.frame.tabButtons[3]:UnlockHighlight()
end
end
end
 
Localization.frFR.lua
35,4 → 35,5
UAReplacementFrame = "Fen\195\170tre de Hauts Faits am\195\169lior\195\169e";
UAOptions = "Options";
UAAchievementDone = "Vous avez d\195\169j\195\160 accomplis ce Haut-Fait, vous ne pouvez donc plus le suivre.";
UAGuild = "Guilde"
end
\ No newline at end of file
Localization.deDE.lua
35,4 → 35,5
UAReplacementFrame = "Ersetzt das Erfolge-Fenster";
UAOptions = "Einstellungen";
UAAchievementDone = "Du hast diesen Erfolg schon errungen; er kann nicht mehr verfolgt werden.";
UAGuild = "Guild"
end
\ No newline at end of file