From d3bd69d198b3e42956c413cda6af14c5abd851ff Mon Sep 17 00:00:00 2001 From: Lexie <6937574+Lexiebean@users.noreply.github.com> Date: Wed, 12 Apr 2023 18:12:49 +1000 Subject: [PATCH] v1.0.9 * There Is No Cow Level * Survival * Wardens of Time * Removed Armored Stormwind Warhorse * Removed mount from Dark Reaver of Karazhan * Added Half-Buried Treasure Chest to Karazhan Crypts * Added rare spawn Admiral Barean Westwind * Fixed Goblin Jumper Cables XL recipe * Engineering: Battery-Powered Crowd Pummeler * Added Blood Ring (PvP) --- AtlasLoot.toc | 2 +- AtlasLoot.xml | 2 +- Core/AtlasLoot.lua | 43 ++++++++--- Core/AtlasLoot.xml | 2 +- Core/ButtonRegistry.lua | 53 +++++++++++++ Core/Crafting.lua | 16 ++-- Core/PvP.lua | 50 +++++++++++++ Core/Spells.lua | 128 +++++++++++++++++++++++++++++++- Core/TextParsing.lua | 1 + Crafting/crafting.en.lua | 23 +++++- Factions/factions.lua | 28 ++++++- Instances/instances.en.lua | 20 ++++- Locale/locale.en.lua | 10 ++- PvP/Battlegrounds.en.lua | 120 ++++++++++++++++++++++++++++++ TableRegister/loottables.en.lua | 22 ++++++ WorldBosses/worldbosses.en.lua | 107 ++++++++++++++++---------- 16 files changed, 561 insertions(+), 66 deletions(-) diff --git a/AtlasLoot.toc b/AtlasLoot.toc index 6959899..f2a68c6 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -2,7 +2,7 @@ ## Title: AtlasLoot TW Edition ## Notes: Shows the possible loot from the bosses ## Author: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons), |cffbe5effLexie|r -## Version: 1.0.8 +## Version: 1.0.9 ## SavedVariables: AtlasLoot_updateavailable ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, DewdropLib, Ace2, EquipCompare, EQCompare diff --git a/AtlasLoot.xml b/AtlasLoot.xml index 6e7fd66..394bf1e 100644 --- a/AtlasLoot.xml +++ b/AtlasLoot.xml @@ -554,7 +554,7 @@ this:SetMovable(1); this:SetBackdropColor(0.75, 0, 0.75); local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); - getglobal("AtlasLootDefaultFrame_Notice"):SetText(AL["This is a loot browser only. To view maps as well, install either Atlas or Alphamap."]); + getglobal("AtlasLootDefaultFrame_Notice"):SetText(AL["If you find anything missing, please /w Lexie or message me on Discord Lexie#4024"]); AtlasLootDefaultFrame_OnShow(); diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index d8b1420..bc25d3a 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -69,7 +69,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); --Establish version number and compatible version of Atlas local VERSION_MAJOR = "1"; local VERSION_MINOR = "0"; -local VERSION_BOSSES = "8"; +local VERSION_BOSSES = "9"; ATLASLOOT_VERSION = "|cffFF8400AtlasLoot TW Edition v"..VERSION_MAJOR.."."..VERSION_MINOR.."."..VERSION_BOSSES.."|r"; ATLASLOOT_CURRENT_ATLAS = "1.12.0"; ATLASLOOT_PREVIEW_ATLAS = "1.12.1"; @@ -170,6 +170,7 @@ AtlasLoot_MenuList = { "ABRepMenu", "AVRepMenu", "WSGRepMenu", + "BRRepMenu", "PVPSET", "SETMENU", "AQ20SET", @@ -532,6 +533,8 @@ function AtlasLoot_SlashCommand(msg) AtlasLootOptions_Toggle(); else AtlasLootDefaultFrame:Show(); + DEFAULT_CHAT_FRAME:AddMessage("|cffbe5eff[AtlasLoot]|r |cffddabffIf you find anything missing, please /w Lexie or message me on Discord Lexie#4024|r") + end end @@ -1135,6 +1138,8 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) AtlasLootT0SetMenu(); elseif(dataID=="PVPMENU") then AtlasLootPvPMenu(); + elseif(dataID=="BRRepMenu") then + AtlasLootBRRepMenu(); elseif(dataID=="WSGRepMenu") then AtlasLootWSGRepMenu(); elseif(dataID=="ABRepMenu") then @@ -2281,12 +2286,15 @@ AtlasLoot_DewDropDown = { { AL["PvP Mounts"], "PvPMountsPvP", "Table" }, }, [5] = { - { AL["Alterac Valley"], "AVRewards", "Submenu" }, + { AL["Blood Ring"], "BRRewards", "Submenu" }, }, [6] = { - { AL["Arathi Basin"], "ABRewards", "Submenu" }, + { AL["Alterac Valley"], "AVRewards", "Submenu" }, }, [7] = { + { AL["Arathi Basin"], "ABRewards", "Submenu" }, + }, + [8] = { { AL["Warsong Gulch"], "WSGRewards", "Submenu" }, }, }, @@ -2398,15 +2406,16 @@ AtlasLoot_DewDropDown = { [8] = { { (AL["Tailoring"]), "Tailoring", "Submenu" }, }, [9] = { { (AL["Cooking"]), "Cooking", "Submenu" }, }, [10] = { { (AL["First Aid"]), "FirstAid1", "Table" }, }, - [11] = { { (AL["Poisons"]), "Poisons1", "Table" }, }, - [12] = { + [11] = { { (AL["Survival"]), "Survival1", "Table" }, }, + [12] = { { (AL["Poisons"]), "Poisons1", "Table" }, }, + [13] = { [AL["Crafted Sets"]] = { { (AL["Blacksmithing"]), "CraftSetBlacksmith", "Submenu" }, { (AL["Leatherworking"]), "CraftSetLeatherwork", "Submenu" }, { (AL["Tailoring"]), "CraftSetTailoring", "Submenu" }, }, }, - [13] = { { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, }, + [14] = { { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, }, }, }, }; @@ -2491,6 +2500,7 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Archlich Enkhraz"], "KCArchlichEnkhraz" }, { AL["Commander Anderson"], "KCCommanderAnderson" }, { AL["Alarus"], "KCAlarus" }, + { AL["Half-Buried Treasure Chest"], "KCTreasure" }, }, ["CavernsOfTimeBlackMorass"] = { { AL["Chronar"], "COTBMChronar" }, @@ -2868,6 +2878,7 @@ AtlasLoot_DewDropDown_SubTables = { { "Dark Reaver of Karazhan", "Reaver" }, { "Ostarius", "Ostarius" }, { "Concavius", "Concavius" }, + { "There Is No Cow Level", "CowKing" }, }, ["RareSpawns"] = { { "Tarangos The Dampener", "Tarangos" }, @@ -2880,6 +2891,7 @@ AtlasLoot_DewDropDown_SubTables = { { "Zareth Terrorblade Demon Hunter", "Zareth" }, { "Jal'akar Dire Troll", "Jalakar" }, { "Explorer Ashbeard", "Ashbeard" }, + { "Admiral Barean Westwind", "AdmiralBareanWestwind" }, }, ["AbyssalCouncil1"] = { { AL["Abyssal Council"].." - "..AL["Templars"], "AbyssalTemplars" }, @@ -2891,6 +2903,7 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Bloodsail Buccaneers"], "Bloodsail1" }, { AL["Brood of Nozdormu"], "AQBroodRings" }, { AL["Cenarion Circle"], "Cenarion1" }, + { AL["Dalaran"], "Dalaran" }, { AL["Darkmoon Faire"], "Darkmoon" }, { AL["Frostwolf Clan"], "Frostwolf1" }, { AL["Gelkis Clan Centaur"], "GelkisClan1" }, @@ -2899,20 +2912,20 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Stormpike Guard"], "Stormpike1" }, { AL["Thorium Brotherhood"], "Thorium1" }, { AL["Timbermaw Hold"], "Timbermaw" }, + { AL["Wardens of Time"], "Warderns1" }, { AL["Wintersaber Trainers"], "Wintersaber1" }, { AL["Zandalar Tribe"], "Zandalar1" }, - { AL["Silvermoon Remnant"], "Helf" }, - { AL["Revantusk Trolls"], "Revantusk" }, - { AL["Ironforge"], "Ironforge" }, { AL["Darnassus"], "Darnassus" }, - { AL["Stormwind"], "Stormwind" }, { AL["Gnomeregan Exiles"], "GnomereganExiles" }, + { AL["Ironforge"], "Ironforge" }, + { AL["Silvermoon Remnant"], "Helf" }, + { AL["Stormwind"], "Stormwind" }, { AL["Darkspear Trolls"], "DarkspearTrolls" }, { AL["Durotar Labor Union"], "DurotarLaborUnion" }, - { AL["Undercity"], "Undercity" }, { AL["Orgrimmar"], "Orgrimmar" }, + { AL["Revantusk Trolls"], "Revantusk" }, { AL["Thunder Bluff"], "ThunderBluff" }, - { AL["Dalaran"], "Dalaran" }, + { AL["Undercity"], "Undercity" }, }, ["BoEWorldEpics"] = { { AtlasLoot_TableNames["WorldEpics3"][1], "WorldEpics3" }, @@ -3043,6 +3056,12 @@ AtlasLoot_DewDropDown_SubTables = { { AL["The Twin Blades of Hakkari"], "HakkariBlades" }, { AL["Zul'Gurub Rings"], "ZGRings" }, }, + ["BRRewards"] = { + { AL["Exalted Reputation Rewards"], "BRRepExalted" }, + { AL["Revered Reputation Rewards"], "BRRepRevered" }, + { AL["Honored Reputation Rewards"], "BRRepHonored" }, + { AL["Friendly Reputation Rewards"], "BRRepFriendly" }, + }, ["AVRewards"] = { { AL["Exalted Reputation Rewards"], "AVRepExalted" }, { AL["Revered Reputation Rewards"], "AVRepRevered" }, diff --git a/Core/AtlasLoot.xml b/Core/AtlasLoot.xml index 6e7fd66..394bf1e 100644 --- a/Core/AtlasLoot.xml +++ b/Core/AtlasLoot.xml @@ -554,7 +554,7 @@ this:SetMovable(1); this:SetBackdropColor(0.75, 0, 0.75); local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); - getglobal("AtlasLootDefaultFrame_Notice"):SetText(AL["This is a loot browser only. To view maps as well, install either Atlas or Alphamap."]); + getglobal("AtlasLootDefaultFrame_Notice"):SetText(AL["If you find anything missing, please /w Lexie or message me on Discord Lexie#4024"]); AtlasLootDefaultFrame_OnShow(); diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index 3e0b546..5b6dbff 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -464,9 +464,16 @@ AtlasLoot_ButtonRegistry = { }; ["KCAlarus"] = { Title = AL["Alarus"]; + Next_Page = "KCTreasure"; + Next_Title = AL["Half-Buried Treasure Chest"]; Prev_Page = "KCCommanderAnderson"; Prev_Title = AL["Commander Anderson"]; }; + ["KCTreasure"] = { + Title = AL["Half-Buried Treasure Chest"]; + Prev_Page = "KCAlarus"; + Prev_Title = AL["Alarus"]; + }; ["COTBMChronar"] = { Title = AL["Chronar"]; Next_Page = "COTBMHarbingerAphygth"; @@ -2506,8 +2513,15 @@ AtlasLoot_ButtonRegistry = { }; ["Concavius"] = { Title = "Concavius"; + Next_Page = "CowKing"; + Next_Title = "The Cow King"; Prev_Page = "Ostarius"; Prev_Title = "Ostarius"; + }; + ["CowKing"] = { + Title = "There Is No Cow Level"; + Prev_Page = "Concavius"; + Prev_Title = "Concavius"; }; ["Tarangos"] = { Title = "Tarangos The Dampener"; @@ -2572,9 +2586,16 @@ AtlasLoot_ButtonRegistry = { }; ["Ashbeard"] = { Title = "Explorer Ashbeard"; + Next_Page = "AdmiralBareanWestwind"; + Next_Title = "Admiral Barean Westwind"; Prev_Page = "Jalakar"; Prev_Title = "Jal'akar Dire Troll"; }; + ["AdmiralBareanWestwind"] = { + Title = "Admiral Barean Westwind"; + Prev_Page = "Ashbeard"; + Prev_Title = "Explorer Ashbeard"; + }; --WoW Factions @@ -2605,6 +2626,11 @@ AtlasLoot_ButtonRegistry = { Title = AL["Bloodsail Buccaneers"]; Back_Page = "REPMENU"; Back_Title = AL["Factions"]; + }; + ["Warderns1"] = { + Title = "Wardens of Time"; + Back_Page = "REPMENU"; + Back_Title = AL["Factions"]; }; ["AQBroodRings"] = { Title = AL["Brood of Nozdormu"]; @@ -2809,6 +2835,28 @@ AtlasLoot_ButtonRegistry = { Back_Page = "REPMENU"; Back_Title = AL["Factions"]; }; + ["BRRepFriendly"] = { + Title = "Blood Ring Friendly Rewards"; + Back_Page = "BRRepMenu"; + Next_Page = "BRRepHonored"; + }; + ["BRRepHonored"] = { + Title = "Blood Ring Honored Rewards"; + Back_Page = "BRRepMenu"; + Next_Page = "BRRepRevered"; + Prev_Page = "BRRepFriendly"; + }; + ["BRRepRevered"] = { + Title = "Blood Ring Revered Rewards"; + Back_Page = "BRRepMenu"; + Next_Page = "BRRepExalted"; + Prev_Page = "BRRepHonored"; + }; + ["BRRepExalted"] = { + Title = "Blood Ring Exalted Rewards"; + Back_Page = "BRRepMenu"; + Prev_Page = "BRRepRevered"; + }; ["ABRepFriendly2029"] = { Title = "AB 20-29 Friendly Rewards"; Back_Page = "ABRepMenu"; @@ -4334,6 +4382,11 @@ AtlasLoot_ButtonRegistry = { Back_Page = "CRAFTINGMENU"; Back_Title = AL["Crafting"]; }; + ["Survival1"] = { + Title = AL["Survival"]; + Back_Page = "CRAFTINGMENU"; + Back_Title = AL["Crafting"]; + }; ["Poisons1"] = { Title = AL["Poisons"]; Back_Page = "CRAFTINGMENU"; diff --git a/Core/Crafting.lua b/Core/Crafting.lua index b67eba1..afc04c7 100644 --- a/Core/Crafting.lua +++ b/Core/Crafting.lua @@ -76,12 +76,18 @@ function AtlasLoot_CraftingMenu() AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\Spell_Holy_SealOfSacrifice"); AtlasLootMenuItem_12.lootpage="FirstAid1"; AtlasLootMenuItem_12:Show(); + --Survival + AtlasLootMenuItem_13_Name:SetText(AL["Survival"]); + AtlasLootMenuItem_13_Extra:SetText(""); + AtlasLootMenuItem_13_Icon:SetTexture("Interface\\Icons\\Trade_Survival"); + AtlasLootMenuItem_13.lootpage="Survival1"; + AtlasLootMenuItem_13:Show(); --Poisons - AtlasLootMenuItem_14_Name:SetText(AL["Poisons"]); - AtlasLootMenuItem_14_Extra:SetText("|cfffff468"..AL["Rogue"]); - AtlasLootMenuItem_14_Icon:SetTexture("Interface\\Icons\\Trade_BrewPoison"); - AtlasLootMenuItem_14.lootpage="Poisons1"; - AtlasLootMenuItem_14:Show(); + AtlasLootMenuItem_15_Name:SetText(AL["Poisons"]); + AtlasLootMenuItem_15_Extra:SetText("|cfffff468"..AL["Rogue"]); + AtlasLootMenuItem_15_Icon:SetTexture("Interface\\Icons\\Trade_BrewPoison"); + AtlasLootMenuItem_15.lootpage="Poisons1"; + AtlasLootMenuItem_15:Show(); --Crafted Armor Sets AtlasLootMenuItem_17_Name:SetText(AL["Crafted Sets"]); AtlasLootMenuItem_17_Extra:SetText(""); diff --git a/Core/PvP.lua b/Core/PvP.lua index 22e79c7..4321c43 100644 --- a/Core/PvP.lua +++ b/Core/PvP.lua @@ -50,6 +50,12 @@ function AtlasLootPvPMenu() AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Misc_Rune_07"); AtlasLootMenuItem_17.lootpage="WSGRepMenu"; AtlasLootMenuItem_17:Show(); + -- Blood Ring Rewards + AtlasLootMenuItem_18_Name:SetText(AL["Blood Ring"]); + AtlasLootMenuItem_18_Extra:SetText(""); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\inv_jewelry_ring_04"); + AtlasLootMenuItem_18.lootpage="BRRepMenu"; + AtlasLootMenuItem_18:Show(); --Weapons AtlasLootMenuItem_23_Name:SetText(AL["Rank 14 Weapons"]); AtlasLootMenuItem_23_Extra:SetText("|cffFF8400"..AL["Level 60"]); @@ -63,6 +69,50 @@ function AtlasLootPvPMenu() AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame); end +function AtlasLootBRRepMenu() + for i = 1, 30, 1 do + getglobal("AtlasLootItem_"..i):Hide(); + end + for i = 1, 30, 1 do + getglobal("AtlasLootMenuItem_"..i):Hide(); + getglobal("AtlasLootMenuItem_"..i).isheader = false; + end + getglobal("AtlasLootItemsFrame_BACK"):Show(); + getglobal("AtlasLootItemsFrame_BACK").lootpage = "PVPMENU"; + getglobal("AtlasLootItemsFrame_NEXT"):Hide(); + getglobal("AtlasLootItemsFrame_PREV"):Hide(); + getglobal("AtlasLootServerQueryButton"):Hide(); + --Friendly + AtlasLootMenuItem_2_Name:SetText("Friendly Reputation Rewards"); + AtlasLootMenuItem_2_Extra:SetText(""); + AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\inv_jewelry_ring_04"); + AtlasLootMenuItem_2.lootpage="BRRepFriendly"; + AtlasLootMenuItem_2:Show(); + --Honored + AtlasLootMenuItem_3_Name:SetText("Honored Reputation Rewards"); + AtlasLootMenuItem_3_Extra:SetText(""); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\inv_jewelry_ring_04"); + AtlasLootMenuItem_3.lootpage="BRRepHonored"; + AtlasLootMenuItem_3:Show(); + --Revered + AtlasLootMenuItem_4_Name:SetText("Revered Reputation Rewards"); + AtlasLootMenuItem_4_Extra:SetText(""); + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\inv_jewelry_ring_04"); + AtlasLootMenuItem_4.lootpage="BRRepRevered"; + AtlasLootMenuItem_4:Show(); + --Exalted + AtlasLootMenuItem_5_Name:SetText("Exalted Reputation Rewards"); + AtlasLootMenuItem_5_Extra:SetText(""); + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\inv_jewelry_ring_04"); + AtlasLootMenuItem_5.lootpage="BRRepExalted"; + AtlasLootMenuItem_5:Show(); + for i = 1, 30, 1 do + getglobal("AtlasLootMenuItem_"..i.."_Extra"):Show(); + end + AtlasLoot_BossName:SetText("|cffFFFFFF"..AL["Blood Ring"]); + AtlasLoot_SetItemInfoFrame(AtlasLoot_AnchorFrame); +end + function AtlasLootWSGRepMenu() for i = 1, 30, 1 do getglobal("AtlasLootItem_"..i):Hide(); diff --git a/Core/Spells.lua b/Core/Spells.lua index 2aaaa50..71852c4 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -1125,6 +1125,113 @@ GetSpellInfoVanillaDB = { [1] = {4470}, }, }, + [46064] = { + ["name"] = "Survival: Dim Torch", + ["requires"] = AL["Cooking Fire"], + ["tools"] = "", + ["castTime"] = 2, + ["text"] = "", + ["craftItem"] = 6182, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {6183}, + }, + }, + [46066] = { + ["name"] = "Survival: Murloc's Flippers", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 2, + ["text"] = "", + ["craftItem"] = 65028, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {5785, 16}, + [2] = {4234, 8}, + [3] = {8343, 2}, + [4] = {6370, 3}, + [5] = {6372}, + }, + }, + [46072] = { + ["name"] = "Survival: Traveler's Tent", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 51283, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4470, 5}, + [2] = {2589, 10}, + [3] = {50231}, + }, + }, + [46073] = { + ["name"] = "Survival: Fishing Boat", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 20, + ["text"] = "", + ["craftItem"] = 51282, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4470, 20}, + [2] = {4359, 10}, + [3] = {17058, 2}, + }, + }, + [46074] = { + ["name"] = "Survival: Simple Wooden Planter", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 10, + ["text"] = "", + ["craftItem"] = 51705, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4470, 10}, + [2] = {4359, 4}, + }, + }, + [46075] = { + ["name"] = "Survival: Iron Lantern", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 2, + ["text"] = "", + ["craftItem"] = 2714, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {3575, 2}, + [2] = {814, 4}, + [3] = {2592, 5}, + }, + }, + [46077] = { + ["name"] = "Survival: Repaired Electro-Lantern", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 5, + ["text"] = "", + ["craftItem"] = 65030, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {1630, 5}, + [2] = {10561}, + [3] = {4359}, + [4] = {4375}, + [5] = {4404, 2}, + [6] = {10558, 2}, + }, + }, [7752] = { ["name"] = "Cooking: Slitherskin Mackerel", ["requires"] = AL["Cooking Fire"], @@ -9490,7 +9597,7 @@ GetSpellInfoVanillaDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {15944, 2}, + [1] = {15994, 2}, [2] = {18631, 2}, [3] = {7191, 2}, [4] = {14227, 2}, @@ -10309,6 +10416,25 @@ GetSpellInfoVanillaDB = { [4] = {10560, 4}, }, }, + [46610] = { + ["name"] = "Engineering: Battery-Powered Crowd Pummeler", + ["requires"] = "", + ["tools"] = {5956, 10498}, + ["castTime"] = 25, + ["text"] = "", + ["craftItem"] = 60099, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {9449}, + [2] = {60098, 5}, + [3] = {814, 2}, + [4] = {7191, 4}, + [5] = {3829}, + [6] = {4375, 6}, + [7] = {18631}, + }, + }, [26011] = { ["name"] = "Engineering: Tranquil Mechanical Yeti", ["requires"] = AL["Anvil"], diff --git a/Core/TextParsing.lua b/Core/TextParsing.lua index 2c57e3e..b2b43ad 100644 --- a/Core/TextParsing.lua +++ b/Core/TextParsing.lua @@ -115,6 +115,7 @@ function AtlasLoot_FixText(text) text = gsub(text, "#p13#", AL["Lockpicking"]); text = gsub(text, "#p14#", AL["Gnomish Engineering"]); text = gsub(text, "#p15#", AL["Goblin Engineering"]); + text = gsub(text, "#p16#", AL["Survival"]); --Reputation text = gsub(text, "#r1#", AL["Neutral"]); diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index 5966ad7..f125010 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -1551,6 +1551,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s19788", "inv_misc_ammo_gunpowder_01", "=q1=Dense Blasting Powder", "=ds=#sr# =so1=250 =so2=250 =so3=255 =so4=260" }, { "s23070", "inv_misc_bomb_06", "=q1=Dense Dynamite", "=ds=#sr# =so1=250 =so2=250 =so3=260 =so4=270" }, { "s23507", "spell_holy_holybolt", "=q1=Snake Burst Firework", "=ds=#sr# =so1=250 =so2=250 =so3=260 =so4=270" }, + { "s46610", "inv_mace_14", "=q4=Battery-Powered Crowd Pummeler", "=ds=#sr# =so1=250 =so2=? =so3=? =so4=?" }, { "s19567", "inv_egg_05", "=q1=Salt Shaker", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s12624", "inv_misc_head_dragon_01", "=q2=Mithril Mechanical Dragonling", "=ds=#sr# =so1=250 =so2=270 =so3=280 =so4=290" }, { "s26011", "ability_hunter_pet_gorilla", "=q1=Tranquil Mechanical Yeti", "=ds=#sr# =so1=250 =so2=320 =so3=330 =so4=340" }, @@ -1571,10 +1572,10 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s19796", "inv_weapon_rifle_08", "=q3=Dark Iron Rifle", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, { "s19799", "inv_misc_bomb_05", "=q1=Dark Iron Bomb", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, { "s19815", "inv_gizmo_07", "=q1=Delicate Arcanite Converter", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, - { "s19800", "inv_ammo_bullet_03", "=q2=Thorium Shells", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, }; EngineeringArtisan2 = { + { "s19800", "inv_ammo_bullet_03", "=q2=Thorium Shells", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, { "s19825", "inv_helmet_47", "=q2=Master Engineer's Goggles", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s19819", "inv_jewelry_amulet_07", "=q2=Voice Amplification Modulator", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s23081", "inv_misc_enggizmos_04", "=q3=Hyper-Radiant Flame Reflector", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, @@ -1865,6 +1866,26 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s18630", "inv_misc_bandage_12", "=q1=Heavy Runecloth Bandage", "=ds=#sr# =so1=290 =so2=290 =so3=320 =so4=350" }, { "s23787", "inv_drink_14", "=q1=Powerful Anti-Venom", "=ds=#sr# =so1=300 =so2=300 =so3=330 =so4=360" }, }; + +-------------- +-- FirstAid -- +-------------- + + Survival1 = { + { 0, "Trade_Survival", "=q6=#p16#", "" }, + { 0, "", "", "" }, + { "s46064", "inv_torch_lit", "=q1=Dim Torch", "=ds=#sr# =so1=1 =so2=30 =so3=45 =so4=60" }, + { 0, "", "", "" }, + { "s46075", "inv_misc_lantern_01", "=q2=Iron Lantern", "=ds=#sr# =so1=30 =so2=30 =so3=45 =so4=60" }, + { 0, "", "", "" }, + { "s46072", "Trade_Survival", "=q2=Traveler's Tent", "=ds=#sr# =so1=50 =so2=100 =so3=? =so4=?" }, + { 0, "", "", "" }, + { "s46074", "trade_herbalism", "=q2=Simple Woodern Planter", "=ds=#sr# =so1=75 =so2=100 =so3=112 =so4=125" }, + { "s46073", "inv_tradeskillitem_02", "=q2=Fishing Boat", "=ds=#sr# =so1=75 =so2=125 =so3=150 =so4=?" }, + { "s46066", "inv_boots_fabric_01", "=q2=Murloc's Flippers", "=ds=#sr# =so1=75 =so2=150 =so3=? =so4=?" }, + { 0, "", "", "" }, + { "s46077", "inv_misc_lantern_01", "=q3=Repaired Electro-Lantern", "=ds=#sr# =so1=90 =so2=120 =so3=135 =so4=150" }, + }; Poisons1 = { { 0, "Trade_BrewPoison", "=q6=#rp1#", "" }, diff --git a/Factions/factions.lua b/Factions/factions.lua index 287508a..0dfbe63 100644 --- a/Factions/factions.lua +++ b/Factions/factions.lua @@ -369,6 +369,32 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 0, "INV_Helmet_66", "=q6=#r2#", "" }, { 12185, "INV_Helmet_66", "=q2=Bloodsail Admiral's Hat", "=ds=#s1#, #a1#" }, }; + Warderns1 = { + { 0, "inv_misc_head_dragon_01", "=q6=#r2#", "" }, + { 61000, "", "=q1=Time-Worn Rune", "" }, + { 0, "", "", "" }, + { 0, "inv_misc_head_dragon_01", "=q6=#r4#", "" }, + { 61001, "", "=q3=Claw of the Infinite", "=ds=#h1#, #w4#" }, + { 61013, "", "=q3=Gauntlets of Temporal Guidance", "=ds=#a3#, #s9#" }, + { 61002, "", "=q3=Robe of the Custodian", "=ds=#a1#, #s5#" }, + { 61004, "", "=q3=Sandswept Ring of Arcanum", "=ds=#s13#" }, + { 61003, "", "=q3=Timeskipper's Helm of Alacrity", "=ds=#a4#, #s1#" }, + { 51043, "", "=q2=Void-Linked Satchel", "=ds=#e10#" }, + { 50070, "", "=q1=Bronze Whelpling", "=ds=#e15#" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "inv_misc_head_dragon_01", "=q6=#r5#", "" }, + { 61007, "", "=q4=Temporal Bronze Boots", "=ds=#a4#, #s12#" }, + { 61009, "", "=q4=Time-Shifting Wheel", "=ds=#h4#, #w8#" }, + { 61010, "", "=q4=Wing of the Time-Lord", "=ds=#s4#" }, + { 61006, "", "=q4=Blade of Infinite Mysteries", "=ds=#w10#, #h3#" }, + { 61011, "INV_Weapon_Rifle_09", "=q4=Flintlocke's Hand Cannon", "=ds=#w5#" }, + { 61012, "", "=q4=Shard of Eternity", "=ds=#s2#" }, + { 51252, "", "=q4=Bronze Drake", "=ds=#e7#" }, + { 80300, "", "=q1=Time Warden's Tabard", "=ds=#s7#" }, + }; Defilers = { { 0, "", "", "" }, { 0, "INV_Jewelry_Amulet_07", "=q6=#r5#", "" }, @@ -601,6 +627,7 @@ AtlasLoot_Data["AtlasLootRepItems"] = { }; Ironforge = { { 0, "inv_drink_08", "=q6=#r3#", "" }, + { 81214, "", "=q2=", "" }, { 81211, "", "=q2=", "" }, { 81212, "", "=q2=", "" }, { 81215, "", "=q2=", "" }, @@ -627,7 +654,6 @@ AtlasLoot_Data["AtlasLootRepItems"] = { }; Stormwind = { { 0, "INV_Staff_13", "=q2=Exalted", "" }, - { 81225, "", "=q2=", "" }, { 80320, "", "=q2=", "" }, }; GnomereganExiles = { diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 437ae83..9e1c336 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -638,6 +638,7 @@ AtlasLootBossButtons = { "KCArchlichEnkhraz"; "KCCommanderAnderson"; "KCAlarus"; + "KCTreasure"; }; CavernsOfTimeBlackMorass = { ""; @@ -2773,7 +2774,7 @@ AtlasLoot_Data["AtlasLootItems"] = { { 83208, "INV_belt_22", "=q3=Circlet of the Crescent Moon", "=ds=#s1#, #a1#", "30%" }, { 83209, "INV_axe_12", "=q3=Sentinel's Moonslicer", "=ds=#h2#, #w1#", "30%" }, { 83211, "INV_shoulder_05", "=q3=Moontouched Shoulders", "=ds=#s3#, #a2#", "30%" }, - { 83210, "", "=q3=Crescent Sigil", "=ds=#s3#, #a2#", "10%" }, + { 83210, "", "=q3=Crescent Sigil", "=ds=#s14#", "10%" }, }; TCGFenektistheDeceiver = { { 83212, "INV_misc_orb_04", "=q3=Felflame Shard", "=ds=#s15#", "25%" }, @@ -2846,7 +2847,7 @@ AtlasLoot_Data["AtlasLootItems"] = { { 50193, "INV_Shoulder_24", "=q3=Gravewalker Pauldrons", "=ds=#s3#, #a2#", "16% ?" }, }; KCAlarus = { - { 83465, "INV_misc_cape_21", "=q3=Shroud of Haunted Torment", "=ds=#s4#, #a1#", "25%" }, + { 83465, "INV_misc_cape_21", "=q3=Shroud of Haunted Torment", "=ds=#s4#", "25%" }, { 83466, "INV_pants_plate_20", "=q3=Baneforged Leggings", "=ds=#s11#, #a4#", "25%" }, { 83467, "INV_wand_03", "=q3=Cryptwatcher's Call", "=ds=#w12#", "25%" }, { 83468, "INV_jewelry_ring_09", "=q3=Corpsekeeper's Charge", "=ds=#s13#", "25%" }, @@ -2859,6 +2860,18 @@ AtlasLoot_Data["AtlasLootItems"] = { { 0, "", "", "" }, { 83571, "inv_misc_book_05", "=q3=Codex: Shadow Mend", "=ds=#c5#", "15" }, }; + KCTreasure = { + { 5823, "", "=q1=Poisonous Mushroom", "=ds=#m25#", "100%" }, + { 11938, "", "=q1=Sack of Gems", "", "100%" }, + { 13456, "", "=q1=Greater Frost Protection Potion", "=ds=#m25#", "100%" }, + { 60799, "", "=q3=Gauntlets of the Lost Crusader", "=ds=#s9#, #a4#", "14%" }, + { 60800, "", "=q2=Femur Club", "=ds=#h1#, #w6#", "14%" }, + { 60801, "", "=q2=Tome of Dark Powers", "=ds=#h4#", "14%" }, + { 60802, "", "=q2=Shawl of the Forgotten", "=ds=#s4#", "14%" }, + { 60796, "", "=q2=Blade of Rotting", "=ds=#h1#, #w10#", "14%" }, + { 60797, "", "=q2=Rotskin Leggings", "=ds=#s11#, #a2#", "14%" }, + { 60798, "", "=q3=Loop of the Forgotten", "=ds=#s13#", "14%" }, + }; COTBMChronar = { { 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#", "100%" }, { 0, "", "", "" }, @@ -3273,6 +3286,9 @@ AtlasLoot_Data["AtlasLootItems"] = { { 17718, "INV_Shield_10", "=q3=Gizlock's Hypertech Buckler", "=ds=#w8#", "30.61%" }, { 17717, "INV_Weapon_Rifle_05", "=q3=Megashot Rifle", "=ds=#w5#", "27.23%" }, { 17719, "INV_Sword_14", "=q3=Inventor's Focal Sword", "=ds=#h3#, #w10#", "27.44%" }, + { 0,"","","" }, + { 51809, "inv_scroll_05", "=q4=Schematic: Battery-Powered Crowd Pummeler", "=ds=#p5#", "8%" }, + }; MaraRotgrip = { { 17732, "INV_Shoulder_05", "=q3=Rotgrip Mantle", "=ds=#s3#, #a1#", "25.73%" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 9a7115c..5345377 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -36,7 +36,7 @@ AL:RegisterTranslations("enUS", function() return { ["ALT+Click to use WishList."] = true, ["Left-click to open AtlasLoot.\nMiddle-click for AtlasLoot options.\nRight-click and drag to move this button."] = true, ["Various Locations"] = true, - ["This is a loot browser only. To view maps as well, install either Atlas or Alphamap."] = true, + ["If you find anything missing, please /w Lexie or message me on Discord Lexie#4024"] = true, ["Toggle AL Panel"] = true, [" is safe."] = true, ["Server queried for "] = true, @@ -924,6 +924,7 @@ AL:RegisterTranslations("enUS", function() return { ["Archlich Enkhraz"] = true, ["Commander Anderson"] = true, ["Alarus"] = true, + ["Half-Buried Treasure Chest"] = true, ["Caverns of Time: Black Morass"] = true, ["Chronar"] = true, ["Harbinger Aph'ygth"] = true, @@ -1328,6 +1329,7 @@ AL:RegisterTranslations("enUS", function() return { ["Stormpike Guard"] = true, ["Thorium Brotherhood"] = true, ["Timbermaw Hold"] = true, + ["Wardens of Time"] = true, ["Wintersaber Trainers"] = true, ["Zandalar Tribe"] = true, ["Apprentice"] = true, @@ -1357,9 +1359,11 @@ AL:RegisterTranslations("enUS", function() return { ["Tailoring"] = true, ["Cooking"] = true, ["First Aid"] = true, + ["Survival"] = true, ["Alterac Valley"] = true, ["Arathi Basin"] = true, ["Warsong Gulch"] = true, + ["Blood Ring"] = true, ["Hellfire Peninsula"] = true, ["Nagrand"] = true, ["Terokkar Forest"] = true, @@ -1406,6 +1410,10 @@ AL:RegisterTranslations("enUS", function() return { ["Revered Reputation Rewards"] = true, ["Exalted Reputation Rewards"] = true, ["ZG Rings"] = true, + ["Friendly Rewards"] = true, + ["Honored Rewards"] = true, + ["Revered Rewards"] = true, + ["Exalted Rewards"] = true, ["51-60 Friendly Rewards"] = true, ["51-60 Honored Rewards"] = true, ["51-60 Revered Rewards"] = true, diff --git a/PvP/Battlegrounds.en.lua b/PvP/Battlegrounds.en.lua index bd0509c..2049252 100644 --- a/PvP/Battlegrounds.en.lua +++ b/PvP/Battlegrounds.en.lua @@ -10,6 +10,74 @@ The English file also contains the loot tables for the battleground loot tables. -- Layout -- ------------ AtlasLootBattlegrounds = { + BloodRing = { + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + ""; + "BRRepFriendly1"; + "BRRepHonored1"; + "BRRepRevered1"; + "BRRepExalted1"; + }; AlteracValleyNorth = { "Stormpike1"; ""; @@ -165,6 +233,58 @@ AtlasLootBattlegrounds = { ---------------------- AtlasLoot_Data["AtlasLootBGItems"] = { EmptyInstance = {}; + BRRepFriendly = { + { 60366, "", "=q3=Gore Ring of the Gladiator", "=ds=#s13#" }, + { 60368, "", "=q3=Loop of Field Medicine", "=ds=#s13#" }, + { 60367, "", "=q3=Auspicious Ring of the Seer", "=ds=#s13#" }, + }; + BRRepHonored = { + { 83421, "", "=q3=Bloody Gladiator's Handwraps", "=ds=#a1#, #s9#" }, + { 83420, "", "=q3=Bloody Gladiator's Sash", "=ds=#a1#, #s10#" }, + { "", "", "", "" }, + { 83430, "", "=q3=Bloody Gladiator's Gloves", "=ds=#a2#, #s9#" }, + { 83429, "", "=q3=Bloody Gladiator's Belt", "=ds=#a2#, #s10#" }, + { "", "", "", "" }, + { 60351, "", "=q3=Bloody Gladiator's Handguards", "=ds=#a3#, #s9#" }, + { 60350, "", "=q3=Bloody Gladiator's Cord", "=ds=#a3#, #s10#" }, + { "", "", "", "" }, + { 60359, "", "=q3=Bloody Gladiator's Gauntlets", "=ds=#a4#, #s9#" }, + { 60358, "", "=q3=Bloody Gladiator's Girdle", "=ds=#a4#, #s10#" }, + }; + BRRepRevered = { + { 83425, "", "=q3=Bloody Gladiator's Wraps", "=ds=#a1#, #s8#" }, + { 83423, "", "=q3=Bloody Gladiator's Britches", "=ds=#a1#, #s11#" }, + { 83424, "", "=q3=Bloody Gladiator's Footwraps", "=ds=#a1#, #s12#" }, + { "", "", "", "" }, + { 83433, "", "=q3=Bloody Gladiator's Bands", "=ds=#a2#, #s8#" }, + { 83431, "", "=q3=Bloody Gladiator's Pants", "=ds=#a2#, #s11#" }, + { 83432, "", "=q3=Bloody Gladiator's Boots", "=ds=#a2#, #s12#" }, + { "", "", "", "" }, + { 60354, "", "=q3=Bloody Gladiator's Wristguards", "=ds=#a3#, #s8#" }, + { 60352, "", "=q3=Bloody Gladiator's Leggings", "=ds=#a3#, #s11#" }, + { 60353, "", "=q3=Bloody Gladiator's Trudgeons", "=ds=#a3#, #s12#" }, + { "", "", "", "" }, + { 60362, "", "=q3=Bloody Gladiator's Bracers", "=ds=#a4#, #s8#" }, + { 60360, "", "=q3=Bloody Gladiator's Legguards", "=ds=#a4#, #s11#" }, + { 60361, "", "=q3=Bloody Gladiator's Greaves", "=ds=#a4#, #s12#" }, + }; + BRRepExalted = { + { 83428, "", "=q4=Bloody Gladiator's Circlet", "=ds=#a1#, #s1#" }, + { 83427, "", "=q4=Bloody Gladiator's Amice", "=ds=#a1#, #s3#" }, + { 83426, "", "=q4=Bloody Gladiator's Vestments", "=ds=#a1#, #s5#" }, + { "", "", "", "" }, + { 83436, "", "=q4=Bloody Gladiator's Headband", "=ds=#a2#, #s1#" }, + { 83435, "", "=q4=Bloody Gladiator's Shoulders", "=ds=#a2#, #s3#" }, + { 83434, "", "=q4=Bloody Gladiator's Tunic", "=ds=#a2#, #s5#" }, + { "", "", "", "" }, + { 60357, "", "=q4=Bloody Gladiator's Helmet", "=ds=#a3#, #s1#" }, + { 60356, "", "=q4=Bloody Gladiator's Pauldrons", "=ds=#a3#, #s3#" }, + { 60355, "", "=q4=Bloody Gladiator's Armor", "=ds=#a3#, #s5#" }, + { "", "", "", "" }, + { 60365, "", "=q4=Bloody Gladiator's Helm", "=ds=#a4#, #s1#" }, + { 60364, "", "=q4=Bloody Gladiator's Spaulders", "=ds=#a4#, #s3#" }, + { 60363, "", "=q4=Bloody Gladiator's Breastplate", "=ds=#a4#, #s5#" }, + }; AVRepFriendly = { { 0, "INV_BannerPVP_02", "=q8=#m7#", "=q7=#b1#" }, { 0, "", "", "" }, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 52b2e18..67ac435 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -375,6 +375,7 @@ AtlasLoot_TableNames = { ["KCArchlichEnkhraz"] = { AL["Archlich Enkhraz"], "AtlasLootItems" }, ["KCCommanderAnderson"] = { AL["Commander Anderson"], "AtlasLootItems" }, ["KCAlarus"] = { AL["Alarus"], "AtlasLootItems" }, + ["KCTreasure"] = { AL["Half-Buried Treasure Chest"], "AtlasLootItems" }, -- Caverns of Time: Black Morass ["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" }, ["COTBMHarbingerAphygth"] = { AL["Harbinger Aph'ygth"], "AtlasLootItems" }, @@ -620,6 +621,7 @@ AtlasLoot_TableNames = { ["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" }, ["Ostarius"] = { "Ostarius", "AtlasLootWBItems" }, ["Concavius"] = { "Concavius", "AtlasLootWBItems" }, + ["CowKing"] = { "CowKing", "AtlasLootWBItems" }, --Doom Lord Kazzak ["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" }, --Emrald Dragons @@ -643,6 +645,7 @@ AtlasLoot_TableNames = { ["Zareth"] = { "Zareth Terrorblade Demon Hunter", "AtlasLootWBItems" }, ["Jalakar"] = { "Jal'akar Dire Troll", "AtlasLootWBItems" }, ["Ashbeard"] = { "Explorer Ashbeard", "AtlasLootWBItems" }, + ["AdmiralBareanWestwind"] = { "Admiral Barean Westwind", "AtlasLootWBItems" }, -------------- --- Events --- @@ -709,6 +712,8 @@ AtlasLoot_TableNames = { ["Thorium2"] = { AL["Thorium Brotherhood"] .. ": " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" }, --Timbermaw Hold ["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" }, + --Wardens of Time + ["Warderns1"] = { AL["Wardens of Time"], "AtlasLootRepItems" }, --Wintersaber Trainers ["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" }, --Zandalar Tribe @@ -806,6 +811,8 @@ AtlasLoot_TableNames = { ["CookingArtisan1"] = { AL["Cooking"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" }, --FirstAid ["FirstAid1"] = { AL["First Aid"], "AtlasLootCrafting" }, + --Survival + ["Survival1"] = { AL["Survival"], "AtlasLootCrafting" }, --Poisons ["Poisons1"] = { AL["Rogue"] .. ": " .. AL["Poisons"], "AtlasLootCrafting" }, @@ -814,6 +821,11 @@ AtlasLoot_TableNames = { ----------- --Battlegrounds + --Blood Ring + ["BRRepFriendly"] = { AL["Blood Ring"] .. " " .. AL["Friendly Rewards"], "AtlasLootBGItems" }, + ["BRRepHonored"] = { AL["Blood Ring"] .. " " .. AL["Honored Rewards"], "AtlasLootBGItems" }, + ["BRRepRevered"] = { AL["Blood Ring"] .. " " .. AL["Revered Rewards"], "AtlasLootBGItems" }, + ["BRRepExalted"] = { AL["Blood Ring"] .. " " .. AL["Exalted Rewards"], "AtlasLootBGItems" }, --Alterac Valley ["AVRepFriendly"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Friendly Rewards"], "AtlasLootBGItems" }, ["AVRepHonored"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Honored Rewards"], "AtlasLootBGItems" }, @@ -878,6 +890,7 @@ AtlasLoot_TableNames = { ["AVRepMenu"] = { "dummy", "dummy" }, ["ABRepMenu"] = { "dummy", "dummy" }, ["WSGRepMenu"] = { "dummy", "dummy" }, + ["BRRepMenu"] = { "dummy", "dummy" }, ["AQ40SET"] = { "dummy", "dummy" }, ["AQ20SET"] = { "dummy", "dummy" }, ["ZGSET"] = { "dummy", "dummy" }, @@ -1646,6 +1659,8 @@ AtlasLoot_TableNamesBoss = { ["Thorium2"] = { AL["Thorium Brotherhood"] .. ": " .. AL["Revered"] .. "/" .. AL["Exalted"], "AtlasLootRepItems" }, --Timbermaw Hold ["Timbermaw"] = { AL["Timbermaw Hold"], "AtlasLootRepItems" }, + --Wardens of Time + ["Warderns1"] = { AL["Wardens of Time"], "AtlasLootRepItems" }, --Wintersaber Trainers ["Wintersaber1"] = { AL["Wintersaber Trainers"], "AtlasLootRepItems" }, --Zandalar Tribe @@ -1744,6 +1759,8 @@ AtlasLoot_TableNamesBoss = { ["CookingArtisan1"] = { AL["Cooking"] .. ": " .. AL["Artisan"], "AtlasLootCrafting" }, --FirstAid ["FirstAid1"] = { AL["First Aid"], "AtlasLootCrafting" }, + --Survival + ["Survival1"] = { AL["Survival"], "AtlasLootCrafting" }, --Poisons ["Poisons1"] = { AL["Rogue"] .. ": " .. AL["Poisons"], "AtlasLootCrafting" }, }, @@ -1753,6 +1770,11 @@ AtlasLoot_TableNamesBoss = { ----------- ["Battlegrounds"] = { + --Blood Ring + ["BRRepFriendly"] = { AL["Blood Ring"] .. " " .. AL["Friendly Rewards"], "AtlasLootBGItems" }, + ["BRRepHonored"] = { AL["Blood Ring"] .. " " .. AL["Honored Rewards"], "AtlasLootBGItems" }, + ["BRRepRevered"] = { AL["Blood Ring"] .. " " .. AL["Revered Rewards"], "AtlasLootBGItems" }, + ["BRRepExalted"] = { AL["Blood Ring"] .. " " .. AL["Exalted Rewards"], "AtlasLootBGItems" }, --Alterac Valley ["AVRepFriendly"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Friendly Rewards"], "AtlasLootBGItems" }, ["AVRepHonored"] = { AL["Alterac Valley"] .. " " .. AL["51-60 Honored Rewards"], "AtlasLootBGItems" }, diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua index 36155ed..8bac3bd 100644 --- a/WorldBosses/worldbosses.en.lua +++ b/WorldBosses/worldbosses.en.lua @@ -34,6 +34,9 @@ AtlasLootWBBossButtons = { Concavius = { "Concavius"; }; + CowKing = { + "CowKing"; + }; RareSpawns = { ""; ""; @@ -56,13 +59,13 @@ AtlasLootWBBossButtons = { "Zareth"; "Jalakar"; "Ashbeard"; + "AdmiralBareanWestwind"; }; }; AtlasLoot_Data["AtlasLootWBItems"] = { EmptyInstance = {}; Reaver = { - { 81090, "", "=q4=", "", "1%" }, { 51778, "", "=q4=", "", "3.85%" }, { 51779, "", "=q4=", "", "3.85%" }, { 51780, "", "=q4=", "", "3.85%" }, @@ -204,6 +207,19 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 15416, "", "=q1=Black Dragonscale", "Group 3", "[2-5] 20%" }, { 20520, "", "=q2=Dark Rune", "Group 3", "[2-4] 20%" }, }; + CowKing = { + { 60486, "inv_misc_fish_02", "=q4=There Is No Cow Level", "There Is No Cow Level", "25%" }, + { 0, "", "", "", "" }, + { 60487, "INV_Misc_Cape_20", "=q4=There Is No Cow Level", "There Is No Cow Level", "50%" }, + { 60488, "INV_Misc_Cape_20", "=q4=There Is No Cow Level", "There Is No Cow Level", "50%" }, + { 60489, "INV_Helmet_28", "=q4=There Is No Cow Level", "There Is No Cow Level", "50%" }, + { 60490, "INV_Helmet_28", "=q4=There Is No Cow Level", "There Is No Cow Level", "50%" }, + { 0, "", "", "", "" }, + { 60485, "spell_shadow_curseoftounges", "=q0=There Is No Cow Level", "There Is No Cow Level", "100%" }, + { 60491, "inv_misc_orb_05", "=q0=There Is No Cow Level", "There Is No Cow Level", "100%" }, + { 0, "", "", "", "" }, + { 51261, "inv_misc_bell_01", "=q1=There Is No Cow Level", "There Is No Cow Level", "100%" }, + }; KKazzak = { { 18546, "INV_Helmet_18", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "9.39%" }, { 17111, "INV_Jewelry_Talisman_01", "=q4=Blazefury Medallion", "=ds=#s2#", "10.95%" }, @@ -377,70 +393,81 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 20949, "INV_Letter_16", "=q1=Magical Ledger", "=ds=#m2#", "" }, }; Tarangos = { - { 81360, "INV_Weapon_ShortBlade_10", "=q3=Claw of Taranassz", "=ds=#w4#", "100%" }, - { 81361, "INV_Shoulder_23", "=q3=Dampener's Pauldron's", "=ds=#a2#", "100%" }, - { 81362, "INV_Boots_Plate_06", "=q3=Azure-Scale Sabatons", "=ds=#a4#", "100%" }, - { 81364, "INV_Misc_MonsterScales_09", "=q3=Scale of Malygos", "=ds=#s14#", "100%" }, + { 81360, "INV_Weapon_ShortBlade_10", "=q3=Claw of Taranassz", "=ds=#w4#", "25%" }, + { 81361, "INV_Shoulder_23", "=q3=Dampener's Pauldron's", "=ds=#a2#", "25%" }, + { 81362, "INV_Boots_Plate_06", "=q3=Azure-Scale Sabatons", "=ds=#a4#", "25%" }, + { 81364, "INV_Misc_MonsterScales_09", "=q3=Scale of Malygos", "=ds=#s14#", "25%" }, }; Kargron = { - { 81365, "INV_Pants_09", "=q3=Kargron's Leggings", "=ds=#a2#", "100%" }, - { 81367, "INV_Jewelry_Ring_23", "=q3=Band of the Old Horde", "=ds=#s13#", "100%" }, - { 81368, "INV_Bracer_07", "=q3=Blackshackle Bracers", "=ds=#a3#", "100%" }, + { 81365, "INV_Pants_09", "=q3=Kargron's Leggings", "=ds=#a2#, #s11#", "25%" }, + { 81366, "INV_MISC_DESECRATED_PLATESHOULDER", "=q3=Blackrock Clan Mantle", "=ds=#a4#, #s3#", "25%" }, + { 81367, "INV_Jewelry_Ring_23", "=q3=Band of the Old Horde", "=ds=#s13#", "25%" }, + { 81368, "INV_Bracer_07", "=q3=Blackshackle Bracers", "=ds=#a3#, #s8#", "25%" }, { 81369, "INV_Sword_20", "=q4=Sword of the Blademaster", "=ds=#w10#", "0.5%" }, }; Xalvic = { - { 81370, "INV_Boots_04", "=q3=Footpads of the Corruptor", "=ds=#a1#", "100%" }, - { 81371, "INV_Chest_Leather_06", "=q3=Gnarltwist Vest", "=ds=#a3#", "100%" }, - { 81372, "INV_Misc_MonsterClaw_01", "=q3=The Black Claw", "=ds=#w13#", "100%" }, - { 81373, "INV_Misc_Cape_06", "=q3=Shawl of the Satyr", "=ds=#a1#", "100%" }, + { 81370, "INV_Boots_04", "=q3=Footpads of the Corruptor", "=ds=#a1#", "25%" }, + { 81371, "INV_Chest_Leather_06", "=q3=Gnarltwist Vest", "=ds=#a3#", "25%" }, + { 81372, "INV_Misc_MonsterClaw_01", "=q3=The Black Claw", "=ds=#w13#", "25%" }, + { 81373, "INV_Misc_Cape_06", "=q3=Shawl of the Satyr", "=ds=#a1#", "25%" }, { 81374, "INV_Jewelry_Necklace_13", "=q4=Trickster's Necklace", "=ds=#s2#", "0.5%" }, }; Mallon = { - { 81375, "INV_Staff_Goldfeathered_01", "=q3=Staff of the Lost Druid", "=ds=#w9#", "100%" }, - { 81376, "INV_Belt_12", "=q3=Moontouched Girdle", "=ds=#a4#", "100%" }, - { 81377, "INV_Helmet_06", "=q3=Enfused Moon Crown", "=ds=#a1#", "100%" }, - { 81378, "INV_Gauntlets_04", "=q3=Eveningstar Gloves", "=ds=#a2#", "100%" }, + { 81375, "INV_Staff_Goldfeathered_01", "=q3=Staff of the Lost Druid", "=ds=#w9#", "25%" }, + { 81376, "INV_Belt_12", "=q3=Moontouched Girdle", "=ds=#a4#", "25%" }, + { 81377, "INV_Helmet_06", "=q3=Enfused Moon Crown", "=ds=#a1#", "25%" }, + { 81378, "INV_Gauntlets_04", "=q3=Eveningstar Gloves", "=ds=#a2#", "25%" }, { 81379, "INV_Jewelry_Ring_29", "=q4=Shard of the Moon", "=ds=#s13#", "0.5%" }, }; Grugthok = { - { 81380, "INV_Chest_Plate04", "=q3=Gordunni War Harness", "=ds=#a4#", "100%" }, - { 81381, "INV_Staff_07", "=q3=Isildien Ley-Stave", "=ds=#s15#", "100%" }, - { 81382, "INV_Jewelry_Necklace_19", "=q3=Gordunni War Beads", "=ds=#s2#", "100%" }, - { 81383, "INV_Mace_11", "=q3=The Ogre Truncheon", "=ds=#w6#", "100%" }, + { 81380, "INV_Chest_Plate04", "=q3=Gordunni War Harness", "=ds=#a4#", "25%" }, + { 81381, "INV_Staff_07", "=q3=Isildien Ley-Stave", "=ds=#s15#", "25%" }, + { 81382, "INV_Jewelry_Necklace_19", "=q3=Gordunni War Beads", "=ds=#s2#", "25%" }, + { 81383, "INV_Mace_11", "=q3=The Ogre Truncheon", "=ds=#w6#", "25%" }, { 81384, "INV_Belt_12", "=q4=Grug'thok's Sash", "=ds=#a2#", "0.5%" }, }; WanderingKnight = { - { 83257, "INV_Weapon_Rifle_07", "=q3=Caer Darrow Reserve Rifle", "=ds=#w5#", "100%" }, - { 83258, "INV_Helmet_39", "=q3=Coif of the Lost Soul", "=ds=#a3#", "100%" }, - { 83259, "INV_Sword_20", "=q3=Old Knighthood Blade", "=ds=#w10#", "100%" }, - { 83260, "INV_Chest_Chain_09", "=q3=Footman's Breastplate", "=ds=#a3#", "100%" }, + { 83257, "INV_Weapon_Rifle_07", "=q3=Caer Darrow Reserve Rifle", "=ds=#w5#", "25%" }, + { 83258, "INV_Helmet_39", "=q3=Coif of the Lost Soul", "=ds=#a3#", "25%" }, + { 83259, "INV_Sword_20", "=q3=Old Knighthood Blade", "=ds=#w10#", "25%" }, + { 83260, "INV_Chest_Chain_09", "=q3=Footman's Breastplate", "=ds=#a3#", "25%" }, }; CrusaderLarsarius = { { 60437, "INV_Helmet_03", "=q4=Righteous Crusader's Helmet", "=ds=#a4#", "0.2%" }, - { 83261, "INV_Misc_Book_09", "=q3=Tome of the First Scripture", "=ds=#s15#", "100%" }, - { 83262, "INV_Hammer_17", "=q3=Scarlet Wanderer's Hammer", "=ds=#w6#", "100%" }, - { 83263, "INV_Bracer_10", "=q3=Cuffs of the Justicar", "=ds=#a2#", "100%" }, - { 83264, "INV_Jewelry_Ring_23", "=q3=Ring of Sacrifice", "=ds=#s13#", "100%" }, + { 83261, "INV_Misc_Book_09", "=q3=Tome of the First Scripture", "=ds=#s15#", "25%" }, + { 83262, "INV_Hammer_17", "=q3=Scarlet Wanderer's Hammer", "=ds=#w6#", "25%" }, + { 83263, "INV_Bracer_10", "=q3=Cuffs of the Justicar", "=ds=#a2#", "25%" }, + { 83264, "INV_Jewelry_Ring_23", "=q3=Ring of Sacrifice", "=ds=#s13#", "25%" }, }; Zareth = { - { 83265, "INV_Misc_Bandana_03", "=q3=Demon Hunter's Blindfold", "=ds=#a2#", "100%" }, - { 83266, "INV_Boots_Fabric_01", "=q3=Sandals of the Demon Stalker", "=ds=#a1#", "100%" }, - { 83267, "INV_Bracer_02", "=q3=Bracers of Demonic Hunt", "=ds=#a3#", "100%" }, - { 83268, "INV_Jewelry_Ring_48Naxxramas", "=q3=Demon Watcher's Ring", "=ds=#s13#", "100%" }, + { 83265, "INV_Misc_Bandana_03", "=q3=Demon Hunter's Blindfold", "=ds=#a2#", "25%" }, + { 83266, "INV_Boots_Fabric_01", "=q3=Sandals of the Demon Stalker", "=ds=#a1#", "25%" }, + { 83267, "INV_Bracer_02", "=q3=Bracers of Demonic Hunt", "=ds=#a3#", "25%" }, + { 83268, "INV_Jewelry_Ring_48Naxxramas", "=q3=Demon Watcher's Ring", "=ds=#s13#", "25%" }, { 83269, "INV_Spear_08", "=q4=Terrorblade Glaive", "=ds=#w10#", "0.5%" }, }; Jalakar = { - { 51023, "INV_Gauntlets_24", "=q3=Vilebranch Grips", "=ds=#a2#", "100%" }, - { 51024, "INV_Misc_Idol_02", "=q3=Cursed Idol", "=ds=#s14#", "100%" }, - { 51025, "Ability_Ambush", "=q3=Vilebranch Seer's Dress", "=ds=#a1#", "100%" }, - { 83273, "INV_Belt_06", "=q3=The Dire Clasp", "=ds=#a3#", "100%" }, + { 51023, "INV_Gauntlets_24", "=q3=Vilebranch Grips", "=ds=#a2#", "25%" }, + { 51024, "INV_Misc_Idol_02", "=q3=Cursed Idol", "=ds=#s14#", "25%" }, + { 51025, "Ability_Ambush", "=q3=Vilebranch Seer's Dress", "=ds=#a1#", "25%" }, + { 83273, "INV_Belt_06", "=q3=The Dire Clasp", "=ds=#a3#", "25%" }, { 83274, "INV_Jewelry_Necklace_19", "=q4=Charmed Voodoo Collar", "=ds=#s2#", "0.5%" }, }; Ashbeard = { { 83275, "INV_Misc_Spyglass_02", "=q4=Ashbeard's Lucky Telescope", "=ds=#s14#", "0.5%" }, - { 83276, "INV_Helmet_44", "=q3=Lens of the Gorge Explorer", "=ds=#a1#", "100%" }, - { 83277, "INV_Misc_Cape_02", "=q3=Dark Iron Adventurer Shawl", "=ds=#a1#", "100%" }, - { 83278, "INV_Shoulder_22", "=q3=Ash Explorer Pauldrons", "=ds=#a2#", "100%" }, - { 83279, "Spell_Fire_Fire", "=q3=Everflame Torch", "=ds=#w6#", "100%" }, + { 83276, "INV_Helmet_44", "=q3=Lens of the Gorge Explorer", "=ds=#a1#", "25%" }, + { 83277, "INV_Misc_Cape_02", "=q3=Dark Iron Adventurer Shawl", "=ds=#a1#", "25%" }, + { 83278, "INV_Shoulder_22", "=q3=Ash Explorer Pauldrons", "=ds=#a2#", "25%" }, + { 83279, "Spell_Fire_Fire", "=q3=Everflame Torch", "=ds=#w6#", "25%" }, + }; + AdmiralBareanWestwind = { + { 60383, "", "=q3=Fleetmaster's Cane", "=ds=#w9#", "17%" }, + { 60384, "", "=q3=Fleet Scimitar", "=ds=#h3#, #w10#", "17%" }, + { 60385, "", "=q3=Westwind's Bicorne", "=ds=#a1#, #s1#", "17%" }, + { 60386, "", "=q3=Sash of the Northrend Expedition", "=ds=#a1#, #s10#", "17%" }, + { 60387, "", "=q3=Sivaxis Tundra Shard", "=ds=#h4#", "17%" }, + { 60388, "", "=q3=Mariner's Cuffs", "=ds=#a3#, #s8#", "17%" }, + { 60389, "", "=q4=The Frigid Star Ring", "=ds=#s13#", "15%" }, + { 60390, "", "=q4=Jacket of the Scarlet Admiral", "=ds=#a2#, #s5#", "15%" }, }; };