From 7aefa979cee3cb2114c90841e4f8217fe35ef7c4 Mon Sep 17 00:00:00 2001 From: shagu Date: Mon, 2 Jan 2017 01:19:32 +0100 Subject: [PATCH] panel: fix and reduce money calculation code --- modules/panel.lua | 50 +++++++++-------------------------------------- 1 file changed, 9 insertions(+), 41 deletions(-) diff --git a/modules/panel.lua b/modules/panel.lua index 0115c686..ee181d15 100644 --- a/modules/panel.lua +++ b/modules/panel.lua @@ -203,55 +203,23 @@ pfUI:RegisterModule("panel", function () local tooltip = function () if not pfUI.panel.initMoney then pfUI.panel.initMoney = GetMoney() end - local dmoney = GetMoney() - pfUI.panel.initMoney + pfUI.panel.diffMoney = GetMoney() - pfUI.panel.initMoney - -- initial gold - local igold = floor(pfUI.panel.initMoney/ 100 / 100) - local isilver = floor(mod((pfUI.panel.initMoney/100),100)) - local icopper = floor(mod(pfUI.panel.initMoney,100)) - - -- current gold - local gold = floor(GetMoney()/ 100 / 100) - local silver = floor(mod((GetMoney()/100),100)) - local copper = floor(mod(GetMoney(),100)) - - -- diff gold - local dgold = floor(abs(dmoney/100/100)) - local dsilver = floor(abs(mod((dmoney/100),100))) - local dcopper = floor(abs(mod(dmoney,100))) - - local dmod, dchar = "", "" - if dmoney < 0 then - dmod = "|cffffaaaa" - dchar = "|cffff8888-" - elseif dmoney > 0 then - dmod = "|cffaaffaa" - dchar = "|cff88ff88+" + local dmod = "" + if pfUI.panel.diffMoney < 0 then + dmod = "|cffff8888-" + elseif pfUI.panel.diffMoney > 0 then + dmod = "|cff88ff88+" end GameTooltip_SetDefaultAnchor(GameTooltip, this) GameTooltip:ClearLines() GameTooltip:AddLine("|cff555555Money") - - GameTooltip:AddDoubleLine("Login:", - "|cffffffff " .. igold .. "|cffffd700g" .. - "|cffffffff " .. isilver .. "|cffc7c7cfs" .. - "|cffffffff " .. icopper .. "|cffeda55fc") - - GameTooltip:AddDoubleLine("Now:", - "|cffffffff " .. gold .. "|cffffd700g" .. - "|cffffffff " .. silver .. "|cffc7c7cfs" .. - "|cffffffff " .. copper .. "|cffeda55fc") - + GameTooltip:AddDoubleLine("Login:", pfUI.api.CreateGoldString(pfUI.panel.initMoney)) + GameTooltip:AddDoubleLine("Now:", pfUI.api.CreateGoldString(GetMoney())) GameTooltip:AddDoubleLine("|cffffffff","") - - GameTooltip:AddDoubleLine("This Session:", - dchar .. - "|cffffffff " .. dmod .. dgold .. "|cffffd700g" .. - "|cffffffff " .. dmod .. dsilver .. "|cffc7c7cfs" .. - "|cffffffff " .. dmod .. dcopper .. "|cffeda55fc") - + GameTooltip:AddDoubleLine("This Session:", dmod .. pfUI.api.CreateGoldString(math.abs(pfUI.panel.diffMoney))) GameTooltip:Show() end