Skip to content

Updated Shadowlands Branch #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hyphie24 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Updated Shadowlands Branch #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2542d39
Fixed rep frame to fit rep amount to fit with the scrollbar
Hyphie24 Aug 28, 2021
f22e79f
Updated toc to current SL build
Hyphie24 Aug 28, 2021
2a2370b
Changed string value to show decimal for rep
Hyphie24 Aug 28, 2021
c545abd
Added Shadowlands Reps & Fixed Other Reps
Hyphie24 Aug 28, 2021
cbafffb
Fixed WIntersaber rep
Hyphie24 Aug 29, 2021
9c063c2
Kiron tor & other fixes
Hyphie24 Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions RepHelper.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ end
function RPH:Quest_Names(questIndex)

RPH_HiddenQuestTooltip:SetOwner(WorldFrame, ANCHOR_NONE)
RPH_HiddenQuestTooltip:SetHyperlink(format("quest:%d", questIndex))
RPH_HiddenQuestTooltip:SetHyperlink(format("quest:%g", questIndex))

local quest = RPH_HiddenQuestTooltipTextLeft1:GetText()
RPH_HiddenQuestTooltip:Hide()
Expand Down Expand Up @@ -1948,7 +1948,7 @@ function RPH:BuildUpdateList() --xxx
local bul_name = RPH:InitMapName(fg_sid_x_d.name)
FUL_I.type = RPH_TXT.instanceShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", fg_sid_x_d.rep)
FUL_I.rep = string.format("%g", fg_sid_x_d.rep)
FUL_I.hasList = false
FUL_I.listShown = nil
FUL_I.index = index
Expand Down Expand Up @@ -1990,7 +1990,7 @@ function RPH:BuildUpdateList() --xxx
local FUL_I = RPH_UpdateList[index]
FUL_I.type = RPH_TXT.mobShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", fg_sid_x_d.rep)
FUL_I.rep = string.format("%g", fg_sid_x_d.rep)
FUL_I.hasList = false
FUL_I.listShown = nil
FUL_I.index = index
Expand Down Expand Up @@ -2106,7 +2106,7 @@ function RPH:BuildUpdateList() --xxx
local FUL_I = RPH_UpdateList[index]
FUL_I.type = RPH_TXT.questShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", fg_sid_x_d.rep)
FUL_I.rep = string.format("%g", fg_sid_x_d.rep)
FUL_I.index = index
FUL_I.belongsTo = nil
FUL_I.isShown = true
Expand Down Expand Up @@ -2191,8 +2191,8 @@ function RPH:BuildUpdateList() --xxx
--FUL_I.name = FUL_I.originalName
FUL_I_TD[x], x = RPH:Update_Tooltip(x, " ", " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.inBag, " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%d", FUL_I.currentTimesBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%d", FUL_I.currentRepBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%g", FUL_I.currentTimesBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%g", FUL_I.currentRepBag))
else
FUL_I.currentTimesBag = nil
FUL_I.currentRepBag = nil
Expand All @@ -2208,8 +2208,8 @@ function RPH:BuildUpdateList() --xxx
RPH_CurrentRepInBagBank = RPH_CurrentRepInBagBank + FUL_I.currentRepBagBank
FUL_I_TD[x], x = RPH:Update_Tooltip(x, " ", " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.inBagBank, " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%d", FUL_I.currentTimesBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%d", FUL_I.currentRepBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%g", FUL_I.currentTimesBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%g", FUL_I.currentRepBagBank))
else
FUL_I.currentTimesBagBank = nil
FUL_I.currentRepBagBank = nil
Expand Down Expand Up @@ -2241,7 +2241,7 @@ function RPH:BuildUpdateList() --xxx

FUL_I_TD[x], x = RPH:Update_Tooltip(x, " ", " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.questCompleted, " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%d", FUL_I.currentRepQuest))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%g", FUL_I.currentRepQuest))
else
FUL_I.lowlight = true
FUL_I.name = FUL_I.name..RPH_QUEST_ACTIVE_COLOUR.." ("..RPH_TXT.active..")|r"
Expand All @@ -2265,7 +2265,7 @@ function RPH:BuildUpdateList() --xxx
local FUL_I = RPH_UpdateList[index]
FUL_I.type = RPH_TXT.questShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", sum)
FUL_I.rep = string.format("%g", sum)
FUL_I.index = index
FUL_I.belongsTo = nil
FUL_I.isShown = true
Expand Down Expand Up @@ -2300,7 +2300,7 @@ function RPH:BuildUpdateList() --xxx
local FUL_I = RPH_UpdateList[index]
FUL_I.type = RPH_TXT.itemsShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", fg_sid_x_d.rep)
FUL_I.rep = string.format("%g", fg_sid_x_d.rep)
FUL_I.index = index
FUL_I.belongsTo = nil
FUL_I.isShown = true
Expand Down Expand Up @@ -2373,8 +2373,8 @@ function RPH:BuildUpdateList() --xxx

FUL_I_TD[x], x = RPH:Update_Tooltip(x, " ", " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.inBag, " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%d", FUL_I.currentTimesBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%d", FUL_I.currentRepBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%g", FUL_I.currentTimesBag))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%g", FUL_I.currentRepBag))
end

if (currentQuestTimesBagBank > 0) then
Expand All @@ -2391,8 +2391,8 @@ function RPH:BuildUpdateList() --xxx

FUL_I_TD[x], x = RPH:Update_Tooltip(x, " ", " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.inBagBank, " ")
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%d", FUL_I.currentTimesBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%d", FUL_I.currentRepBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.turnIns, string.format("%g", FUL_I.currentTimesBagBank))
FUL_I_TD[x], x = RPH:Update_Tooltip(x, RPH_TXT.reputation, string.format("%g", FUL_I.currentRepBagBank))
end

