From 2542d39f069569d4a246bb64a51239dbebb7f430 Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sat, 28 Aug 2021 17:49:04 -0400 Subject: [PATCH 1/6] Fixed rep frame to fit rep amount to fit with the scrollbar Made it so the rep gain amount wasn't behind the scroll wheel if the amount of mobs exceed the window and required a scroll --- RepHelper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RepHelper.xml b/RepHelper.xml index 70f10b2..4d4d861 100644 --- a/RepHelper.xml +++ b/RepHelper.xml @@ -41,8 +41,8 @@ - - + + Common parts for item entries<--> @@ -1429,4 +1429,4 @@ --> ============================================================================================================== <--> - \ No newline at end of file + From f22e79fbdd65955f0240b9fea3f6a00db82c6608 Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sat, 28 Aug 2021 17:49:52 -0400 Subject: [PATCH 2/6] Updated toc to current SL build --- RepHelper.toc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RepHelper.toc b/RepHelper.toc index a350f16..d8a1db3 100644 --- a/RepHelper.toc +++ b/RepHelper.toc @@ -1,4 +1,4 @@ -## Interface: 90002 +## Interface: 90100 ## Title: RepHelper ## Version: @project-version@ ## Author: Chawan, Marabon @@ -14,4 +14,4 @@ content.lua mapping.lua locale.xml RepHelper.xml -RepHelperSkin.lua \ No newline at end of file +RepHelperSkin.lua From 2a2370b3d00d0675b550f628c7aec733cb927952 Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sat, 28 Aug 2021 17:57:19 -0400 Subject: [PATCH 3/6] Changed string value to show decimal for rep Changed the string value from %d to %g to show decimal values on reputation gain. to help with rep gains that give .25-.75 gains and also to help with DMF to be a little more exact with the numbers --- RepHelper.lua | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/RepHelper.lua b/RepHelper.lua index 87ea9cd..c494a34 100644 --- a/RepHelper.lua +++ b/RepHelper.lua @@ -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() @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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" @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -2736,7 +2736,7 @@ 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)) @@ -2744,7 +2744,7 @@ function RPH:DumpReputationChangesToChat(initOnly) 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)) @@ -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 @@ -3969,4 +3969,4 @@ function RPH:OriginalRepOrder(i,factionIndex,factionRow,factionBar,factionBarPre -- ^ rfl ORO 7 end --- ^ rfl ORO \ No newline at end of file +-- ^ rfl ORO From c545abd4070ae1125df5262f0488d5b35346fd1f Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sat, 28 Aug 2021 17:59:36 -0400 Subject: [PATCH 4/6] Added Shadowlands Reps & Fixed Other Reps Added shadowlands turn in for Korthia rep, added rep gains for Shadowlands areas. Added Brawlers guild rep gain calculations. Possible fix for Wintersaber turn ins. Added Bodyguard rep calculations for Draenor. Fixed guild calculations for quest turn ins. Added all Ve'nari rep mobs & events. --- content.lua | 348 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 307 insertions(+), 41 deletions(-) diff --git a/content.lua b/content.lua index eca7b0d..a60e2bd 100644 --- a/content.lua +++ b/content.lua @@ -161,6 +161,14 @@ zone.Frostwall = 585 zone.Frostfire_Ridge = 525 zone.Nagrand_WoD = 550 +--Shadowlands +zone.The_Maw = 1543 +zone.Maldraxxus = 1536 +zone.Bastion = 1533 +zone.Ardenweald = 1565 +zone.Revendreth = 1525 +zone.Korthia = 1961 + -- Battlegrounds zone.Temple_of_Kotmogu = 417 zone.Alterac_Valley = 91 @@ -353,6 +361,8 @@ zone.Trial_of_Valor = 806 zone.Antorus_the_Burning_Throne = 909 zone.The_Nighthold = 764 +-- Shadowlands Dungeons +zone.Halls_of_Atonement = 1663 if (RPH_IsAlliance) then @@ -472,8 +482,11 @@ zone.The_Nighthold = 764 -- The League of Arathor 509 RPH_AddGeneral(509, 4, 8, "Arathi Basin collect 100 Resources", 50, "Collect 100 Resources", "For every 100 resources your team collects you gain 50 reputation") RPH_AddGeneral(509, 4, 8, "Arathi Basin win (1500 Resources)", 750, "Arathi Basin win (1500 Resources)", "If your team wins with 1500 resources you will earn a total of 750 reputation") - -- Bizmo's Brawlpub 1419 - RPH_AddQuest(1419, 1, 8, 5, 1) + -- Bizmo's Brawlpub 1419 (S1), 1691 (S2), 2011 (S3), 2371 (S4) + RPH_AddGeneral(1419, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(1691, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(2011, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(2371, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") -- Outlands (Burning Crusade) -- Honor Hold 946 RPH_AddInstance(946, 4, 5, zone.Hellfire_Ramparts, 600, false) @@ -725,7 +738,8 @@ zone.The_Nighthold = 764 RPH_AddQuest(1177, 4, 8, 28689, 250) -- Mist of Pandaria -- Pearlfin Jinyu 1242 - RPH_AddQuest(1242, 1, 8, 5, 1) + RPH_AddQuest(1242, 1, 8, 29905, 1) + RPH_AddQuest(1242, 1, 8, 29906, 1) -- Operation: Shieldwall 1376 RPH_AddQuest(1376, 1, 8, 32643, 400) ---- Lion's Landing @@ -1010,8 +1024,11 @@ zone.The_Nighthold = 764 RPH_AddGeneral(889, 4, 8, "Warsong Gulch flag capture", 100, "Warsong Gulch flag capture", "Every time your team captures a flag you gain 100 reputation") RPH_AddGeneral(889, 4, 8, "Warsong Gulch victory", 100, "Warsong Gulch victory", "Every time your team wins you gain 100 reputation") RPH_AddGeneral(889, 4, 8, "Warsong Gulch loss", 35, "Warsong Gulch loss", "Every time your team lose you gain 35 reputation") - -- Brawl'gar Arena 1374 - RPH_AddQuest(1374, 1, 8, 5, 1) + -- Brawl'gar Arena 1374(S1), 1690(S2), 2010(S3), 2372(S4) + RPH_AddGeneral(1374, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(1690, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(2010, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") + RPH_AddGeneral(2372, 1, 8, "Complete 4 Fights per Rank", 250, "Complete 4 Fights per Rank", "For every 4 fights completed, increase rank up to Max Rank") -- 0 Outlands (Burning Crusade) -- Thrallmar 947 RPH_AddInstance(947, 4, 5, zone.Hellfire_Ramparts, 600, false) @@ -1569,10 +1586,12 @@ zone.The_Nighthold = 764 RPH_AddMob(576, 2, 8, "High Chief Winterfall", 50, zone.Winterspring) -- TODO: Fix wintersaber quest -- Wintersaber Trainers 589 - --RPH_AddQuest(589, 4, 8, 29037, 1500) - --RPH_AddQuest(589, 4, 8, 29035, 1500) - --RPH_AddQuest(589, 4, 8, 29038, 1500) - --RPH_AddQuest(589, 4, 8, 29040, 1500) + RPH_AddQuest(589, 1, 4, 29032, 3000) + RPH_AddQuest(589, 4, 6, 29037, 1500) + RPH_AddQuest(589, 4, 6, 29035, 1500) + RPH_AddQuest(589, 4, 6, 29038, 1500) + RPH_AddQuest(589, 4, 6, 29040, 1500) + RPH_AddQuest(589, 5, 8, 29034, 42999) -- Raid_Factions -- Ashtongue Deathsworn 1012 RPH_AddInstance(1012, 4, 8, zone.Black_Temple, 8000) @@ -2423,14 +2442,30 @@ zone.The_Nighthold = 764 RPH_AddQuest(1850, 1, 8, 39582, 1500, {[124099] = 100}) end - RPH_AddMob(1850, 1, 8, "Blackfang Hunter", 25, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Blackfang Prowler", 25, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Blackfang Savage", 25, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Blackfang Shaman", 25, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Soulslicer (Rare elite)", 500, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Gloomtalon (Rare elite)", 500, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "Krell the Serene (Rare elite)", 500, ZONE.Tanaan_Jungle) - RPH_AddMob(1850, 1, 8, "The Blackfang (Rare elite)", 500, ZONE.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Blackfang Hunter", 25, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Blackfang Prowler", 25, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Blackfang Savage", 25, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Blackfang Shaman", 25, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Soulslicer (Rare elite)", 500, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Gloomtalon (Rare elite)", 500, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "Krell the Serene (Rare elite)", 500, zone.Tanaan_Jungle) + RPH_AddMob(1850, 1, 8, "The Blackfang (Rare elite)", 500, zone.Tanaan_Jungle) + + -- Barracks Bodyguards Leorajh 1741, Vivianne 1739, Tormmok 1736, Defender Illona 1738, Aeda Brightdawn 1740, Delvar Ironfist 1733, Talonprist Ishaal 1737 + if RPH_IsHorde then + RPH_AddGeneral(1740, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1739, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1741, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1736, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1737, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + end + if RPH_IsAlliance then + RPH_AddGeneral(1733, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1738, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1741, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1736, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + RPH_AddGeneral(1737, 1, 8, "Draenor Mobs", 10, "Draenor Mobs", "Killing mobs in Draenor while having this bodyguard active") + end -- Legion Factions -- Armies of Legionfall 2045 @@ -2608,15 +2643,15 @@ zone.The_Nighthold = 764 -- Battle for Azeroth - -- Champions of Azeroth + -- Champions of Azeroth 2164 RPH_AddGeneral(2164, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2164, 1, 8, "Champions of Azeroth Emissary", 1500, "Champions of Azeroth Emissary", "Complete 4x Champions of Azeroth world quests while the emissary is available to gain reputation") - -- Tortollan Seekers + -- Tortollan Seekers 2163 RPH_AddGeneral(2163, 1, 8, "Tortollan Seekers", 175, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2163, 1, 8, "Tortollan Seekers Emissary", 1500, "Tortollan Seekers Emissary", "Complete 3x Tortollan Seekers world quests while the emissary is available to gain reputation") - -- Rustbolt Resistance + -- Rustbolt Resistance 2391 RPH_AddGeneral(2391, 1, 8, "Daily World Quest", 850, "Daily World Quest", "Complete the daily world quest to gain reputation with this faction") RPH_AddGeneral(2391, 1, 8, "Daily Pet Battle World Quest", 75, "Daily Pet Battle", "Complete the daily pet battle world quest to gain reputation with this faction") RPH_AddGeneral(2391, 1, 8, "PVP Daily Quest", 200, "Daily PVP Quest", "Complete a PVP daily quest to gain reputation with this faction") @@ -2624,7 +2659,7 @@ zone.The_Nighthold = 764 RPH_AddGeneral(2391, 1, 8, "Daily Quests 150 rep", 150, "Daily Quests", "Daily quests that provide 150 reputation") RPH_AddQuest(2045, 1, 8, 46735, 150, {[1342] = 100}) - -- Rajanji + -- Rajanji 2415 RPH_AddQuest(2415, 1, 8, 57008, 500) RPH_AddQuest(2415, 1, 8, 57728, 500) RPH_AddQuest(2415, 1, 8, 56064, 1500) @@ -2632,31 +2667,262 @@ zone.The_Nighthold = 764 RPH_AddGeneral(2415, 1, 8, "Threat objectives 50-75 rep", 50, "Threat Objectives", "Completing threat objectives marked by a skull or crossed swords on the minimap provide 50-75 reputation.") RPH_AddGeneral(2415, 1, 8, "Daily Pet Battle World Quest", 75, "Daily Pet Battle", "Complete the daily pet battle world quest to gain reputation with this faction") - -- Uldum Accord + -- Uldum Accord 2417 RPH_AddQuest(2417, 1, 8, 55350, 500) RPH_AddQuest(2417, 1, 8, 56308, 500) RPH_AddQuest(2417, 1, 8, 57157, 1500) RPH_AddGeneral(2417, 1, 8, "Daily Quests 125 rep", 125, "Daily Quests", "Daily quests that provide 125 reputation") RPH_AddGeneral(2417, 1, 8, "Threat objectives 50-75 rep", 50, "Threat Objectives", "Completing threat objectives marked by a skull or crossed swords on the minimap provide 50-75 reputation.") RPH_AddGeneral(2417, 1, 8, "Daily Pet Battle World Quest", 75, "Daily Pet Battle", "Complete the daily pet battle world quest to gain reputation with this faction") + + --Shadowlands + + -- Court of Harvesters 2413 + RPH_AddGeneral(2413, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2413, 1, 8, "Venthyr Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") + RPH_AddGeneral(2413, 1, 8, "Rare Revendreth Calling", 1500, "Complete Rare Revendreth Calling", "Calling rewards Blue quality cache") + RPH_AddGeneral(2413, 1, 8, "Epic Revendreth Calling", 2000, "Complete Epic Revendreth Calling", "Calling rewards Purple quality cache") + + -- Court of Night 2464 + RPH_AddQuest(2464, 1, 8, 62081, 750) + RPH_AddQuest(2464, 1, 8, 62224, 750) + RPH_AddQuest(2464, 1, 8, 62188, 750) + RPH_AddQuest(2464, 1, 8, 62155, 750) + RPH_AddQuest(2464, 1, 8, 61950, 750) + RPH_AddQuest(2464, 1, 8, 61875, 750) + RPH_AddQuest(2464, 1, 8, 61985, 750) + RPH_AddQuest(2464, 1, 8, 62160, 750) + RPH_AddQuest(2464, 1, 8, 61968, 750) + RPH_AddQuest(2464, 1, 8, 62057, 750) + RPH_AddQuest(2464, 1, 8, 62068, 1000) + RPH_AddQuest(2464, 1, 8, 61717, 1000) + RPH_AddQuest(2464, 1, 8, 62051, 1000) + RPH_AddQuest(2464, 1, 8, 61394, 1000) + + + -- Death's Advance 2470 + RPH_AddGeneral(2470, 1, 8, "Korthia Dailes", 125, "Complete Korthia Dailies") + RPH_AddGeneral(2470, 1, 8, "Maw World Quest", 200, "World Quests", "Complete Maw world quests") + RPH_AddGeneral(2470, 1, 8, "Maw Assault", 350, "Complete Covenant Maw Assault", "Complete assault in the Maw") + RPH_AddQuest(2470, 1, 8, 63949, 750) + + -- Marasmius 2463 (Night Fae Only) Will not work until Blizz adds rep to Faction tab + -- RPH_AddQuest(2463, 1, 8, 62615, 350) + -- RPH_AddQuest(2463, 1, 8, 62614, 350) + -- RPH_AddQuest(2463, 1, 8, 62611, 350) + -- RPH_AddQuest(2463, 1, 8, 62610, 350) + -- RPH_AddQuest(2463, 1, 8, 62608, 350) + -- RPH_AddQuest(2463, 1, 8, 62607, 350) + -- RPH_AddQuest(2463, 1, 8, 62606, 350) + -- RPH_AddQuest(2463, 1, 8, 60175, 350) + -- RPH_AddQuest(2463, 1, 8, 57455, 500) + -- RPH_AddQuest(2463, 1, 8, 57458, 500) + -- RPH_AddQuest(2463, 1, 8, 57459, 500) + -- RPH_AddQuest(2463, 1, 8, 57463, 500) + -- RPH_AddQuest(2463, 1, 8, 57583, 500) + -- RPH_AddQuest(2463, 1, 8, 60153, 500) + -- RPH_AddQuest(2463, 1, 8, 62382, 500) + -- RPH_AddQuest(2463, 1, 8, 62296, 500) + -- RPH_AddQuest(2463, 1, 8, 62453, 500) + -- RPH_AddQuest(2463, 1, 8, 60188, 650) + -- RPH_AddQuest(2463, 1, 8, 62263, 650) + -- RPH_AddQuest(2463, 1, 8, 62400, 650) + -- RPH_AddQuest(2463, 1, 8, 62417, 650) + -- RPH_AddQuest(2463, 1, 8, 62459, 650) + -- RPH_AddQuest(2463, 1, 8, 62465, 650) + -- RPH_AddQuest(2463, 1, 8, 62466, 650) + + -- Stitchmasters 2462 + RPH_AddQuest(2462, 1, 8, 58525, 750) + RPH_AddQuest(2462, 1, 8, 61511, 750) + RPH_AddQuest(2462, 1, 8, 57634, 750) + RPH_AddQuest(2462, 1, 8, 60237, 750) + RPH_AddQuest(2462, 1, 8, 58432, 750) + RPH_AddQuest(2462, 1, 8, 60765, 750) + RPH_AddQuest(2462, 1, 8, 56470, 750) + RPH_AddQuest(2462, 1, 8, 60291, 750) + RPH_AddQuest(2462, 1, 8, 60340, 750) + RPH_AddQuest(2462, 1, 8, 62213, 750) + RPH_AddQuest(2462, 1, 8, 59043, 750) + RPH_AddQuest(2462, 1, 8, 62276, 750) + RPH_AddQuest(2462, 1, 8, 60342, 750) + RPH_AddQuest(2462, 1, 8, 58992, 750) + RPH_AddQuest(2462, 1, 8, 62194, 750) + RPH_AddQuest(2462, 1, 8, 59293, 750) + RPH_AddQuest(2462, 1, 8, 62407, 750) + RPH_AddQuest(2462, 1, 8, 61510, 750) + RPH_AddQuest(2462, 1, 8, 62244, 750) + RPH_AddQuest(2462, 1, 8, 61522, 750) + RPH_AddQuest(2462, 1, 8, 61523, 750) + RPH_AddQuest(2462, 1, 8, 62261, 750) + RPH_AddQuest(2462, 1, 8, 58515, 750) + RPH_AddQuest(2462, 1, 8, 62256, 750) + RPH_AddQuest(2462, 1, 8, 61509, 750) + RPH_AddQuest(2462, 1, 8, 62217, 750) + RPH_AddQuest(2462, 1, 8, 62195, 750) + RPH_AddQuest(2462, 1, 8, 62232, 750) + RPH_AddQuest(2462, 1, 8, 61996, 750) + RPH_AddQuest(2462, 1, 8, 62294, 750) + RPH_AddQuest(2462, 1, 8, 62216, 750) + RPH_AddQuest(2462, 1, 8, 62041, 750) + RPH_AddQuest(2462, 1, 8, 59126, 750) + + -- The Archivists' Codex 2472 + RPH_AddGeneral(2472, 1, 8, "Cataloged Research", 1, "Cataloged Research", "Vendor Turn in 1 rep per 2 Research") + RPH_AddItems(2472, 1, 8, 1, {[186685] = 2}) + RPH_AddItems(2472, 1, 8, 4, {[187322] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187457] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187324] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187323] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187460] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187458] = 1}) + RPH_AddItems(2472, 1, 8, 4, {[187459] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187465] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187327] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187463] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187325] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187326] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187462] = 1}) + RPH_AddItems(2472, 1, 8, 24, {[187478] = 1}) + RPH_AddItems(2472, 1, 8, 50, {[187336] = 1}) + RPH_AddItems(2472, 1, 8, 50, {[187466] = 1}) + RPH_AddItems(2472, 1, 8, 50, {[187332] = 1}) + RPH_AddItems(2472, 1, 8, 50, {[187328] = 1}) + RPH_AddItems(2472, 1, 8, 50, {[187334] = 1}) + RPH_AddItems(2472, 1, 8, 75, {[187330] = 1}) + RPH_AddItems(2472, 1, 8, 75, {[187329] = 1}) + RPH_AddItems(2472, 1, 8, 75, {[187467] = 1}) + RPH_AddItems(2472, 1, 8, 75, {[187331] = 1}) + RPH_AddItems(2472, 1, 8, 150, {[187311] = 1}) + RPH_AddItems(2472, 1, 8, 150, {[187333] = 1}) + RPH_AddItems(2472, 1, 8, 150, {[187350] = 1}) + RPH_AddItems(2472, 1, 8, 150, {[187335] = 1}) + + + -- The Ascended 2407 + RPH_AddGeneral(2407, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2407, 1, 8, "Kyrian Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") + RPH_AddGeneral(2407, 1, 8, "Rare Bastion Calling", 1500, "Complete Rare Bastion Calling", "Calling rewards Blue quality cache") + RPH_AddGeneral(2407, 1, 8, "Epic Bastion Calling", 2000, "Complete Epic Bastion Calling", "Calling rewards Purple quality cache") + + -- The Avowed 2439 + RPH_AddMob(2439, 5, 8, "Inquisitor", 50, zone.Revendreth) + RPH_AddMob(2439, 5, 8, "High Inquisitor", 100, zone.Revendreth) + RPH_AddMob(2439, 5, 8, "Grand Inquisitor", 200, zone.Revendreth) + RPH_AddInstance(2439, 1, 6, zone.Halls_of_Atonement, 750, false) + + -- The Undying Army 2410 + RPH_AddGeneral(2410, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2410, 1, 8, "Maldraxxus Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") + RPH_AddGeneral(2410, 1, 8, "Rare Maldraxxus Calling", 1500, "Complete Rare Maldraxxus Calling", "Calling rewards Blue quality cache") + RPH_AddGeneral(2410, 1, 8, "Epic Maldraxxus Calling", 2000, "Complete Epic Maldraxxus Calling", "Calling rewards Purple quality cache") + + -- The Wild Hunt 2465 + RPH_AddGeneral(2465, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2465, 1, 8, "Night Fae Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") + RPH_AddGeneral(2465, 1, 8, "Rare Ardenweald Calling", 1500, "Complete Rare Ardenweald Calling", "Calling rewards Blue quality cache") + RPH_AddGeneral(2465, 1, 8, "Epic Ardenweald Calling", 2000, "Complete Epic Ardenweald Calling", "Calling rewards Purple quality cache") + + -- Ve'nari 2432 + RPH_AddMob(2432, 1, 8, "Adjutant Dekaris", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Orophea", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Soulforger Rhovus", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Conjured Death", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Eternas the Tormentor", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Obolos ", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Yero the Skittish", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Nascent Devourer", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Darklord Taraxis", 80, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Silent Soulstalker", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Stygian Stonecrusher", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Deadsoul Hatcher", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Screaming Shade", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Relic Breaker Krelva", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Consumption", 80, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Borr-Geth", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Ekphoras, Herald of Grief", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Apholeias, Herald of Loss", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Talaporas, Herald of Pain", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Eketra ", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Morguliax ", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Ikras the Devourer", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Shadeweaver Zeris", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Dolos ", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Thanassos ", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Exos, Herald of Dominion ", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Darithis the Bleak", 100, zone.The_Maw) + RPH_AddMob(2432, 1, 8, "Consumption (Rare Elite)", 100, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Observer Yorik", 100, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Yarxhov the Pillager", 100, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Towering Exterminator", 150, zone.Korthia) + RPH_AddMob(2432, 1, 8, "Soul Fragment", 150, zone.Korthia) + RPH_AddQuest(2432, 1, 8, 63050, 75) + RPH_AddQuest(2432, 1, 8, 63166, 75) + RPH_AddQuest(2432, 1, 8, 60732, 75) + RPH_AddQuest(2432, 1, 8, 63062, 75) + RPH_AddQuest(2432, 1, 8, 63100, 75) + RPH_AddQuest(2432, 1, 8, 63039, 75) + RPH_AddQuest(2432, 1, 8, 63043, 75) + RPH_AddQuest(2432, 1, 8, 63047, 75) + RPH_AddQuest(2432, 1, 8, 63179, 75) + RPH_AddQuest(2432, 1, 8, 63031, 75) + RPH_AddQuest(2432, 1, 8, 60775, 75) + RPH_AddQuest(2432, 1, 8, 61088, 75) + RPH_AddQuest(2432, 1, 8, 60622, 75) + RPH_AddQuest(2432, 1, 8, 61079, 75) + RPH_AddQuest(2432, 1, 8, 60646, 75) + RPH_AddQuest(2432, 1, 8, 60762, 75) + RPH_AddQuest(2432, 1, 8, 61104, 75) + RPH_AddQuest(2432, 1, 8, 61103, 75) + RPH_AddQuest(2432, 1, 8, 61075, 75) + RPH_AddQuest(2432, 1, 8, 61765, 75) + RPH_AddQuest(2432, 1, 8, 62234, 75) + RPH_AddQuest(2432, 1, 8, 62214, 75) + RPH_AddQuest(2432, 1, 8, 63072, 75) + RPH_AddQuest(2432, 1, 8, 62239, 75) + RPH_AddQuest(2432, 1, 8, 63069, 75) + RPH_AddQuest(2432, 1, 8, 64541, 1000) + RPH_AddGeneral(2432, 1, 8, "Drifting Sorrow (The Maw)", 40, "Special encounter", "Located at /way 32, 21") + RPH_AddGeneral(2432, 1, 8, "Razkazzar (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Huwerath (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Agonix (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Akros (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Sanngror the Torturer (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Skittering Broodmother (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Odalrik (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Dath Rezara (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Dartanos (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Orrholyn (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Soulsmith Yol-Mattar (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Cyrixia (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Krala (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Malevolent Stygia (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Houndmaster Vasanok (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Valis the Cruel (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Stygian Incinerator (The Maw)", 40, "Special encounter") + RPH_AddGeneral(2432, 1, 8, "Tormentors of Torghast (The Maw)", 200, "Complete Totementors of Torghast Weekly", "Can only be completed once a week") + RPH_AddGeneral(2432, 1, 8, "Wrath of the Jailer (The Maw)", 250, "Complete Wrath of the Jailer Weekly", "Can only be completed once a week") + RPH_AddGeneral(2432, 1, 8, "Beastwarren Hunt Boss (The Maw)", 525, "Complete Beastwarren Event", "Can be completed twice a week, Tuesday 11am EST & Friday 11pm EST") + + if (RPH_IsAlliance) then - -- Proudmoore Admiralty + -- Proudmoore Admiralty 2160 RPH_AddGeneral(2160, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2160, 1, 8, "Proudmoore Admiralty Emissary", 1500, "Proudmoore Admiralty Emissary", "Complete 4x Proudmoore Admiralty world quests while the emissary is available to gain reputation") RPH_AddGeneral(2160, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- Order of Embers + -- Order of Embers 2161 RPH_AddGeneral(2161, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2161, 1, 8, "Order of Embers Emissary", 1500, "Order of Embers Emissary", "Complete 4x Order of Embers world quests while the emissary is available to gain reputation") RPH_AddGeneral(2161, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- Storm's Wake + -- Storm's Wake 2162 RPH_AddGeneral(2162, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2162, 1, 8, "Storm's Wake Emissary", 1500, "Storm's Wake Emissary", "Complete 4x Storm's Wake world quests while the emissary is available to gain reputation") RPH_AddGeneral(2162, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- 7th Legion + -- 7th Legion 2159 RPH_AddGeneral(2159, 1, 8, "World Quests 75 rep", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2159, 1, 8, "World Quests 150 rep", 150, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2159, 1, 8, "7th Legion Emissary", 1500, "7th Legion Emissary", "Completing 4x 7th Legion world quests while the emissary is available to gain reputation") @@ -2665,7 +2931,7 @@ zone.The_Nighthold = 764 RPH_AddGeneral(2159, 1, 8, "Call to Arms Quest", 75, "Call to Arms Quest", "Complete Call to Arms quest to gain reputation") RPH_AddGeneral(2159, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- Waveblade Ankoan + -- Waveblade Ankoan 2400 RPH_AddGeneral(2400, 1, 8, "Waveblade Ankoan World Quests", 75, "Waveblade Ankoan Emissary", "Complete Waveblade Ankoan world quests to gain reputation") RPH_AddGeneral(2400, 1, 8, "Waveblade Ankoan Emissary", 1500, "Waveblade Ankoan Emissary", "Complete 4x Waveblade Ankoan world quests while the emissary is available to gain reputation") RPH_AddGeneral(2400, 1, 8, "Laboratory of Mardivas Weekly", 500, "Laboratory of Mardivas Weekly", "Complete the Laboratory of Mardivas weekly quest to gain reputation") @@ -2674,7 +2940,7 @@ zone.The_Nighthold = 764 RPH_AddGeneral(2400, 1, 8, "Bounties / Requisition Quests", 50, "Bountes / Requisition Quets", "Complete bounties and requisition quests to gain reputation") RPH_AddItems(2400, 1, 8, 150, {[170152] = 1}) - -- Honeyback Hive + -- Honeyback Hive 2395 RPH_AddItems(2395, 1, 8, 20, {[168822] = 1}) -- Thin Jelly RPH_AddItems(2395, 1, 8, 80, {[168825] = 1}) -- Rich Jelly RPH_AddItems(2395, 1, 8, 160, {[168828] = 1}) -- Royal Jelly @@ -2683,22 +2949,22 @@ zone.The_Nighthold = 764 end if (RPH_IsHorde) then - -- Zandalari Empire + -- Zandalari Empire 2103 RPH_AddGeneral(2103, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2103, 1, 8, "Zandalari Empire Emissary", 1500, "Zandalari Empire Emissary", "Complete 4x Zandalari Empire world quests while the emissary is available to gain reputation") RPH_AddGeneral(2103, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- Talanji's Expedition + -- Talanji's Expedition 2156 RPH_AddGeneral(2156, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2156, 1, 8, "Talanji's Expedition Emissary", 1500, "Talanji's Expedition Emissary", "Complete 4x Talanji's Expedition world quests while the emissary is available to gain reputation") RPH_AddGeneral(2156, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- Voldunai + -- Voldunai 2158 RPH_AddGeneral(2158, 1, 8, "World Quests", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2158, 1, 8, "Voldunai Emissary", 1500, "Voldunai Emissary", "Complete 4x Voldunai world quests while the emissary is available to gain reputation") RPH_AddGeneral(2158, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- The Honorbound + -- The Honorbound 2157 RPH_AddGeneral(2157, 1, 8, "World Quests 75 rep", 75, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2157, 1, 8, "World Quests 150 rep", 150, "World Quests", "Complete world quests with this faction to gain reputation") RPH_AddGeneral(2157, 1, 8, "The Honorbound Emissary", 1500, "The Honorbound Emissary", "Complete 4x The Honorbound world quests while the emissary is available to gain reputation") @@ -2708,7 +2974,7 @@ zone.The_Nighthold = 764 RPH_AddGeneral(2157, 1, 8, "Naga Attack! World Quest", 150, "Naga Attack! World Quest", "Complete the Naga Attack! world quest to gain reputation") - -- The Unshackled + -- The Unshackled 2373 RPH_AddGeneral(2373, 1, 8, "The Unshackled World Quests", 75, "The Unshackled Emissary", "Complete The Unshackled world quests to gain reputation") RPH_AddGeneral(2373, 1, 8, "The Unshackled Emissary", 1500, "The Unshackled Emissary", "Complete 4x The Unshackled world quests while the emissary is available to gain reputation") RPH_AddGeneral(2373, 1, 8, "Laboratory of Mardivas Weekly", 500, "Laboratory of Mardivas Weekly", "Complete the Laboratory of Mardivas weekly quest to gain reputation") @@ -2720,20 +2986,20 @@ zone.The_Nighthold = 764 -- Dead Factions -- Shen'dralar 809 RPH_AddQuest(809, 1, 8, 6, 1) - -- Gelkis Clan Centaur 92 - RPH_AddQuest(92, 1, 8, 6, 1) - -- Magram Clan Centaur 93 - RPH_AddQuest(93, 1, 8, 6, 1) + -- Gelkis Clan Centaur 92 (1 quest rewards exalted with both) + RPH_AddQuest(92, 1, 8, 14394, 1) + -- Magram Clan Centaur 93 (1 quest rewards exalted with both) + RPH_AddQuest(93, 1, 8, 14394, 1) -- Zandalar Tribe 270 RPH_AddQuest(270, 1, 8, 6, 1) -- The Brewmasters 1351 RPH_AddQuest(1351, 1, 8, 6, 1) -- 0 guildName - if (guildName and guildCapBase) then - RPH_AddQuest(guildName, 4, 8, 8, 125) - end + RPH_AddQuest(1168, 4, 8, 8, 125) + -- if (guildName and guildCapBase) then + -- RPH_AddQuest(guildName, 4, 8, 8, 125) + -- end --- local preGC = collectgarbage("count") collectgarbage("collect") --- print("Collected " .. (preGC-collectgarbage("count")) .. " kB of garbage RPH"); end - From cbafffb69b21ad937a02a95aa627e99f97e85e5b Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sat, 28 Aug 2021 23:58:36 -0400 Subject: [PATCH 5/6] Fixed WIntersaber rep Hadn't noticed, for horde it was causing an error due to wintersaber rep not being alliance only. This fixed it --- content.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/content.lua b/content.lua index a60e2bd..6af8dc5 100644 --- a/content.lua +++ b/content.lua @@ -906,6 +906,15 @@ zone.Halls_of_Atonement = 1663 RPH_AddGeneral(1847, 1, 8, "Lion's Watch command table random daily quest", 500, "Lion's Watch command table random daily quest", "Random daily that awards 500 reputation") RPH_AddQuest(1847, 1, 8, 39574, 250) RPH_AddGeneral(1847, 1, 8, "Vindicator Krethos random daily quest", 250, "Vindicator Krethos random daily quest", "Random daily that awards 250 reputation") + + -- TODO: Fix wintersaber quest + -- Wintersaber Trainers 589 + RPH_AddQuest(589, 1, 4, 29032, 3000) + RPH_AddQuest(589, 4, 6, 29037, 1500) + RPH_AddQuest(589, 4, 6, 29035, 1500) + RPH_AddQuest(589, 4, 6, 29038, 1500) + RPH_AddQuest(589, 4, 6, 29040, 1500) + RPH_AddQuest(589, 5, 8, 29034, 42999) end if (RPH_IsHorde) then -- Hord Cities @@ -1584,14 +1593,7 @@ zone.Halls_of_Atonement = 1663 RPH_AddMob(576, 2, 8, "Ragepaw (Rare)", 50, zone.Felwood) RPH_AddMob(576, 2, 8, "Grizzle Snowpaw (Rare)", 50, zone.Winterspring) RPH_AddMob(576, 2, 8, "High Chief Winterfall", 50, zone.Winterspring) - -- TODO: Fix wintersaber quest - -- Wintersaber Trainers 589 - RPH_AddQuest(589, 1, 4, 29032, 3000) - RPH_AddQuest(589, 4, 6, 29037, 1500) - RPH_AddQuest(589, 4, 6, 29035, 1500) - RPH_AddQuest(589, 4, 6, 29038, 1500) - RPH_AddQuest(589, 4, 6, 29040, 1500) - RPH_AddQuest(589, 5, 8, 29034, 42999) + -- Raid_Factions -- Ashtongue Deathsworn 1012 RPH_AddInstance(1012, 4, 8, zone.Black_Temple, 8000) @@ -2995,11 +2997,11 @@ zone.Halls_of_Atonement = 1663 -- The Brewmasters 1351 RPH_AddQuest(1351, 1, 8, 6, 1) -- 0 guildName - RPH_AddQuest(1168, 4, 8, 8, 125) - -- if (guildName and guildCapBase) then - -- RPH_AddQuest(guildName, 4, 8, 8, 125) - -- end + RPH_AddGeneral(1168, 1, 8, "All non-gray quest turn ins", 125, "Gain reputation by doing this quest", "Complete any non-gray quests") + RPH_AddGeneral(1168, 1, 8, "With Renown Tabard", 250, "Gain reputation by doing this quest", "Complete any non-gray quests") + --- local preGC = collectgarbage("count") collectgarbage("collect") --- print("Collected " .. (preGC-collectgarbage("count")) .. " kB of garbage RPH"); end + From 9c063c227be727755dff3d48e7d6cd55b7fa7821 Mon Sep 17 00:00:00 2001 From: Hyphie24 <31455641+Hyphie24@users.noreply.github.com> Date: Sun, 29 Aug 2021 17:51:26 -0400 Subject: [PATCH 6/6] Kiron tor & other fixes Fixed Kiron Tor Fishing, Cooking & Jewelcrafting daily Added Onyx Egg for Order of the Cloud Serpent Fixed quest linked with Highmaul Relics Added Netherstorm general zone quests Added general Chromie scenario for rep towards timelord Updated Gelkis & Magram rep reward, from 1 to 10 million Updated Guild tuurn ins --- content.lua | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/content.lua b/content.lua index 6af8dc5..aebed79 100644 --- a/content.lua +++ b/content.lua @@ -1718,8 +1718,7 @@ zone.Halls_of_Atonement = 1663 RPH_AddQuest(933, 5, 8, 10308, 250) RPH_AddQuest(933, 6, 8, 10971, 250) RPH_AddQuest(933, 7, 8, 10973, 500) - RPH_AddQuest(933, 4, 8, 99, 250) - RPH_AddQuest(933, 4, 8, 99, 350) + RPH_AddGeneral(933, 4, 8, "Netherstorm Zone Quests", 250) -- Timewalking Commendation RPH_AddItems(933, 1, 8, 500, {[129945] = 1}) -- Shattrath City @@ -1809,10 +1808,9 @@ zone.Halls_of_Atonement = 1663 RPH_AddQuest(1106, 4, 8, 13811, 325) end -- Kirin Tor 1090 - RPH_AddQuest(1090, 4, 8, 99, 250, "nil", RPH_LIMIT_TYPE_Cook) - RPH_AddQuest(1090, 4, 8, 99, 250, "nil", RPH_LIMIT_TYPE_Fish) - RPH_AddQuest(1090, 4, 8, 99, 50, "nil", RPH_LIMIT_TYPE_Jewel) - RPH_AddQuest(1090, 4, 8, 99, 125) + RPH_AddGeneral(1090, 4, 8, "Northrend Dalaran Cooking Daily", 150, "Northrend Dalaran Cooking Daily", "Complete the Northrend Dalaran Cooking Daily") + RPH_AddGeneral(1090, 4, 8, "Northrend Dalaran Fishing Daily", 250, "Northrend Dalaran Fishing Daily", "Complete the Northrend Dalaran Fishing Daily") + RPH_AddGeneral(1090, 4, 8, "Northrend Dalaran Jewelcrafting Daily", 25, "Northrend Dalaran Jewelcrafting Dialy", "Complete the Northrend Dalaran Jewelcrafting Daily") RPH_AddQuest(1090, 4, 8, 14203, 325) RPH_AddQuest(1090, 4, 8, 13845, 325) RPH_AddItems(1090, 4, 8, 520, {[43950] = 1}) @@ -2148,12 +2146,9 @@ zone.Halls_of_Atonement = 1663 RPH_AddQuest(1337, 1, 8, 32659, 400) -- Order of the Cloud Serpent 1271 RPH_AddItems(1271, 1, 8, 1000, {[86592] = 1}) + RPH_AddItems(1271, 4, 8, 500, {[89155] = 1}) -- Timewalking Commendation RPH_AddItems(1271, 1, 8, 300, {[143942] = 1}) - RPH_AddQuest(1271, 4, 8, 99, 780) - RPH_AddQuest(1271, 4, 8, 99, 780) - RPH_AddQuest(1271, 4, 8, 99, 780) - RPH_AddQuest(1271, 4, 8, 99, 780) ------ Jenova Longeye - Main Quests RPH_AddQuest(1271, 1, 8, 30149, 125) RPH_AddQuest(1271, 1, 8, 30147, 125) @@ -2194,13 +2189,13 @@ zone.Halls_of_Atonement = 1663 -- Shang Xi's Academy 1216 RPH_AddQuest(1216, 1, 8, 5, 1) -- The Black Prince 1359 - RPH_AddQuest(1359, 1, 8, 5, 1) + RPH_AddGeneral(1359, 1, 8, "Timeless Isle Celestial World Boss", 500, "Timeless Isle Celestial World Boss", "Complete Timless Isle Celestial world boss once a week") RPH_AddMob(1359, 1, 7, "Granite Quilen", 10) RPH_AddMob(1359, 1, 7, "Shao-Tien Marauder", 10) RPH_AddMob(1359, 1, 7, "Kor'thik Warcaller", 100) RPH_AddMob(1359, 1, 7, "Rare Mobs", 400, "928") -- The Lorewalkers 1345 - RPH_AddQuest(1345, 1, 8, 5, 1) + RPH_AddGeneral(1345, 1, 8, "Scroll Quests", 4100, "Complete all scroll quests", "Complete all the scroll quests collected within Pandaria. Each scroll is tied to an achievement, finishing the achievement will have quest item mailed") -- The Anglers (group) -- The Anglers 1302 RPH_AddQuest(1302, 1, 8, 30613, 500) @@ -2420,7 +2415,7 @@ zone.Halls_of_Atonement = 1663 -- Steamwheedle Preservation Society 1711 RPH_AddItems(1711, 1, 8, 1000, {[128315] = 1}) RPH_AddQuest(1711, 1, 8, 35147, 250, {[118099] = 20}) - RPH_AddQuest(1711, 1, 8, 35125, 350, {[118100] = 1}) + RPH_AddQuest(1711, 1, 8, 37125, 350, {[118100] = 1}) RPH_AddQuest(1711, 1, 8, 37210, 500, {[118654] = 1}) RPH_AddQuest(1711, 1, 8, 37211, 500, {[118655] = 1}) RPH_AddQuest(1711, 1, 8, 37221, 500, {[118656] = 1}) @@ -2489,7 +2484,10 @@ zone.Halls_of_Atonement = 1663 RPH_AddGeneral(2045, 1, 8, "World Boss World Quest", 500, "World Boss World Quest", "Complete world boss world quests with this faction to gain reputation.") RPH_AddGeneral(2045, 1, 8, "Raid World Quests", 500, "Epic Elite World Quests", "Complete raid world quests with this faction to gain reputation.") RPH_AddGeneral(2045, 1, 8, "Armies of Legionfall Emissary", 1500, "Armies of Legionfall Emissary", "Complete 4x Armies of Legionfall world quests while the emissary is available to gain reputation") - + + --Chromie + RPH_AddGeneral(2135, 1, 8, "Run Chromie Scenarios In Dragonblite", 3000, "Complete Chromie Scenarios", "Complete Chromie time scenarios in Dragonblight") + -- Court of Farondis 1900 -- Insignia reputation tokens RPH_AddItems(1900, 1, 8, 250, {[146937] = 1}, {[146943] = 1}) @@ -2681,10 +2679,13 @@ zone.Halls_of_Atonement = 1663 -- Court of Harvesters 2413 RPH_AddGeneral(2413, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2413, 1, 8, "A Valuable Find Dungeon Quest", 500, "Complete a Valuable Find Dungeon Quest", "Weekly quest from Ta'lan the Antiquary in Oribos") + RPH_AddGeneral(2413, 1, 8, "Trading Favors Dungeon Quest", 500, "Complete Trading Favors Dungeon Quest", "Weekly quest from Finder Ta'sul in Oribos") RPH_AddGeneral(2413, 1, 8, "Venthyr Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") RPH_AddGeneral(2413, 1, 8, "Rare Revendreth Calling", 1500, "Complete Rare Revendreth Calling", "Calling rewards Blue quality cache") RPH_AddGeneral(2413, 1, 8, "Epic Revendreth Calling", 2000, "Complete Epic Revendreth Calling", "Calling rewards Purple quality cache") + -- Court of Night 2464 RPH_AddQuest(2464, 1, 8, 62081, 750) RPH_AddQuest(2464, 1, 8, 62224, 750) @@ -2804,10 +2805,13 @@ zone.Halls_of_Atonement = 1663 -- The Ascended 2407 RPH_AddGeneral(2407, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2407, 1, 8, "A Valuable Find Dungeon Quest", 500, "Complete a Valuable Find Dungeon Quest", "Weekly quest from Ta'lan the Antiquary in Oribos") + RPH_AddGeneral(2407, 1, 8, "Trading Favors Dungeon Quest", 500, "Complete Trading Favors Dungeon Quest", "Weekly quest from Finder Ta'sul in Oribos") RPH_AddGeneral(2407, 1, 8, "Kyrian Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") RPH_AddGeneral(2407, 1, 8, "Rare Bastion Calling", 1500, "Complete Rare Bastion Calling", "Calling rewards Blue quality cache") RPH_AddGeneral(2407, 1, 8, "Epic Bastion Calling", 2000, "Complete Epic Bastion Calling", "Calling rewards Purple quality cache") + -- The Avowed 2439 RPH_AddMob(2439, 5, 8, "Inquisitor", 50, zone.Revendreth) RPH_AddMob(2439, 5, 8, "High Inquisitor", 100, zone.Revendreth) @@ -2816,16 +2820,22 @@ zone.Halls_of_Atonement = 1663 -- The Undying Army 2410 RPH_AddGeneral(2410, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2410, 1, 8, "A Valuable Find Dungeon Quest", 500, "Complete a Valuable Find Dungeon Quest", "Weekly quest from Ta'lan the Antiquary in Oribos") + RPH_AddGeneral(2410, 1, 8, "Trading Favors Dungeon Quest", 500, "Complete Trading Favors Dungeon Quest", "Weekly quest from Finder Ta'sul in Oribos") RPH_AddGeneral(2410, 1, 8, "Maldraxxus Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") RPH_AddGeneral(2410, 1, 8, "Rare Maldraxxus Calling", 1500, "Complete Rare Maldraxxus Calling", "Calling rewards Blue quality cache") RPH_AddGeneral(2410, 1, 8, "Epic Maldraxxus Calling", 2000, "Complete Epic Maldraxxus Calling", "Calling rewards Purple quality cache") + -- The Wild Hunt 2465 RPH_AddGeneral(2465, 1, 8, "World Quests", 125, "World Quests", "Complete world quests with this faction to gain reputation") + RPH_AddGeneral(2465, 1, 8, "A Valuable Find Dungeon Quest", 500, "Complete a Valuable Find Dungeon Quest", "Weekly quest from Ta'lan the Antiquary in Oribos") + RPH_AddGeneral(2465, 1, 8, "Trading Favors Dungeon Quest", 500, "Complete Trading Favors Dungeon Quest", "Weekly quest from Finder Ta'sul in Oribos") RPH_AddGeneral(2465, 1, 8, "Night Fae Assault", 1000, "Complete Bi-Weekly Maw Assault", "Assault in the maw. Only one assault we be active at a time") RPH_AddGeneral(2465, 1, 8, "Rare Ardenweald Calling", 1500, "Complete Rare Ardenweald Calling", "Calling rewards Blue quality cache") RPH_AddGeneral(2465, 1, 8, "Epic Ardenweald Calling", 2000, "Complete Epic Ardenweald Calling", "Calling rewards Purple quality cache") + -- Ve'nari 2432 RPH_AddMob(2432, 1, 8, "Adjutant Dekaris", 80, zone.The_Maw) RPH_AddMob(2432, 1, 8, "Orophea", 80, zone.The_Maw) @@ -2989,9 +2999,9 @@ zone.Halls_of_Atonement = 1663 -- Shen'dralar 809 RPH_AddQuest(809, 1, 8, 6, 1) -- Gelkis Clan Centaur 92 (1 quest rewards exalted with both) - RPH_AddQuest(92, 1, 8, 14394, 1) + RPH_AddQuest(92, 1, 8, 14394, 10000000) -- Magram Clan Centaur 93 (1 quest rewards exalted with both) - RPH_AddQuest(93, 1, 8, 14394, 1) + RPH_AddQuest(93, 1, 8, 14394, 10000000) -- Zandalar Tribe 270 RPH_AddQuest(270, 1, 8, 6, 1) -- The Brewmasters 1351