WoWInterface SVN Aloft

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /branches/preview/Aloft/AloftClassData
    from Rev 1822 to Rev 1990
    ↔ Reverse comparison
  •

Rev 1822 → Rev 1990

AloftClassData.lua
340,10 → 340,33
function AloftClassData:UpdateClassesFromBattlefield(event)
for i = 1, GetNumBattlefieldScores() do
-- using class token here (arg 10), not the localized class (arg 9)
local name, _, _, _, _, _, _, _, _, class, _, _ = GetBattlefieldScore(i)
if name and name ~= L["Unknown"] and class then
local name, killingBlows, honorableKills, deaths, honorGained, faction, race, class, classToken, damageDone, healingDone, bgRating, ratingChange = GetBattlefieldScore(i)
-- rank has been deprecated in WoW 4.X
 
-- verify the raw data from GetBattlefieldScore
--[[
ChatFrame7:AddMessage("AloftClassData:UpdateClassesFromBattlefield(): score #" .. tostring(i)
.. "/" .. tostring("N:") .. tostring(name)
.. "/" .. tostring("KB:") .. tostring(killingBlows)
.. "/" .. tostring("HK:") .. tostring(honorableKills)
.. "/" .. tostring("D:") .. tostring(deaths)
.. "/" .. tostring("HG:") .. tostring(honorGained)
.. "/" .. tostring("F:") .. tostring(faction)
.. "/" .. tostring("K:") .. tostring(rank)
.. "/" .. tostring("R:") .. tostring(race)
.. "/" .. tostring("C:") .. tostring(class)
.. "/" .. tostring("CT:") .. tostring(classToken)
.. "/" .. tostring("DD:") .. tostring(damageDone)
.. "/" .. tostring("HD:") .. tostring(healingDone))
]]
 
-- use the classToken, it is in english/caps already
if name and name ~= L["Unknown"] and classToken and type(classToken) == "string" then
name = ("-"):split(name, 2)
AddData(name, normalClassNames[class:upper()])
AddData(name, normalClassNames[classToken:upper()])
else
-- class is not a string, or name is unknown
-- ChatFrame7:AddMessage("AloftClassData:UpdateClassesFromBattlefield(): name " .. tostring(name) .. " classToken " .. tostring(classToken) .. " type " .. type(classToken))
end
end
self:UpdateVisibleNameplates()
407,7 → 430,7
 
function AloftClassData:AssignValues(aloftData, class)
-- ChatFrame7:AddMessage("AloftClassData:AssignValues(): " .. tostring(aloftData.name) .. "/" .. tostring(class))
if not aloftData.class ~= class then
if aloftData.class ~= class then
aloftData.class = class
self:SendMessage("Aloft:OnClassDataChanged", aloftData)
-- ChatFrame7:AddMessage("AloftClassData:AssignValues(): trigger " .. tostring(aloftData.name) .. "/" .. tostring(class))