From dbf0b9703337d8ae90d56559afe737de1ddc59cf Mon Sep 17 00:00:00 2001 From: Anch Date: Sat, 12 Mar 2022 17:28:15 +1300 Subject: [PATCH] added submenus --- AtlasLoot/Core/AtlasLoot.lua | 14 +---- AtlasLoot/Menus/PvPMenus.lua | 13 ----- AtlasLoot/Menus/RepMenus.lua | 65 ----------------------- AtlasLoot/Menus/SetMenus.lua | 17 ------ AtlasLoot/TableRegister/loottables.en.lua | 12 ----- 5 files changed, 2 insertions(+), 119 deletions(-) diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index d5cca48..e64b61d 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -492,18 +492,9 @@ function AtlasLoot_OnLoad() SlashCmdList["ATLASLOOT"] = function(msg) AtlasLoot_SlashCommand(msg); end + AtlasLoot_SetExpac(); +end -<<<<<<< Updated upstream - --Set defualt to classic as that seems to be where most players are. - local function getExpacByLevel() - if UnitLevel("player") > 60 then - return "TBC" - else - return "CLASSIC" - end - end - AtlasLoot_Expac = ATLAS_EXPANSION[GetAccountExpansionLevel()] or getExpacByLevel(); -======= function AtlasLoot_SetExpac() if GetAccountExpansionLevel() == 0 then AtlasLoot_Expac = "CLASSIC"; @@ -518,7 +509,6 @@ function AtlasLoot_SetExpac() AtlasLoot_Expac2 = "CLASSIC"; AtlasLoot_Expac3 = "TBC"; end ->>>>>>> Stashed changes end --[[ diff --git a/AtlasLoot/Menus/PvPMenus.lua b/AtlasLoot/Menus/PvPMenus.lua index 6c1e9e6..1136df8 100644 --- a/AtlasLoot/Menus/PvPMenus.lua +++ b/AtlasLoot/Menus/PvPMenus.lua @@ -9,12 +9,6 @@ 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"]}; -<<<<<<< Updated upstream -======= - Prev = "PVPMENUWRATH"; - Next = "PVPMENUTBC"; - Back = "PVPMENU"..AtlasLoot_Expac; ->>>>>>> Stashed changes }; AtlasLoot_Data["PVPMENUTBC"] = { @@ -31,13 +25,9 @@ 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"] = { @@ -48,12 +38,9 @@ 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"] }; -<<<<<<< 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 26b01e2..a6eb6aa 100644 --- a/AtlasLoot/Menus/RepMenus.lua +++ b/AtlasLoot/Menus/RepMenus.lua @@ -3,33 +3,6 @@ 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"], ""}; - { 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"]}; - }; - -======= ->>>>>>> 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"]}; @@ -46,46 +19,8 @@ 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" - }; - - 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"]}; - Type = "Expansion" - }; - - AtlasLoot_Data["REPMENU_ORIGINALWOW"] = { - { 2, "Argent1", "inv_jewelry_talisman_07", "=ds="..BabbleFaction["Argent Dawn"], "=q5="..BabbleZone["Eastern Plaguelands"]}; - { 3, "AQBroodRings", "inv_misc_head_dragon_bronze", "=ds="..BabbleFaction["Brood of Nozdormu"], "=q5="..BabbleZone["Temple of Ahn'Qiraj"].." / "..BabbleZone["Caverns of Time"]}; - { 4, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The Defilers"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Arathi Basin"]}; - { 5, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Gelkis Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; - { 6, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The League of Arathor"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Arathi Basin"]}; - { 7, "AlteracFactions", "INV_Jewelry_StormPikeTrinket_01", "=ds="..BabbleFaction["Stormpike Guard"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Alterac Valley"]}; - { 8, "Timbermaw", "achievement_reputation_timbermaw", "=ds="..BabbleFaction["Timbermaw Hold"], ""}; - { 9, "Zandalar1", "inv_bijou_green", "=ds="..BabbleFaction["Zandalar Tribe"], "=q5="..BabbleZone["Zul'Gurub"]}; - { 17, "BloodsailHydraxian", "INV_Helmet_66", "=ds="..BabbleFaction["Bloodsail Buccaneers"], "=q5="..BabbleZone["Stranglethorn Vale"]}; - { 18, "Cenarion1", "ability_racial_ultravision", "=ds="..BabbleFaction["Cenarion Circle"], ""}; - { 19, "AlteracFactions", "INV_Jewelry_FrostwolfTrinket_01", "=ds="..BabbleFaction["Frostwolf Clan"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Alterac Valley"]}; - { 20, "BloodsailHydraxian", "Spell_Frost_SummonWaterElemental_2", "=ds="..BabbleFaction["Hydraxian Waterlords"], "=q5="..BabbleZone["Molten Core"]}; - { 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; }; diff --git a/AtlasLoot/Menus/SetMenus.lua b/AtlasLoot/Menus/SetMenus.lua index 516a85f..5742dec 100644 --- a/AtlasLoot/Menus/SetMenus.lua +++ b/AtlasLoot/Menus/SetMenus.lua @@ -10,10 +10,6 @@ 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"], ""}; @@ -28,11 +24,8 @@ 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" }; @@ -42,20 +35,13 @@ 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" }; @@ -73,11 +59,8 @@ 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 be45fe0..1dd3654 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1970,28 +1970,16 @@ 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" };