diff --git a/FuBar_FuXPFu/FuBar_FuXPFu.lua b/FuBar_FuXPFu/FuBar_FuXPFu.lua index 42ea32a..db19f84 100644 --- a/FuBar_FuXPFu/FuBar_FuXPFu.lua +++ b/FuBar_FuXPFu/FuBar_FuXPFu.lua @@ -748,6 +748,13 @@ function FuXP:OnTextUpdate() currentRep = renownReputationData.renownReputationEarned factionStandingLabel = "|cff00b0bdRenown " .. renownReputationData.renownLevel + + if currentRepParagon ~= nil then --Renown + Paragon + maxRep = maxRepParagon + currentRep = currentRepParagon % maxRepParagon + + factionStandingLabel = factionStandingLabel .. "|r |cffffffff+|r |cffB2D7F7Paragon" + end elseif currentRepParagon ~= nil then --Paragon minRep = 0 maxRep = maxRepParagon @@ -794,7 +801,11 @@ function FuXP:OnTextUpdate() self:SetText(string.format(L["%s (%s) // XP: %3.0f%%/%s to go"], name, factionStandingLabel .. "|r", math.floor(xp / max * 100), numWithCommas(toGo))) end else - self:SetText(string.format(L["%s: %3.0f%% (%s/%s) (%s)"], name, ((currentRep - minRep) / (maxRep - minRep)) * 100 , numWithCommas(currentRep - minRep), numWithCommas(maxRep - minRep), factionStandingLabel .. "|r")) + if currentRep == minRep and minRep == maxRep then -- Max reputation + self:SetText(string.format("%s (%s)", name, factionStandingLabel .. "|r")) + else + self:SetText(string.format(L["%s: %3.0f%% (%s/%s) (%s)"], name, ((currentRep - minRep) / (maxRep - minRep)) * 100 , numWithCommas(currentRep - minRep), numWithCommas(maxRep - minRep), factionStandingLabel .. "|r")) + end end else self:SetText(string.format(L["XP: %3.0f%%/%s to go"], math.floor(xp / max * 100), numWithCommas(toGo))) @@ -871,7 +882,14 @@ function FuXP:OnTooltipUpdate() maxRep = renownReputationData.renownLevelThreshold currentRep = renownReputationData.renownReputationEarned - standing = "|cff00b0bdRenown " .. renownReputationData.renownLevel .. "|r" --Renown + standing = "|cff00b0bdRenown " .. renownReputationData.renownLevel .. "|r" --Renown + + if currentRepParagon ~= nil then --Renown + Paragon + maxRep = maxRepParagon + currentRep = currentRepParagon % maxRepParagon + + standing = standing .. " |cffffffff+|r |cffB2D7F7Paragon|r" + end elseif currentRepParagon ~= nil then maxRep = maxRepParagon currentRep = currentRepParagon % maxRepParagon diff --git a/FuBar_FuXPFu/FuBar_FuXPFu.toc b/FuBar_FuXPFu/FuBar_FuXPFu.toc index 4856e3d..bf99e6f 100644 --- a/FuBar_FuXPFu/FuBar_FuXPFu.toc +++ b/FuBar_FuXPFu/FuBar_FuXPFu.toc @@ -1,10 +1,10 @@ -## Interface: 100005 +## Interface: 100100 ## Title: FuBar - |cffffffffFuXP|r|cff00ff00Fu|r ## Title-koKR: |CFF99FF99F|CFFFFFFFFu|CFF99FF99B|CFFFFFFFFar - |cffffffffFuXP|r|cff00ff00Fu|r ## Notes: Lightweight XP Bar ## Notes-zhCN: 迷你经验条 ## Notes-zhTW: 輕量級的經驗值條模組。 -## Version: 10.0.5.0 +## Version: 10.1.0.0 ## Author: Wobin, azuraji ## eMail: wobster@gmail.com ## X-Credits: Bant (For the design) diff --git a/FuBar_FuXPFu/Libs/AceAddon-2.0/AceAddon-2.0.toc b/FuBar_FuXPFu/Libs/AceAddon-2.0/AceAddon-2.0.toc index bda433a..bb2edb5 100644 --- a/FuBar_FuXPFu/Libs/AceAddon-2.0/AceAddon-2.0.toc +++ b/FuBar_FuXPFu/Libs/AceAddon-2.0/AceAddon-2.0.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceConsole-2.0/AceConsole-2.0.toc b/FuBar_FuXPFu/Libs/AceConsole-2.0/AceConsole-2.0.toc index dba0287..051612c 100644 --- a/FuBar_FuXPFu/Libs/AceConsole-2.0/AceConsole-2.0.toc +++ b/FuBar_FuXPFu/Libs/AceConsole-2.0/AceConsole-2.0.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceDB-2.0/AceDB-2.0.toc b/FuBar_FuXPFu/Libs/AceDB-2.0/AceDB-2.0.toc index 755d789..130e841 100644 --- a/FuBar_FuXPFu/Libs/AceDB-2.0/AceDB-2.0.toc +++ b/FuBar_FuXPFu/Libs/AceDB-2.0/AceDB-2.0.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceEvent-2.0/AceEvent-2.0.toc b/FuBar_FuXPFu/Libs/AceEvent-2.0/AceEvent-2.0.toc index da417fa..deb37f6 100644 --- a/FuBar_FuXPFu/Libs/AceEvent-2.0/AceEvent-2.0.toc +++ b/FuBar_FuXPFu/Libs/AceEvent-2.0/AceEvent-2.0.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceHook-2.1/AceHook-2.1.toc b/FuBar_FuXPFu/Libs/AceHook-2.1/AceHook-2.1.toc index 6bca777..40fbf3e 100644 --- a/FuBar_FuXPFu/Libs/AceHook-2.1/AceHook-2.1.toc +++ b/FuBar_FuXPFu/Libs/AceHook-2.1/AceHook-2.1.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## Title: Lib: AceHook-2.1 ## Notes: AddOn development framework diff --git a/FuBar_FuXPFu/Libs/AceLibrary/AceLibrary.toc b/FuBar_FuXPFu/Libs/AceLibrary/AceLibrary.toc index 42a63f1..37edbab 100644 --- a/FuBar_FuXPFu/Libs/AceLibrary/AceLibrary.toc +++ b/FuBar_FuXPFu/Libs/AceLibrary/AceLibrary.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceLocale-2.2/AceLocale-2.2.toc b/FuBar_FuXPFu/Libs/AceLocale-2.2/AceLocale-2.2.toc index 96ebda7..0ccd470 100644 --- a/FuBar_FuXPFu/Libs/AceLocale-2.2/AceLocale-2.2.toc +++ b/FuBar_FuXPFu/Libs/AceLocale-2.2/AceLocale-2.2.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/AceOO-2.0/AceOO-2.0.toc b/FuBar_FuXPFu/Libs/AceOO-2.0/AceOO-2.0.toc index 3f5f524..ddc7932 100644 --- a/FuBar_FuXPFu/Libs/AceOO-2.0/AceOO-2.0.toc +++ b/FuBar_FuXPFu/Libs/AceOO-2.0/AceOO-2.0.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1101 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/CrayonLib/AceLibrary/AceLibrary.toc b/FuBar_FuXPFu/Libs/CrayonLib/AceLibrary/AceLibrary.toc index 2394879..f06f06d 100644 --- a/FuBar_FuXPFu/Libs/CrayonLib/AceLibrary/AceLibrary.toc +++ b/FuBar_FuXPFu/Libs/CrayonLib/AceLibrary/AceLibrary.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## X-Curse-Packaged-Version: r1094 ## X-Curse-Project-Name: Ace2 ## X-Curse-Project-ID: ace2 diff --git a/FuBar_FuXPFu/Libs/CrayonLib/CrayonLib.toc b/FuBar_FuXPFu/Libs/CrayonLib/CrayonLib.toc index 4f7ec27..4164480 100644 --- a/FuBar_FuXPFu/Libs/CrayonLib/CrayonLib.toc +++ b/FuBar_FuXPFu/Libs/CrayonLib/CrayonLib.toc @@ -1,4 +1,4 @@ -## Interface: 100002 +## Interface: 100100 ## LoadOnDemand: 1 ## Title: Lib: Crayon-2.0 ## Notes: A library to provide coloring tools.