diff --git a/AtlasLoot/AtlasLayout/worldbosses.en.lua b/AtlasLoot/AtlasLayout/worldbosses.en.lua index 8d9ba0b..733be0e 100644 --- a/AtlasLoot/AtlasLayout/worldbosses.en.lua +++ b/AtlasLoot/AtlasLayout/worldbosses.en.lua @@ -18,29 +18,29 @@ AtlasLootWBBossButtons = { ""; ""; ""; - "DLethon"; - "DEmeriss"; - "DTaerar"; - "DYsondre"; + "WorldBossesCLASSIC"; + "WorldBossesCLASSIC"; + "WorldBossesCLASSIC"; + "WorldBossesCLASSIC"; }; Azuregos = { - "WorldBossesClassic"; + "WorldBossesCLASSIC"; }; Kazzak = { - "Kazzak60"; + "WorldBossesCLASSIC"; }; Setis = { - "Setis"; + "WorldBossesCLASSIC"; }; DoomLordKazzak = { - "WorldBossesBC"; + "WorldBossesCLASSIC"; }; Doomwalker = { - "WorldBossesBC"; + "WorldBossesTBC"; }; Skettis = { diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 4d01884..d5cca48 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -493,6 +493,7 @@ function AtlasLoot_OnLoad() AtlasLoot_SlashCommand(msg); end +<<<<<<< Updated upstream --Set defualt to classic as that seems to be where most players are. local function getExpacByLevel() if UnitLevel("player") > 60 then @@ -502,6 +503,22 @@ function AtlasLoot_OnLoad() end end AtlasLoot_Expac = ATLAS_EXPANSION[GetAccountExpansionLevel()] or getExpacByLevel(); +======= +function AtlasLoot_SetExpac() + if GetAccountExpansionLevel() == 0 then + AtlasLoot_Expac = "CLASSIC"; + AtlasLoot_Expac2 = "TBC"; + AtlasLoot_Expac3 = "WRATH"; + elseif GetAccountExpansionLevel() == 1 then + AtlasLoot_Expac = "TBC"; + AtlasLoot_Expac2 = "CLASSIC"; + AtlasLoot_Expac3 = "WRATH"; + elseif GetAccountExpansionLevel() == 2 then + AtlasLoot_Expac = "WRATH"; + AtlasLoot_Expac2 = "CLASSIC"; + AtlasLoot_Expac3 = "TBC"; + end +>>>>>>> Stashed changes end --[[ diff --git a/AtlasLoot/DefaultFrame/DewDropDown.lua b/AtlasLoot/DefaultFrame/DewDropDown.lua index 81e576a..b750a71 100644 --- a/AtlasLoot/DefaultFrame/DewDropDown.lua +++ b/AtlasLoot/DefaultFrame/DewDropDown.lua @@ -289,16 +289,16 @@ AtlasLoot_DewDropDown = { { AL["Crafting"], "CRAFTINGMENU", "Table" }, }, [5] = { - { AL["Sets/Collections"], "SETMENU"..AtlasLoot_Expac, "Table" }, + { AL["Sets/Collections"], "SETMENU"..AtlasLoot_Expac, "Submenu" }, }, [6] = { - { AL["PvP Rewards"], "PVPMENU"..AtlasLoot_Expac, "Table" }, + { AL["PvP Rewards"], "PVPMENU"..AtlasLoot_Expac, "Submenu" }, }, [7] = { - { AL["World Bosses"], "WorldBosses", "Submenu" }, + { AL["World Bosses"], "WorldBosses"..AtlasLoot_Expac, "Submenu" }, }, [8] = { - { AL["Reputation Factions"], "REPMENU"..AtlasLoot_Expac, "Table" }, + { AL["Reputation Factions"], "REPMENU"..AtlasLoot_Expac, "Submenu" }, }, [9] = { { AL["World Events"], "WORLDEVENTMENU", "Table" }, @@ -306,6 +306,21 @@ AtlasLoot_DewDropDown = { }; AtlasLoot_DewDropDown_SubTables = { + ["REPMENU"..AtlasLoot_Expac] = { + { "", "REPMENU"..AtlasLoot_Expac }, + { "", "REPMENU"..AtlasLoot_Expac2 }, + { "", "REPMENU"..AtlasLoot_Expac3 }, + }, + ["PVPMENU"..AtlasLoot_Expac] = { + { "", "PVPMENU"..AtlasLoot_Expac }, + { "", "PVPMENU"..AtlasLoot_Expac2 }, + { "", "PVPMENU"..AtlasLoot_Expac3 }, + }, + ["SETMENU"..AtlasLoot_Expac] = { + { "", "SETMENU"..AtlasLoot_Expac }, + { "", "SETMENU"..AtlasLoot_Expac2 }, + { "", "SETMENU"..AtlasLoot_Expac3 }, + }, ["BlackrockDepths"] = { { "", "BRDPyron" }, { "", "BRDLordRoccor" }, @@ -915,15 +930,9 @@ AtlasLoot_DewDropDown_SubTables = { { "", "TheNexusKolurgStoutbeardHEROIC"}, { "", "TheNexusKeristrasza" }, }, - ["WorldBosses"] = { - { "", "WorldBossesClassic" }, - { "", "DEmeriss" }, - { "", "DLethon"}, - { "", "DTaerar" }, - { "", "DYsondre" }, - { "", "Kazzak60" }, - { "", "Setis" }, - { "", "WorldBossesBC"}, + ["WorldBosses"..AtlasLoot_Expac] = { + { "", "WorldBosses"..AtlasLoot_Expac }, + { "", "WorldBosses"..AtlasLoot_Expac2 }, }, ["ForgeofSouls"] = { { "", "FoSBronjahm" }, diff --git a/AtlasLoot/Locales/constants.en.lua b/AtlasLoot/Locales/constants.en.lua index 12f30e9..429916b 100644 --- a/AtlasLoot/Locales/constants.en.lua +++ b/AtlasLoot/Locales/constants.en.lua @@ -653,6 +653,14 @@ if AL then AL["Level 40-49 Rewards"] = true; AL["Level 60 Rewards"] = true; + -- Sets/PVP/Rep Menus + AL["Original WOW Collections"] = true; + AL["Burning Crusade Collections"] = true; + AL["Wrath of the Lich King Collections"] = true; + AL["Original WOW PvP Rewards"] = true; + AL["Burning Crusade PvP Rewards"] = true; + AL["Wrath of the Lich King PvP Rewards"] = true; + -- Brood of Nozdormu Paths AL["Path of the Conqueror"] = true; AL["Path of the Invoker"] = true; diff --git a/AtlasLoot/Menus/PvPMenus.lua b/AtlasLoot/Menus/PvPMenus.lua index 411e9fa..6c1e9e6 100644 --- a/AtlasLoot/Menus/PvPMenus.lua +++ b/AtlasLoot/Menus/PvPMenus.lua @@ -9,7 +9,12 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 4, "PVPMENU2", "INV_Jewelry_Necklace_21", "=ds="..AL["BG PvP Rewards"], ""}; { 16, "PVPWeapons_A", "INV_Weapon_Bow_08", "=ds="..AL["PvP Weapons"], "=q5="..AL["Level 60"]}; { 17, "PvP60Ench", "INV_Scroll_06", "=ds="..AL["PvP Enchants"], "=q5="..AL["Level 60"]}; - Type = "Expansion" +<<<<<<< Updated upstream +======= + Prev = "PVPMENUWRATH"; + Next = "PVPMENUTBC"; + Back = "PVPMENU"..AtlasLoot_Expac; +>>>>>>> Stashed changes }; AtlasLoot_Data["PVPMENUTBC"] = { @@ -26,7 +31,13 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 18, "Arena2Weapons1", "INV_Weapon_Crossbow_11", "=ds="..AL["Arena Season 2 Weapons"], "=q5="..AL["Level 70"]}; { 19, "Arena3Weapons1", "INV_Weapon_Crossbow_12", "=ds="..AL["Arena Season 3 Weapons"], "=q5="..AL["Level 70"]}; { 20, "Arena4Weapons1", "inv_weapon_crossbow_26", "=ds="..AL["Arena Season 4 Weapons"], "=q5="..AL["Level 70"]}; +<<<<<<< Updated upstream Type = "Expansion" +======= + Prev = "PVPMENUCLASSIC"; + Next = "PVPMENUWRATH"; + Back = "PVPMENU"..AtlasLoot_Expac; +>>>>>>> Stashed changes }; AtlasLoot_Data["PVPMENUWRATH"] = { @@ -37,7 +48,12 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 6, "VentureBay1", "INV_Misc_Coin_16", "=ds="..BabbleZone["Grizzly Hills"], "=q5="..AL["Venture Bay"]}; { 16, "PVP80NONSETEPICS", "inv_bracer_51", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 80"]}; { 17, "WrathfulGladiatorWeapons1", "INV_Sword_86", "=ds="..AL["Wrathful Gladiator\'s Weapons"], "=q5="..AL["Level 80"] }; - Type = "Expansion" +<<<<<<< Updated upstream +======= + Prev = "PVPMENUTBC"; + Next = "PVPMENUCLASSIC"; + Back = "PVPMENU"..AtlasLoot_Expac; +>>>>>>> Stashed changes }; AtlasLoot_Data["PVPMENU2"] = { diff --git a/AtlasLoot/Menus/RepMenus.lua b/AtlasLoot/Menus/RepMenus.lua index cc1dbf7..26b01e2 100644 --- a/AtlasLoot/Menus/RepMenus.lua +++ b/AtlasLoot/Menus/RepMenus.lua @@ -3,6 +3,7 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0") local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") +<<<<<<< Updated upstream AtlasLoot_Data["REPMENUTBC"] = { { 1, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; @@ -25,9 +26,10 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 23, "SunOffensive1", "inv_shield_48", "=ds="..BabbleFaction["Shattered Sun Offensive"], "=q5="..BabbleZone["Isle of Quel'Danas"]}; { 24, "Thrallmar1", "INV_BannerPVP_01", "=ds="..BabbleFaction["Thrallmar"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Hellfire Peninsula"]}; { 25, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; - Type = "Expansion" }; +======= +>>>>>>> Stashed changes AtlasLoot_Data["REPMENUCLASSIC"] = { { 1, "Argent1", "inv_jewelry_talisman_07", "=ds="..BabbleFaction["Argent Dawn"], "=q5="..BabbleZone["Eastern Plaguelands"]}; { 2, "AQBroodRings", "inv_misc_head_dragon_bronze", "=ds="..BabbleFaction["Brood of Nozdormu"], "=q5="..BabbleZone["Temple of Ahn'Qiraj"].." / "..BabbleZone["Caverns of Time"]}; @@ -44,6 +46,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 20, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Magram Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; { 21, "Thorium1", "INV_Ingot_Mithril", "=ds="..BabbleFaction["Thorium Brotherhood"], "=q5="..BabbleZone["Searing Gorge"]}; { 22, "MiscFactions", "Ability_Mount_PinkTiger", "=ds="..BabbleFaction["Wintersaber Trainers"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Winterspring"]}; +<<<<<<< Updated upstream Type = "Expansion" }; @@ -79,45 +82,53 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Magram Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; { 22, "Thorium1", "INV_Ingot_Mithril", "=ds="..BabbleFaction["Thorium Brotherhood"], "=q5="..BabbleZone["Searing Gorge"]}; { 23, "MiscFactions", "Ability_Mount_PinkTiger", "=ds="..BabbleFaction["Wintersaber Trainers"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Winterspring"]}; +======= + Prev = "REPMENUWRATH"; + Next = "REPMENUTBC"; +>>>>>>> Stashed changes Back = "REPMENU"..AtlasLoot_Expac; }; - AtlasLoot_Data["REPMENU_BURNINGCRUSADE"] = { - { 2, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; - { 3, "CExpedition1", "INV_Misc_Ammo_Arrow_02", "=ds="..BabbleFaction["Cenarion Expedition"], "=q5="..BabbleZone["Zangarmarsh"]}; - { 4, "HonorHold1", "INV_BannerPVP_02", "=ds="..BabbleFaction["Honor Hold"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Hellfire Peninsula"]}; - { 5, "Kurenai1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["Kurenai"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Nagrand"]}; - { 6, "Maghar1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Mag'har"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Nagrand"]}; - { 7, "Ogrila1", "inv_misc_apexis_crystal", "=ds="..BabbleFaction["Ogri'la"], "=q5="..BabbleZone["Blade's Edge Mountains"]}; - { 8, "Scryer1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Scryers"], ""}; - { 9, "Skyguard1", "INV_Misc_Ribbon_01", "=ds="..BabbleFaction["Sha'tari Skyguard"], "=q5="..BabbleZone["Terokkar Forest"].." / "..BabbleZone["Blade's Edge Mountains"]}; - { 10, "Sporeggar1", "inv_mushroom_11", "=ds="..BabbleFaction["Sporeggar"], "=q5="..BabbleZone["Zangarmarsh"]}; - { 11, "Tranquillien1", "INV_Misc_Bandana_03", "=ds="..BabbleFaction["Tranquillien"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Ghostlands"]}; - { 17, "Ashtongue1", "achievement_reputation_ashtonguedeathsworn", "=ds="..BabbleFaction["Ashtongue Deathsworn"], "=q5="..BabbleZone["Shadowmoon Valley"].." / "..BabbleZone["Black Temple"]}; - { 18, "Consortium1", "INV_Weapon_Shortblade_31", "=ds="..BabbleFaction["The Consortium"], ""}; - { 19, "KeepersofTime1", "Ability_Warrior_VictoryRush", "=ds="..BabbleFaction["Keepers of Time"], "=q5="..BabbleZone["Caverns of Time"]}; - { 20, "LowerCity1", "Spell_Holy_ChampionsBond", "=ds="..BabbleFaction["Lower City"], ""}; - { 21, "Netherwing1", "Ability_Mount_Netherdrakepurple", "=ds="..BabbleFaction["Netherwing"], "=q5="..BabbleZone["Shadowmoon Valley"]}; - { 22, "ScaleSands1", "INV_Misc_MonsterScales_13", "=ds="..BabbleFaction["The Scale of the Sands"], "=q5="..BabbleZone["Hyjal Summit"]}; - { 23, "Shatar1", "Ability_Warrior_ShieldMastery", "=ds="..BabbleFaction["The Sha'tar"], ""}; - { 24, "SunOffensive1", "inv_shield_48", "=ds="..BabbleFaction["Shattered Sun Offensive"], "=q5="..BabbleZone["Isle of Quel'Danas"]}; - { 25, "Thrallmar1", "INV_BannerPVP_01", "=ds="..BabbleFaction["Thrallmar"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Hellfire Peninsula"]}; - { 26, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; + AtlasLoot_Data["REPMENUTBC"] = { + { 1, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; + { 2, "CExpedition1", "INV_Misc_Ammo_Arrow_02", "=ds="..BabbleFaction["Cenarion Expedition"], "=q5="..BabbleZone["Zangarmarsh"]}; + { 3, "HonorHold1", "INV_BannerPVP_02", "=ds="..BabbleFaction["Honor Hold"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Hellfire Peninsula"]}; + { 4, "Kurenai1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["Kurenai"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Nagrand"]}; + { 5, "Maghar1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Mag'har"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Nagrand"]}; + { 6, "Ogrila1", "inv_misc_apexis_crystal", "=ds="..BabbleFaction["Ogri'la"], "=q5="..BabbleZone["Blade's Edge Mountains"]}; + { 7, "Scryer1", "INV_Misc_Foot_Centaur", "=ds="..BabbleFaction["The Scryers"], ""}; + { 8, "Skyguard1", "INV_Misc_Ribbon_01", "=ds="..BabbleFaction["Sha'tari Skyguard"], "=q5="..BabbleZone["Terokkar Forest"].." / "..BabbleZone["Blade's Edge Mountains"]}; + { 9, "Sporeggar1", "inv_mushroom_11", "=ds="..BabbleFaction["Sporeggar"], "=q5="..BabbleZone["Zangarmarsh"]}; + { 10, "Tranquillien1", "INV_Misc_Bandana_03", "=ds="..BabbleFaction["Tranquillien"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Ghostlands"]}; + { 16, "Ashtongue1", "achievement_reputation_ashtonguedeathsworn", "=ds="..BabbleFaction["Ashtongue Deathsworn"], "=q5="..BabbleZone["Shadowmoon Valley"].." / "..BabbleZone["Black Temple"]}; + { 17, "Consortium1", "INV_Weapon_Shortblade_31", "=ds="..BabbleFaction["The Consortium"], ""}; + { 18, "KeepersofTime1", "Ability_Warrior_VictoryRush", "=ds="..BabbleFaction["Keepers of Time"], "=q5="..BabbleZone["Caverns of Time"]}; + { 19, "LowerCity1", "Spell_Holy_ChampionsBond", "=ds="..BabbleFaction["Lower City"], ""}; + { 20, "Netherwing1", "Ability_Mount_Netherdrakepurple", "=ds="..BabbleFaction["Netherwing"], "=q5="..BabbleZone["Shadowmoon Valley"]}; + { 21, "ScaleSands1", "INV_Misc_MonsterScales_13", "=ds="..BabbleFaction["The Scale of the Sands"], "=q5="..BabbleZone["Hyjal Summit"]}; + { 22, "Shatar1", "Ability_Warrior_ShieldMastery", "=ds="..BabbleFaction["The Sha'tar"], ""}; + { 23, "SunOffensive1", "inv_shield_48", "=ds="..BabbleFaction["Shattered Sun Offensive"], "=q5="..BabbleZone["Isle of Quel'Danas"]}; + { 24, "Thrallmar1", "INV_BannerPVP_01", "=ds="..BabbleFaction["Thrallmar"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Hellfire Peninsula"]}; + { 25, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; + Prev = "REPMENUCLASSIC"; + Next = "REPMENUWRATH"; Back = "REPMENU"..AtlasLoot_Expac; }; - AtlasLoot_Data["REPMENU_WOTLK"] = { - { 2, "AllianceVanguard1", "spell_misc_hellifrepvphonorholdfavor", "=ds="..BabbleFaction["Alliance Vanguard"], "=q5="..BabbleFaction["Alliance"]}; - { 3, "WinterfinRetreat", "INV_Misc_Shell_04", "=ds="..BabbleFaction["Winterfin Retreat"], "=q5="..BabbleZone["Borean Tundra"]}; - { 4, "TheWyrmrestAccord", "achievement_reputation_wyrmresttemple", "=ds="..BabbleFaction["The Wyrmrest Accord"], "=q5="..BabbleZone["Dragonblight"]}; - { 5, "KnightsoftheEbonBlade", "achievement_reputation_knightsoftheebonblade", "=ds="..BabbleFaction["Knights of the Ebon Blade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; - { 6, "TheOracles", "inv_misc_head_murloc_01", "=ds="..BabbleFaction["The Oracles"], "=q5="..BabbleZone["Sholazar Basin"]}; - { 7, "TheSonsofHodir1", "Spell_Holy_DivinePurpose", "=ds="..BabbleFaction["The Sons of Hodir"], "=q5="..BabbleZone["The Storm Peaks"]}; - { 17, "HordeExpedition1", "spell_misc_hellifrepvpthrallmarfavor", "=ds="..BabbleFaction["Horde Expedition"], "=q5="..BabbleFaction["Horde"]}; - { 18, "TheKaluak", "INV_Fishingpole_03", "=ds="..BabbleFaction["The Kalu'ak"], "" }; - { 19, "KirinTor", "achievement_reputation_kirintor", "=ds="..BabbleFaction["Kirin Tor"], "=q5="..BabbleZone["Borean Tundra"].." / "..BabbleZone["Dalaran"]}; - { 20, "ArgentCrusade", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["Argent Crusade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; - { 21, "FrenzyheartTribe", "ability_mount_whitedirewolf", "=ds="..BabbleFaction["Frenzyheart Tribe"], "=q5="..BabbleZone["Sholazar Basin"]}; - { 22, "AshenVerdict", "INV_Jewelry_Ring_85", "=ds="..BabbleFaction["The Ashen Verdict"], "=q5="..BabbleZone["Icecrown"]}; + AtlasLoot_Data["REPMENUWRATH"] = { + { 1, "AllianceVanguard1", "spell_misc_hellifrepvphonorholdfavor", "=ds="..BabbleFaction["Alliance Vanguard"], "=q5="..BabbleFaction["Alliance"]}; + { 2, "WinterfinRetreat", "INV_Misc_Shell_04", "=ds="..BabbleFaction["Winterfin Retreat"], "=q5="..BabbleZone["Borean Tundra"]}; + { 3, "TheWyrmrestAccord", "achievement_reputation_wyrmresttemple", "=ds="..BabbleFaction["The Wyrmrest Accord"], "=q5="..BabbleZone["Dragonblight"]}; + { 4, "KnightsoftheEbonBlade", "achievement_reputation_knightsoftheebonblade", "=ds="..BabbleFaction["Knights of the Ebon Blade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 5, "TheOracles", "inv_misc_head_murloc_01", "=ds="..BabbleFaction["The Oracles"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 6, "TheSonsofHodir1", "Spell_Holy_DivinePurpose", "=ds="..BabbleFaction["The Sons of Hodir"], "=q5="..BabbleZone["The Storm Peaks"]}; + { 7, "HordeExpedition1", "spell_misc_hellifrepvpthrallmarfavor", "=ds="..BabbleFaction["Horde Expedition"], "=q5="..BabbleFaction["Horde"]}; + { 16, "TheKaluak", "INV_Fishingpole_03", "=ds="..BabbleFaction["The Kalu'ak"], "" }; + { 17, "KirinTor", "achievement_reputation_kirintor", "=ds="..BabbleFaction["Kirin Tor"], "=q5="..BabbleZone["Borean Tundra"].." / "..BabbleZone["Dalaran"]}; + { 18, "ArgentCrusade", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["Argent Crusade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 19, "FrenzyheartTribe", "ability_mount_whitedirewolf", "=ds="..BabbleFaction["Frenzyheart Tribe"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 20, "AshenVerdict", "INV_Jewelry_Ring_85", "=ds="..BabbleFaction["The Ashen Verdict"], "=q5="..BabbleZone["Icecrown"]}; + Prev = "REPMENUTBC"; + Next = "REPMENUCLASSIC"; Back = "REPMENU"..AtlasLoot_Expac; - }; + }; \ No newline at end of file diff --git a/AtlasLoot/Menus/SetMenus.lua b/AtlasLoot/Menus/SetMenus.lua index e1bf6d6..516a85f 100644 --- a/AtlasLoot/Menus/SetMenus.lua +++ b/AtlasLoot/Menus/SetMenus.lua @@ -10,7 +10,10 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") -- { #, "PVPMENU", "INV_Axe_02", "=ds="..AL["PvP Rewards"], ""}; AtlasLoot_Data["SETMENUCLASSIC"] = { +<<<<<<< Updated upstream +======= +>>>>>>> Stashed changes { 1, "SETSCLASSIC", "INV_Sword_43", "=ds="..AL["Classic Sets"], ""}; { 3, 0, "INV_Box_01", "=q6="..AL["BoE World Epics"], ""}; { 4, "WorldEpics1", "INV_Jewelry_Ring_15", "=ds="..AL["Level 30-39"], ""}; @@ -25,6 +28,11 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, "T1SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1 Sets"], ""}; { 22, "T2SET", "INV_Pants_Mail_26", "=ds="..AL["Tier 2 Sets"], ""}; { 23, "T3SET", "INV_Pants_Mail_38v3", "=ds="..AL["Tier 3 Sets"], ""}; +<<<<<<< Updated upstream +======= + Prev = "SETMENUWRATH"; + Next = "SETMENUTBC"; +>>>>>>> Stashed changes Back = "SETMENU"..AtlasLoot_Expac; Type = "Expansion" }; @@ -34,11 +42,20 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 3, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; { 4, "WorldEpics4", "INV_Sword_76", "=ds=".."World Epics", ""}; { 5, "TBCSets", "INV_Weapon_Glave_01", "=ds="..AL["Burning Crusade Misc Sets"], ""}; +<<<<<<< Updated upstream { 7, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; +======= + { 6, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; +>>>>>>> Stashed changes { 16, "DS3SET", "INV_Helmet_15", "=ds="..AL["Dungeon 3 Sets"], ""}; { 18, "T4SET", "inv_helmet_58", "=ds="..AL["Tier 4 Sets"], ""}; { 19, "T5SET", "inv_helmet_92", "=ds="..AL["Tier 5 Sets"], ""}; { 20, "T6SET", "inv_helmet_98", "=ds="..AL["Tier 6 Sets"], ""}; +<<<<<<< Updated upstream +======= + Prev = "SETMENUCLASSIC"; + Next = "SETMENUWRATH"; +>>>>>>> Stashed changes Back = "SETMENU"..AtlasLoot_Expac; Type = "Expansion" }; @@ -56,6 +73,11 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 16, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; { 17, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; { 18, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; +<<<<<<< Updated upstream +======= + Prev = "SETMENUTBC"; + Next = "SETMENUCLASSIC"; +>>>>>>> Stashed changes Back = "SETMENU"..AtlasLoot_Expac; Type = "Expansion" }; diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index b045d07..be45fe0 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1412,19 +1412,17 @@ end --- World Bosses --- -------------------- - -- Azuregos - AtlasLoot_TableNames["WorldBossesClassic"] = { BabbleBoss["Azuregos"], "AtlasLootOriginalWoW" }; - --Classic Kazzak - AtlasLoot_TableNames["Kazzak60"] = { BabbleBoss["Doom Lord Kazzak"].." (Classic)", "AtlasLootOriginalWoW" }; - --Setis - AtlasLoot_TableNames["Setis"] = { "Setis", "AtlasLootOriginalWoW" }; - -- Kazzak/Doomwalker - AtlasLoot_TableNames["WorldBossesBC"] = { BabbleBoss["Doom Lord Kazzak"].." / "..BabbleBoss["Doomwalker"], "AtlasLootBurningCrusade" }; + -- Classic + AtlasLoot_TableNames["WorldBossesCLASSIC"] = { "World Bosses Classic", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["WorldBossesClassicPhysDPS"] = { "World Boss Physical DPS Gear", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["WorldBossesClassicCaster"] = { "World Boss Caster Gear", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["WorldBossesClassicLeather"] = { "World Boss Leather Armor", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["WorldBossesClassicMail"] = { "World Boss Mail Armor", "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["WorldBossesClassicTank"] = { "World Boss Tank Gear", "AtlasLootOriginalWoW" }; + + -- Kazzak/Doomwalker + AtlasLoot_TableNames["WorldBossesTBC"] = { BabbleBoss["Doom Lord Kazzak"].." / "..BabbleBoss["Doomwalker"], "AtlasLootOriginalWoW" }; -- Emerald Dragons - AtlasLoot_TableNames["DEmeriss"] = { BabbleBoss["Emeriss"], "AtlasLootOriginalWoW" }; - AtlasLoot_TableNames["DLethon"] = { BabbleBoss["Lethon"], "AtlasLootOriginalWoW" }; - AtlasLoot_TableNames["DTaerar"] = { BabbleBoss["Taerar"], "AtlasLootOriginalWoW" }; - AtlasLoot_TableNames["DYsondre"] = { BabbleBoss["Ysondre"], "AtlasLootOriginalWoW" }; -------------- --- Events --- @@ -1972,16 +1970,28 @@ end AtlasLoot_TableNames["REPMENUCLASSIC"] = { AL["Factions - Original WoW"], "Menu" }; AtlasLoot_TableNames["REPMENUTBC"] = { AL["Factions - Burning Crusade"], "Menu" }; AtlasLoot_TableNames["REPMENUWRATH"] = { AL["Factions - Wrath of the Lich King"], "Menu" }; +<<<<<<< Updated upstream AtlasLoot_TableNames["SETMENUCLASSIC"] = { AL["Collections - Original WoW"], "Menu" }; AtlasLoot_TableNames["SETMENUTBC"] = { AL["Collections - Burning Crusade"], "Menu" }; AtlasLoot_TableNames["SETMENUWRATH"] = { AL["Collections - Wrath of the Lich King"], "Menu" }; +======= + AtlasLoot_TableNames["SETMENUCLASSIC"] = { AL["Original WOW Collections"], "Menu" }; + AtlasLoot_TableNames["SETMENUTBC"] = { AL["Burning Crusade Collections"], "Menu" }; + AtlasLoot_TableNames["SETMENUWRATH"] = { AL["Wrath of the Lich King Collections"], "Menu" }; +>>>>>>> Stashed changes AtlasLoot_TableNames["MOUNTMENU"] = { AL["Mounts"], "Menu" }; AtlasLoot_TableNames["PETMENU"] = { AL["Vanity Pets"], "Menu" }; AtlasLoot_TableNames["PVPSET"] = { AL["PvP Armor Sets"]..": "..AL["Level 60"], "Menu" }; +<<<<<<< Updated upstream AtlasLoot_TableNames["PVPMENUCLASSIC"] = { AL["PVP - Original WoW"], "Menu" }; AtlasLoot_TableNames["PVPMENUTBC"] = { AL["PVP - Burning Crusade"], "Menu" }; AtlasLoot_TableNames["PVPMENUWRATH"] = { AL["PVP - Wrath of the Lich King"], "Menu" }; +======= + AtlasLoot_TableNames["PVPMENUCLASSIC"] = { AL["Original WOW PvP Rewards"], "Menu" }; + AtlasLoot_TableNames["PVPMENUTBC"] = { AL["Burning Crusade PvP Rewards"], "Menu" }; + AtlasLoot_TableNames["PVPMENUWRATH"] = { AL["Wrath of the Lich King PvP Rewards"], "Menu" }; +>>>>>>> Stashed changes AtlasLoot_TableNames["PVPMENU2"] = { AL["PvP Rewards"], "Menu" }; AtlasLoot_TableNames["WINTERGRASPMENU"] = { BabbleZone["Wintergrasp"], "Menu" }; AtlasLoot_TableNames["PVP70RepSET"] = { AL["PvP Reputation Sets"]..": "..AL["Level 70"], "Menu" }; diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 6efc99a..ad62717 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -7539,7 +7539,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 18, 6774, "", "=q2=Uthek's Finger", "=q1=#m4#: =ds=#s15#"}; { 20, 0, "INV_Jewelry_Amulet_07", "=q6=#b6#", "=q5=#r5#, =q1="..BabbleFaction["Horde"]}; { 21, 20131, "", "=q1=Battle Tabard of the Defilers", "=q1=#m4#: =ds=#s7#"}; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ------------------- @@ -7564,7 +7564,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 23, 22636, "", "=q3=Ice Guard", "=ds=#s1# #e17#"}; { 25, 22524, "", "=q2=Insignia of the Crusade", "=ds=#m17#"}; Next = "Argent2"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Argent2"] = { @@ -7593,7 +7593,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 29, 0, "INV_Jewelry_Talisman_08", "=q6=#r5#", ""}; { 30, 18182, "", "=q2=Chromatic Mantle of the Dawn", "=ds=#s3# #e17#"}; Prev = "Argent1"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; --------------------------------------------------- @@ -7614,7 +7614,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 17333, "", "=q1=Aqual Quintessence", "=ds=#m3#"}; { 21, 0, "Spell_Frost_SummonWaterElemental_2", "=q6="..BabbleFaction["Hydraxian Waterlords"], "=q5=#r4#"}; { 22, 22754, "", "=q1=Eternal Quintessence", "=ds=#m3#"}; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ------------------------- --- Brood of Nozdormu --- @@ -7639,7 +7639,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 21198, "", "=q4=Signet Ring of the Bronze Dragonflight", "=ds=#s13#, =q1=#r3#"}; { 20, 21199, "", "=q4=Signet Ring of the Bronze Dragonflight", "=ds=#s13#, =q1=#r4#"}; { 21, 21200, "", "=q4=Signet Ring of the Bronze Dragonflight", "=ds=#s13#, =q1=#r5#"}; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ----------------------- @@ -7665,7 +7665,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 25, 20801, "", "=q2=Cenarion Tactical Badge", "=ds=#m17#"}; { 26, 21508, "", "=q2=Mark of Cenarius", "=ds=#m17#"}; Next = "Cenarion2"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Cenarion2"] = { @@ -7682,7 +7682,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 21181, "", "=q3=Grace of Earth", "=ds=#s14#", "7 #ccombat# 4 #clogistics# 4 #ctactical#"}; Next = "Cenarion3"; Prev = "Cenarion1"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Cenarion3"] = { @@ -7701,7 +7701,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 20, 21185, "", "=q4=Earthcalm Orb", "=ds=#s15#", "15 #ccombat# 20 #clogistics# 17 #ctactical# 1 #cremulos#"}; Next = "Cenarion4"; Prev = "Cenarion2"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Cenarion4"] = { @@ -7712,7 +7712,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 18, 21180, "", "=q4=Earthstrike", "=ds=#s14#", "15 #ccombat# 20 #clogistics# 20 #ctactical# 1 #ccenarius#"}; { 19, 21188, "", "=q4=Fist of Cenarius", "=ds=#h2#, #w6#", "15 #ccombat# 20 #clogistics# 20 #ctactical# 1 #ccenarius#", "", ""}; Prev = "Cenarion3"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ---------------------------------------- @@ -7738,7 +7738,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 20, 17906, "", "=q2=Frostwolf Insignia Rank 3", "=ds=#s14#, =q1=#r3#"}; { 21, 17905, "", "=q2=Frostwolf Insignia Rank 2", "=ds=#s14#, =q1=#r2#"}; { 22, 17690, "", "=q2=Frostwolf Insignia Rank 1", "=ds=#s14#, =q1=#r1#"}; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; --------------------------- @@ -7764,7 +7764,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 24, 17017, "", "=q1=Pattern: Flarecore Mantle", "=ds=#p8# (300)"}; { 25, 19219, "", "=q1=Pattern: Flarecore Robe", "=ds=#p8# (300)"}; Next = "Thorium2"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Thorium2"] = { @@ -7786,7 +7786,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 19210, "", "=q1=Plans: Ebon Hand", "=ds=#p2# (300)"}; { 20, 19212, "", "=q1=Plans: Nightfall", "=ds=#p2# (300)"}; Prev = "Thorium1"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ---------------------- @@ -7812,7 +7812,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 19218, "", "=q1=Pattern: Mantle of the Timbermaw", "=ds=#p8# (300)"}; { 22, 0, "INV_Misc_Horn_01", "=q6=#r5#", ""}; { 23, 21326, "", "=q4=Defender of the Timbermaw", "=q1=#m4#: =ds=#s14#"}; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; ---------------------- @@ -7840,7 +7840,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 24, 19765, "", "=q1=Pattern: Bloodvine Leggings", "=ds=#p8# (300)"}; { 25, 20031, "", "=q1=Essence Mango", "=ds=#e3#", "1 #zandalar#", ""}; Next = "Zandalar2"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; AtlasLoot_Data["Zandalar2"] = { @@ -7860,7 +7860,7 @@ AtlasLoot_Data["PVPWarrior2"] = { { 19, 20078, "", "=q3=Zandalar Signet of Serenity", "=ds=#s3# #e17#", "15 #zandalar#", ""}; { 20, 20013, "", "=q1=Recipe: Living Action Potion", "=ds=#p1# (285)"}; Prev = "Zandalar1"; - Back = "REPMENU_ORIGINALWOW"; + Back = "REPMENUCLASSIC"; }; -------------------- @@ -7871,150 +7871,97 @@ AtlasLoot_Data["PVPWarrior2"] = { --- Dragons of Nightmare --- ---------------------------- - AtlasLoot_Data["DEmeriss"] = { - { 1, 20579, "", "=q4=Green Dragonskin Cloak", "=ds=#s4# =q1=#m5#", "", "9.14%"}; - { 2, 20618, "", "=q4=Gloves of Delusional Power", "=ds=#s9#, #a1# =q1=#m5#", "", "9.71%"}; - { 3, 20615, "", "=q4=Dragonspur Wraps", "=ds=#s8#, #a2# =q1=#m5#", "", "8.83%"}; - { 4, 20617, "", "=q4=Ancient Corroded Leggings", "=ds=#s11#, #a3# =q1=#m5#", "", "9.80%"}; - { 5, 20616, "", "=q4=Dragonbone Wristguards", "=ds=#s8#, #a4# =q1=#m5#", "", "10.20%"}; - { 6, 20619, "", "=q4=Acid Inscribed Greaves", "=ds=#s12#, #a4# =q1=#m5#", "", "8.85%"}; - { 7, 20582, "", "=q4=Trance Stone", "=ds=#s15# =q1=#m5#", "", "9.57%"}; - { 8, 20580, "", "=q4=Hammer of Bestial Fury", "=ds=#h3#, #w6# =q1=#m5#", "", "8.93%"}; - { 9, 20581, "", "=q4=Staff of Rampant Growth", "=ds=#w9# =q1=#m5#", "", "9.70%"}; - { 11, 20644, "", "=q4=Nightmare Engulfed Object", "=ds=#m3# =q1=#m5#", "", "80.05%"}; - { 12, 20600, "", "=q4=Malfurion's Signet Ring", "=q1=#m4#: =ds=#s13#"}; - { 16, 20623, "", "=q4=Circlet of Restless Dreams", "=ds=#s1#, #a2#", "", "10.51%"}; - { 17, 20621, "", "=q4=Boots of the Endless Moor", "=ds=#s12#, #a3#", "", "10.24%"}; - { 18, 20622, "", "=q4=Dragonheart Necklace", "=ds=#s2#", "", "12.35%"}; - { 19, 20624, "", "=q4=Ring of the Unliving", "=ds=#s13#", "", "13.23%"}; + AtlasLoot_Data["WorldBossesCLASSIC"] = { + { 1, 0, "inv_sword_74", "=q4=Physical Gear", "", "", "", "=LT=WorldBossesClassicPhysDPS"}; + { 2, 0, "inv_wand_1h_zuldazarraid_d_01", "=q4=Caster Gear", "", "", "", "=LT=WorldBossesClassicCaster"}; + { 16, 0, "inv_shield_draenorcrafted_d_01_a_alliance", "=q4=Tank Gear", "", "", "", "=LT=WorldBossesClassicTank"}; + { 4, 20581, "", "=q4=Staff of Rampant Growth", "=ds=#w9# =q1=#m5#", "", "9.70%"}; + { 5, 17070, "", "=q4=Fang of the Mystics", "=ds=#h3#, #w4#", "", "13.64%"}; + { 6, 19130, "", "=q4=Cold Snap", "=ds=#w12#", "", "11.89%"}; + { 7, 17113, "", "=q4=Amberseal Keeper", "=ds=#h2#, #w9#", "", "16.87% "}; + { 8, 20636, "", "=q4=Hibernation Crystal", "=ds=#s14#", "", "12.75%"}; + { 9, 20582, "", "=q4=Trance Stone", "=ds=#s15# =q1=#m5#", "", "9.57%"}; + { 10, 18665, "", "=q4=The Eye of Shadow", "=ds=#s14#", "", "40.96%"}; + { 12, 18704, "", "=q4=Mature Blue Dragon Sinew", "=ds=#m3# =q1=(#c2#)", "", "51.56%"}; + { 13, 18714, "", "=q4=Ancient Sinew Wrapped Lamina", "=q1=#m4#: =ds=#m14# #w19#"}; + { 19, 20580, "", "=q4=Hammer of Bestial Fury", "=ds=#h3#, #w6# =q1=#m5#", "", "8.93%"}; { 20, 20599, "", "=q4=Polished Ironwood Crossbow", "=ds=#w3#", "", "12.63%"}; - Prev = "WorldBossesClassic"; - Next = "DLethon"; + { 21, 18202, "", "=q4=Eskhandar's Left Claw", "=ds=#h4#, #w13#", "", "11.76%"}; + { 22, 20577, "", "=q4=Nightmare Blade", "=ds=#h1#, #w10#", "", "12.07%"}; + { 23, 20578, "", "=q4=Emerald Dragonfang", "=ds=#h1#, #w4#", "", "9.95%"}; + { 24, 17112, "", "=q4=Empyrean Demolisher", "=ds=#h1#, #w6#", "", "13.54%"}; + { 25, 18542, "", "=q4=Typhoon", "=ds=#h2#, #w10#", "", "16.89%"}; + { 27, 20644, "", "=q4=Nightmare Engulfed Object", "=ds=#m3# =q1=#m5#", "", "80.05%"}; + { 28, 20600, "", "=q4=Malfurion's Signet Ring", "=q1=#m4#: =ds=#s13#"}; + Prev = "WorldBossesTBC"; + Next = "WorldBossesTBC"; }; - AtlasLoot_Data["DLethon"] = { - { 1, 20579, "", "=q4=Green Dragonskin Cloak", "=ds=#s4# =q1=#m5#", "", "9.14%"}; - { 2, 20618, "", "=q4=Gloves of Delusional Power", "=ds=#s9#, #a1# =q1=#m5#", "", "9.71%"}; + AtlasLoot_Data["WorldBossesClassicPhysDPS"] = { + { 1, 20623, "", "=q4=Circlet of Restless Dreams", "=ds=#s1#, #a2#", "", "10.51%"}; { 3, 20615, "", "=q4=Dragonspur Wraps", "=ds=#s8#, #a2# =q1=#m5#", "", "8.83%"}; - { 4, 20617, "", "=q4=Ancient Corroded Leggings", "=ds=#s11#, #a3# =q1=#m5#", "", "9.80%"}; - { 5, 20616, "", "=q4=Dragonbone Wristguards", "=ds=#s8#, #a4# =q1=#m5#", "", "10.20%"}; - { 6, 20619, "", "=q4=Acid Inscribed Greaves", "=ds=#s12#, #a4# =q1=#m5#", "", "8.85%"}; - { 7, 20582, "", "=q4=Trance Stone", "=ds=#s15# =q1=#m5#", "", "9.57%"}; - { 8, 20580, "", "=q4=Hammer of Bestial Fury", "=ds=#h3#, #w6# =q1=#m5#", "", "8.93%"}; - { 9, 20581, "", "=q4=Staff of Rampant Growth", "=ds=#w9# =q1=#m5#", "", "9.70%"}; - { 11, 20644, "", "=q4=Nightmare Engulfed Object", "=ds=#m3# =q1=#m5#", "", "80.05%"}; - { 12, 20600, "", "=q4=Malfurion's Signet Ring", "=q1=#m4#: =ds=#s13#"}; - { 16, 20626, "", "=q4=Black Bark Wristbands", "=ds=#s8#, #a1#", "", "9.44%"}; - { 17, 20625, "", "=q4=Belt of the Dark Bog", "=ds=#s10#, #a1#", "", "10.99%"}; - { 18, 20628, "", "=q4=Deviate Growth Cap", "=ds=#s1#, #a2#", "", "15.80%"}; - { 19, 20627, "", "=q4=Dark Heart Pants", "=ds=#s11#, #a2#", "", "11.68%"}; - { 20, 20629, "", "=q4=Malignant Footguards", "=ds=#s12#, #a3#", "", "4.46%"}; - { 21, 20630, "", "=q4=Gauntlets of the Shining Light", "=ds=#s9#, #a4#", "", "8.19%"}; - Prev = "DEmeriss"; - Next = "DTaerar"; - }; - - AtlasLoot_Data["DTaerar"] = { - { 1, 20579, "", "=q4=Green Dragonskin Cloak", "=ds=#s4# =q1=#m5#", "", "9.14%"}; - { 2, 20618, "", "=q4=Gloves of Delusional Power", "=ds=#s9#, #a1# =q1=#m5#", "", "9.71%"}; - { 3, 20615, "", "=q4=Dragonspur Wraps", "=ds=#s8#, #a2# =q1=#m5#", "", "8.83%"}; - { 4, 20617, "", "=q4=Ancient Corroded Leggings", "=ds=#s11#, #a3# =q1=#m5#", "", "9.80%"}; - { 5, 20616, "", "=q4=Dragonbone Wristguards", "=ds=#s8#, #a4# =q1=#m5#", "", "10.20%"}; - { 6, 20619, "", "=q4=Acid Inscribed Greaves", "=ds=#s12#, #a4# =q1=#m5#", "", "8.85%"}; - { 7, 20582, "", "=q4=Trance Stone", "=ds=#s15# =q1=#m5#", "", "9.57%"}; - { 8, 20580, "", "=q4=Hammer of Bestial Fury", "=ds=#h3#, #w6# =q1=#m5#", "", "8.93%"}; - { 9, 20581, "", "=q4=Staff of Rampant Growth", "=ds=#w9# =q1=#m5#", "", "9.70%"}; - { 11, 20644, "", "=q4=Nightmare Engulfed Object", "=ds=#m3# =q1=#m5#", "", "80.05%"}; - { 12, 20600, "", "=q4=Malfurion's Signet Ring", "=q1=#m4#: =ds=#s13#"}; - { 16, 20631, "", "=q4=Mendicant's Slippers", "=ds=#s12#, #a1#", "", "13.14%"}; - { 17, 20633, "", "=q4=Unnatural Leather Spaulders", "=ds=#s3#, #a2#", "", "11.30%"}; - { 18, 20634, "", "=q4=Boots of Fright", "=ds=#s12#, #a2#", "", "10.15%"}; - { 19, 20632, "", "=q4=Mindtear Band", "=ds=#s13#", "", "13.69%"}; - { 20, 20577, "", "=q4=Nightmare Blade", "=ds=#h1#, #w10#", "", "12.07%"}; - Prev = "DLethon"; - Next = "DYsondre"; - }; - - AtlasLoot_Data["DYsondre"] = { - { 1, 20579, "", "=q4=Green Dragonskin Cloak", "=ds=#s4# =q1=#m5#", "", "9.14%"}; - { 2, 20618, "", "=q4=Gloves of Delusional Power", "=ds=#s9#, #a1# =q1=#m5#", "", "9.71%"}; - { 3, 20615, "", "=q4=Dragonspur Wraps", "=ds=#s8#, #a2# =q1=#m5#", "", "8.83%"}; - { 4, 20617, "", "=q4=Ancient Corroded Leggings", "=ds=#s11#, #a3# =q1=#m5#", "", "9.80%"}; - { 5, 20616, "", "=q4=Dragonbone Wristguards", "=ds=#s8#, #a4# =q1=#m5#", "", "10.20%"}; - { 6, 20619, "", "=q4=Acid Inscribed Greaves", "=ds=#s12#, #a4# =q1=#m5#", "", "8.85%"}; - { 7, 20582, "", "=q4=Trance Stone", "=ds=#s15# =q1=#m5#", "", "9.57%"}; - { 8, 20580, "", "=q4=Hammer of Bestial Fury", "=ds=#h3#, #w6# =q1=#m5#", "", "8.93%"}; - { 9, 20581, "", "=q4=Staff of Rampant Growth", "=ds=#w9# =q1=#m5#", "", "9.70%"}; - { 11, 20644, "", "=q4=Nightmare Engulfed Object", "=ds=#m3# =q1=#m5#", "", "80.05%"}; - { 12, 20600, "", "=q4=Malfurion's Signet Ring", "=q1=#m4#: =ds=#s13#"}; - { 16, 20635, "", "=q4=Jade Inlaid Vestments", "=ds=#s5#, #a1#", "", "14.19%"}; - { 17, 20638, "", "=q4=Leggings of the Demented Mind", "=ds=#s11#, #a3#", "", "3.66%"}; - { 18, 20637, "", "=q4=Acid Inscribed Pauldrons", "=ds=#s3#, #a4#", "", "10.13%"}; - { 19, 20639, "", "=q4=Strangely Glyphed Legplates", "=ds=#s11#, #a4#", "", "8.87%"}; - { 20, 20636, "", "=q4=Hibernation Crystal", "=ds=#s14#", "", "12.75%"}; - { 21, 20578, "", "=q4=Emerald Dragonfang", "=ds=#h1#, #w4#", "", "9.95%"}; - Prev = "DTaerar"; - Next = "Kazzak60"; - }; - - ---------------- - --- Azuregos --- - ---------------- - - AtlasLoot_Data["WorldBossesClassic"] = { - { 1, 18541, "", "=q4=Puissant Cape", "=ds=#s4#", "", "11.71%"}; - { 2, 18208, "", "=q4=Drape of Benediction", "=ds=#s4#", "", "11.22%"}; - { 3, 19132, "", "=q4=Crystal Adorned Crown", "=ds=#s1#, #a1#", "", "13.54%"}; - { 4, 18545, "", "=q4=Leggings of Arcane Supremacy", "=ds=#s11#, #a1#", "", "16.39% "}; - { 5, 19131, "", "=q4=Snowblind Shoes", "=ds=#s12#, #a1#", "", "12.23%"}; - { 6, 18547, "", "=q4=Unmelting Ice Girdle", "=ds=#s10#, #a4#", "", "12.93%"}; - { 7, 17070, "", "=q4=Fang of the Mystics", "=ds=#h3#, #w4#", "", "13.64%"}; - { 8, 18202, "", "=q4=Eskhandar's Left Claw", "=ds=#h4#, #w13#", "", "11.76%"}; - { 9, 18542, "", "=q4=Typhoon", "=ds=#h2#, #w10#", "", "16.89%"}; - { 10, 19130, "", "=q4=Cold Snap", "=ds=#w12#", "", "11.89%"}; - { 11, 18704, "", "=q4=Mature Blue Dragon Sinew", "=ds=#m3# =q1=(#c2#)", "", "51.56%"}; - { 12, 18714, "", "=q4=Ancient Sinew Wrapped Lamina", "=q1=#m4#: =ds=#m14# #w19#"}; - Prev = "Setis"; - Next = "DEmeriss"; - }; - - AtlasLoot_Data["Kazzak60"] = { - { 1, 18665, "", "=q4=The Eye of Shadow", "=ds=#s14#", "", "40.96%"}; - { 2, 18546, "", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "", "22.89%"}; - { 3, 17112, "", "=q4=Empyrean Demolisher", "=ds=#h1#, #w6#", "", "13.54%"}; - { 4, 17113, "", "=q4=Amberseal Keeper", "=ds=#h2#, #w9#", "", "16.87% "}; - { 5, 18204, "", "=q4=Eskhandar's Pelt", "=ds=#s4#, #a1#", "", "12.23%"}; - { 6, 19133, "", "=q4=Fel Infused Leggings", "=ds=#s11#, #a1#", "", "12.05%"}; - { 7, 18543, "", "=q4=Ring of Entropy", "=ds=#s13#", "", "14.46%"}; + { 4, 122884, "", "=q4=Wristguards of the Shifting Sands", "=ds=#s8#, #a2#", "", ""}; + { 6, 122885, "", "=q4=Waistguard of the Shifting Sands", "=ds=#s10#, #a2#", "", ""}; { 8, 18544, "", "=q4=Doomhide Gauntlets", "=ds=#s9#, #a2#", "", "11.76%"}; - { 9, 19134, "", "=q4=Flayed Doomguard Belt", "=ds=#s10#, #a2#", "", "16.89%"}; - { 10, 19135, "", "=q4=Blacklight Bracer", "=ds=#s8#, #a1#", "", "11.89%"}; - Prev = "DYsondre"; - Next = "Setis"; - + { 10, 20627, "", "=q4=Dark Heart Pants", "=ds=#s11#, #a2#", "", "11.68%"}; + { 13, 20633, "", "=q4=Unnatural Leather Spaulders", "=ds=#s3#, #a2#", "", "11.30%"}; + { 11, 20617, "", "=q4=Ancient Corroded Leggings", "=ds=#s11#, #a3# =q1=#m5#", "", "9.80%"}; + { 16, 20624, "", "=q4=Ring of the Unliving", "=ds=#s13#", "", "13.23%"}; + { 18, 20622, "", "=q4=Dragonheart Necklace", "=ds=#s2#", "", "12.35%"}; + { 20, 18541, "", "=q4=Puissant Cape", "=ds=#s4#", "", "11.71%"}; + { 21, 18204, "", "=q4=Eskhandar's Pelt", "=ds=#s4#, #a1#", "", "12.23%"}; + Prev = "WorldBossesClassicTank"; + Next = "WorldBossesClassicCaster"; + Back = "WorldBossesCLASSIC"; }; - AtlasLoot_Data["Setis"] = { - { 1,122880, "", "=q4=Scepter of the Gate Warden", "=ds=#h3#, #w6#", "", ""}; - { 2,122881, "", "=q4=Staff of the Gate Warden", "=ds=#h2#, #w9#", "", ""}; - { 3,122883, "", "=q4=Musket of the Gate Warden", "=ds=#w5#", "", ""}; - { 4,122884, "", "=q4=Wristguards of the Shifting Sands", "=ds=#s8#, #a2#", "", ""}; - { 5,122885, "", "=q4=Waistguard of the Shifting Sands", "=ds=#s10#, #a2#", "", ""}; - { 6,122886, "", "=q4=Bracers of the Sand Prince", "=ds=#s8#, #a2#", "", ""}; - { 7,122887, "", "=q4=Belt of the Sand Prince", "=ds=#s10#, #a2#", "", ""}; - { 8,122888, "", "=q4=Amulet of the Gate Warden", "=ds=#s2#", "", ""}; - { 9,122889, "", "=q4=Amulet of the Sand Prince", "=ds=#s2#", "", ""}; - { 10,122890, "", "=q4=Amulet of the Shifting Sands", "=ds=#s2#", "", ""}; - Prev = "Kazzak60"; - Next = "WorldBossesClassic"; + AtlasLoot_Data["WorldBossesClassicCaster"] = { + { 1, 19132, "", "=q4=Crystal Adorned Crown", "=ds=#s1#, #a1#", "", "13.54%"}; + { 2, 18546, "", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "", "22.89%"}; + { 3, 20628, "", "=q4=Deviate Growth Cap", "=ds=#s1#, #a2#", "", "15.80%"}; + { 5, 18545, "", "=q4=Leggings of Arcane Supremacy", "=ds=#s11#, #a1#", "", "16.39% "}; + { 6, 19133, "", "=q4=Fel Infused Leggings", "=ds=#s11#, #a1#", "", "12.05%"}; + { 7, 20638, "", "=q4=Leggings of the Demented Mind", "=ds=#s11#, #a3#", "", "3.66%"}; + { 8, 20639, "", "=q4=Strangely Glyphed Legplates", "=ds=#s11#, #a4#", "", "8.87%"}; + { 10, 19131, "", "=q4=Snowblind Shoes", "=ds=#s12#, #a1#", "", "12.23%"}; + { 11, 20631, "", "=q4=Mendicant's Slippers", "=ds=#s12#, #a1#", "", "13.14%"}; + { 12, 20634, "", "=q4=Boots of Fright", "=ds=#s12#, #a2#", "", "10.15%"}; + { 13, 20621, "", "=q4=Boots of the Endless Moor", "=ds=#s12#, #a3#", "", "10.24%"}; + { 14, 20629, "", "=q4=Malignant Footguards", "=ds=#s12#, #a3#", "", "4.46%"}; + { 16, 20630, "", "=q4=Gauntlets of the Shining Light", "=ds=#s9#, #a4#", "", "8.19%"}; + { 17, 20618, "", "=q4=Gloves of Delusional Power", "=ds=#s9#, #a1# =q1=#m5#", "", "9.71%"}; + { 15, 20635, "", "=q4=Jade Inlaid Vestments", "=ds=#s5#, #a1#", "", "14.19%"}; + { 19, 19135, "", "=q4=Blacklight Bracer", "=ds=#s8#, #a1#", "", "11.89%"}; + { 20,122886, "", "=q4=Bracers of the Sand Prince", "=ds=#s8#, #a2#", "", ""}; + { 21, 20626, "", "=q4=Black Bark Wristbands", "=ds=#s8#, #a1#", "", "9.44%"}; + { 23,122887, "", "=q4=Belt of the Sand Prince", "=ds=#s10#, #a2#", "", ""}; + { 24, 19134, "", "=q4=Flayed Doomguard Belt", "=ds=#s10#, #a2#", "", "16.89%"}; + { 25, 20625, "", "=q4=Belt of the Dark Bog", "=ds=#s10#, #a1#", "", "10.99%"}; + { 27, 20579, "", "=q4=Green Dragonskin Cloak", "=ds=#s4# =q1=#m5#", "", "9.14%"}; + { 28, 18208, "", "=q4=Drape of Benediction", "=ds=#s4#", "", "11.22%"}; + { 29, 20632, "", "=q4=Mindtear Band", "=ds=#s13#", "", "13.69%"}; + { 30, 18543, "", "=q4=Ring of Entropy", "=ds=#s13#", "", "14.46%"}; + Prev = "WorldBossesClassicPhysDPS"; + Next = "WorldBossesClassicTank"; + Back = "WorldBossesCLASSIC"; }; - -------------------- - --- World Bosses --- - -------------------- + AtlasLoot_Data["WorldBossesClassicTank"] = { + { 1, 18547, "", "=q4=Unmelting Ice Girdle", "=ds=#s10#, #a4#", "", "12.93%"}; + { 3, 20616, "", "=q4=Dragonbone Wristguards", "=ds=#s8#, #a4# =q1=#m5#", "", "10.20%"}; + { 5, 20619, "", "=q4=Acid Inscribed Greaves", "=ds=#s12#, #a4# =q1=#m5#", "", "8.85%"}; + { 7, 20637, "", "=q4=Acid Inscribed Pauldrons", "=ds=#s3#, #a4#", "", "10.13%"}; + Prev = "WorldBossesClassicCaster"; + Next = "WorldBossesClassicPhysDPS"; + Back = "WorldBossesCLASSIC"; + }; + + ------------------------ + --- World Bosses TBC --- + ------------------------ - AtlasLoot_Data["WorldBossesBC"] = { + AtlasLoot_Data["WorldBossesTBC"] = { { 1, 0, "INV_Box_01", "=q6="..BabbleBoss["Doom Lord Kazzak"], ""}; { 2, 30735, "", "=q4=Ancient Spellcloak of the Highborne", "=ds=#s4#", "", "16.5%"}; { 3, 30734, "", "=q4=Leggings of the Seventh Circle", "=ds=#s11#, #a1#", "", "17.0%"}; @@ -8037,4 +7984,6 @@ AtlasLoot_Data["PVPWarrior2"] = { { 24, 30723, "", "=q4=Talon of the Tempest", "=ds=#h3#, #w4#", "", "15.4%"}; { 25, 30722, "", "=q4=Ethereum Nexus-Reaver", "=ds=#h2#, #w1#", "", "16.0%"}; { 26, 30724, "", "=q4=Barrel-Blade Longrifle", "=ds=#w5#", "", "20.0%"}; + Prev = "WorldBossesCLASSIC"; + Next = "WorldBossesCLASSIC"; }; diff --git a/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua b/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua index 81509ae..e10ffdd 100644 --- a/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua +++ b/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua @@ -10524,7 +10524,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 24, 22630, "", "=q5=Atiesh, Greatstaff of the Guardian", "=ds=#m4#, =q1=#m1# =ds=#c8#", "", "", [AtlasLoot_Difficulty.DUPLICATE] = "(Warlock)" }, { 26, 49623, "", "=q5=Shadowmourne", "=ds=#h2# #w1#", "" }; { 27, 46017, "", "=q5=Val'anyr, Hammer of Ancient Kings", "=ds=#h3# #w6#", "" }; - Back = "SETMENUWRATH"; + Back = "SETMENU"..AtlasLoot_Expac; Type = "BCRaid"; }; @@ -11318,7 +11318,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 29, 42947, "", "=q7=Dignified Headmaster's Charge", "=ds=#w9#", "65 #eofheroism# / 95 #champseal#"}; { 30, 42946, "", "=q7=Charmed Ancient Bone Bow", "=ds=#w2#", "65 #eofheroism# / 95 #champseal#"}; Next = "Heirloom2"; - Back = "SETMENUWRATH"; + Back = "SETMENU"..AtlasLoot_Expac; }; AtlasLoot_Data["Heirloom2"] = { @@ -11339,7 +11339,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 20, 44095, "", "=q7=Grand Staff of Jordan", "=ds=#w9#", "325 #wintergrasp#"}; { 21, 44093, "", "=q7=Upgraded Dwarven Hand Cannon", "=ds=#w5#", "325 #wintergrasp#"}; Prev = "Heirloom"; - Back = "SETMENUWRATH"; + Back = "SETMENU"..AtlasLoot_Expac; }; -------------------------------