diff --git a/AtlasLoot.toc b/AtlasLoot.toc index ee76268..c8f756c 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -3,7 +3,7 @@ ## Notes: Shows possible loot from dungeon bosses and other sources. ## Author: Otari (overhaul/revamp, menu changes, bugfixes/updates), Lexie (Turtle WoW fixes/updates), Pepopo, MarcelineVQ (Kara40 loot), Shagu ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons) -## Version: 3.3.5 +## Version: 3.3.6 ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 4f3c9f7..3796b58 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -110,6 +110,7 @@ AtlasLoot_MenuList = { ["JEWELCRAFTMENU"] = "AtlasLoot_JewelcraftingMenu", ["CRAFTSET"] = "AtlasLootCraftedSetMenu", ["WORLDBOSSMENU"] = "AtlasLoot_WorldBossMenu", + ["TMHSET"] = "AtlasLootTMHSetMenu", }; -- This is a multi-layer table defining the main loot listing. diff --git a/Core/Sets.lua b/Core/Sets.lua index db7ba19..abfef48 100644 --- a/Core/Sets.lua +++ b/Core/Sets.lua @@ -52,30 +52,43 @@ function AtlasLootSetMenu() AtlasLoot_PrepMenu(nil, AL["Collections"]) AtlasLootCharDB.LastBoss = "SETMENU" AtlasLootCharDB.LastBossText = AL["Collections"] + --Sets + AtlasLootMenuItem_1_Name:SetText(AL["Sets"]); + AtlasLootMenuItem_1_Extra:SetText(""); + AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\INV_Sword_43"); + AtlasLootMenuItem_1.lootpage = "PRE60SET"; + AtlasLootMenuItem_1:Show(); --ZG - AtlasLootMenuItem_3_Name:SetText(AL["Zul'Gurub Sets"]); - AtlasLootMenuItem_3_Extra:SetText(""); - AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Sword_55"); - AtlasLootMenuItem_3.lootpage = "ZGSET"; - AtlasLootMenuItem_3:Show(); + AtlasLootMenuItem_2_Name:SetText(AL["Zul'Gurub Sets"]); + AtlasLootMenuItem_2_Extra:SetText(""); + AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Sword_55"); + AtlasLootMenuItem_2.lootpage = "ZGSET"; + AtlasLootMenuItem_2:Show(); --AQ20 - AtlasLootMenuItem_4_Name:SetText(AL["Ruins of Ahn'Qiraj Sets"]); - AtlasLootMenuItem_4_Extra:SetText(""); - AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Axe_15"); - AtlasLootMenuItem_4.lootpage = "AQ20SET"; - AtlasLootMenuItem_4:Show(); + AtlasLootMenuItem_3_Name:SetText(AL["Ruins of Ahn'Qiraj Sets"]); + AtlasLootMenuItem_3_Extra:SetText(""); + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Axe_15"); + AtlasLootMenuItem_3.lootpage = "AQ20SET"; + AtlasLootMenuItem_3:Show(); --AQ40 - AtlasLootMenuItem_5_Name:SetText(AL["Temple of Ahn'Qiraj Sets"]); - AtlasLootMenuItem_5_Extra:SetText(""); - AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_35"); - AtlasLootMenuItem_5.lootpage = "AQ40SET"; - AtlasLootMenuItem_5:Show(); + AtlasLootMenuItem_4_Name:SetText(AL["Temple of Ahn'Qiraj Sets"]); + AtlasLootMenuItem_4_Extra:SetText(""); + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Shoulder_35"); + AtlasLootMenuItem_4.lootpage = "AQ40SET"; + AtlasLootMenuItem_4:Show(); --Karazhan - AtlasLootMenuItem_6_Name:SetText(AL["Karazhan"] .. " " .. AL["Sets"]); + AtlasLootMenuItem_5_Name:SetText(AL["Karazhan"] .. " " .. AL["Sets"]); + AtlasLootMenuItem_5_Extra:SetText(""); + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Staff_Medivh"); + AtlasLootMenuItem_5.lootpage = "KARASET"; + AtlasLootMenuItem_5:Show(); + -- Timbermaw + AtlasLootMenuItem_6_Name:SetText(AL["Timbermaw Hold"] .. " " .. AL["Sets"]); AtlasLootMenuItem_6_Extra:SetText(""); - AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\INV_Staff_Medivh"); - AtlasLootMenuItem_6.lootpage = "KARASET"; + AtlasLootMenuItem_6_Icon:SetTexture("Interface\\Icons\\INV_Misc_Horn_01"); + AtlasLootMenuItem_6.lootpage = "TMHSET"; AtlasLootMenuItem_6:Show(); + --Legendaries AtlasLootMenuItem_8_Name:SetText(AL["Legendary Items"]); AtlasLootMenuItem_8_Extra:SetText(""); @@ -94,48 +107,44 @@ function AtlasLootSetMenu() AtlasLootMenuItem_10_Icon:SetTexture("Interface\\Icons\\INV_Misc_QirajiCrystal_05"); AtlasLootMenuItem_10.lootpage = "RareMounts"; AtlasLootMenuItem_10:Show(); - --Sets - AtlasLootMenuItem_2_Name:SetText(AL["Sets"]); - AtlasLootMenuItem_2_Extra:SetText(""); - AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Sword_43"); - AtlasLootMenuItem_2.lootpage = "PRE60SET"; - AtlasLootMenuItem_2:Show(); --World Epics - AtlasLootMenuItem_23_Name:SetText(AL["World Epics"]); - AtlasLootMenuItem_23_Extra:SetText(""); - AtlasLootMenuItem_23_Icon:SetTexture("Interface\\Icons\\INV_Gauntlets_30"); - AtlasLootMenuItem_23.lootpage = "WorldEpics1"; - AtlasLootMenuItem_23:Show(); + AtlasLootMenuItem_11_Name:SetText(AL["World Epics"]); + AtlasLootMenuItem_11_Extra:SetText(""); + AtlasLootMenuItem_11_Icon:SetTexture("Interface\\Icons\\INV_Gauntlets_30"); + AtlasLootMenuItem_11.lootpage = "WorldEpics1"; + AtlasLootMenuItem_11:Show(); --Tabards - AtlasLootMenuItem_24_Name:SetText(AL["Tabards"]); - AtlasLootMenuItem_24_Extra:SetText(""); - AtlasLootMenuItem_24_Icon:SetTexture("Interface\\Icons\\INV_Shirt_GuildTabard_01"); - AtlasLootMenuItem_24.lootpage = "Tabards"; - AtlasLootMenuItem_24:Show(); + AtlasLootMenuItem_12_Name:SetText(AL["Tabards"]); + AtlasLootMenuItem_12_Extra:SetText(""); + AtlasLootMenuItem_12_Icon:SetTexture("Interface\\Icons\\INV_Shirt_GuildTabard_01"); + AtlasLootMenuItem_12.lootpage = "Tabards"; + AtlasLootMenuItem_12:Show(); + --Dungeon Set 1/2 - AtlasLootMenuItem_17_Name:SetText(AL["Dungeon 1/2 Sets"]); - AtlasLootMenuItem_17_Extra:SetText(""); - AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Helmet_24"); - AtlasLootMenuItem_17.lootpage = "T0SET"; - AtlasLootMenuItem_17:Show(); + AtlasLootMenuItem_16_Name:SetText(AL["Dungeon 1/2 Sets"]); + AtlasLootMenuItem_16_Extra:SetText(""); + AtlasLootMenuItem_16_Icon:SetTexture("Interface\\Icons\\INV_Helmet_24"); + AtlasLootMenuItem_16.lootpage = "T0SET"; + AtlasLootMenuItem_16:Show(); --Tier 1 - AtlasLootMenuItem_18_Name:SetText(AL["Tier 1 Sets"]); - AtlasLootMenuItem_18_Extra:SetText(""); - AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Helmet_09"); - AtlasLootMenuItem_18.lootpage = "T1SET"; - AtlasLootMenuItem_18:Show(); + AtlasLootMenuItem_17_Name:SetText(AL["Tier 1 Sets"]); + AtlasLootMenuItem_17_Extra:SetText(""); + AtlasLootMenuItem_17_Icon:SetTexture("Interface\\Icons\\INV_Helmet_09"); + AtlasLootMenuItem_17.lootpage = "T1SET"; + AtlasLootMenuItem_17:Show(); --Tier 2 - AtlasLootMenuItem_19_Name:SetText(AL["Tier 2 Sets"]); - AtlasLootMenuItem_19_Extra:SetText(""); - AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Helmet_74"); - AtlasLootMenuItem_19.lootpage = "T2SET"; - AtlasLootMenuItem_19:Show(); + AtlasLootMenuItem_18_Name:SetText(AL["Tier 2 Sets"]); + AtlasLootMenuItem_18_Extra:SetText(""); + AtlasLootMenuItem_18_Icon:SetTexture("Interface\\Icons\\INV_Helmet_74"); + AtlasLootMenuItem_18.lootpage = "T2SET"; + AtlasLootMenuItem_18:Show(); --Tier 3 - AtlasLootMenuItem_20_Name:SetText(AL["Tier 3 Sets"]); - AtlasLootMenuItem_20_Extra:SetText(""); - AtlasLootMenuItem_20_Icon:SetTexture("Interface\\Icons\\INV_Helmet_58"); - AtlasLootMenuItem_20.lootpage = "T3SET"; - AtlasLootMenuItem_20:Show(); + AtlasLootMenuItem_19_Name:SetText(AL["Tier 3 Sets"]); + AtlasLootMenuItem_19_Extra:SetText(""); + AtlasLootMenuItem_19_Icon:SetTexture("Interface\\Icons\\INV_Helmet_58"); + AtlasLootMenuItem_19.lootpage = "T3SET"; + AtlasLootMenuItem_19:Show(); + for i = 1, 30 do if _G["AtlasLootMenuItem_"..i].container then _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0) @@ -940,3 +949,50 @@ function AtlasLoot_Kara40SetMenu() end end end + +function AtlasLootTMHSetMenu() + AtlasLoot_PrepMenu("SETMENU", AL["Timbermaw Hold"] .. " " .. AL["Sets"]) + + AtlasLootMenuItem_1_Name:SetText(AL["Majesty of the Stag"]) + AtlasLootMenuItem_1_Extra:SetText(AL["Cloth"]) + AtlasLootMenuItem_1_Icon:SetTexture("Interface\\Icons\\INV_Chest_Cloth_43") + AtlasLootMenuItem_1.container = data.TMHClothHealer + AtlasLootMenuItem_1:Show() + + AtlasLootMenuItem_2_Name:SetText(AL["Wisdom of the Deer"]) + AtlasLootMenuItem_2_Extra:SetText(AL["Cloth"]) + AtlasLootMenuItem_2_Icon:SetTexture("Interface\\Icons\\INV_Chest_Cloth_43") + AtlasLootMenuItem_2.container = data.TMHClothDps + AtlasLootMenuItem_2:Show() + + AtlasLootMenuItem_3_Name:SetText(AL["Rage of the Ursa"]) + AtlasLootMenuItem_3_Extra:SetText(AL["Leather"]) + AtlasLootMenuItem_3_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_15") + AtlasLootMenuItem_3.container = data.TMHLeather + AtlasLootMenuItem_3:Show() + + AtlasLootMenuItem_4_Name:SetText(AL["Might of the Hyppogryph"]) + AtlasLootMenuItem_4_Extra:SetText(AL["Mail"]) + AtlasLootMenuItem_4_Icon:SetTexture("Interface\\Icons\\INV_Chest_Chain_15") + AtlasLootMenuItem_4.container = data.TMHMail + AtlasLootMenuItem_4:Show() + + AtlasLootMenuItem_5_Name:SetText(AL["Pride of the Moose"]) + AtlasLootMenuItem_5_Extra:SetText(AL["Plate"]) + AtlasLootMenuItem_5_Icon:SetTexture("Interface\\Icons\\INV_Chest_Plate02") + AtlasLootMenuItem_5.container = data.TMHPlate + AtlasLootMenuItem_5:Show() + + for i = 1, 30 do + local button = _G["AtlasLootMenuItem_" .. i] + button.dataSource = AtlasLoot_GetDataSource(button.lootpage) + if ( type(button.container) == "table" ) then + _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0) + for row = 1, getn(button.container) do + for item = 1, getn(button.container[row]) do + AtlasLoot_CacheItem(button.container[row][item][1]) + end + end + end + end +end diff --git a/Database/Sets.lua b/Database/Sets.lua index e8b5e8d..9830c85 100644 --- a/Database/Sets.lua +++ b/Database/Sets.lua @@ -1,5 +1,50 @@ AtlasLoot_Data["AtlasLootSetItems"] = { EmptyInstance = {}; + TMHClothHealer = {{ + { 33380, "=ds=#s1#" }, + { 33381, "=ds=#s3#" }, + { 33382, "=ds=#s5#" }, + { 33383, "=ds=#s9#" }, + { 33384, "=ds=#s11#" }, + { 33385, "=ds=#s12#" }, + } + }, + TMHClothDps = {{ + { 33674, "=ds=#s1#" }, + { 33675, "=ds=#s3#" }, + { 33676, "=ds=#s5#" }, + { 33677, "=ds=#s9#" }, + { 33678, "=ds=#s11#" }, + { 33679, "=ds=#s12#" }, + } + }, + TMHLeather = {{ + { 33386, "=ds=#s1#" }, + { 33387, "=ds=#s3#" }, + { 33388, "=ds=#s5#" }, + { 33389, "=ds=#s9#" }, + { 33390, "=ds=#s11#" }, + { 33391, "=ds=#s12#" }, + } + }, + TMHMail = {{ + { 33392, "=ds=#s1#" }, + { 33393, "=ds=#s3#" }, + { 33394, "=ds=#s5#" }, + { 33395, "=ds=#s9#" }, + { 33396, "=ds=#s11#" }, + { 33397, "=ds=#s12#" }, + } + }, + TMHPlate = {{ + { 33398, "=ds=#s1#" }, + { 33399, "=ds=#s3#" }, + { 33400, "=ds=#s5#" }, + { 33401, "=ds=#s9#" }, + { 33402, "=ds=#s11#" }, + { 33403, "=ds=#s12#" }, + } + }, DEADMINES = { { 0, "", "", "" }, { 0,"INV_Box_01","=q6=#pre60s1#","" }, diff --git a/Database/TableRegister.lua b/Database/TableRegister.lua index a6982c2..c7ef59f 100644 --- a/Database/TableRegister.lua +++ b/Database/TableRegister.lua @@ -1128,6 +1128,7 @@ AtlasLoot_TableNames = { ["FIRSTAIDMENU"] = { "dummy", "dummy" }, ["WORLDBOSSMENU"] = { "dummy", "dummy" }, ["JEWELCRAFTMENU"] = { "dummy", "dummy" }, + ["TMHSET"] = { "dummy", "dummy" }, ["WishList"] = { AL["WishList"], "AtlasLootCharDB" }, ["SearchResult"] = { AL["Search"], "AtlasLootCharDB" }, --If all else fails! diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index bb2ead0..2805c52 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -47,6 +47,12 @@ AL:RegisterTranslations("enUS", function() return { ["Ursol"] = true, ["Peroth'arn"] = true, + ["Majesty of the Stag"] = true, + ["Wisdom of the Deer"] = true, + ["Rage of the Ursa"] = true, + ["Might of the Hyppogryph"] = true, + ["Pride of the Moose"] = true, + DAYS_COOLDOWN = "%d days cooldown", DAYS_COOLDOWN_1 = "%d day cooldown", [" added to the WishList."] = true,