diff --git a/AtlasLoot.toc b/AtlasLoot.toc index 2f70ba0..e987e04 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -2,7 +2,7 @@ ## Title: AtlasLoot TW Edition ## Notes: Shows the possible loot from the bosses ## Author: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons), |cff5BCEFAL|cffF5A9B8e|cffFFFFFFx|cffF5A9B8i|cff5BCEFAe|r -## Version: 1.1.0 +## Version: 1.1.2 ## SavedVariables: AtlasLoot_updateavailable ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 7a8fbd2..027eb3b 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -69,7 +69,7 @@ local AL = AceLibrary("AceLocale-2.2"):new("AtlasLoot"); --Establish version number and compatible version of Atlas local VERSION_MAJOR = "1"; local VERSION_MINOR = "1"; -local VERSION_BOSSES = "0"; +local VERSION_BOSSES = "2"; ATLASLOOT_VERSION = "|cffFF8400AtlasLoot TW Edition v"..VERSION_MAJOR.."."..VERSION_MINOR.."."..VERSION_BOSSES.."|r"; ATLASLOOT_CURRENT_ATLAS = "1.12.0"; ATLASLOOT_PREVIEW_ATLAS = "1.12.1"; @@ -2398,7 +2398,7 @@ AtlasLoot_HewdropDown = { { AL["Elemental Invasion"], "ElementalInvasion", "Table" }, }, [4] = { - { AL["Feast of Winter Veil"], "Winterviel1", "Table" }, + { AL["Feast of Winter Veil"], "Winterviel", "Submenu" }, }, [5] = { { AL["Gurubashi Arena Booty Run"], "GurubashiArena", "Table" }, @@ -2961,6 +2961,7 @@ AtlasLoot_HewdropDown_SubTables = { { "|cffffffff[44]|cffffd200 Bonecruncher |cffffffff(Gilneas)", "Bonecruncher" }, { "|cffffffff[44]|cffffd200 Duskskitter |cffffffff(Gilneas)", "Duskskitter" }, { "|cffffffff[45]|cffffd200 Baron Perenolde |cffffffff(Gilneas)", "BaronPerenolde" }, + { "|cffffffff[45]|cffffd200 Kin'Tozo |cffffffff(Stranglethorn Vale)", "KinTozo" }, { "|cffffffff[47]|cffffd200 Grug'thok the Seer |cffffffff(Feralas)", "Grugthok" }, { "|cffffffff[49]|cffffd200 Explorer Ashbeard |cffffffff(Searing Gorge)", "Ashbeard" }, { "|cffffffff[50]|cffffd200 Jal'akar |cffffffff(Hinterlands)", "Jalakar" }, @@ -2974,12 +2975,12 @@ AtlasLoot_HewdropDown_SubTables = { { "|cffffffff[55]|cffffd200 Letashaz |cffffffff(Gilijim Isle)", "Letashaz" }, { "|cffffffff[55]|cffffd200 Margon the Mighty |cffffffff(Lapidis Isle)", "MargontheMighty" }, { "|cffffffff[55]|cffffd200 The Wandering Knight |cffffffff(WPL)", "WanderingKnight" }, - { "|cffffffff[56]|cffffd200 Stoneshell |cffffffff(Tel'abim)", "Stoneshell" }, + { "|cffffffff[56]|cffffd200 Stoneshell |cffffffff(Tel'abim)", "Stoneshell" }, { "|cffffffff[57]|cffffd200 Zareth Terrorblade |cffffffff(Blasted Lands)", "Zareth" }, - { "|cffffffff[58]|cffffd200 Highvale Silverback |cffffffff(Tel'abim)", "HighvaleSilverback" }, + { "|cffffffff[58]|cffffd200 Highvale Silverback |cffffffff(Tel'abim)", "HighvaleSilverback" }, { "|cffffffff[58]|cffffd200 Mallon The Moontouched |cffffffff(Winterspring)", "Mallon" }, { "|cffffffff[59]|cffffd200 Blademaster Kargron |cffffffff(Burning Steppes)", "Kargron" }, - { "|cffffffff[60]|cffffd200 Admiral Barean Westwind |cffffffff(Sarlet Enclave)", "AdmiralBareanWestwind" }, + { "|cffffffff[60]|cffffd200 Admiral Barean Westwind |cffffffff(Scarlet Enclave)", "AdmiralBareanWestwind" }, { "|cffffffff[60]|cffffd200 Azurebeak |cffffffff(Hyjal)", "Azurebeak" }, { "|cffffffff[60]|cffffd200 Barkskin Fisher |cffffffff(Hyjal)", "BarkskinFisher" }, { "|cffffffff[61]|cffffd200 Crusader Larsarius |cffffffff(EPL)", "CrusaderLarsarius" }, @@ -2992,6 +2993,10 @@ AtlasLoot_HewdropDown_SubTables = { { AL["Abyssal Council"].." - "..AL["Dukes"], "AbyssalDukes" }, { AL["Abyssal Council"].." - "..AL["High Council"], "AbyssalLords" }, }, + ["Winterviel"] = { + { AL["Feast of Winter Veil"], "Winterviel1", "Table" }, + { "Snowball", "WintervielSnowball", "Table" }, + }, ["Factions"] = { { AL["Argent Dawn"], "Argent1" }, { AL["Bloodsail Buccaneers"], "Bloodsail1" }, @@ -3838,10 +3843,11 @@ AtlasLoot_updater:RegisterEvent("PARTY_MEMBERS_CHANGED") AtlasLoot_updater:SetScript("OnEvent", function() if event == "CHAT_MSG_ADDON" and arg1 == "AtlasLoot" then - local v, remoteversion = AtlasLoot_strsplit(":", arg2) + local v, remoteversion, remotetitle = AtlasLoot_strsplit(":", arg2) + local _,title = GetAddOnInfo("AtlasLoot") local remoteversion = tonumber(remoteversion) if remoteversion >= 40000 then remoteversion = 0 end --Block for people using some version from another version of WoW. - if v == "VERSION" and remoteversion then + if v == "VERSION" and remoteversion and title == remotetitle then if remoteversion > localversion then AtlasLoot_updateavailable = remoteversion if not alreadyshown then @@ -3858,11 +3864,12 @@ AtlasLoot_updater:SetScript("OnEvent", function() _,name = GetChannelName(source) end if name == "LFT" then - local msg, v, remoteversion = AtlasLoot_strsplit(":", arg1) + local msg, v, remoteversion, remotetitle = AtlasLoot_strsplit(":", arg1) if msg == "Atlasloot" then local remoteversion = tonumber(remoteversion) or 0 + local _,title = GetAddOnInfo("AtlasLoot") if remoteversion >= 40000 then remoteversion = 0 end --Block for people using some version from another version of WoW. - if v == "VERSION" and remoteversion then + if v == "VERSION" and remoteversion and title == remotetitle then if remoteversion > localversion then AtlasLoot_updateavailable = remoteversion if not alreadyshown then @@ -3874,12 +3881,13 @@ AtlasLoot_updater:SetScript("OnEvent", function() end end end - + + local _,title = GetAddOnInfo("AtlasLoot") if event == "PARTY_MEMBERS_CHANGED" then local groupsize = GetNumRaidMembers() > 0 and GetNumRaidMembers() or GetNumPartyMembers() > 0 and GetNumPartyMembers() or 0 if ( this.group or 0 ) < groupsize then for _, chan in pairs(groupchannels) do - SendAddonMessage("AtlasLoot", "VERSION:" .. localversion, chan) + SendAddonMessage("AtlasLoot", "VERSION:" .. localversion..":"..title, chan) end end this.group = groupsize @@ -3893,10 +3901,10 @@ AtlasLoot_updater:SetScript("OnEvent", function() end for _, chan in pairs(loginchannels) do - SendAddonMessage("AtlasLoot", "VERSION:" .. localversion, chan) + SendAddonMessage("AtlasLoot", "VERSION:" .. localversion..":"..title, chan) end if GetChannelName("LFT") ~= 0 then - SendChatMessage("Atlasloot:VERSION:" .. localversion, "CHANNEL", nil, GetChannelName("LFT")) + SendChatMessage("Atlasloot:VERSION:" .. localversion..":"..title, "CHANNEL", nil, GetChannelName("LFT")) end end end) diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index a05ede2..bf67dba 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -4185,11 +4185,22 @@ AtlasLoot_ButtonRegistry = { }; ["Winterviel2"] = { Title = AtlasLoot_TableNames["Winterviel2"][1]; + Next_Page = "WintervielSnowball"; + Next_Title = "Snowball"; Prev_Page = "Winterviel1"; Prev_Title = AL["Feast of Winter Veil"]; Back_Page = "WORLDEVENTMENU"; Back_Title = AL["World Events"]; }; + ["WintervielSnowball"] = { + Title = "Snowball"; + Next_Page = "Winterviel1"; + Next_Title = AL["Feast of Winter Veil"]; + Prev_Page = "Winterviel2"; + Prev_Title = AtlasLoot_TableNames["Winterviel2"][1]; + Back_Page = "WORLDEVENTMENU"; + Back_Title = AL["World Events"]; + }; ["Halloween1"] = { Title = AL["Hallow's End"]; Next_Page = "Halloween2"; diff --git a/Core/Spells.lua b/Core/Spells.lua index 9a79822..ced71ec 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -8712,7 +8712,7 @@ GetSpellInfoVanillaDB = { [1] = {10620}, }, }, - [57121] = { + [45451] = { ["name"] = "Smelting: Smelt Dreamsteel", ["requires"] = AL["Forge"], ["tools"] = "", @@ -8722,7 +8722,7 @@ GetSpellInfoVanillaDB = { ["craftQuantityMin"] = "", ["craftQuantityMax"] = "", ["reagents"] = { - [1] = {61199}, + [1] = {61198}, [2] = {3859}, [3] = {20381}, }, @@ -13038,6 +13038,125 @@ GetSpellInfoVanillaDB = { [4] = {7910, 4}, }, }, + [46652] = { + ["name"] = "Blacksmithing: Untempered Runeblade", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60293, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12655, 25}, + [2] = {12808, 10}, + [3] = {20520, 8}, + [4] = {12810, 2}, + [5] = {12644, 6}, + [6] = {12364}, + }, + }, + [47021] = { + ["name"] = "Blacksmithing: Rune-Etched Greaves", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60288, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 20}, + [2] = {12655, 2}, + [3] = {20520, 2}, + [4] = {12810}, + [5] = {12361}, + }, + }, + [47022] = { + ["name"] = "Blacksmithing: Rune-Etched Legplates", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60289, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 24}, + [2] = {12655, 6}, + [3] = {20520, 4}, + [4] = {12810, 2}, + [5] = {12800}, + }, + }, + [47023] = { + ["name"] = "Blacksmithing: Rune-Etched Breastplate", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60290, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 24}, + [2] = {12655, 4}, + [3] = {20520, 4}, + [4] = {12810, 2}, + [5] = {12644}, + [6] = {7910}, + }, + }, + [47024] = { + ["name"] = "Blacksmithing: Rune-Etched Crown", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60291, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 16}, + [2] = {12655, 2}, + [3] = {20520, 2}, + [4] = {7080}, + }, + }, + [47025] = { + ["name"] = "Blacksmithing: Rune-Etched Mantle", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60292, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 14}, + [2] = {12655, 2}, + [3] = {20520, 3}, + [4] = {12810}, + [5] = {7076}, + }, + }, + [47026] = { + ["name"] = "Blacksmithing: Rune-Etched Grips", + ["requires"] = AL["Anvil"], + ["tools"] = {5956}, + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 60287, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {12359, 12}, + [2] = {12655, 2}, + [3] = {20520, 2}, + [4] = {12810, 2}, + }, + }, [15296] = { ["name"] = "Blacksmithing: Dark Iron Plate", ["requires"] = AL["Black Anvil"], @@ -17515,6 +17634,20 @@ GetSpellInfoVanillaDB = { [2] = {4291, 4}, }, }, + [10550] = { + ["name"] = "Leatherworking: Nightscape Cloak", + ["requires"] = "", + ["tools"] = "", + ["castTime"] = 60, + ["text"] = "", + ["craftItem"] = 8195, + ["craftQuantityMin"] = "", + ["craftQuantityMax"] = "", + ["reagents"] = { + [1] = {4304, 12}, + [2] = {4291, 4}, + }, + }, [10552] = { ["name"] = "Leatherworking: Turtle Scale Helm", ["requires"] = "", diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index 6e8fd3d..708a2b1 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -762,7 +762,6 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s15293", "inv_chest_chain_16", "=q2=Dark Iron Mail", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, { "s16649", "inv_bracer_19", "=q2=Imperial Plate Bracers", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, { "s16648", "inv_chest_plate16", "=q2=Radiant Breastplate", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, - { "s16965", "inv_axe_24", "=q2=Bleakwood Hew", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, { "s20201", "inv_staff_19", "=q1=Arcanite Rod", "=ds=#sr# =so1=275 =so2=275 =so3=280 =so4=285" }, { "s19669", "inv_misc_key_08", "=q2=Arcanite Skeleton Key", "=ds=#sr# =so1=275 =so2=275 =so3=280 =so4=285" }, { "s16651", "inv_misc_armorkit_20", "=q2=Thorium Shield Spike", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, @@ -770,18 +769,18 @@ AtlasLoot_Data["AtlasLootCrafting"] = { }; SmithingArtisan2 = { - { "s47032", "inv_belt_04", "=q2=Hateforge Belt", "=ds=#sr# =so1=275 =so2=300 =so3=312 =so4=325" }, - { "s47034", "inv_boots_01", "=q2=Hateforge Boots", "=ds=#sr# =so1=275 =so2=300 =so3=310 =so4=320" }, + { "s47032", "inv_belt_04", "=q3=Hateforge Belt", "=ds=#sr# =so1=275 =so2=300 =so3=312 =so4=325" }, + { "s47034", "inv_boots_01", "=q3=Hateforge Boots", "=ds=#sr# =so1=275 =so2=300 =so3=310 =so4=320" }, { "s57113", "inv_boots_plate_05", "=q2=Thorium Spurs", "=ds=#sr# =so1=275 =so2=300 =so3=310 =so4=320" }, { "s15295", "inv_shoulder_09", "=q2=Dark Iron Shoulders", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, { "s16652", "inv_boots_plate_08", "=q2=Thorium Boots", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, { "s16653", "inv_helmet_23", "=q2=Thorium Helm", "=ds=#sr# =so1=280 =so2=300 =so3=310 =so4=320" }, { "s16971", "inv_weapon_halberd_11", "=q2=Huge Thorium Battleaxe", "=ds=#sr# =so1=280 =so2=305 =so3=317 =so4=330" }, - { "s47033", "inv_gauntlets_04", "=q2=Hateforge Grips", "=ds=#sr# =so1=285 =so2=300 =so3=310 =so4=320" }, + { "s47033", "inv_gauntlets_04", "=q4=Hateforge Grips", "=ds=#sr# =so1=285 =so2=300 =so3=310 =so4=320" }, { "s16654", "inv_gauntlets_26", "=q2=Radiant Gloves", "=ds=#sr# =so1=285 =so2=305 =so3=315 =so4=325" }, - { "s47029", "inv_helmet_10", "=q2=Hateforge Helmet", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, - { "s47030", "inv_chest_chain_09", "=q2=Hateforge Cuirass", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, - { "s47031", "inv_pants_03", "=q2=Hateforge Leggings", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, + { "s47029", "inv_helmet_10", "=q3=Hateforge Helmet", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, + { "s47030", "inv_chest_chain_09", "=q3=Hateforge Cuirass", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, + { "s47031", "inv_pants_03", "=q3=Hateforge Leggings", "=ds=#sr# =so1=290 =so2=300 =so3=310 =so4=320" }, { "s16656", "inv_boots_plate_03", "=q2=Radiant Boots", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s16660", "inv_shoulder_20", "=q3=Dawnbringer Shoulders", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, { "s23632", "inv_belt_11", "=q3=Girdle of the Dawn", "=ds=#sr# =so1=290 =so2=310 =so3=320 =so4=330" }, @@ -812,9 +811,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s24913", "inv_helmet_10", "=q3=Darkrune Helm", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24139", "inv_chest_plate08", "=q3=Darksoul Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24140", "inv_pants_plate_21", "=q3=Darksoul Leggings", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, - { "s16986", "inv_weapon_shortblade_27", "=q3=Blood Talon", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s24141", "inv_shoulder_01", "=q3=Darksoul Shoulders", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, - { "s16987", "inv_spear_08", "=q3=Darkspear", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23633", "inv_gauntlets_29", "=q3=Gloves of the Dawn", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s27585", "inv_belt_16", "=q3=Heavy Obsidian Belt", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23629", "inv_boots_chain_10", "=q3=Heavy Timbermaw Boots", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, @@ -823,6 +820,12 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s28462", "inv_gauntlets_29", "=q3=Ironvine Gloves", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s27588", "inv_belt_16", "=q3=Light Obsidian Belt", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s57026", "inv_shoulder_13", "=q3=Mantle of Centaur Authority", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47021", "inv_boots_plate_05", "=q3=Rune-Etched Greaves", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47022", "inv_pants_04", "=q3=Rune-Etched Legplates", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47023", "inv_chest_plate08", "=q3=Rune-Etched Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47024", "inv_helmet_06", "=q3=Rune-Etched Crown", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47025", "INV_Shoulder_11", "=q3=Rune-Etched Mantle", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s47026", "INV_Gauntlets_09", "=q3=Rune-Etched Grips", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s27589", "inv_gauntlets_31", "=q4=Black Grasp of the Destroyer", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s28244", "inv_bracer_07", "=q4=Icebane Bracers", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s28242", "inv_chest_chain_11", "=q4=Icebane Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, @@ -830,13 +833,13 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s27586", "inv_shield_22", "=q4=Jagged Obsidian Shield", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s27590", "inv_chest_chain_17", "=q4=Obsidian Mail Tunic", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s27587", "inv_chest_chain_17", "=q4=Thick Obsidian Breastplate", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + }; + + SmithingArtisan4 = { { "s21161", "inv_hammer_unique_sulfuras", "=q4=Sulfuron Hammer", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, { "s54009", "inv_chest_plate16", "=q4=Fiery Chain Breastplate", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, { "s57196", "INV_Misc_Buckle_08", "=q4=Bloody Belt Buckle", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, { "s57181", "INV_Misc_Buckle_07", "=q4=Dreamsteel Belt Buckle", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, - }; - - SmithingArtisan4 = { { "s45471", "INV_Boots_01", "=q4=Dreamsteel Boots", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, { "s45469", "INV_Bracer_03", "=q4=Dreamsteel Bracers", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, { "s45467", "INV_Pants_03", "=q4=Dreamsteel Leggings", "=ds=#sr# =so1=300 =so2=325 =so3=337 =so4=350" }, @@ -879,7 +882,10 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s10011", "inv_spear_07", "=q3=Blight", "=ds=#sr# =so1=250 =so2=275 =so3=287 =so4=300" }, { "s10015", "inv_sword_19", "=q3=Truesilver Champion", "=ds=#sr# =so1=260 =so2=285 =so3=297 =so4=310" }, { "s15292", "inv_hammer_09", "=q3=Dark Iron Pulverizer", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" }, + { "s16965", "inv_axe_24", "=q2=Bleakwood Hew", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, { "s15294", "inv_weapon_halberd_02", "=q3=Dark Iron Sunderer", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, + { "s16986", "inv_weapon_shortblade_27", "=q3=Blood Talon", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s16987", "inv_spear_08", "=q3=Darkspear", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s16995", "inv_sword_17", "=q3=Heartseeker", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23638", "inv_weapon_shortblade_12", "=q4=Black Amnesty", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23639", "inv_spear_08", "=q4=Blackfury", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, @@ -909,6 +915,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s16978", "inv_sword_30", "=q3=Blazing Rapier", "=ds=#sr# =so1=280 =so2=305 =so3=317 =so4=330" }, { "s16985", "inv_sword_07", "=q3=Corruption", "=ds=#sr# =so1=290 =so2=315 =so3=327 =so4=340" }, { "s16990", "inv_sword_39", "=q3=Arcanite Champion", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, + { "s46652", "INV_Sword_17", "=q3=Untempered Runeblade", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s16992", "inv_sword_11", "=q3=Frostguard", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s20890", "inv_sword_48", "=q3=Dark Iron Reaver", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, { "s23652", "inv_sword_39", "=q4=Blackguard", "=ds=#sr# =so1=300 =so2=320 =so3=330 =so4=340" }, @@ -1059,6 +1066,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { LeatherArtisan1 = { { "s10548", "inv_pants_11", "=q2=Nightscape Pants", "=ds=#sr# =so1=230 =so2=250 =so3=260 =so4=270" }, + { "s10550", "inv_misc_cape_03", "=q2=Nightscape Cloak", "=ds=#sr# =so1=230 =so2=250 =so3=260 =so4=270" }, { "s10552", "inv_helmet_40", "=q2=Turtle Scale Helm", "=ds=#sr# =so1=230 =so2=250 =so3=260 =so4=270" }, { "s10558", "inv_boots_05", "=q2=Nightscape Boots", "=ds=#sr# =so1=235 =so2=255 =so3=265 =so4=275" }, { "s10554", "inv_boots_05", "=q2=Tough Scorpid Boots", "=ds=#sr# =so1=235 =so2=255 =so3=265 =so4=275" }, @@ -1080,10 +1088,9 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s19051", "inv_chest_chain_15", "=q2=Heavy Scorpid Vest", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" }, { "s19052", "inv_bracer_07", "=q2=Wicked Leather Bracers", "=ds=#sr# =so1=265 =so2=285 =so3=295 =so4=305" }, { "s19055", "inv_gauntlets_31", "=q2=Runic Leather Gauntlets", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, - { "s19055", "inv_gauntlets_31", "=q2=Runic Leather Gauntlets", "=ds=#sr# =so1=270 =so2=290 =so3=300 =so4=310" }, - { "s47020", "inv_boots_plate_05", "=q2=Primalist's Boots", "=ds=#sr# =so1=270 =so2=290 =so3=291 =so4=295" }, { "s47015", "inv_gauntlets_09", "=q2=Primalist's Gloves ", "=ds=#sr# =so1=270 =so2=285 =so3=290 =so4=295" }, { "s47017", "inv_helmet_04", "=q2=Primalist's Headdress", "=ds=#sr# =so1=270 =so2=290 =so3=291 =so4=295" }, + { "s47020", "inv_boots_plate_05", "=q2=Primalist's Boots", "=ds=#sr# =so1=275 =so2=290 =so3=291 =so4=295" }, { "s22815", "inv_chest_chain_14", "=q2=Gordok Ogre Suit", "=ds=#sr# =so1=275 =so2=285 =so3=290 =so4=295" }, { "s19064", "inv_gauntlets_24", "=q2=Heavy Scorpid Gauntlets", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, { "s19065", "inv_bracer_11", "=q2=Runic Leather Bracers", "=ds=#sr# =so1=275 =so2=295 =so3=305 =so4=315" }, @@ -1766,7 +1773,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "s14891", "inv_ingot_mithril", "=q1=Smelt Dark Iron", "=ds=#sr# =so1=230 =so2=230 =so3=230 =so4=230" }, { "s10098", "inv_ingot_08", "=q2=Smelt Truesilver", "=ds=#sr# =so1=230 =so2=230 =so3=230 =so4=230" }, { "s16153", "inv_ingot_07", "=q1=Smelt Thorium", "=ds=#sr# =so1=250 =so2=250 =so3=250 =so4=250" }, - { "s57121", "INV_Ingot_DreamSteel", "=q5=Smelt Dreamsteel", "=ds=#sr# =so1=300 =so2=350 =so3=362 =so4=375" }, + { "s45451", "INV_Ingot_DreamSteel", "=q5=Smelt Dreamsteel", "=ds=#sr# =so1=300 =so2=350 =so3=362 =so4=375" }, { "s22967", "inv_ingot_thorium", "=q5=Smelt Elementium", "=ds=#sr# =so1=300 =so2=350 =so3=362 =so4=375" }, }; diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 28382d8..eba49cf 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -3127,7 +3127,7 @@ AtlasLoot_Data["AtlasLootItems"] = { { 61025, "inv_misc_lantern_01", "=q2=Pyreflame Lantern", "=ds=#s15#", "13%" }, { 61029, "inv_jewelry_necklace_22", "=q2=Crocolisk Tooth Necklace", "=ds=#s2#", "13%" }, { 61030, "inv_fishingpole_02", "=q2=The Murkfisher", "=ds=#h2#, #w9#", "13%" }, - { 61034, "inv_jewelry_ring_12", "=q2=Band of the Marsh Bog", "=ds=#s15#", "13%" }, + { 61034, "inv_jewelry_ring_12", "=q2=Band of the Marsh Bog", "=ds=#s13#", "13%" }, { 61063, "inv_misc_monsterfang_01", "=q2=Rotmaw's Tooth", "=ds=#h1#, #w4#", "13%" }, { 61699, "INV_QirajIdol_War", "=q3=Idol of Savagery", "=ds=#s16#, #e16# =q13=#c1#", "13%" }, { 61701, "INV_Helmet_41", "=q3=Wraps of the Transmogrified", "=ds=#s1#, #a1#", "13%" }, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 7068609..99975ec 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -699,13 +699,14 @@ AtlasLoot_TableNames = { ["FirstbornofArugal"] = { "Firstborn of Arugal", "AtlasLootWBItems" }, ["Letashaz"] = { "Letashaz", "AtlasLootWBItems" }, ["MargontheMighty"] = { "Margon the Mighty", "AtlasLootWBItems" }, - ["Stoneshell"] = { "Stoneshell", "AtlasLootWBItems" }, - ["HighvaleSilverback"] = { "Highvale Silverback", "AtlasLootWBItems" }, + ["Stoneshell"] = { "Stoneshell", "AtlasLootWBItems" }, + ["HighvaleSilverback"] = { "Highvale Silverback", "AtlasLootWBItems" }, ["Azurebeak"] = { "Azurebeak", "AtlasLootWBItems" }, ["BarkskinFisher"] = { "Barkskin Fisher", "AtlasLootWBItems" }, ["ShadeflayerGoliath"] = { "Shadeflayer Goliath", "AtlasLootWBItems" }, ["M0L1Y"] = { "M-0L1Y", "AtlasLootWBItems" }, ["WidowoftheWoods"] = { "Widow of the Woods", "AtlasLootWBItems" }, + ["KinTozo"] = { "Kin'Tozo", "AtlasLootWBItems" }, -------------- --- Events --- @@ -727,6 +728,7 @@ AtlasLoot_TableNames = { ["Valentineday"] = { AL["Love is in the Air"], "AtlasLootWorldEvents" }, ["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, ["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, + ["WintervielSnowball"] = { "Snowball", "AtlasLootWorldEvents" }, --Other ["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" }, ["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" }, @@ -1737,13 +1739,14 @@ AtlasLoot_TableNamesBoss = { ["FirstbornofArugal"] = { "Firstborn of Arugal", "AtlasLootWBItems" }, ["Letashaz"] = { "Letashaz", "AtlasLootWBItems" }, ["MargontheMighty"] = { "Margon the Mighty", "AtlasLootWBItems" }, - ["Stoneshell"] = { "Stoneshell", "AtlasLootWBItems" }, - ["HighvaleSilverback"] = { "Highvale Silverback", "AtlasLootWBItems" }, + ["Stoneshell"] = { "Stoneshell", "AtlasLootWBItems" }, + ["HighvaleSilverback"] = { "Highvale Silverback", "AtlasLootWBItems" }, ["Azurebeak"] = { "Azurebeak", "AtlasLootWBItems" }, ["BarkskinFisher"] = { "Barkskin Fisher", "AtlasLootWBItems" }, ["ShadeflayerGoliath"] = { "Shadeflayer Goliath", "AtlasLootWBItems" }, ["M0L1Y"] = { "M-0L1Y", "AtlasLootWBItems" }, ["WidowoftheWoods"] = { "Widow of the Woods", "AtlasLootWBItems" }, + ["KinTozo"] = { "Kin'Tozo", "AtlasLootWBItems" }, }, -------------- @@ -1766,6 +1769,7 @@ AtlasLoot_TableNamesBoss = { ["Valentineday"] = { AL["Love is in the Air"], "AtlasLootWorldEvents" }, ["Winterviel1"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, ["Winterviel2"] = { AL["Feast of Winter Veil"], "AtlasLootWorldEvents" }, + ["WintervielSnowball"] = { "Snowball", "AtlasLootWorldEvents" }, --Other ["ElementalInvasion"] = { AL["Elemental Invasion"], "AtlasLootWorldEvents" }, ["FishingExtravaganza"] = { AL["Stranglethorn Fishing Extravaganza"], "AtlasLootWorldEvents" }, diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua index 9fe68a1..2503d60 100644 --- a/WorldBosses/worldbosses.en.lua +++ b/WorldBosses/worldbosses.en.lua @@ -84,6 +84,7 @@ AtlasLootWBBossButtons = { "BarkskinFisher"; "ShadeflayerGoliath"; "M0L1Y"; + "KinTozo"; }; }; @@ -432,6 +433,8 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 81361, "INV_Shoulder_23", "=q3=Dampener's Pauldron's", "=ds=#a2#", "25%" }, { 81362, "INV_Boots_Plate_06", "=q3=Azure-Scale Sabatons", "=ds=#a4#", "25%" }, { 81364, "INV_Misc_MonsterScales_09", "=q3=Scale of Malygos", "=ds=#s14#", "25%" }, + { 0, "", "", "", "" }, + { 81363, "Inv_staff_07", "=q4=Staff of Azure Domination", "=ds=#h2#, #w9#", "2%" }, }; Kargron = { { 81365, "INV_Pants_09", "=q3=Kargron's Leggings", "=ds=#a2#, #s11#", "25%" }, @@ -522,8 +525,9 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 61505, "INV_Pants_06", "=q2=Leggings of Fiery Temper", "=ds=#s11#, #a2#", "50%" }, }; WitchDoctorTanzo = { - { 61507, "INV_Jewelry_Necklace_01", "=q2=Pendant of Wilderness", "=ds=#s2#", "50%" }, - { 61508, "Ability_Creature_Poison_04", "=q2=Thorned Branch", "=ds=#s14#", "50%" }, + { 61507, "INV_Jewelry_Necklace_01", "=q2=Pendant of Wilderness", "=ds=#s2#", "40%" }, + { 61506, "INV_Offhand_Blood_A_01", "=q2=Shard of Wild Hexes", "=ds=#s15#", "40%" }, + { 61508, "Ability_Creature_Poison_04", "=q2=Thorned Branch", "=ds=#s14#", "20%" }, }; Dawnhowl = { { 61580, "Ability_Mount_WhiteDireWolf", "=q2=Wolf's Skull", "=ds=#s1#, #a3#", "33%" }, @@ -548,6 +552,15 @@ AtlasLoot_Data["AtlasLootWBItems"] = { }; BaronPerenolde = { { 61577, "INV_Sword_25", "=q2=Lieutenant's Sword", "=ds=#h1#, #w10#", "33%" }, + { 61578, "inv_pants_04", "=q2=Old Knight's Leggings", "=ds=#s11#, #a4#", "33%" }, + }; + KinTozo = { + { 60438, "INV_Bracer_19", "=q3=Vambracers of Kin'Tozo", "=ds=#s8#, #a4#", "25%" }, + { 60439, "spell_nature_agitatingtotem", "=q3=Chieftain's Mantle", "=ds=#s3#, #a2#", "25%" }, + { 60440, "INV_Weapon_Bow_02", "=q3=Bloodscalp Longbow", "=ds=#w2#", "25%" }, + { 60441, "INV_Jewelry_Ring_35", "=q3=The Mojo Ring", "=ds=#s13#", "25%" }, + { 0, "", "", "", "" }, + { 60442, "INV_Axe_01", "=q4=Hak'thalz of Legacy", "=ds=#h3#, #w1#", "2%" }, }; FirstbornofArugal = { { 61586, "INV_Shoulder_08", "=q2=Explorer's Shoulders", "=ds=#s3#, #a2#", "40%" }, diff --git a/WorldEvents/worldevents.lua b/WorldEvents/worldevents.lua index 740a73a..9492e9d 100644 --- a/WorldEvents/worldevents.lua +++ b/WorldEvents/worldevents.lua @@ -300,6 +300,38 @@ AtlasLoot_Data["AtlasLootWorldEvents"] = { { 17304, "INV_Holiday_Christmas_Wrapping_01", "=q1=Green Ribboned Wrapping Paper", "=ds=#m33#" }, { 17307, "INV_Holiday_Christmas_Wrapping_02", "=q1=Purple Ribboned Wrapping Paper", "=ds=#m33#" }, }; + WintervielSnowball = { + { 51249, "Ability_Mount_WhiteDireWolf", "=q3=Snowball", "=ds=#e7#" }, + { 0,"","","" }, + { 647, "INV_Sword_19", "=q4=Destiny", "=ds=#h2#, #w10#" }, + { 811, "INV_Axe_07", "=q4=Axe of the Deep Woods", "=ds=#h3#, #w1#" }, + { 833, "INV_Ore_TrueSilver_01", "=q4=Lifestone", "=ds=#s14#" }, + { 944, "INV_Staff_07", "=q4=Elemental Mage Staff", "=ds=#h2#, #w9#" }, + { 1168, "INV_Shield_01", "=q4=Skullflame Shield", "=ds=#w8#" }, + { 1263, "INV_Weapon_Halberd_10", "=q4=Brain Hacker", "=ds=#h2#, #w1#" }, + { 1443, "INV_Jewelry_Amulet_01", "=q4=Jeweled Amulet of Cainwyn", "=ds=#s2#" }, + { 1728, "INV_Sword_22", "=q4=Teebu's Blazing Longsword", "=ds=#h3#, #w10#" }, + { 2099, "INV_Weapon_Rifle_09", "=q4=Dwarven Hand Cannon", "=ds=#w5#" }, + { 2243, "INV_Mace_14", "=q4=Hand of Edward the Odd", "=ds=#h1#, #w6#" }, + { 2244, "INV_Sword_18", "=q4=Krol Blade", "=ds=#h3#, #w10#" }, + { 2245, "INV_Helmet_05", "=q4=Helm of Narv", "=ds=#s1#, #a3#" }, + { 2246, "INV_Jewelry_Ring_05", "=q4=Myrmidon's Signet", "=ds=#s13#" }, + { 61089, "INV_Misc_Bag_10_Red", "=q3=The Great Sack of Winter Veil", "=ds=#e10#, #m4#" }, + { 0,"","","" }, + { 2801, "INV_Sword_10", "=q4=Blade of Hanna", "=ds=#h2#, #w10#" }, + { 3475, "INV_Misc_Cape_08", "=q4=Cloak of Flames", "=ds=#s4#" }, + { 14552, "INV_Shoulder_20", "=q4=Stockade Pauldrons", "=ds=#s3#, #a4#" }, + { 14553, "INV_Belt_09", "=q4=Sash of Mercy", "=ds=#s10#, #a2#" }, + { 14554, "INV_Pants_04", "=q4=Cloudkeeper Legplates", "=ds=#s11#, #a4#" }, + { 14555, "INV_Sword_34", "=q4=Alcor's Sunrazor", "=ds=#h1#, #w4#" }, + { 14557, "INV_Misc_Horn_03", "=q4=The Lion Horn of Stormwind", "=ds=#s14#" }, + { 14558, "INV_Jewelry_Necklace_08", "=q4=Lady Maye's Pendant", "=ds=#s2#" }, + { 20698, "INV_Sword_22", "=q4=Elemental Attuned Blade", "=ds=#h3#, #w10#" }, + { 60782, "INV_Weapon_Crossbow_15", "=q4=Shieldbreaker Arbalest", "=ds=#w3#" }, + { 60784, "INV_Chest_Leather_08", "=q4=Breastplate of Beast Mastery", "=ds=#s5#, #a3#" }, + { 80793, "INV_Misc_Horn_02", "=q4=The Wolf Horn of Orgrimmar", "=ds=#s14#" }, + + }; Noblegarden = { { 0, "INV_Egg_03", "=q6=#cb25#", "" }, { 19028, "INV_Chest_Cloth_04", "=q1=Elegant Dress", "=ds=#s5#" },