diff --git a/AtlasLoot/AtlasLoot.toc b/AtlasLoot/AtlasLoot.toc index 6a8eb1e..6d49f15 100644 --- a/AtlasLoot/AtlasLoot.toc +++ b/AtlasLoot/AtlasLoot.toc @@ -39,8 +39,8 @@ Locales\Locales.xml TableRegister\TableRegister.xml AtlasLayout\AtlasLayout.xml Add_Ons\Addons.xml -Menus\Menus.xml Core\AtlasLoot.xml DefaultFrame\AtlaslootDefaultFrame.xml +Menus\Menus.xml modules.xml diff --git a/AtlasLoot/Core/AtlasLoot.lua b/AtlasLoot/Core/AtlasLoot.lua index 2cf5768..ef24baf 100644 --- a/AtlasLoot/Core/AtlasLoot.lua +++ b/AtlasLoot/Core/AtlasLoot.lua @@ -196,7 +196,7 @@ Invoked by the VARIABLES_LOADED event. Now that we are sure all the assets the addon needs are in place, we can properly set up the mod ]] function AtlasLoot_OnVariablesLoaded() - local AtlasCheck = false; + local AtlasCheck = false; AtlasLoot.db = LibStub("AceDB-3.0"):New("AtlasLootDB"); AtlasLoot.db:RegisterDefaults(AtlasLootDBDefaults); if not AtlasLootCharDB then AtlasLootCharDB = {} end @@ -489,6 +489,17 @@ function AtlasLoot_OnLoad() SlashCmdList["ATLASLOOT"] = function(msg) AtlasLoot_SlashCommand(msg); end + AtlasLoot_SetExpac(); +end + +function AtlasLoot_SetExpac() + if GetAccountExpansionLevel() == 0 then + AtlasLoot_Expac = "CLASSIC" + elseif GetAccountExpansionLevel() == 1 then + AtlasLoot_Expac = "TBC" + elseif GetAccountExpansionLevel() == 2 then + AtlasLoot_Expac = "WRATH" + end end --[[ diff --git a/AtlasLoot/DefaultFrame/DewDropDown.lua b/AtlasLoot/DefaultFrame/DewDropDown.lua index d4eeb89..884b387 100644 --- a/AtlasLoot/DefaultFrame/DewDropDown.lua +++ b/AtlasLoot/DefaultFrame/DewDropDown.lua @@ -298,7 +298,7 @@ AtlasLoot_DewDropDown = { { AL["World Bosses"], "WorldBosses", "Submenu" }, }, [8] = { - { AL["Reputation Factions"], "REPMENU", "Table" }, + { AL["Reputation Factions"], "REPMENU"..AtlasLoot_Expac, "Table" }, }, [9] = { { AL["World Events"], "WORLDEVENTMENU", "Table" }, diff --git a/AtlasLoot/Menus/RepMenus.lua b/AtlasLoot/Menus/RepMenus.lua index ad246c7..0188d22 100644 --- a/AtlasLoot/Menus/RepMenus.lua +++ b/AtlasLoot/Menus/RepMenus.lua @@ -4,7 +4,7 @@ local BabbleFaction = AtlasLoot_GetLocaleLibBabble("LibBabble-Faction-3.0") local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") - AtlasLoot_Data["REPMENU"] = { + AtlasLoot_Data["REPMENUTBC"] = { { 2, "REPMENU_ORIGINALWOW", "INV_Helmet_66", "=ds="..AL["Factions - Original WoW"], ""}; { 17, "REPMENU_WOTLK", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Wrath of the Lich King"], ""}; { 4, "Aldor1", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["The Aldor"], ""}; @@ -29,6 +29,43 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 28, "VioletEye1", "spell_holy_mindsooth", "=ds="..BabbleFaction["The Violet Eye"], "=q5="..BabbleZone["Karazhan"]}; }; + AtlasLoot_Data["REPMENUCLASSIC"] = { + { 2, "REPMENU_BURNINGCRUSADE", "INV_Helmet_66", "=ds="..AL["Factions - Burning Crusade"], ""}; + { 17, "REPMENU_WOTLK", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Wrath of the Lich King"], ""}; + { 4, "Argent1", "inv_jewelry_talisman_07", "=ds="..BabbleFaction["Argent Dawn"], "=q5="..BabbleZone["Eastern Plaguelands"]}; + { 5, "AQBroodRings", "inv_misc_head_dragon_bronze", "=ds="..BabbleFaction["Brood of Nozdormu"], "=q5="..BabbleZone["Temple of Ahn'Qiraj"].." / "..BabbleZone["Caverns of Time"]}; + { 6, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The Defilers"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Arathi Basin"]}; + { 7, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Gelkis Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; + { 8, "MiscFactions", "INV_Jewelry_Amulet_07", "=ds="..BabbleFaction["The League of Arathor"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Arathi Basin"]}; + { 9, "AlteracFactions", "INV_Jewelry_StormPikeTrinket_01", "=ds="..BabbleFaction["Stormpike Guard"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Alterac Valley"]}; + { 10, "Timbermaw", "achievement_reputation_timbermaw", "=ds="..BabbleFaction["Timbermaw Hold"], ""}; + { 11, "Zandalar1", "inv_bijou_green", "=ds="..BabbleFaction["Zandalar Tribe"], "=q5="..BabbleZone["Zul'Gurub"]}; + { 19, "BloodsailHydraxian", "INV_Helmet_66", "=ds="..BabbleFaction["Bloodsail Buccaneers"], "=q5="..BabbleZone["Stranglethorn Vale"]}; + { 20, "Cenarion1", "ability_racial_ultravision", "=ds="..BabbleFaction["Cenarion Circle"], ""}; + { 21, "AlteracFactions", "INV_Jewelry_FrostwolfTrinket_01", "=ds="..BabbleFaction["Frostwolf Clan"], "=q5="..BabbleFaction["Horde"].." - "..BabbleZone["Alterac Valley"]}; + { 22, "BloodsailHydraxian", "Spell_Frost_SummonWaterElemental_2", "=ds="..BabbleFaction["Hydraxian Waterlords"], "=q5="..BabbleZone["Molten Core"]}; + { 23, "MiscFactions", "INV_Misc_Head_Centaur_01", "=ds="..BabbleFaction["Magram Clan Centaur"], "=q5="..BabbleZone["Desolace"]}; + { 24, "Thorium1", "INV_Ingot_Mithril", "=ds="..BabbleFaction["Thorium Brotherhood"], "=q5="..BabbleZone["Searing Gorge"]}; + { 25, "MiscFactions", "Ability_Mount_PinkTiger", "=ds="..BabbleFaction["Wintersaber Trainers"], "=q5="..BabbleFaction["Alliance"].." - "..BabbleZone["Winterspring"]}; + }; + + AtlasLoot_Data["REPMENUWRATH"] = { + { 2, "REPMENU_ORIGINALWOW", "INV_Helmet_66", "=ds="..AL["Factions - Original WoW"], ""}; + { 17, "REPMENU_BURNINGCRUSADE", "INV_Misc_Ribbon_01", "=ds="..AL["Factions - Burning Crusade"], ""}; + { 4, "AllianceVanguard1", "spell_misc_hellifrepvphonorholdfavor", "=ds="..BabbleFaction["Alliance Vanguard"], "=q5="..BabbleFaction["Alliance"]}; + { 5, "WinterfinRetreat", "INV_Misc_Shell_04", "=ds="..BabbleFaction["Winterfin Retreat"], "=q5="..BabbleZone["Borean Tundra"]}; + { 6, "TheWyrmrestAccord", "achievement_reputation_wyrmresttemple", "=ds="..BabbleFaction["The Wyrmrest Accord"], "=q5="..BabbleZone["Dragonblight"]}; + { 7, "KnightsoftheEbonBlade", "achievement_reputation_knightsoftheebonblade", "=ds="..BabbleFaction["Knights of the Ebon Blade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 8, "TheOracles", "inv_misc_head_murloc_01", "=ds="..BabbleFaction["The Oracles"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 9, "TheSonsofHodir1", "Spell_Holy_DivinePurpose", "=ds="..BabbleFaction["The Sons of Hodir"], "=q5="..BabbleZone["The Storm Peaks"]}; + { 10, "HordeExpedition1", "spell_misc_hellifrepvpthrallmarfavor", "=ds="..BabbleFaction["Horde Expedition"], "=q5="..BabbleFaction["Horde"]}; + { 19, "TheKaluak", "INV_Fishingpole_03", "=ds="..BabbleFaction["The Kalu'ak"], "" }; + { 20, "KirinTor", "achievement_reputation_kirintor", "=ds="..BabbleFaction["Kirin Tor"], "=q5="..BabbleZone["Borean Tundra"].." / "..BabbleZone["Dalaran"]}; + { 21, "ArgentCrusade", "INV_Jewelry_Talisman_08", "=ds="..BabbleFaction["Argent Crusade"], "=q5="..BabbleZone["Zul'Drak"].." / "..BabbleZone["Icecrown"]}; + { 22, "FrenzyheartTribe", "ability_mount_whitedirewolf", "=ds="..BabbleFaction["Frenzyheart Tribe"], "=q5="..BabbleZone["Sholazar Basin"]}; + { 23, "AshenVerdict", "INV_Jewelry_Ring_85", "=ds="..BabbleFaction["The Ashen Verdict"], "=q5="..BabbleZone["Icecrown"]}; + }; + 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"]}; @@ -45,7 +82,7 @@ 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"]}; - Back = "REPMENU"; + Back = "REPMENU"..AtlasLoot_Expac; }; AtlasLoot_Data["REPMENU_BURNINGCRUSADE"] = { @@ -69,7 +106,7 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 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"]}; - Back = "REPMENU"; + Back = "REPMENU"..AtlasLoot_Expac; }; AtlasLoot_Data["REPMENU_WOTLK"] = { @@ -85,5 +122,5 @@ local BabbleZone = AtlasLoot_GetLocaleLibBabble("LibBabble-Zone-3.0") { 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"]}; - Back = "REPMENU"; + Back = "REPMENU"..AtlasLoot_Expac; }; diff --git a/AtlasLoot/TableRegister/loottables.en.lua b/AtlasLoot/TableRegister/loottables.en.lua index a0069ea..ff52997 100644 --- a/AtlasLoot/TableRegister/loottables.en.lua +++ b/AtlasLoot/TableRegister/loottables.en.lua @@ -1957,7 +1957,9 @@ end AtlasLoot_TableNames["REPMENU_ORIGINALWOW"] = { AL["Factions - Original WoW"], "Menu" }; AtlasLoot_TableNames["REPMENU_BURNINGCRUSADE"] = { AL["Factions - Burning Crusade"], "Menu" }; AtlasLoot_TableNames["REPMENU_WOTLK"] = { AL["Factions - Wrath of the Lich King"], "Menu" }; - AtlasLoot_TableNames["REPMENU"] = { AL["Factions"], "Menu" }; + AtlasLoot_TableNames["REPMENUCLASSIC"] = { AL["Factions"], "Menu" }; + AtlasLoot_TableNames["REPMENUTBC"] = { AL["Factions"], "Menu" }; + AtlasLoot_TableNames["REPMENUWRATH"] = { AL["Factions"], "Menu" }; AtlasLoot_TableNames["SETMENU"] = { AL["Collections"], "Menu" }; AtlasLoot_TableNames["MOUNTMENU"] = { AL["Mounts"], "Menu" }; AtlasLoot_TableNames["PETMENU"] = { AL["Vanity Pets"], "Menu" };