diff --git a/AtlasLoot.toc b/AtlasLoot.toc index 87c9125..54639c3 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -3,7 +3,7 @@ ## Notes: Shows possible loot from dungeon bosses and other sources. ## Author: Shagu (pfUI update code), Lexie (Turtle WoW fixes/updates), Otari (overhaul/revamp, menu changes, bugfixes/updates) ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons) -## Version: 3.1.6 +## Version: 3.1.7 ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/Tooltip.lua b/Core/Tooltip.lua index cdf4f34..0dacd84 100644 --- a/Core/Tooltip.lua +++ b/Core/Tooltip.lua @@ -5,11 +5,15 @@ local strfind = string.find local GetItemInfo = GetItemInfo local GREY = "|cff999999" +local insideHook = false local tooltipMoney = 0 local original_SetTooltipMoney = SetTooltipMoney function SetTooltipMoney(frame, money) - original_SetTooltipMoney(frame, money) - tooltipMoney = money or 0 + if insideHook then + tooltipMoney = money or 0 + else + original_SetTooltipMoney(frame, money) + end end local WrappingLines = { @@ -89,12 +93,6 @@ local function AddSourceLine(tooltip, sourceStr) tooltip:AddLine(lines[i][1], lines[i][3], lines[i][4], lines[i][5], wrap) end end - if tooltipMoney > 0 then - local moneyFrame = getglobal(tooltip:GetName().."MoneyFrame") - moneyFrame:SetPoint("LEFT", tooltip:GetName().."TextLeft"..tooltip:NumLines(), "LEFT", 4, 0) - moneyFrame:Show() - end - tooltip:Show() end local lastItemID, lastSourceStr @@ -102,31 +100,25 @@ local function ExtendTooltip(tooltip) if not AtlasLootCharDB.ShowSource then return end - -- local tooltipName = tooltip:GetName() local itemID = tonumber(tooltip.itemID) if itemID and itemID ~= 51217 then -- 51217 Fashion Coin if itemID ~= lastItemID then lastItemID = itemID lastSourceStr = nil - -- for row = 1, tooltip:NumLines() do - -- local rowtext = getglobal(tooltipName .. "TextLeft" .. row):GetText() - -- -- skip items that state which rep they require - -- if strfind(rowtext or "", "—", 1, true) then - -- return - -- end - -- end local source = AtlasLoot_Data["AtlasLootSources"][itemID] if source then local str = GREY .. source .. "|r" - AddSourceLine(tooltip, str) lastSourceStr = str end - else - if lastSourceStr then - AddSourceLine(tooltip, lastSourceStr) - end + end + if lastSourceStr then + AddSourceLine(tooltip, lastSourceStr) end end + if tooltipMoney > 0 then + original_SetTooltipMoney(tooltip, tooltipMoney) + end + tooltip:Show() end local lastSearchName @@ -174,49 +166,63 @@ local function HookTooltip(tooltip) end) function tooltip.SetLootRollItem(self, rollID) + insideHook = true original_SetLootRollItem(self, rollID) + insideHook = false local _, _, id = strfind(GetLootRollItemLink(rollID) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetLootItem(self, slot) + insideHook = true original_SetLootItem(self, slot) + insideHook = false local _, _, id = strfind(GetLootSlotLink(slot) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetMerchantItem(self, merchantIndex) + insideHook = true original_SetMerchantItem(self, merchantIndex) + insideHook = false local _, _, id = strfind(GetMerchantItemLink(merchantIndex) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetQuestLogItem(self, itemType, index) + insideHook = true original_SetQuestLogItem(self, itemType, index) + insideHook = false local _, _, id = strfind(GetQuestLogItemLink(itemType, index) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetQuestItem(self, itemType, index) + insideHook = true original_SetQuestItem(self, itemType, index) + insideHook = false local _, _, id = strfind(GetQuestItemLink(itemType, index) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetHyperlink(self, arg1) + insideHook = true original_SetHyperlink(self, arg1) + insideHook = false local _, _, id = strfind(arg1 or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetBagItem(self, container, slot) + insideHook = true local hasCooldown, repairCost = original_SetBagItem(self, container, slot) + insideHook = false local _, _, id = strfind(GetContainerItemLink(container, slot) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) @@ -224,14 +230,18 @@ local function HookTooltip(tooltip) end function tooltip.SetInboxItem(self, mailID, attachmentIndex) + insideHook = true original_SetInboxItem(self, mailID, attachmentIndex) + insideHook = false local itemName = GetInboxItem(mailID) self.itemID = GetItemIDByName(itemName) ExtendTooltip(self) end function tooltip.SetInventoryItem(self, unit, slot) + insideHook = true local hasItem, hasCooldown, repairCost = original_SetInventoryItem(self, unit, slot) + insideHook = false local _, _, id = strfind(GetInventoryItemLink(unit, slot) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) @@ -239,21 +249,27 @@ local function HookTooltip(tooltip) end function tooltip.SetCraftItem(self, skill, slot) + insideHook = true original_SetCraftItem(self, skill, slot) + insideHook = false local _, _, id = strfind(GetCraftReagentItemLink(skill, slot) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetCraftSpell(self, slot) + insideHook = true original_SetCraftSpell(self, slot) + insideHook = false local _, _, id = strfind(GetCraftItemLink(slot) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetTradeSkillItem(self, skillIndex, reagentIndex) + insideHook = true original_SetTradeSkillItem(self, skillIndex, reagentIndex) + insideHook = false if reagentIndex then local _, _, id = strfind(GetTradeSkillReagentItemLink(skillIndex, reagentIndex) or "", "item:(%d+)") self.itemID = tonumber(id) @@ -265,28 +281,36 @@ local function HookTooltip(tooltip) end function tooltip.SetAuctionItem(self, atype, index) + insideHook = true original_SetAuctionItem(self, atype, index) + insideHook = false local itemName = GetAuctionItemInfo(atype, index) self.itemID = GetItemIDByName(itemName) ExtendTooltip(self) end function tooltip.SetAuctionSellItem(self) + insideHook = true original_SetAuctionSellItem(self) + insideHook = false local itemName = GetAuctionSellItemInfo() self.itemID = GetItemIDByName(itemName) ExtendTooltip(self) end function tooltip.SetTradePlayerItem(self, index) + insideHook = true original_SetTradePlayerItem(self, index) + insideHook = false local _, _, id = strfind(GetTradePlayerItemLink(index) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) end function tooltip.SetTradeTargetItem(self, index) + insideHook = true original_SetTradeTargetItem(self, index) + insideHook = false local _, _, id = strfind(GetTradeTargetItemLink(index) or "", "item:(%d+)") self.itemID = tonumber(id) ExtendTooltip(self) @@ -294,7 +318,22 @@ local function HookTooltip(tooltip) end HookTooltip(GameTooltip) -HookTooltip(ItemRefTooltip) + +local original_SetItemRef = SetItemRef +function SetItemRef(link, text, button) + local item, _, id = string.find(link, "item:(%d+)") + ItemRefTooltip.itemID = id + original_SetItemRef(link, text, button) + if not IsShiftKeyDown() and not IsControlKeyDown() and item then + ExtendTooltip(ItemRefTooltip) + end +end + +local original_OnHide = ItemRefTooltip:GetScript("OnHide") +ItemRefTooltip:SetScript("OnHide", function() + original_OnHide() + ItemRefTooltip.itemID = nil +end) AtlasLootTip:SetScript("OnShow", function() if aux_frame and aux_frame:IsVisible() then @@ -5242,10 +5281,10 @@ AtlasLoot_Data["AtlasLootSources"] = { [41346] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 210+)", [41347] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 220+)", [41349] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 220+)", - [41373] = AL["Upper Karazhan Halls"].." - "..AL["Ley-Watcher Incantagos"], + [41373] = AL["Upper Karazhan Halls"].." - "..AL["Ley-Watcher Incantagos"].." (100%)", [41403] = AL["Upper Karazhan Halls"].." - "..AL["Ley-Watcher Incantagos"].." (100%)", - [41412] = AL["Upper Karazhan Halls"].." - "..AL["Anomalus"], - [41414] = AL["Upper Karazhan Halls"].." - "..AL["Echo of Medivh"], + [41412] = AL["Upper Karazhan Halls"].." - "..AL["Anomalus"].." (100%)", + [41414] = AL["Upper Karazhan Halls"].." - "..AL["Echo of Medivh"].." (100%)", [41485] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (100%)", [47000] = AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], [47001] = AL["Molten Core"].." - "..AL["Tier 1"].." "..AL["Set"], @@ -5911,12 +5950,12 @@ AtlasLoot_Data["AtlasLootSources"] = { [55339] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 200+)", [55340] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 85+)", [55341] = AL["Jewelcrafting"].." ("..AL["Skill:"].." 135+)", - [55346] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], - [55347] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], - [55351] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], - [55353] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], - [55356] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], - [55357] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], + [55346] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (8%)", + [55347] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (8%)", + [55351] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (19%)", + [55353] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (19%)", + [55356] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (19%)", + [55357] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (8%)", [55359] = AL["Jewelcrafting"]..": "..AL["Goldsmithing"].." ("..AL["Skill:"].." 300)", [55360] = AL["Jewelcrafting"]..": "..AL["Goldsmithing"].." ("..AL["Skill:"].." 290+)", [55361] = AL["Jewelcrafting"]..": "..AL["Goldsmithing"].." ("..AL["Skill:"].." 300)", @@ -5955,31 +5994,31 @@ AtlasLoot_Data["AtlasLootSources"] = { [55476] = AL["Scarlet Monastery (Armory)"].." - "..AL["Armory Quartermaster Daghelm"].." (25%)", [55477] = AL["Scarlet Monastery (Armory)"].." - "..AL["Armory Quartermaster Daghelm"].." (25%)", [55482] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (10%)", - [55483] = AL["Upper Karazhan Halls"].." - "..AL["King (Chess fight)"].." (50%, 25%)", - [55484] = AL["Upper Karazhan Halls"].." - "..AL["King (Chess fight)"].." (50%, 25%)", - [55485] = AL["Upper Karazhan Halls"].." - "..AL["Sanv Tas'dal"].." (50%, 25%)", - [55486] = AL["Upper Karazhan Halls"].." - "..AL["Sanv Tas'dal"].." (50%, 25%)", - [55489] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (50%, 25%)", - [55490] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (50%, 25%)", - [55491] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (50%, 25%)", - [55492] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (50%, 25%)", - [55494] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55495] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55496] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55497] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55498] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55499] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55500] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55501] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55502] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55503] = AL["Azshara"].." - "..AL["Cla'ckora"], - [55504] = AL["Azshara"].." - "..AL["Cla'ckora"], + [55483] = AL["Upper Karazhan Halls"].." - "..AL["King (Chess fight)"].." (50%)", + [55484] = AL["Upper Karazhan Halls"].." - "..AL["King (Chess fight)"].." (50%)", + [55485] = AL["Upper Karazhan Halls"].." - "..AL["Sanv Tas'dal"].." (50%)", + [55486] = AL["Upper Karazhan Halls"].." - "..AL["Sanv Tas'dal"].." (50%)", + [55489] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (50%)", + [55490] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (50%)", + [55491] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (50%)", + [55492] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (50%)", + [55494] = AL["Azshara"].." - "..AL["Cla'ckora"].." (20%)", + [55495] = AL["Azshara"].." - "..AL["Cla'ckora"].." (20%)", + [55496] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55497] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55498] = AL["Azshara"].." - "..AL["Cla'ckora"].." (20%)", + [55499] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55500] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55501] = AL["Azshara"].." - "..AL["Cla'ckora"].." (20%)", + [55502] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55503] = AL["Azshara"].." - "..AL["Cla'ckora"].." (17%)", + [55504] = AL["Azshara"].." - "..AL["Cla'ckora"].." (20%)", [55506] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (11.1%)", [55507] = AL["Upper Karazhan Halls"].." - "..AL["Ley-Watcher Incantagos"].." (25%)", [55508] = AL["Upper Karazhan Halls"].." - "..AL["Trash Mobs"].." (0.25%)", [55510] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (11.1%)", [55511] = AL["Upper Karazhan Halls"].." - "..AL["Kruul"].." (11.1%)", - [55513] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], + [55513] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (19%)", [55515] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], [55516] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], [55517] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"], @@ -7193,6 +7232,7 @@ AtlasLoot_Data["AtlasLootSources"] = { [92006] = AL["Lower Karazhan Halls"].." - "..AL["Enchants"], [92007] = AL["Lower Karazhan Halls"].." - "..AL["Enchants"], [92008] = AL["Lower Karazhan Halls"].." - "..AL["Enchants"], + [92020] = AL["Azshara"].." - "..AL["Cla'ckora"].." (5%)", [92080] = AL["Molten Core"].." - "..AL["Ragnaros"], [92082] = AL["Upper Karazhan Halls"].." - "..AL["Mephistroth"].." (100%)", } diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index a9688e2..1422de7 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -8110,12 +8110,12 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55081, "INV_Boots_05", "=q4=Manadrenched Feather Slippers", "=ds=#s12#, #a1#", "25%" }, { 55285, "INV_Gauntlets_05", "=q4=Crite's Holy Hands", "=ds=#s9#, #a1#", "25%" }, { 0, "", "", "" }, - { 55079, "INV_Chest_Leather_04", "=q4=Ravenkeeper’s Frenzied Embrace", "=ds=#s5#, #a2#", "25%" }, + { 55079, "INV_Chest_Leather_04", "=q4=Ravenkeeper's Frenzied Embrace", "=ds=#s5#, #a2#", "25%" }, { 55080, "INV_Bloodmoon", "=q4=Bloodmoon, Sickle of the Murderous Flight", "=ds=#h1#, #w1#", "25%" }, { 55082, "INV_QirajIdol_War", "=q4=Idol of Laceration", "=ds=#s16#, #e16# =q13=#c1#", "25%" }, { 55083, "inv_helmet_24", "=q4=Crown of the Wildpack", "=ds=#s1#, #a3#", "25%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, }; UKHIncantagos = { { 55086, "INV_Belt_22", "=q4=Magehunter Belt", "=ds=#s10#, #a3# ", "25%" }, @@ -8138,8 +8138,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55134, "Inv_Wand_05", "=q4=Rod of Permafrost", "=q1=#m4# =ds=#w12#" }, { 55135, "Inv_misc_monsterscales_09", "=q4=Shard of Leyflow", "=q1=#m4# =ds=#s14#" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, - { 41373, "INV_Misc_EngGizmos_08", "=q4=Draconic Focus", "=ds=#m3#" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, + { 41373, "INV_Misc_EngGizmos_08", "=q1=Draconic Focus", "=ds=#m3#", "100%", }, }; UKHAnomalus = { { 55092, "INV_Boots_Plate_06", "=q4=Manahide Slippers", "=ds=#s12#, #a2#", "25%" }, @@ -8152,8 +8152,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55097, "INV_Jewelry_Necklace_08", "=q4=Choker of Chromatic Power", "=ds=#s2#", "25%" }, { 55098, "INV_Gauntlets_05", "=q4=Gloves of Nourishment", "=ds=#s9#, #a2#", "25%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, - { 41412, "INV_Enchant_DustSoul", "=q4=Cosmic Residue", "=ds=#m3#" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, + { 41412, "INV_Enchant_DustSoul", "=q1=Cosmic Residue", "=ds=#m3#", "100%", }, }; UKHEcho = { { 55108, "INV_DemonhornShoulders", "=q4=Dreadslayer Shoulderblades", "=ds=#s3#, #a4#", "25%" }, @@ -8166,8 +8166,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55112, "INV_Jewelry_Talisman_Health", "=q4=Pendant of Forgiven Mistakes", "=ds=#s2#", "25%" }, { 55094, "INV_Jewelry_Ring_Jade", "=q4=Medivh's Hindsight", "=ds=#s13#", "25%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, - { 41414, "INV_Enchant_EssenceMysticalSmall", "=q1=Anima of the Guardian", "=ds=#m3#" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, + { 41414, "INV_Enchant_EssenceMysticalSmall", "=q1=Anima of the Guardian", "=ds=#m3#", "100%", }, }; UKHKing = { { 55088, "INV_Gauntlets_05", "=q4=Dragonclaw Gauntlets", "=ds=#s9#, #a4#", "12.5%" }, @@ -8181,18 +8181,18 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 20739, "Ability_Mount_RidingHorse", "=q4=Mechanical Horse", "=ds=#e7#", "3%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 55483, "INV_Boots_Cloth_01", "=q4=Ethereal Boots of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55483, "INV_Boots_Cloth_01", "=q4=Ethereal Boots of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47274, "=ds=#s12#, #a4#" }, }, -- war { { 47232, "=ds=#s12#, #a1#" }, { 47238, "=ds=#s12#, #a1#" }, }, -- priest { { 47310, "=ds=#s12#, #a1#" }, { 47316, "=ds=#s12#, #a1#" }, }, -- lock { { 47394, "=ds=#s12#, #a2#" }, { 47400, "=ds=#s12#, #a2#" }, { 47406, "=ds=#s3#, #a2#" } }, -- druid }, }, - { 55484, "INV_Boots_Cloth_01", "=q4=Ethereal Boots of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55484, "INV_Boots_Cloth_01", "=q4=Ethereal Boots of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47064, "=ds=#s12#, #a4#" }, { 47070, "=ds=#s12#, #a4#" }, { 47076, "=ds=#s12#, #a4#" }, }, -- paladin { { 47322, "=ds=#s12#, #a3#" }, }, -- hunter { { 47328, "=ds=#s12#, #a2#" }, }, -- rogue @@ -8201,7 +8201,7 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }, { 0, "", "", "" }, - { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=T3.5 Neck", "10%", "", "", "", "", "", "", "", "", "", "", { + { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=#s2#", "10%", "", "", "", "", "", "", "", "", "", "", { { { 47275, "=ds=#s3#, #a4#" }, }, -- war { { 47233, "=ds=#s3#, #a1#" }, { 47239, "=ds=#s3#, #a1#" }, }, -- priest { { 47311, "=ds=#s3#, #a1#" }, { 47317, "=ds=#s3#, #a1#" }, }, -- lock @@ -8223,21 +8223,21 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55118, "INV_Misc_Cape_06", "=q4=Kum'isha's Tattered Drape", "=ds=#s4#", "14.3%" }, { 55119, "inv_helmet_24", "=q4=Forgotten Hide Helm", "=ds=#s1#, #a2#", "14.3%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 55485, "INV_Shoulder_17", "=q4=Shifting Mantle of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55485, "INV_Shoulder_17", "=q4=Shifting Mantle of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47271, "=ds=#s3#, #a4#" }, }, -- war { { 47229, "=ds=#s3#, #a1#" }, { 47235, "=ds=#s3#, #a1#" }, }, -- priest { { 47307, "=ds=#s3#, #a1#" }, { 47313, "=ds=#s3#, #a1#" }, }, -- lock { { 47391, "=ds=#s3#, #a2#" }, { 47397, "=ds=#s3#, #a2#" }, { 47403, "=ds=#s3#, #a2#" } }, -- druid }, }, - { 55486, "INV_Shoulder_17", "=q4=Shifting Mantle of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55486, "INV_Shoulder_17", "=q4=Shifting Mantle of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47061, "=ds=#s3#, #a4#" }, { 47067, "=ds=#s3#, #a4#" }, { 47073, "=ds=#s3#, #a4#" }, }, -- paladin { { 47319, "=ds=#s3#, #a3#" }, }, -- hunter { { 47325, "=ds=#s3#, #a2#" }, }, -- rogue @@ -8246,7 +8246,7 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }, { 0, "", "", "" }, - { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=T3.5 Neck", "10%", "", "", "", "", "", "", "", "", "", "", { + { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=#s2#", "10%", "", "", "", "", "", "", "", "", "", "", { { { 47275, "=ds=#s3#, #a4#" }, }, -- war { { 47233, "=ds=#s3#, #a1#" }, { 47239, "=ds=#s3#, #a1#" }, }, -- priest { { 47311, "=ds=#s3#, #a1#" }, { 47317, "=ds=#s3#, #a1#" }, }, -- lock @@ -8270,19 +8270,19 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55510, "inv_stone_10", "=q4=Fragments of Aldrach", "=ds=#w11#", "11.1%" }, { 55511, "Inv_Wand_06", "=q4=Hellflame", "=ds=#w12#", "11.1%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 55489, "INV_Pants_Plate_11", "=q4=Brutal Leggings of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55489, "INV_Pants_Plate_11", "=q4=Brutal Leggings of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47273, "=ds=#s11#, #a4#" }, }, -- war { { 47231, "=ds=#s11#, #a1#" }, { 47237, "=ds=#s11#, #a1#" }, }, -- priest { { 47309, "=ds=#s11#, #a1#" }, { 47315, "=ds=#s11#, #a1#" }, }, -- lock { { 47393, "=ds=#s11#, #a2#" }, { 47399, "=ds=#s11#, #a2#" }, { 47405, "=ds=#s11#, #a2#" } }, -- druid }, }, - { 55490, "INV_Pants_Plate_11", "=q4=Brutal Leggings of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55490, "INV_Pants_Plate_11", "=q4=Brutal Leggings of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47063, "=ds=#s11#, #a4#" }, { 47069, "=ds=#s11#, #a4#" }, { 47075, "=ds=#s11#, #a4#" }, }, -- paladin { { 47321, "=ds=#s11#, #a3#" }, }, -- hunter { { 47327, "=ds=#s11#, #a2#" }, }, -- rogue @@ -8291,7 +8291,7 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }, { 0, "", "", "" }, - { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=T3.5 Neck", "10%", "", "", "", "", "", "", "", "", "", "", { + { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=#s2#", "10%", "", "", "", "", "", "", "", "", "", "", { { { 47275, "=ds=#s3#, #a4#" }, }, -- war { { 47233, "=ds=#s3#, #a1#" }, { 47239, "=ds=#s3#, #a1#" }, }, -- priest { { 47311, "=ds=#s3#, #a1#" }, { 47317, "=ds=#s3#, #a1#" }, }, -- lock @@ -8313,21 +8313,21 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55125, "INV_Gauntlets_05", "=q4=Handwraps of Dead Winds", "=ds=#s9#, #a2#", "14.3%" }, { 55126, "inv_shoulder_14", "=q4=Mantle of the Drifting Stars", "=ds=#s3#, #a2#", "14.3%" }, { 0, "", "", "" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "3.25%" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "3.25%" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "", "", "" }, - { 55489, "INV_Helmet_57", "=q4=Fractured Crown of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55489, "INV_Helmet_57", "=q4=Fractured Crown of Conquest", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47270, "=ds=#s11#, #a4#" }, }, -- war { { 47228, "=ds=#s11#, #a1#" }, { 47234, "=ds=#s11#, #a1#" }, }, -- priest { { 47306, "=ds=#s11#, #a1#" }, { 47312, "=ds=#s11#, #a1#" }, }, -- lock { { 47390, "=ds=#s11#, #a2#" }, { 47396, "=ds=#s11#, #a2#" }, { 47402, "=ds=#s11#, #a2#" } }, -- druid }, }, - { 55490, "INV_Helmet_57", "=q4=Fractured Crown of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55490, "INV_Helmet_57", "=q4=Fractured Crown of Ascendancy", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47060, "=ds=#s11#, #a4#" }, { 47066, "=ds=#s11#, #a4#" }, { 47072, "=ds=#s11#, #a4#" }, }, -- paladin { { 47318, "=ds=#s11#, #a3#" }, }, -- hunter { { 47324, "=ds=#s11#, #a2#" }, }, -- rogue @@ -8336,7 +8336,7 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }, { 0, "", "", "" }, - { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=T3.5 Neck", "10%", "", "", "", "", "", "", "", "", "", "", { + { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=#s2#", "10%", "", "", "", "", "", "", "", "", "", "", { { { 47275, "=ds=#s3#, #a4#" }, }, -- war { { 47233, "=ds=#s3#, #a1#" }, { 47239, "=ds=#s3#, #a1#" }, }, -- priest { { 47311, "=ds=#s3#, #a1#" }, { 47317, "=ds=#s3#, #a1#" }, }, -- lock @@ -8350,13 +8350,13 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }; UKHMephistroth = { - { 55351, "INV_Belt_22", "=q4=Turalyon's Hope", "=ds=#s10#, #a4#" }, - { 55353, "INV_Jewelry_Ring_Nightbreaker", "=q4=Mephistroth's Cunning", "=ds=#s13#" }, - { 55356, "INV_Bracer_18", "=q4=Netherwrought Bracers", "=ds=#s8#, #a4#" }, - { 55513, "INV_Chest_Chain_07", "=q4=Tunic of Demonic Deception", "=ds=#s5#, #a2#", }, - { 55357, "INV_Belt_26", "=q4=Sash of the Grand Betrayal", "=ds=#s10#, #a2#", }, - { 55346, "INV_Weapon_BoneBow2", "=q4=Rain of Spiders", "=ds=#w2#" }, - { 55347, "INV_Thunderfall", "=q4=Thunderfall, Stormhammer of the Chief Thane", "=ds=#h1#, #w6#" }, + { 55351, "INV_Belt_22", "=q4=Turalyon's Hope", "=ds=#s10#, #a4#", "19%", }, + { 55353, "INV_Jewelry_Ring_Nightbreaker", "=q4=Mephistroth's Cunning", "=ds=#s13#", "19%", }, + { 55356, "INV_Bracer_18", "=q4=Netherwrought Bracers", "=ds=#s8#, #a4#", "19%", }, + { 55513, "INV_Chest_Chain_07", "=q4=Tunic of Demonic Deception", "=ds=#s5#, #a2#", "19%", }, + { 55357, "INV_Belt_26", "=q4=Sash of the Grand Betrayal", "=ds=#s10#, #a2#", "8%", }, + { 55346, "INV_Weapon_BoneBow2", "=q4=Rain of Spiders", "=ds=#w2#", "8%", }, + { 55347, "INV_Thunderfall", "=q4=Thunderfall, Stormhammer of the Chief Thane", "=ds=#h1#, #w6#", "8%", }, { 0, "", "", "" }, { 55348, "INV_Kirel", "=q4=Kirel'narak, the Death Sentence", "=ds=#w9#", "" }, { 55512, "inv_shoulder_01", "=q4=Forgotten Hide Pauldrons", "=ds=#s3#, #a2#", "" }, @@ -8366,21 +8366,21 @@ AtlasLoot_Data["AtlasLootItems"] = { { 55354, "INV_Gauntlets_05", "=q4=Khadgar's Guidance", "=ds=#s9#, #a1#" }, { 55355, "INV_Belt_03", "=q4=Memory of the Last Guardian", "=ds=#s10#, #a1#" }, { 92082, "Spell_Shadow_SummonFelHunter", "=q4=Felforged Dreadhound", "=ds=#e7#", "5%" }, - { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Lay Crytstal", "=ds=", "" }, + { 41485, "INV_Misc_Gem_Diamond_01", "=q3=Pristine Ley Crystal", "=ds=#e12#", "100%" }, { 0, "", "", "" }, { 55579, "BTNHeartAmulet", "=q4=Heart of Mephistroth", "=ds=#m3#", "100%" }, { 55515, "INV_Misc_Cape_17", "=q4=Felforged Nathrezan Veil", "=q1=#m4# =ds=#s4#" }, { 55516, "BTNGoldMysticRing", "=q4=Felforged Nathrezan Circlet", "=q1=#m4# =ds=#s13#" }, { 55517, "INV_Jewelry_Ring_Emerald", "=q4=Felforged Nathrezan Aureole", "=q1=#m4# =ds=#s13#" }, { 0, "", "", "" }, - { 55491, "INV_Chest_Cloth_45", "=q4=Nathrezim Armor of Treachery", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55491, "INV_Chest_Cloth_45", "=q4=Nathrezim Armor of Treachery", "=q17=#c9#=ds=, =q9=#c5#=ds=, =q11=#c8#, =q13=#c1#", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47272, "=ds=#s3#, #a4#" }, }, -- war { { 47230, "=ds=#s3#, #a1#" }, { 47236, "=ds=#s3#, #a1#" }, }, -- priest { { 47308, "=ds=#s3#, #a1#" }, { 47314, "=ds=#s3#, #a1#" }, }, -- lock { { 47392, "=ds=#s3#, #a2#" }, { 47398, "=ds=#s3#, #a2#" }, { 47404, "=ds=#s3#, #a2#" } }, -- druid }, }, - { 55492, "INV_Shoulder_17", "=q4=Nathrezim Armor of Deceit", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%, 25%", "", "", "", "", "", "", "", "", "", "", { + { 55492, "INV_Shoulder_17", "=q4=Nathrezim Armor of Deceit", "=q16=#c4#=ds=, =q14=#c2#=ds=, =q12=#c6#, =q15=#c7#=ds=, =q10=#c3#=ds=", "50%", "", "", "", "", "", "", "", "", "", "", { { { 47062, "=ds=#s3#, #a4#" }, { 47068, "=ds=#s3#, #a4#" }, { 47074, "=ds=#s3#, #a4#" }, }, -- paladin { { 47320, "=ds=#s3#, #a3#" }, }, -- hunter { { 47326, "=ds=#s3#, #a2#" }, }, -- rogue @@ -8389,7 +8389,7 @@ AtlasLoot_Data["AtlasLootItems"] = { }, }, { 0, "", "", "" }, - { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=T3.5 Neck", "4%", "", "", "", "", "", "", "", "", "", "", { + { 55482, "INV_Jewelry_Necklace_29", "=q4=Ephemeral Pendant", "=ds=#s2#", "10%", "", "", "", "", "", "", "", "", "", "", { { { 47275, "=ds=#s3#, #a4#" }, }, -- war { { 47233, "=ds=#s3#, #a1#" }, { 47239, "=ds=#s3#, #a1#" }, }, -- priest { { 47311, "=ds=#s3#, #a1#" }, { 47317, "=ds=#s3#, #a1#" }, }, -- lock diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua index c3fab7a..755d653 100644 --- a/WorldBosses/worldbosses.en.lua +++ b/WorldBosses/worldbosses.en.lua @@ -230,6 +230,8 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 55503, "INV_Jewelry_Ring_38", "=q4=Loop of Unceasing Frost", "=ds=#s13#" }, { 55501, "INV_Ore_Arcanite_02", "=q4=Sphere of the Endless Gulch", "=ds=#s14#" }, { 55497, "INV_QirajIdol_Night", "=q4=Idol of Ebb and Flow", "=ds=#e16# =q13=#c1#" }, + { 0, "", "", "", "" }, + { 92020, "INV_Misc_Birdbeck_02", "=q3=Spawn of Cla'ckora", "=ds=#e15#", "5%" }, }; KKazzak = { { 18546, "INV_Helmet_18", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "20%" },