WoWInterface SVN UrbanAchiever

Compare Revisions

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

Rev 13 → Rev 14

Main.lua
77,24 → 77,41
 
["completed d"] = function(a, b)
local _,_,_,_,a1,a2,a3 = GetAchievementInfo(a)
a1, a2, a3 = a1 or 0, a2 or 0, a3 or 0
local _,_,_,_,b1,b2,b3 = GetAchievementInfo(b)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
b = (b1 or "") .. "/" .. (b2 or "") .. "/" .. (b3 or "")
return a < b
b1, b2, b3 = b1 or 0, b2 or 0, b3 or 0
if a3 ~= b3 then return a3 < b3 end --Years first
if a1 ~= b1 then return a1 < b1 end --Then Months
if a2 ~= b2 then return a2 < b2 end --Finally Days
return false --They're exactly the same, return false
end,
 
["completed a"] = function(a, b)
local _,_,_,_,a1,a2,a3 = GetAchievementInfo(a)
a1, a2, a3 = a1 or 0, a2 or 0, a3 or 0
local _,_,_,_,b1,b2,b3 = GetAchievementInfo(b)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
b = (b1 or "") .. "/" .. (b2 or "") .. "/" .. (b3 or "")
return a > b
b1, b2, b3 = b1 or 0, b2 or 0, b3 or 0
if a3 ~= b3 then return a3 > b3 end --Years first
if a1 ~= b1 then return a1 > b1 end --Then Months
if a2 ~= b2 then return a2 > b2 end --Finally Days
return false --They're exactly the same, return false
end,
 
["compare d"] = function(a, b)
if not self.isComparing then return false end
--They're both achievements, go by date
if self.masterList[a].isAchievement and self.masterList[b].isAchievement 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)
b1, b2, b3 = b1 or 0, b2 or 0, b3 or 0
if a3 ~= b3 then return a3 < b3 end --Years first
if a1 ~= b1 then return a1 < b1 end --Then Months
if a2 ~= b2 then return a2 < b2 end --Finally Days
return false --They're exactly the same, return false
end
 
if self.masterList[a].isFunction then
if self.masterList[a].isAchievement then
local _,a1, a2, a3 = GetAchievementComparisonInfo(a,1)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
else
114,6 → 131,17
["compare a"] = function(a, b)
if not self.isComparing then return false end
 
if self.masterList[a].isAchievement and self.masterList[b].isAchievement 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)
b1, b2, b3 = b1 or 0, b2 or 0, b3 or 0
if a3 ~= b3 then return a3 > b3 end --Years first
if a1 ~= b1 then return a1 > b1 end --Then Months
if a2 ~= b2 then return a2 > b2 end --Finally Days
return false --They're exactly the same, return false
end
 
if self.masterList[a].isAchievement then
local _,a1, a2, a3 = GetAchievementComparisonInfo(a,1)
a = (a1 or "") .. "/" .. (a2 or "") .. "/" .. (a3 or "")
121,7 → 149,7
a = GetStatistic(a)
end
 
if self.masterList[b].isFunction then
if self.masterList[b].isAchievement then
local _,b1, b2, b3 = GetAchievementComparisonInfo(b,1)
b = (b1 or "") .. "/" .. (b2 or "") .. "/" .. (b3 or "")
else