if ((currentQuestTimesBag == 0) and (currentQuestTimesBagBank > 0 == false)) then
Expand Down Expand Up @@ -2425,7 +2425,7 @@ function RPH:BuildUpdateList() --xxx
local FUL_I = RPH_UpdateList[index]
FUL_I.type = RPH_TXT.generalShort
FUL_I.times = math.ceil(toDo).."x"
FUL_I.rep = string.format("%d", fg_sid_x_d.rep)
FUL_I.rep = string.format("%g", fg_sid_x_d.rep)
FUL_I.index = index
FUL_I.belongsTo = nil
FUL_I.isShown = true
Expand Down Expand Up @@ -2736,15 +2736,15 @@ function RPH:DumpReputationChangesToChat(initOnly)
-- If the faction is a friend faction and not at max rank get the next standing text
RPH:Print(RPH_NEW_REP_COLOUR..string.format(FACTION_STANDING_INCREASED..RPH_TXT.statsNextStanding, name, barValue-RPH_StoredRep[name].rep, sign, barValue-RPH_StoredRep[name].origRep, RPH_GetFriendFactionStandingLabel(factionID, nextFriendThreshold),barMax-barValue))
elseif (friendID == nil and standingID < 8) then
-- If not a friend faction and below max rank use the format (Total: %s%d, Left to %s: %d) if not use the normal format (Total: %s%d, Left: %d)
-- If not a friend faction and below max rank use the format (Total: %s%g, Left to %s: %g) if not use the normal format (Total: %s%g, Left: %g)
RPH:Print(RPH_NEW_REP_COLOUR..string.format(FACTION_STANDING_INCREASED..RPH_TXT.statsNextStanding, name, barValue-RPH_StoredRep[name].rep, sign, barValue-RPH_StoredRep[name].origRep, _G["FACTION_STANDING_LABEL"..standingID + 1],barMax-barValue))
else
RPH:Print(RPH_NEW_REP_COLOUR..string.format(FACTION_STANDING_INCREASED..RPH_TXT.stats, name, barValue-RPH_StoredRep[name].rep, sign, barValue-RPH_StoredRep[name].origRep, barMax-barValue))
end
elseif (barValue < RPH_StoredRep[name].rep) then
-- decreased rep
if (standingID > 1 and friendID == nil) then
-- Only use the new format (Total: %s%d, Left to %s: %d) if we are above the lowest rank, otherwise use the normal format (Total: %s%d, Left: %d)
-- Only use the new format (Total: %s%g, Left to %s: %g) if we are above the lowest rank, otherwise use the normal format (Total: %s%g, Left: %g)
RPH:Print(RPH_NEW_REP_COLOUR..string.format(FACTION_STANDING_DECREASED..RPH_TXT.statsNextStanding, name, RPH_StoredRep[name].rep-barValue, sign, barValue-RPH_StoredRep[name].origRep, _G["FACTION_STANDING_LABEL"..standingID - 1], barMax-barValue))
else
RPH:Print(RPH_NEW_REP_COLOUR..string.format(FACTION_STANDING_DECREASED..RPH_TXT.stats, name, RPH_StoredRep[name].rep-barValue, sign, barValue-RPH_StoredRep[name].origRep, barMax-barValue))
Expand Down Expand Up @@ -3225,7 +3225,7 @@ function RPH:Rep_Detail_Frame(faction,colorID,barValue,barMax,origBarValue,stand
RPH_ReputationDetailStandingBagBankValue:SetText(RPH_CurrentRepInBagBank)
RPH_ReputationDetailStandingQuestsValue:SetText(RPH_CurrentRepInQuest)
if (RPH_StoredRep and RPH_StoredRep[name] and RPH_StoredRep[name].origRep) then
RPH_ReputationDetailStandingGainedValue:SetText(string.format("%d", origBarValue-RPH_StoredRep[name].origRep))
RPH_ReputationDetailStandingGainedValue:SetText(string.format("%g", origBarValue-RPH_StoredRep[name].origRep))
else
RPH_ReputationDetailStandingGainedValue:SetText("")
end
Expand Down Expand Up @@ -3969,4 +3969,4 @@ function RPH:OriginalRepOrder(i,factionIndex,factionRow,factionBar,factionBarPre
-- ^ rfl ORO 7

end
-- ^ rfl ORO
-- ^ rfl ORO
4 changes: 2 additions & 2 deletions RepHelper.toc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 90002
## Interface: 90100
## Title: RepHelper
## Version: @project-version@
## Author: Chawan, Marabon
Expand All @@ -14,4 +14,4 @@ content.lua
mapping.lua
locale.xml
RepHelper.xml
RepHelperSkin.lua
RepHelperSkin.lua
6 changes: 3 additions & 3 deletions RepHelper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<Anchors><Anchor point="LEFT" relativeTo="$parent" relativePoint="LEFT"><Offset x="80" y="0"/></Anchor></Anchors>
</FontString>
<FontString name="$parentRep" inherits="DetailFontWhite" justifyH="RIGHT">
<Size x="30" y="16"/>
<Anchors><Anchor point="LEFT" relativeTo="$parent" relativePoint="LEFT"><Offset x="400" y="0"/></Anchor></Anchors>
<Size x="50" y="16"/>
<Anchors><Anchor point="LEFT" relativeTo="$parent" relativePoint="LEFT"><Offset x="380" y="0"/></Anchor></Anchors>
</FontString>
<!-->Common parts for item entries<-->
<FontString name="$parentItemTimes" inherits="DetailFontGrey" justifyH="RIGHT">
Expand Down Expand Up @@ -1429,4 +1429,4 @@
-->
<!--> ============================================================================================================== <-->

</Ui>
</Ui>
Loading