Use own coinstring function, fix account money display

This commit is contained in:
rilgamon 2021-03-13 15:04:20 +01:00
parent 576a458787
commit 90a79d9946
2 changed files with 16 additions and 28 deletions

View File

@ -126,17 +126,19 @@ local function OnTooltipShow(tip)
local ttlist = {}
if(addonTable['db']['sv']['profileKeys']) then
for k,v in pairs(addonTable['db']['sv']['profileKeys']) do
local n,_,m = strsplit(' ',k,3)
if(n) then
local cr = Helper_Tooltip3(m)
if(m == realm or cr) then
cdbCheck(n,cr and m or realm)
if( faction == db[cr and m or realm][n]['faction']) then
sum = sum + db[cr and m or realm][n]['currentGold']
ttlist[k] = db[cr and m or realm][n]['currentGold']
end
local n,_,m = strsplit(' ',k,3)
if(n) then
local cr = Helper_Tooltip3(m)
if(m == realm or cr) then
cdbCheck(n, m)
if( faction == db[m][n]['faction']) then
sum = sum + db[m][n]['currentGold']
ttlist[k] = db[m][n]['currentGold']
end
elseif(db['accountMoney']) then
sum = sum + db[m][n]['currentGold']
end
end
end
end
end
for _,v in pairs(addonTable:sortArray(ttlist,db['sortDir'])) do

View File

@ -64,25 +64,11 @@ local specs = {
}
function addonTable:displayMoney(money, abr)
if(abr) then
local ab = false
if(db['abrevM'] and money >= 10000000000) then
ab = L['abrM']
money = addonTable:round(money / 10000000000,0) * 10000
elseif(db['abrevK'] and money >= 10000000) then
ab = L['abrK']
money = addonTable:round(money / 10000000,0) * 10000
end
if(ab) then
if(db['shortMoney'] and money>10000)then
money = addonTable:round(money / 10000,0) * 10000
end
return gsub(GetCoinTextureString(money), "(%d+)", function(num) return format('%i%s',num, ab) end,1)
end
if(db['shortMoney'] and money>10000)then
money = addonTable:round(money / 10000,0) * 10000
end
end
if(db['shortMoney'] and money>10000)then
money = addonTable:round(money / 10000,0) * 10000
end
return GetCoinTextureString(money)
return addonTable:MoneyString(money, color, db['abrevK'] and L['abrK'] or nil, db['abrevM'] and L['abrM'] or nil)
end
local pew_events = {}
function pew_events:PLAYER_MONEY(event)