From 9a0e9d527498a1f3da4e7aadf35b927bfcbcf310 Mon Sep 17 00:00:00 2001 From: Skrylas <> Date: Fri, 5 Mar 2021 00:05:12 -0500 Subject: [PATCH] 70 PVP and Misc 70 PVP and Misc --- AtlasLoot/Menus/PvPMenus.lua | 29 +- AtlasLoot/Menus/SetMenus.lua | 73 +++-- AtlasLoot/TableRegister/loottables.en.lua | 14 + AtlasLoot/changelog.txt | 12 + AtlasLoot_BurningCrusade/burningcrusade.lua | 300 +++++++++++++++++- AtlasLoot_OriginalWoW/originalwow.lua | 117 +++++-- AtlasLoot_WorldEvents/worldevents.lua | 4 +- .../wrathofthelichking.lua | 2 +- 8 files changed, 471 insertions(+), 80 deletions(-) diff --git a/AtlasLoot/Menus/PvPMenus.lua b/AtlasLoot/Menus/PvPMenus.lua index 72633bb..1e25221 100644 --- a/AtlasLoot/Menus/PvPMenus.lua +++ b/AtlasLoot/Menus/PvPMenus.lua @@ -14,16 +14,15 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 11, "PvP80NonSet1", "INV_Jewelry_Necklace_36", "=ds="..AL["PvP Accessories"], "=q5="..AL["Level 80"]}; { 12, "PvP80Misc", "INV_Scroll_06", "=ds="..AL["PvP Misc"], "=q5="..AL["Level 80"]}; { 13, "LEVEL80PVPSETS", "INV_Boots_01", "=ds="..AL["PvP Armor Sets"], "=q5="..AL["Level 80"], "" }; - { 15, "WINTERGRASPMENU", "INV_Misc_Platnumdisks", "=ds="..BabbleZone["Wintergrasp"], ""}; { 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"]}; - { 21, "Arena1Weapons1", "INV_Weapon_Crossbow_09", "=ds="..AL["Arena Season 1 Weapons"], "=q5="..AL["Level 70"]}; - { 22, "Arena2Weapons1", "INV_Weapon_Crossbow_10", "=ds="..AL["Arena Season 2 Weapons"], "=q5="..AL["Level 70"]}; - { 23, "Arena3Weapons1", "INV_Weapon_Crossbow_11", "=ds="..AL["Arena Season 3 Weapons"], "=q5="..AL["Level 70"]}; - { 24, "Arena4Weapons1", "INV_Weapon_Crossbow_12", "=ds="..AL["Arena Season 4 Weapons"], "=q5="..AL["Level 70"]}; + { 20, "Arena0Weapons1_A", "INV_Weapon_Crossbow_09", "=ds="..AL["Arena Season 0 Weapons"], "=q5="..AL["Level 70"]}; + { 21, "Arena1Weapons1", "INV_Weapon_Crossbow_10", "=ds="..AL["Arena Season 1 Weapons"], "=q5="..AL["Level 70"]}; + { 22, "Arena2Weapons1", "INV_Weapon_Crossbow_11", "=ds="..AL["Arena Season 2 Weapons"], "=q5="..AL["Level 70"]}; + { 23, "Arena3Weapons1", "INV_Weapon_Crossbow_12", "=ds="..AL["Arena Season 3 Weapons"], "=q5="..AL["Level 70"]}; + { 24, "Arena4Weapons1", "inv_weapon_crossbow_26", "=ds="..AL["Arena Season 4 Weapons"], "=q5="..AL["Level 70"]}; { 26, "PVP80NONSETEPICS", "inv_bracer_51", "=ds="..AL["PvP Non-Set Epics"], "=q5="..AL["Level 80"]}; { 27, "WrathfulGladiatorWeapons1", "INV_Sword_86", "=ds="..AL["Wrathful Gladiator\'s Weapons"], "=q5="..AL["Level 80"] }; - { 30, "VentureBay1", "INV_Misc_Coin_16", "=ds="..BabbleZone["Grizzly Hills"], "=q5="..AL["Venture Bay"]}; Back = "SETMENU"; }; @@ -41,6 +40,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 12, "Zangarmarsh", "Spell_Nature_ElementalPrecision_1", "=ds="..BabbleZone["Zangarmarsh"], "=q5="..AL["Twin Spire Ruins"]}; { 26, "Terokkar", "INV_Jewelry_FrostwolfTrinket_04", "=ds="..BabbleZone["Terokkar Forest"], "=q5="..AL["Spirit Towers"]}; { 27, "Nagrand1", "INV_Misc_Rune_09", "=ds="..BabbleZone["Nagrand"], "=q5="..AL["Halaa"]}; + { 14, "WINTERGRASPMENU", "INV_Misc_Platnumdisks", "=ds="..BabbleZone["Wintergrasp"], ""}; + { 29, "VentureBay1", "INV_Misc_Coin_16", "=ds="..BabbleZone["Grizzly Hills"], "=q5="..AL["Venture Bay"]}; Back = "PVPMENU"; }; @@ -80,10 +81,16 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") }; AtlasLoot_Data["PVP70RepSET"] = { - { 2, "PVP70RepCloth", "INV_Boots_Cloth_12", "=ds="..BabbleInventory["Cloth"], ""}; - { 3, "PVP70RepMail", "INV_Boots_Plate_06", "=ds="..BabbleInventory["Mail"], ""}; - { 17, "PVP70RepLeather", "INV_Boots_08", "=ds="..BabbleInventory["Leather"], ""}; - { 18, "PVP70RepPlate", "INV_Boots_Plate_04", "=ds="..BabbleInventory["Plate"], ""}; + { 2, "PVP70RepCloth", "INV_Boots_Cloth_12", "=ds="..BabbleInventory["Cloth"], "=q5=".."Reputation"}; + { 3, "PVP70RepMail", "INV_Boots_Plate_06", "=ds="..BabbleInventory["Mail"], "=q5=".."Reputation"}; + { 17, "PVP70RepLeather", "INV_Boots_08", "=ds="..BabbleInventory["Leather"], "=q5=".."Reputation"}; + { 18, "PVP70RepPlate", "INV_Boots_Plate_04", "=ds="..BabbleInventory["Plate"], "=q5=".."Reputation"}; + { 5, "PVP70RareCloth_A", "INV_Boots_Cloth_12", "=ds="..BabbleInventory["Cloth"], "=q5=".."Pre-Arena"}; + { 6, "PVP70RareMail_A", "INV_Boots_Plate_06", "=ds="..BabbleInventory["Mail"], "=q5=".."Pre-Arena"}; + { 20, "PVP70RareLeather_A", "INV_Boots_08", "=ds="..BabbleInventory["Leather"], "=q5=".."Pre-Arena"}; + { 21, "PVP70RarePlate_A", "INV_Boots_Plate_04", "=ds="..BabbleInventory["Plate"], "=q5=".."Pre-Arena"}; + + Back = "PVPMENU"; }; @@ -124,7 +131,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 17, "LakeWintergrasp1", "inv_misc_rune_11", "=ds="..AL["Accessories"], ""}; { 18, "LakeWintergrasp7", "inv_sword_19", "=ds="..AL["Heirloom"], ""}; { 19, "LakeWintergrasp6", "inv_jewelcrafting_icediamond_02", "=ds="..AL["PVP Gems/Enchants/Jewelcrafting Designs"], ""}; - Back = "PVPMENU"; + Back = "PVPMENU2"; }; \ No newline at end of file diff --git a/AtlasLoot/Menus/SetMenus.lua b/AtlasLoot/Menus/SetMenus.lua index 74123aa..0516319 100644 --- a/AtlasLoot/Menus/SetMenus.lua +++ b/AtlasLoot/Menus/SetMenus.lua @@ -3,6 +3,12 @@ local BabbleInventory = AtlasLoot_GetLocaleLibBabble("LibBabble-Inventory-3.0") local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") +-- { #, "MOUNTMENU", "INV_Misc_QirajiCrystal_05", "=ds="..AL["Mounts"], ""}; +-- { #, "PETMENU", "INV_Box_PetCarrier_01", "=ds="..AL["Vanity Pets"], ""}; +-- { #, "Tabards3", "INV_Shirt_GuildTabard_01", "=ds="..AL["Tabards"], ""}; +-- { #, "CardGame1", "INV_Misc_Ticket_Tarot_Madness", "=ds="..AL["Upper Deck Card Game Items"], ""}; +-- { #, "PVPMENU", "INV_Axe_02", "=ds="..AL["PvP Rewards"], ""}; + AtlasLoot_Data["SETMENU"] = { { 1, "EMBLEMOFFROSTMENU", "inv_misc_frostemblem_01", "=ds="..AL["Emblem of Frost Rewards"], "=q5="..AL["Wrath of the Lich King"]}; @@ -10,22 +16,25 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 3, "EMBLEMOFCONQUESTMENU", "Spell_Holy_ChampionsGrace", "=ds="..AL["Emblem of Conquest Rewards"], "=q5="..AL["Wrath of the Lich King"]}; { 4, "EMBLEMOFVALORMENU", "Spell_Holy_ProclaimChampion_02", "=ds="..AL["Emblem of Valor Rewards"], "=q5="..AL["Wrath of the Lich King"]}; { 5, "EMBLEMOFHEROISMMENU", "Spell_Holy_ProclaimChampion", "=ds="..AL["Emblem of Heroism Rewards"], "=q5="..AL["Wrath of the Lich King"]}; - { 7, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; - { 8, "MOUNTMENU", "INV_Misc_QirajiCrystal_05", "=ds="..AL["Mounts"], ""}; - { 9, "PETMENU", "INV_Box_PetCarrier_01", "=ds="..AL["Vanity Pets"], ""}; - { 10, "Tabards3", "INV_Shirt_GuildTabard_01", "=ds="..AL["Tabards"], ""}; - { 11, "CardGame1", "INV_Misc_Ticket_Tarot_Madness", "=ds="..AL["Upper Deck Card Game Items"], ""}; - { 13, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; + { 6, "70TOKENMENU", "Spell_Holy_ChampionsBond", "=ds="..AL["Badge of Justice Rewards"], "=q5="..AL["Burning Crusade"]}; + { 8, "Heirloom", "INV_Sword_43", "=ds="..AL["Heirloom"], ""}; + { 10, "SETSCLASSIC", "INV_Sword_43", "=ds="..AL["Classic Sets"], ""}; + { 11, "TBCSets", "INV_Weapon_Glave_01", "=ds="..AL["Burning Crusade Misc Sets"], ""}; + { 12, "SETSWRATHOFLICHKING", "inv_misc_monsterscales_15", "=ds="..AL["Wrath of the Lich King Sets"], ""}; + { 14, "Legendaries", "INV_Staff_Medivh", "=ds="..AL["Legendary Items"], ""}; { 15, "WORLDEPICS", "INV_Sword_76", "=ds="..AL["BoE World Epics"], ""}; - { 16, "PVPMENU", "INV_Axe_02", "=ds="..AL["PvP Rewards"], ""}; - { 18, "SETSCLASSIC", "INV_Sword_43", "=ds="..AL["Classic Sets"], ""}; - { 19, "SETSWRATHOFLICHKING", "inv_misc_monsterscales_15", "=ds="..AL["Wrath of the Lich King Sets"], ""}; - { 21, "70TOKENMENU", "Spell_Holy_ChampionsBond", "=ds="..AL["Badge of Justice Rewards"], "=q5="..AL["Burning Crusade"]}; - { 23, "TBCSets", "INV_Weapon_Glave_01", "=ds="..AL["Burning Crusade Misc Sets"], ""}; - { 25, "DS3SET", "INV_Helmet_15", "=ds="..AL["Dungeon 3 Sets"], ""}; - { 26, "T4SET", "inv_helmet_58", "=ds="..AL["Tier 4 Sets"], ""}; - { 27, "T5SET", "inv_helmet_92", "=ds="..AL["Tier 5 Sets"], ""}; - { 28, "T6SET", "inv_helmet_98", "=ds="..AL["Tier 6 Sets"], ""}; + { 16, "T0SET", "INV_Chest_Chain_03", "=ds="..AL["Dungeon 1/2 Sets"], ""}; + { 17, "ZGSets1", "INV_Misc_MonsterClaw_04", "=ds="..AL["Zul'Gurub Sets"], ""}; + { 18, "AQ20Sets1", "INV_Jewelry_Ring_AhnQiraj_03", "=ds="..AL["Ruins of Ahn'Qiraj Sets"], ""}; + { 19, "AQ40Sets1", "INV_Sword_59", "=ds="..AL["Temple of Ahn'Qiraj Sets"], ""}; + { 20, "T1T2T3SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1/2/3 Sets"], ""}; + { 22, "DS3SET", "INV_Helmet_15", "=ds="..AL["Dungeon 3 Sets"], ""}; + { 23, "T4SET", "inv_helmet_58", "=ds="..AL["Tier 4 Sets"], ""}; + { 24, "T5SET", "inv_helmet_92", "=ds="..AL["Tier 5 Sets"], ""}; + { 25, "T6SET", "inv_helmet_98", "=ds="..AL["Tier 6 Sets"], ""}; + { 27, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; + { 28, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; + { 29, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; }; AtlasLoot_Data["70TOKENMENU"] = { @@ -131,12 +140,12 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 13, "VWOWSets3", "INV_Sword_43", "=ds="..AL["Dal'Rend's Arms"], "=q5="..BabbleZone["Upper Blackrock Spire"]}; { 17, "VWOWSets3", "INV_Misc_MonsterScales_15", "=ds="..AL["Shard of the Gods"], "=q5="..AL["Various Locations"]}; { 18, "VWOWSets3", "INV_Misc_MonsterClaw_04", "=ds="..AL["Spirit of Eskhandar"], "=q5="..AL["Various Locations"]}; - { 20, "T0SET", "INV_Chest_Chain_03", "=ds="..AL["Dungeon 1/2 Sets"], ""}; - { 22, "VWOWZulGurub", "INV_Weapon_Hand_01", "=ds="..AL["Misc Zul'Gurub Sets"], ""}; - { 23, "ZGSets1", "INV_Misc_MonsterClaw_04", "=ds="..AL["Zul'Gurub Sets"], ""}; - { 24, "AQ20Sets1", "INV_Jewelry_Ring_AhnQiraj_03", "=ds="..AL["Ruins of Ahn'Qiraj Sets"], ""}; - { 25, "AQ40Sets1", "INV_Sword_59", "=ds="..AL["Temple of Ahn'Qiraj Sets"], ""}; - { 26, "T1T2T3SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1/2/3 Sets"], ""}; +-- { 20, "T0SET", "INV_Chest_Chain_03", "=ds="..AL["Dungeon 1/2 Sets"], ""}; + { 20, "VWOWZulGurub", "INV_Weapon_Hand_01", "=ds="..AL["Misc Zul'Gurub Sets"], ""}; +-- { 23, "ZGSets1", "INV_Misc_MonsterClaw_04", "=ds="..AL["Zul'Gurub Sets"], ""}; +-- { 24, "AQ20Sets1", "INV_Jewelry_Ring_AhnQiraj_03", "=ds="..AL["Ruins of Ahn'Qiraj Sets"], ""}; +-- { 25, "AQ40Sets1", "INV_Sword_59", "=ds="..AL["Temple of Ahn'Qiraj Sets"], ""}; +-- { 26, "T1T2T3SET", "INV_Pants_Mail_03", "=ds="..AL["Tier 1/2/3 Sets"], ""}; Back = "SETMENU"; }; @@ -152,9 +161,9 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 2, "WOTLKSets", "inv_jewelry_necklace_27", "=ds="..AL["Raine's Revenge"], "=q5="..AL["World Drop"]}; { 3, "WOTLKSets", "inv_misc_monsterscales_15", "=ds="..AL["Purified Shard of the Gods"], "=q5="..BabbleZone["Onyxia's Lair"]}; { 4, "WOTLKSets", "inv_misc_monsterscales_15", "=ds="..AL["Shiny Shard of the Gods"], "=q5="..BabbleZone["Onyxia's Lair"]}; - { 6, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; - { 7, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; - { 8, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; +-- { 6, "T7T8SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 7/8 Sets"], "=q5="..AL["10/25 Man"]}; +-- { 7, "T9SET", "inv_gauntlets_80", "=ds="..AL["Tier 9 Sets"], "=q5="..AL["10/25 Man"]}; +-- { 8, "T10SET", "INV_Chest_Chain_15", "=ds="..AL["Tier 10 Sets"], "=q5="..AL["10/25 Man"]}; Back = "SETMENU"; }; @@ -168,7 +177,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 19, "T0Paladin", "Spell_Holy_SealOfMight", "=ds="..LOCALIZED_CLASS_NAMES_MALE["PALADIN"], ""}; { 20, "T0Rogue", "Ability_BackStab", "=ds="..LOCALIZED_CLASS_NAMES_MALE["ROGUE"], ""}; { 21, "T0Warlock", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], ""}; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["DS3SET"] = { @@ -198,8 +207,8 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 8, "T3Priest", "Spell_Holy_PowerWordShield", "=ds="..LOCALIZED_CLASS_NAMES_MALE["PRIEST"], "=q5="..AL["Tier 3 Sets"]}; { 10, "T1T2Shaman", "Spell_FireResistanceTotem_01", "=ds="..LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "=q5="..AL["Tier 1/2 Sets"]}; { 11, "T3Shaman", "Spell_FireResistanceTotem_01", "=ds="..LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "=q5="..AL["Tier 3 Sets"]}; - { 13, "T1T2Warrior", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 1/2 Sets"]}; - { 14, "T3Warrior", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 3 Sets"]}; + { 13, "T1T2Warrior", "INV_Shield_05", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 1/2 Sets"]}; + { 14, "T3Warrior", "INV_Shield_05", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 3 Sets"]}; { 16, "T1T2Hunter", "Ability_Hunter_RunningShot", "=ds="..LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "=q5="..AL["Tier 1/2 Sets"]}; { 17, "T3Hunter", "Ability_Hunter_RunningShot", "=ds="..LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "=q5="..AL["Tier 3 Sets"]}; { 19, "T1T2Paladin", "Spell_Holy_SealOfMight", "=ds="..LOCALIZED_CLASS_NAMES_MALE["PALADIN"], "=q5="..AL["Tier 1/2 Sets"]}; @@ -208,7 +217,9 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 23, "T3Rogue", "Ability_BackStab", "=ds="..LOCALIZED_CLASS_NAMES_MALE["ROGUE"], "=q5="..AL["Tier 3 Sets"]}; { 25, "T1T2Warlock", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "=q5="..AL["Tier 1/2 Sets"]}; { 26, "T3Warlock", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "=q5="..AL["Tier 3 Sets"]}; - Back = "SETSCLASSIC"; + { 28, "T1T2DPSWarrior", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 1/2 Sets"]}; + { 29, "T3DPSWarrior", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Tier 3 Sets"]}; + Back = "SETMENU"; }; AtlasLoot_Data["T4SET"] = { @@ -299,7 +310,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 26, "NaxxWarlock", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], ""}; { 28, "NaxxWarriorFury", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Fury"]}; { 29, "NaxxWarriorProtection", "INV_Shield_05", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Protection"]}; - Back = "SETSWRATHOFLICHKING"; + Back = "SETMENU"; Next = "T9SET"; }; @@ -323,7 +334,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 26, "T9Warlock_A", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], ""}; { 28, "T9WarriorFury_A", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Fury"]}; { 29, "T9WarriorProtection_A", "INV_Shield_05", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Protection"]}; - Back = "SETSWRATHOFLICHKING"; + Back = "SETMENU"; Prev = "T7T8SET"; Next = "T10SET"; }; @@ -348,6 +359,6 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 26, "T10Warlock", "Spell_Shadow_CurseOfTounges", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], ""}; { 28, "T10WarriorFury", "Ability_Warrior_BattleShout", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Fury"]}; { 29, "T10WarriorProtection", "INV_Shield_05", "=ds="..LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "=q5="..AL["Protection"]}; - Back = "SETSWRATHOFLICHKING"; + Back = "SETMENU"; Prev = "T9SET"; }; \ No newline at end of file diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index de0637b..1c0964c 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1085,6 +1085,14 @@ end AtlasLoot_TableNames["PVP70RepLeather"] = { BabbleInventory["Leather"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["PVP70RepMail"] = { BabbleInventory["Mail"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["PVP70RepPlate"] = { BabbleInventory["Plate"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareCloth_A"] = { BabbleInventory["Cloth"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareLeather_A"] = { BabbleInventory["Leather"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareMail_A"] = { BabbleInventory["Mail"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RarePlate_A"] = { BabbleInventory["Plate"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareCloth_H"] = { BabbleInventory["Cloth"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareLeather_H"] = { BabbleInventory["Leather"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RareMail_H"] = { BabbleInventory["Mail"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["PVP70RarePlate_H"] = { BabbleInventory["Plate"], "AtlasLootBurningCrusade" }; -- Level 80 PvP Sets AtlasLoot_TableNames["PvP80DeathKnight"] = { LOCALIZED_CLASS_NAMES_MALE["DEATHKNIGHT"], "AtlasLootWotLK" }; AtlasLoot_TableNames["PvP80DeathKnight2"] = { LOCALIZED_CLASS_NAMES_MALE["DEATHKNIGHT"], "AtlasLootWotLK" }; @@ -1238,6 +1246,7 @@ end AtlasLoot_TableNames["T1T2Shaman"] = { LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2Warlock"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2Warrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1T2DPSWarrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; -- T1/T2 Sets HEROIC AtlasLoot_TableNames["T1T2DruidHEROIC"] = { "Druid", "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2HunterHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "AtlasLootOriginalWoW" }; @@ -1248,6 +1257,7 @@ end AtlasLoot_TableNames["T1T2ShamanHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2WarlockHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T1T2WarriorHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T1T2DPSWarriorHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; -- T3 Sets AtlasLoot_TableNames["T3Druid"] = { "Druid", "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3Hunter"] = { LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "AtlasLootOriginalWoW" }; @@ -1258,6 +1268,7 @@ end AtlasLoot_TableNames["T3Shaman"] = { LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3Warlock"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3Warrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T3DPSWarrior"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; -- T3 Sets HEROIC AtlasLoot_TableNames["T3DruidHEROIC"] = { "Druid", "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3HunterHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["HUNTER"], "AtlasLootOriginalWoW" }; @@ -1268,6 +1279,7 @@ end AtlasLoot_TableNames["T3ShamanHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["SHAMAN"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3WarlockHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARLOCK"], "AtlasLootOriginalWoW" }; AtlasLoot_TableNames["T3WarriorHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; + AtlasLoot_TableNames["T3DPSWarriorHEROIC"] = { LOCALIZED_CLASS_NAMES_MALE["WARRIOR"], "AtlasLootOriginalWoW" }; -- T4 Sets AtlasLoot_TableNames["T4DruidBalance"] = { "Druid".." - T4 "..AL["Balance"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["T4DruidFeral"] = { "Druid".." - T4 "..AL["Feral"], "AtlasLootBurningCrusade" }; @@ -1993,6 +2005,8 @@ end AtlasLoot_TableNames["Arena3Weapons2"] = { AL["Arena Season 3 Weapons"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["Arena1Weapons1"] = { AL["Arena Season 1 Weapons"], "AtlasLootBurningCrusade" }; AtlasLoot_TableNames["Arena1Weapons2"] = { AL["Arena Season 1 Weapons"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["Arena0Weapons1_A"] = { AL["Arena Season 0 Weapons"], "AtlasLootBurningCrusade" }; + AtlasLoot_TableNames["Arena0Weapons1_H"] = { AL["Arena Season 0 Weapons"], "AtlasLootBurningCrusade" }; ------------- --- Other --- ------------- diff --git a/AtlasLoot/changelog.txt b/AtlasLoot/changelog.txt index 0a11144..6030b45 100644 --- a/AtlasLoot/changelog.txt +++ b/AtlasLoot/changelog.txt @@ -1,4 +1,16 @@ -------------------------------------------------------------------------------------------------------- +v1.5.2 03/05/2021 +- Sets/Collections Menu now lists T1-T10 sets instead of having submenus +- Removed Mount, Pet, and Tabard collections +- PVP link from Sets/Collections removed, but is still accessible through Loot Table dropdown +- New custom DPS warrior has it's own listing under T1/2/3 +- Added T2 DPS Warrior set +- Level 70 Blue PVP items added + - Weapons are listed under Arena Season 0 + - Armor is available under the PVP Reputation sets Sub-menu +- Wintergrasp and Grizzly Hills PVP menus moved to BG/Open PVP sub-menu +- Added Smoldering Emberwyrm and Magmatic Steed to Prince and Ragnaros respectively +-------------------------------------------------------------------------------------------------------- v1.5.1 02/08/2021 - Added new T1 Warrior DPS set - Added Heroic Thunderfury and Sulfuras diff --git a/AtlasLoot_BurningCrusade/burningcrusade.lua b/AtlasLoot_BurningCrusade/burningcrusade.lua index e5a64ec..1700c4a 100644 --- a/AtlasLoot_BurningCrusade/burningcrusade.lua +++ b/AtlasLoot_BurningCrusade/burningcrusade.lua @@ -2676,6 +2676,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 17, 229761, "", "=q4=Helm of the Fallen Defender", "=q1=#m1# =ds=#c1#, #c5#, #c9#", "", "26.73%"}; { 18, 229759, "", "=q4=Helm of the Fallen Hero", "=q1=#m1# =ds=#c2#, #c3#, #c8#", "", "20.48%"}; { 20, 29434, "", "=q4=Badge of Justice", "=ds=#e15#", "", "100%"}; + { 28, 499438, "", "=q4=Smoldering Emberwyrm", "=ds=#e12#", "" }; Prev = "KaraChessHEROIC"; }; @@ -5083,6 +5084,243 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Back = "PVP70RepSET"; }; + AtlasLoot_Data["PVP70RareCloth_H"] = { + { 1,0, "INV_BannerPVP_01", "=q6=#pvprep705_1#", "=ec1=#c5#"}; + { 2,28857, "", "=q3=High Warlord's Satin Hood"}; + { 3,28859, "", "=q3=High Warlord's Satin Mantle"}; + { 4,28860, "", "=q3=High Warlord's Satin Robe"}; + { 5,28856, "", "=q3=High Warlord's Satin Gloves"}; + { 6,28858, "", "=q3=High Warlord's Satin Leggings"}; + { 8,0, "INV_BannerPVP_01", "=q6=#pvprep705_2#", "=ec1=#c5#"}; + { 9,31626, "", "=q3=High Warlord's Mooncloth Cowl"}; + { 10,31628, "", "=q3=High Warlord's Mooncloth Shoulderpads"}; + { 11,31629, "", "=q3=High Warlord's Mooncloth Vestments"}; + { 12,31621, "", "=q3=High Warlord's Mooncloth Mitts"}; + { 13,31627, "", "=q3=High Warlord's Mooncloth Legguards"}; + { 16,0, "INV_BannerPVP_01", "=q6=#pvprep703#", "=ec1=#c3#"}; + { 17,28867, "", "=q3=High Warlord's Silk Cowl"}; + { 18,28866, "", "=q3=High Warlord's Silk Amice"}; + { 19,28869, "", "=q3=High Warlord's Silk Raiment"}; + { 20,28868, "", "=q3=High Warlord's Silk Handguards"}; + { 21,28870, "", "=q3=High Warlord's Silk Trousers"}; + { 23,0, "INV_BannerPVP_01", "=q6=#pvprep708#", "=ec1=#c8#"}; + { 24,28818, "", "=q3=High Warlord's Dreadweave Hood"}; + { 25,28820, "", "=q3=High Warlord's Dreadweave Mantle"}; + { 26,28821, "", "=q3=High Warlord's Dreadweave Robe"}; + { 27,28817, "", "=q3=High Warlord's Dreadweave Gloves"}; + { 28,28819, "", "=q3=High Warlord's Dreadweave Leggings"}; + Next = "PVP70RareLeather_H"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RareLeather_H"] = { + { 1,0, "INV_BannerPVP_01", "=q6=#pvprep701_1#", "=ec1=#c1#"}; + { 2,28812, "", "=q3=High Warlord's Dragonhide Helm"}; + { 3,28814, "", "=q3=High Warlord's Dragonhide Spaulders"}; + { 4,28815, "", "=q3=High Warlord's Dragonhide Robe"}; + { 5,28811, "", "=q3=High Warlord's Dragonhide Gloves"}; + { 6,28813, "", "=q3=High Warlord's Dragonhide Legguards"}; + { 8,0, "INV_BannerPVP_01", "=q6=#pvprep701_2#", "=ec1=#c1#"}; + { 9,28872, "", "=q3=High Warlord's Wyrmhide Helm"}; + { 10,28874, "", "=q3=High Warlord's Wyrmhide Spaulders"}; + { 11,28875, "", "=q3=High Warlord's Wyrmhide Robe"}; + { 12,28871, "", "=q3=High Warlord's Wyrmhide Gloves"}; + { 13,28873, "", "=q3=High Warlord's Wyrmhide Legguards"}; + { 16,0, "INV_BannerPVP_01", "=q6=#pvprep701_3#", "=ec1=#c1#"}; + { 17,31585, "", "=q3=High Warlord's Kodohide Helm"}; + { 18,31587, "", "=q3=High Warlord's Kodohide Spaulders"}; + { 19,31588, "", "=q3=High Warlord's Kodohide Robe"}; + { 20,31584, "", "=q3=High Warlord's Kodohide Gloves"}; + { 21,31586, "", "=q3=High Warlord's Kodohide Legguards"}; + { 23,0, "INV_BannerPVP_01", "=q6=#pvprep706#", "=ec1=#c6#"}; + { 24,28837, "", "=q3=High Warlord's Leather Helm"}; + { 25,28839, "", "=q3=High Warlord's Leather Spaulders"}; + { 26,28840, "", "=q3=High Warlord's Leather Tunic"}; + { 27,28836, "", "=q3=High Warlord's Leather Gloves"}; + { 28,28838, "", "=q3=High Warlord's Leather Legguards"}; + Prev = "PVP70RareCloth_H"; + Next = "PVP70RareMail_H"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RareMail_H"] = { + { 1,0, "INV_BannerPVP_01", "=q6=#pvprep707_1#", "=ec1=#c7#"}; + { 2,28843, "", "=q3=High Warlord's Linked Helm"}; + { 3,28845, "", "=q3=High Warlord's Linked Spaulders"}; + { 4,28841, "", "=q3=High Warlord's Linked Armor"}; + { 5,28842, "", "=q3=High Warlord's Linked Gauntlets"}; + { 6,28844, "", "=q3=High Warlord's Linked Leggings"}; + { 8,0, "INV_BannerPVP_01", "=q6=#pvprep707_2#", "=ec1=#c7#"}; + { 9,28848, "", "=q3=High Warlord's Mail Helm"}; + { 10,28850, "", "=q3=High Warlord's Mail Spaulders"}; + { 11,28846, "", "=q3=High Warlord's Mail Armor"}; + { 12,28847, "", "=q3=High Warlord's Mail Gauntlets"}; + { 13,28849, "", "=q3=High Warlord's Mail Leggings"}; + { 16,0, "INV_BannerPVP_01", "=q6=#pvprep707_3#", "=ec1=#c7#"}; + { 17,31648, "", "=q3=High Warlord's Ringmail Headpiece"}; + { 18,31650, "", "=q3=High Warlord's Ringmail Shoulderpads"}; + { 19,31646, "", "=q3=High Warlord's Ringmail Chestguard"}; + { 20,31647, "", "=q3=High Warlord's Ringmail Gloves"}; + { 21,31649, "", "=q3=High Warlord's Ringmail Legguards"}; + { 23,0, "INV_BannerPVP_01", "=q6=#pvprep702#", "=ec1=#c2#"}; + { 24,28807, "", "=q3=High Warlord's Chain Helm"}; + { 25,28809, "", "=q3=High Warlord's Chain Spaulders"}; + { 26,28805, "", "=q3=High Warlord's Chain Armor"}; + { 27,28806, "", "=q3=High Warlord's Chain Gauntlets"}; + { 28,28808, "", "=q3=High Warlord's Chain Leggings"}; + Prev = "PVP70RareLeather_H"; + Next = "PVP70RarePlate_H"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RarePlate_H"] = { + { 1,0, "INV_BannerPVP_01", "=q6=#pvprep704_1#", "=ec1=#c4#"}; + { 2,28863, "", "=q3=High Warlord's Scaled Helm"}; + { 3,28865, "", "=q3=High Warlord's Scaled Shoulders"}; + { 4,28861, "", "=q3=High Warlord's Scaled Chestpiece"}; + { 5,28862, "", "=q3=High Warlord's Scaled Gauntlets"}; + { 6,28864, "", "=q3=High Warlord's Scaled Legguards"}; + { 8,0, "INV_BannerPVP_01", "=q6=#pvprep704_2#", "=ec1=#c4#"}; + { 9,31637, "", "=q3=High Warlord's Ornamented Headguard"}; + { 10,31639, "", "=q3=High Warlord's Ornamented Spaulders"}; + { 11,31635, "", "=q3=High Warlord's Ornamented Chestplate"}; + { 12,31636, "", "=q3=High Warlord's Ornamented Gloves"}; + { 13,31638, "", "=q3=High Warlord's Ornamented Leggings"}; + { 16,0, "INV_BannerPVP_01", "=q6=#pvprep709#", "=ec1=#c9#"}; + { 17,28853, "", "=q3=High Warlord's Plate Helm"}; + { 18,28855, "", "=q3=High Warlord's Plate Shoulders"}; + { 19,28851, "", "=q3=High Warlord's Plate Chestpiece"}; + { 20,28852, "", "=q3=High Warlord's Plate Gauntlets"}; + { 21,28854, "", "=q3=High Warlord's Plate Legguards"}; + { 23,0, "INV_BannerPVP_01", "=q6=#arenas4_1#", "=ec1=#c4#"}; + { 24,28833, "", "=q3=High Warlord's Lamellar Helm"}; + { 25,28835, "", "=q3=High Warlord's Lamellar Shoulders"}; + { 26,28831, "", "=q3=High Warlord's Lamellar Chestpiece"}; + { 27,28832, "", "=q3=High Warlord's Lamellar Gauntlets"}; + { 28,28834, "", "=q3=High Warlord's Lamellar Legguards"}; + Prev = "PVP70RareMail_H"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RareCloth_A"] = { + { 1,0, "INV_BannerPVP_02", "=q6=#pvprep705_1#", "=ec1=#c5#"}; + { 2,28705, "", "=q3=Grand Marshal's Satin Hood"}; + { 3,28707, "", "=q3=Grand Marshal's Satin Mantle"}; + { 4,28708, "", "=q3=Grand Marshal's Satin Robe"}; + { 5,28704, "", "=q3=Grand Marshal's Satin Gloves"}; + { 6,28706, "", "=q3=Grand Marshal's Satin Leggings"}; + { 8,0, "INV_BannerPVP_02", "=q6=#pvprep705_2#", "=ec1=#c5#"}; + { 9,31622, "", "=q3=Grand Marshal's Mooncloth Cowl"}; + { 10,31624, "", "=q3=Grand Marshal's Mooncloth Shoulderpads"}; + { 11,31625, "", "=q3=Grand Marshal's Mooncloth Vestments"}; + { 12,31620, "", "=q3=Grand Marshal's Mooncloth Mitts"}; + { 13,31623, "", "=q3=Grand Marshal's Mooncloth Legguards"}; + { 16,0, "INV_BannerPVP_02", "=q6=#pvprep703#", "=ec1=#c3#"}; + { 17,28715, "", "=q3=Grand Marshal's Silk Cowl"}; + { 18,28714, "", "=q3=Grand Marshal's Silk Amice"}; + { 19,28717, "", "=q3=Grand Marshal's Silk Raiment"}; + { 20,28716, "", "=q3=Grand Marshal's Silk Handguards"}; + { 21,28718, "", "=q3=Grand Marshal's Silk Trousers"}; + { 23,0, "INV_BannerPVP_02", "=q6=#pvprep708#", "=ec1=#c8#"}; + { 24,28625, "", "=q3=Grand Marshal's Dreadweave Hood"}; + { 25,28627, "", "=q3=Grand Marshal's Dreadweave Mantle"}; + { 26,28628, "", "=q3=Grand Marshal's Dreadweave Robe"}; + { 27,28624, "", "=q3=Grand Marshal's Dreadweave Gloves"}; + { 28,28626, "", "=q3=Grand Marshal's Dreadweave Leggings"}; + Next = "PVP70RareLeather_A"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RareLeather_A"] = { + { 1,0, "INV_BannerPVP_02", "=q6=#pvprep701_1#", "=ec1=#c1#"}; + { 2,28619, "", "=q3=Grand Marshal's Dragonhide Helm"}; + { 3,28622, "", "=q3=Grand Marshal's Dragonhide Spaulders"}; + { 4,28623, "", "=q3=Grand Marshal's Dragonhide Robe"}; + { 5,28618, "", "=q3=Grand Marshal's Dragonhide Gloves"}; + { 6,28620, "", "=q3=Grand Marshal's Dragonhide Legguards"}; + { 8,0, "INV_BannerPVP_02", "=q6=#pvprep701_2#", "=ec1=#c1#"}; + { 9,31590, "", "=q3=Grand Marshal's Wyrmhide Helm"}; + { 10,31592, "", "=q3=Grand Marshal's Wyrmhide Spaulders"}; + { 11,31593, "", "=q3=Grand Marshal's Wyrmhide Robe"}; + { 12,31589, "", "=q3=Grand Marshal's Wyrmhide Gloves"}; + { 13,31591, "", "=q3=Grand Marshal's Wyrmhide Legguards"}; + { 16,0, "INV_BannerPVP_02", "=q6=#pvprep701_3#", "=ec1=#c1#"}; + { 17,28720, "", "=q3=Grand Marshal's Kodohide Helm"}; + { 18,28722, "", "=q3=Grand Marshal's Kodohide Spaulders"}; + { 19,28723, "", "=q3=Grand Marshal's Kodohide Robe"}; + { 20,28719, "", "=q3=Grand Marshal's Kodohide Gloves"}; + { 21,28721, "", "=q3=Grand Marshal's Kodohide Legguards"}; + { 23,0, "INV_BannerPVP_02", "=q6=#pvprep706#", "=ec1=#c6#"}; + { 24,28685, "", "=q3=Grand Marshal's Leather Helm"}; + { 25,28687, "", "=q3=Grand Marshal's Leather Spaulders"}; + { 26,28688, "", "=q3=Grand Marshal's Leather Tunic"}; + { 27,28684, "", "=q3=Grand Marshal's Leather Gloves"}; + { 28,28686, "", "=q3=Grand Marshal's Leather Legguards"}; + Prev = "PVP70RareCloth_A"; + Next = "PVP70RareMail_A"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RareMail_A"] = { + { 1,0, "INV_BannerPVP_02", "=q6=#pvprep707_1#", "=ec1=#c7#"}; + { 2,28691, "", "=q3=Grand Marshal's Linked Helm"}; + { 3,28693, "", "=q3=Grand Marshal's Linked Spaulders"}; + { 4,28689, "", "=q3=Grand Marshal's Linked Armor"}; + { 5,28690, "", "=q3=Grand Marshal's Linked Gauntlets"}; + { 6,28692, "", "=q3=Grand Marshal's Linked Leggings"}; + { 8,0, "INV_BannerPVP_02", "=q6=#pvprep707_2#", "=ec1=#c7#"}; + { 9,28696, "", "=q3=Grand Marshal's Mail Helm"}; + { 10,28698, "", "=q3=Grand Marshal's Mail Spaulders"}; + { 11,28694, "", "=q3=Grand Marshal's Mail Armor"}; + { 12,28695, "", "=q3=Grand Marshal's Mail Gauntlets"}; + { 13,28697, "", "=q3=Grand Marshal's Mail Leggings"}; + { 16,0, "INV_BannerPVP_02", "=q6=#pvprep707_3#", "=ec1=#c7#"}; + { 17,31642, "", "=q3=Grand Marshal's Ringmail Headpiece"}; + { 18,31644, "", "=q3=Grand Marshal's Ringmail Shoulderpads"}; + { 19,31640, "", "=q3=Grand Marshal's Ringmail Chestguard"}; + { 20,31641, "", "=q3=Grand Marshal's Ringmail Gloves"}; + { 21,31643, "", "=q3=Grand Marshal's Ringmail Legguards"}; + { 23,0, "INV_BannerPVP_02", "=q6=#pvprep702#", "=ec1=#c2#"}; + { 24,28615, "", "=q3=Grand Marshal's Chain Helm"}; + { 25,28617, "", "=q3=Grand Marshal's Chain Spaulders"}; + { 26,28613, "", "=q3=Grand Marshal's Chain Armor"}; + { 27,28614, "", "=q3=Grand Marshal's Chain Gauntlets"}; + { 28,28616, "", "=q3=Grand Marshal's Chain Leggings"}; + Prev = "PVP70RareLeather_A"; + Next = "PVP70RarePlate_A"; + Back = "PVP70RepSET"; + }; + + AtlasLoot_Data["PVP70RarePlate_A"] = { + { 1,0, "INV_BannerPVP_02", "=q6=#pvprep704_1#", "=ec1=#c4#"}; + { 2,28711, "", "=q3=Grand Marshal's Scaled Helm"}; + { 3,28713, "", "=q3=Grand Marshal's Scaled Shoulders"}; + { 4,28709, "", "=q3=Grand Marshal's Scaled Chestpiece"}; + { 5,28710, "", "=q3=Grand Marshal's Scaled Gauntlets"}; + { 6,28712, "", "=q3=Grand Marshal's Scaled Legguards"}; + { 8,0, "INV_BannerPVP_02", "=q6=#pvprep704_2#", "=ec1=#c4#"}; + { 9,31632, "", "=q3=Grand Marshal's Ornamented Headguard"}; + { 10,31634, "", "=q3=Grand Marshal's Ornamented Spaulders"}; + { 11,31630, "", "=q3=Grand Marshal's Ornamented Chestplate"}; + { 12,31631, "", "=q3=Grand Marshal's Ornamented Gloves"}; + { 13,31633, "", "=q3=Grand Marshal's Ornamented Leggings"}; + { 16,0, "INV_BannerPVP_02", "=q6=#pvprep709#", "=ec1=#c9#"}; + { 17,28701, "", "=q3=Grand Marshal's Plate Helm"}; + { 18,28703, "", "=q3=Grand Marshal's Plate Shoulders"}; + { 19,28699, "", "=q3=Grand Marshal's Plate Chestpiece"}; + { 20,28700, "", "=q3=Grand Marshal's Plate Gauntlets"}; + { 21,28702, "", "=q3=Grand Marshal's Plate Legguards"}; + { 23,0, "INV_BannerPVP_02", "=q6=#arenas4_1#", "=ec1=#c4#"}; + { 24,28681, "", "=q3=Grand Marshal's Lamellar Helm"}; + { 25,28683, "", "=q3=Grand Marshal's Lamellar Shoulders"}; + { 26,28679, "", "=q3=Grand Marshal's Lamellar Chestpiece"}; + { 27,28680, "", "=q3=Grand Marshal's Lamellar Gauntlets"}; + { 28,28724, "", "=q3=Grand Marshal's Lamellar Legguards"}; + Prev = "PVP70RareMail_A"; + Back = "PVP70RepSET"; + }; + + ---------------------------------- --- PvP Level 70 - Accessories --- ---------------------------------- @@ -5719,12 +5957,57 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Back = "ARENASET"; }; - - - -------------------------------- --- Arena Seasons - Weapons --- -------------------------------- + AtlasLoot_Data["Arena0Weapons1_H"] = { + {1, 28928, "", "=q3=High Warlord's Right Ripper"}; + {2, 28922, "", "=q3=High Warlord's Left Ripper"}; + {3, 28931, "", "=q3=High Warlord's Spellblade"}; + {4, 28929, "", "=q3=High Warlord's Shanker"}; + {5, 28930, "", "=q3=High Warlord's Shiv"}; + {6, 28937, "", "=q3=High Warlord's Slicer"}; + {7, 28926, "", "=q3=High Warlord's Quickblade"}; + {8, 28293, "", "=q3=High Warlord's Claymore"}; + {9, 28920, "", "=q3=High Warlord's Cleaver"}; + {10, 28921, "", "=q3=High Warlord's Hacker"}; + {11, 28918, "", "=q3=High Warlord's Decapitator"}; + {12, 28925, "", "=q3=High Warlord's Pummeler"}; + {13, 28924, "", "=q3=High Warlord's Bonecracker"}; + {14, 28917, "", "=q3=High Warlord's Bonegrinder"}; + {15, 28919, "", "=q3=High Warlord's Maul"}; + {16, 28923, "", "=q3=High Warlord's Painsaw"}; + {17, 28935, "", "=q3=High Warlord's War Staff"}; + {18, 28939, "", "=q3=High Warlord's Barricade"}; + {19, 28933, "", "=q3=High Warlord's Heavy Crossbow"}; + {20, 28938, "", "=q3=High Warlord's Battletome"}; + Back = "PVPMENU"; + }; + + AtlasLoot_Data["Arena0Weapons1_A"] = { + {1, 28953, "", "=q3=Grand Marshal's Right Ripper"}; + {2, 28947, "", "=q3=Grand Marshal's Left Ripper"}; + {3, 28957, "", "=q3=Grand Marshal's Spellblade"}; + {4, 28954, "", "=q3=Grand Marshal's Shanker"}; + {5, 28955, "", "=q3=Grand Marshal's Shiv"}; + {6, 28956, "", "=q3=Grand Marshal's Slicer"}; + {7, 28952, "", "=q3=Grand Marshal's Quickblade"}; + {8, 28943, "", "=q3=Grand Marshal's Warblade"}; + {9, 28944, "", "=q3=Grand Marshal's Cleaver"}; + {10, 28946, "", "=q3=Grand Marshal's Hacker"}; + {11, 28945, "", "=q3=Grand Marshal's Decapitator"}; + {12, 28951, "", "=q3=Grand Marshal's Pummeler"}; + {13, 28950, "", "=q3=Grand Marshal's Bonecracker"}; + {14, 28942, "", "=q3=Grand Marshal's Bonegrinder"}; + {15, 28948, "", "=q3=Grand Marshal's Maul"}; + {16, 28949, "", "=q3=Grand Marshal's Painsaw"}; + {17, 28959, "", "=q3=Grand Marshal's War Staff"}; + {18, 28940, "", "=q3=Grand Marshal's Barricade"}; + {19, 28960, "", "=q3=Grand Marshal's Heavy Crossbow"}; + {20, 28941, "", "=q3=Grand Marshal's Battletome"}; + Back = "PVPMENU"; + }; + AtlasLoot_Data["Arena1Weapons1"] = { {1, 28313, "", "=q4=Gladiator's Right Ripper", "=ds=", "2625 #arena#", ""}; {2, 28314, "", "=q4=Gladiator's Left Ripper", "=ds=", "1125 #arena#", ""}; @@ -5766,10 +6049,6 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Prev = "Arena1Weapons1"; Back = "PVPMENU"; }; - - - - AtlasLoot_Data["Arena3Weapons1"] = { {1, 33737, "", "=q4=Vengeful Gladiator's Right Ripper", "=ds=", "2100 #arena#", ""}; @@ -5829,8 +6108,6 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") Back = "PVPMENU"; }; - - AtlasLoot_Data["Arena2Weapons1"] = { {1, 32028, "", "=q4=Merciless Gladiator's Right Ripper", "=ds=", "18000 #arena#", ""}; {2, 32003, "", "=q4=Merciless Gladiator's Left Ripper", "=ds=", "9000 #arena#", ""}; @@ -7476,4 +7753,7 @@ AtlasLoot_Data["T6WarriorFury"] = { { 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%"}; - }; \ No newline at end of file + }; + + + \ No newline at end of file diff --git a/AtlasLoot_OriginalWoW/originalwow.lua b/AtlasLoot_OriginalWoW/originalwow.lua index 1d8273c..97325a3 100644 --- a/AtlasLoot_OriginalWoW/originalwow.lua +++ b/AtlasLoot_OriginalWoW/originalwow.lua @@ -2903,6 +2903,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 9, 216954, "", "=q4=Judgement Legplates", "=q1=#m1# =ds=#c4# (T2)", "", "10.81%"}; { 11, 217204, "", "=q5=Eye of Sulfuras", "=ds=#m3#", "", "3.42%"}; { 12, 217182, "", "=q5=Sulfuras, Hand of Ragnaros", "=q1=#m4#: =ds=#h2#, #w6#"}; + { 13, 102107, "", "=q4=Reins of the Magmatic Steed", "=ds=#e12#", "" }; { 14, 219017, "", "=q1=Essence of the Firelord", "=ds=#m3#", "", "0.46%"}; { 15, 219019, "", "=q5=Thunderfury, Blessed Blade of the Windseeker", "=q1=#m4#: =ds=#h1#, #w10#"}; { 16, 217102, "", "=q4=Cloak of the Shrouded Mists", "=ds=#s4#", "", "14.31%"}; @@ -6963,11 +6964,6 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 7, 16864, "", "=q4=Belt of Might", "=ds="..AL["Trash Mobs"], "", "0.16%"}; { 8, 16867, "", "=q4=Legplates of Might", "=ds="..BabbleBoss["Magmadar"], "", "13.97%"}; { 9, 16862, "", "=q4=Sabatons of Might", "=ds="..BabbleBoss["Gehennas"], "", "14.48%"}; - { 11, 0, "Ability_Warrior_BattleShout", "=q6=#t1s9#", "=ec1=#m30#"}; - { 12, 10480, "", "=q4=Faceguard of Might", "=ds="..BabbleBoss["Garr"], ""}; - { 13, 10481, "", "=q4=Shoulderpads of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], ""}; - { 14, 10482, "", "=q4=Chesttplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], ""}; - { 15, 10483, "", "=q4=Wristguards of Might", "=ds="..AL["Trash Mobs"], ""}; { 16, 0, "INV_Shield_05", "=q6=#t2s9#", "=ec1=#m31#"}; { 17, 16963, "", "=q4=Helm of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "13.65%"}; { 18, 16961, "", "=q4=Pauldrons of Wrath", "=ds="..BabbleBoss["Chromaggus"], "", "16.83%"}; @@ -6977,14 +6973,33 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 22, 16960, "", "=q4=Waistband of Wrath", "=ds="..BabbleBoss["Vaelastrasz the Corrupt"], "", "20.03%"}; { 23, 16962, "", "=q4=Legplates of Wrath", "=ds="..BabbleBoss["Ragnaros"], "", "17.23%"}; { 24, 16965, "", "=q4=Sabatons of Wrath", "=ds="..BabbleBoss["Broodlord Lashlayer"], "", "16.84%"}; - { 27, 10484, "", "=q4=Handguards of Might", "=ds="..BabbleBoss["Lucifron"], ""}; - { 28, 10485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; - { 29, 10486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; - { 30, 10487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; Prev = "T0Warrior"; Next = "T3Warrior"; Back = "T1T2T3SET"; }; + + AtlasLoot_Data["T1T2DPSWarrior"] = { + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t1s9#", "=ec1=#m30#"}; + { 2, 10480, "", "=q4=Faceguard of Might", "=ds="..BabbleBoss["Garr"], ""}; + { 3, 10481, "", "=q4=Shoulderpads of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], ""}; + { 4, 10482, "", "=q4=Chesttplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], ""}; + { 5, 10483, "", "=q4=Wristguards of Might", "=ds="..AL["Trash Mobs"], ""}; + { 6, 10484, "", "=q4=Handguards of Might", "=ds="..BabbleBoss["Lucifron"], ""}; + { 7, 10485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; + { 8, 10486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; + { 9, 10487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; + { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s9#", "=ec1=#m31#"}; + { 17, 10904, "", "=q4=Faceguard of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "13.65%"}; + { 18, 10902, "", "=q4=Shoulderpads of Wrath", "=ds="..BabbleBoss["Chromaggus"], "", "16.83%"}; + { 19, 10907, "", "=q4=Chestplate of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "15.06%"}; + { 20, 10900, "", "=q4=Wristguards of Wrath", "=ds="..BabbleBoss["Razorgore the Untamed"], "", "20.29%"}; + { 21, 10905, "", "=q4=Grippers of Wrath", "=ds="..BabbleBoss["Firemaw"]..", "..BabbleBoss["Ebonroc"]..", "..BabbleBoss["Flamegor"], "", "5.93%"}; + { 22, 10901, "", "=q4=Belt of Wrath", "=ds="..BabbleBoss["Vaelastrasz the Corrupt"], "", "20.03%"}; + { 23, 10903, "", "=q4=Legguards of Wrath", "=ds="..BabbleBoss["Ragnaros"], "", "17.23%"}; + { 24, 10906, "", "=q4=Stompers of Wrath", "=ds="..BabbleBoss["Broodlord Lashlayer"], "", "16.84%"}; + Next = "T3DPSWarrior"; + Back = "T1T2T3SET"; + }; ------------------------------------ @@ -7216,6 +7231,28 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { Back = "T1T2T3SET"; }; + AtlasLoot_Data["T1T2DPSWarriorHEROIC"] = { + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t1s9#", "=ec1=#m30#"}; + { 2, 210480, "", "=q4=Faceguard of Might", "=ds="..BabbleBoss["Garr"], ""}; + { 3, 210481, "", "=q4=Shoulderpads of Might", "=ds="..BabbleBoss["Sulfuron Harbinger"], ""}; + { 4, 210482, "", "=q4=Chestplate of Might", "=ds="..BabbleBoss["Golemagg the Incinerator"], ""}; + { 5, 210483, "", "=q4=Wristguards of Might", "=ds="..AL["Trash Mobs"], ""}; + { 6, 210484, "", "=q4=Handguards of Might", "=ds="..BabbleBoss["Lucifron"], ""}; + { 7, 210485, "", "=q4=Girdle of Might", "=ds="..AL["Trash Mobs"], ""}; + { 8, 210486, "", "=q4=Legguards of Might", "=ds="..BabbleBoss["Magmadar"], ""}; + { 9, 210487, "", "=q4=Stompers of Might", "=ds="..BabbleBoss["Gehennas"], ""}; + { 16, 0, "Ability_Warrior_BattleShout", "=q6=#t2s9#", "=ec1=#m31#"}; + { 17, 210904, "", "=q4=Faceguard of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "13.65%"}; + { 18, 210902, "", "=q4=Shoulderpads of Wrath", "=ds="..BabbleBoss["Chromaggus"], "", "16.83%"}; + { 19, 210907, "", "=q4=Chestplate of Wrath", "=ds="..BabbleBoss["Nefarian"], "", "15.06%"}; + { 20, 210900, "", "=q4=Wristguards of Wrath", "=ds="..BabbleBoss["Razorgore the Untamed"], "", "20.29%"}; + { 21, 210905, "", "=q4=Grippers of Wrath", "=ds="..BabbleBoss["Firemaw"]..", "..BabbleBoss["Ebonroc"]..", "..BabbleBoss["Flamegor"], "", "5.93%"}; + { 22, 210901, "", "=q4=Belt of Wrath", "=ds="..BabbleBoss["Vaelastrasz the Corrupt"], "", "20.03%"}; + { 23, 210903, "", "=q4=Legguards of Wrath", "=ds="..BabbleBoss["Ragnaros"], "", "17.23%"}; + { 24, 210906, "", "=q4=Stompers of Wrath", "=ds="..BabbleBoss["Broodlord Lashlayer"], "", "16.84%"}; + Next = "T3DPSWarriorHEROIC"; + Back = "T1T2T3SET"; + }; ------------------------ --- Tier 3 Sets (T3) --- @@ -7355,6 +7392,21 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { Prev = "T1T2Warrior"; Back = "T1T2T3SET"; }; + + AtlasLoot_Data["T3DPSWarrior"] = { + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; +-- { 2, 22418, "", "=q4=Dreadnaught Helmet", "=ds="}; +-- { 3, 22419, "", "=q4=Dreadnaught Pauldrons", "=ds="}; +-- { 4, 22416, "", "=q4=Dreadnaught Breastplate", "=ds="}; +-- { 5, 22423, "", "=q4=Dreadnaught Bracers", "=ds="}; +-- { 6, 22421, "", "=q4=Dreadnaught Gauntlets", "=ds="}; +-- { 7, 22422, "", "=q4=Dreadnaught Waistguard", "=ds="}; +-- { 8, 22417, "", "=q4=Dreadnaught Legplates", "=ds="}; +-- { 9, 22420, "", "=q4=Dreadnaught Sabatons", "=ds="}; +-- { 10, 23059, "", "=q4=Ring of the Dreadnaught", "=ds="}; + Prev = "T1T2DPSWarrior"; + Back = "T1T2T3SET"; + }; ------------------------------- --- Tier 3 Sets (T3) HEROIC --- @@ -7494,6 +7546,21 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { Prev = "T1T2WarriorHEROIC"; Back = "T1T2T3SET"; }; + + AtlasLoot_Data["T3DPSWarriorHEROIC"] = { + { 1, 0, "Ability_Warrior_BattleShout", "=q6=#t3s9#", "=ec1=#m35#"}; +-- { 2, 22418, "", "=q4=Dreadnaught Helmet", "=ds="}; +-- { 3, 22419, "", "=q4=Dreadnaught Pauldrons", "=ds="}; +-- { 4, 22416, "", "=q4=Dreadnaught Breastplate", "=ds="}; +-- { 5, 22423, "", "=q4=Dreadnaught Bracers", "=ds="}; +-- { 6, 22421, "", "=q4=Dreadnaught Gauntlets", "=ds="}; +-- { 7, 22422, "", "=q4=Dreadnaught Waistguard", "=ds="}; +-- { 8, 22417, "", "=q4=Dreadnaught Legplates", "=ds="}; +-- { 9, 22420, "", "=q4=Dreadnaught Sabatons", "=ds="}; +-- { 10, 23059, "", "=q4=Ring of the Dreadnaught", "=ds="}; + Prev = "T1T2DPSWarriorHEROIC"; + Back = "T1T2T3SET"; + }; ------------------------ --- Vanilla WoW Sets --- ------------------------ @@ -7642,7 +7709,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 27, 19826, "", "=q4=Zandalar Freethinker's Belt", "=q4=#zgt2#, =ds=#r3#"}; { 28, 19827, "", "=q4=Zandalar Freethinker's Armguards", "=q4=#zgt3#, =ds=#r2#"}; Next = "ZGSets2"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["ZGSets2"] = { @@ -7672,7 +7739,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 19848, "", "=q4=Zandalar Demoniac's Wraps", "=q4=#zgt5#, =ds=#r2#"}; Next = "ZGSets3"; Prev = "ZGSets1"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["ZGSets3"] = { @@ -7683,7 +7750,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 5, 19823, "", "=q4=Zandalar Vindicator's Belt", "=q4=#zgt7#, =ds=#r3#"}; { 6, 19824, "", "=q4=Zandalar Vindicator's Armguards", "=q4=#zgt8#, =ds=#r2#"}; Prev = "ZGSets2"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; @@ -7717,7 +7784,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 27, 219826, "", "=q4=Zandalar Freethinker's Belt", "=q4=#zgt2#, =ds=#r3#"}; { 28, 219827, "", "=q4=Zandalar Freethinker's Armguards", "=q4=#zgt3#, =ds=#r2#"}; Next = "ZGSets2HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["ZGSets2HEROIC"] = { @@ -7747,7 +7814,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 219848, "", "=q4=Zandalar Demoniac's Wraps", "=q4=#zgt5#, =ds=#r2#"}; Next = "ZGSets3HEROIC"; Prev = "ZGSets1HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["ZGSets3HEROIC"] = { @@ -7758,7 +7825,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 5, 219823, "", "=q4=Zandalar Vindicator's Belt", "=q4=#zgt7#, =ds=#r3#"}; { 6, 219824, "", "=q4=Zandalar Vindicator's Armguards", "=q4=#zgt8#, =ds=#r2#"}; Prev = "ZGSets2HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; @@ -7792,7 +7859,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 21406, "", "=q4=Cloak of Veiled Shadows", "=q3=#aq20t2#, =ds=#r4#"}; { 29, 21405, "", "=q4=Band of Veiled Shadows", "=q3=#aq20t4#, =ds=#r3#"}; Next = "AQ20Sets2"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ20Sets2"] = { @@ -7809,7 +7876,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 13, 21394, "", "=q4=Drape of Unyielding Strength", "=q3=#aq20t2#, =ds=#r4#"}; { 14, 21393, "", "=q4=Signet of Unyielding Strength", "=q3=#aq20t3#=ds=, #r3#"}; Prev = "AQ20Sets1"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; ------------------------ @@ -7842,7 +7909,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 221406, "", "=q4=Cloak of Veiled Shadows", "=q3=#aq20t2#, =ds=#r4#"}; { 29, 221405, "", "=q4=Band of Veiled Shadows", "=q3=#aq20t4#, =ds=#r3#"}; Next = "AQ20Sets2HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ20Sets2HEROIC"] = { @@ -7859,7 +7926,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 13, 221394, "", "=q4=Drape of Unyielding Strength", "=q3=#aq20t2#, =ds=#r4#"}; { 14, 221393, "", "=q4=Signet of Unyielding Strength", "=q3=#aq20t3#=ds=, #r3#"}; Prev = "AQ20Sets1HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; ----------------- --- AQ40 Sets --- @@ -7891,7 +7958,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 27, 21391, "", "=q4=Avenger's Pauldrons", "=q4=#aq40t1#, =ds=#r1#"}; { 28, 21388, "", "=q4=Avenger's Greaves", "=q4=#aq40t1#, =ds=#r1#"}; Next = "AQ40Sets2"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ40Sets2"] = { @@ -7921,7 +7988,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 21338, "", "=q4=Doomcaller's Footwraps", "=q4=#aq40t1#, =ds=#r1#"}; Next = "AQ40Sets3"; Prev = "AQ40Sets1"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ40Sets3"] = { @@ -7932,7 +7999,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 5, 21330, "", "=q4=Conqueror's Spaulders", "=q4=#aq40t5#, =ds=#r1#"}; { 6, 21333, "", "=q4=Conqueror's Greaves", "=q4=#aq40t5#, =ds=#r1#"}; Prev = "AQ40Sets2"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; ----------------------- @@ -7965,7 +8032,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 27, 221391, "", "=q4=Avenger's Pauldrons", "=q4=#aq40t1#, =ds=#r1#"}; { 28, 221388, "", "=q4=Avenger's Greaves", "=q4=#aq40t1#, =ds=#r1#"}; Next = "AQ40Sets2HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ40Sets2HEROIC"] = { @@ -7995,7 +8062,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 28, 221338, "", "=q4=Doomcaller's Footwraps", "=q4=#aq40t1#, =ds=#r1#"}; Next = "AQ40Sets3HEROIC"; Prev = "AQ40Sets1HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; AtlasLoot_Data["AQ40Sets3HEROIC"] = { @@ -8006,7 +8073,7 @@ AtlasLoot_Data["AQ20ClassBooksHEROIC"] = { { 5, 221330, "", "=q4=Conqueror's Spaulders", "=q4=#aq40t5#, =ds=#r1#"}; { 6, 221333, "", "=q4=Conqueror's Greaves", "=q4=#aq40t5#, =ds=#r1#"}; Prev = "AQ40Sets2HEROIC"; - Back = "SETSCLASSIC"; + Back = "SETMENU"; }; ----------------------- --- BoE World Epics --- diff --git a/AtlasLoot_WorldEvents/worldevents.lua b/AtlasLoot_WorldEvents/worldevents.lua index 78c8df8..ad16fee 100644 --- a/AtlasLoot_WorldEvents/worldevents.lua +++ b/AtlasLoot_WorldEvents/worldevents.lua @@ -821,7 +821,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, 44788, "", "=q1=Pilgrim's Boots", "=q1=#m4#: =ds=#s12#"}; { 22, 44844, "", "=q1=Turkey Caller", "=q1=#m4#: =ds="}; { 23, 44812, "", "=q1=Turkey Shooter", "=q1=#m4#: =ds="}; - Back = "PILGRIMSBOUNTYMENU"; + Back = "WORLDEVENTMENU"; }; AtlasLoot_Data["PilgrimsBounty_H"] = { @@ -845,7 +845,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 21, 44788, "", "=q1=Pilgrim's Boots", "=q1=#m4#: =ds=#s12#"}; { 22, 44844, "", "=q1=Turkey Caller", "=q1=#m4#: =ds="}; { 23, 44812, "", "=q1=Turkey Shooter", "=q1=#m4#: =ds="}; - Back = "PILGRIMSBOUNTYMENU"; + Back = "WORLDEVENTMENU"; }; -------------------------- diff --git a/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua b/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua index ba44086..cac2cb0 100644 --- a/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua +++ b/AtlasLoot_WrathoftheLichKing/wrathofthelichking.lua @@ -8675,7 +8675,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 20, 40822, "", "=q3=Sigil of the Frozen Conscience", "=ds=#w21#", "30 #venturecoin#"}; { 21, 40867, "", "=q3=Sigil of the Wild Buck", "=ds=#w21#", "30 #venturecoin#"}; { 23, 37836, "", "=q1=Venture Coin", "=ds=#m17#"}; - Back = "PVPMENU"; + Back = "PVPMENU2"; }; --------------------------