diff --git a/AtlasLoot.toc b/AtlasLoot.toc index e3cf8f3..024a7a7 100644 --- a/AtlasLoot.toc +++ b/AtlasLoot.toc @@ -1,8 +1,8 @@ ## Interface: 11200 ## 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) -## Version: 1.0.3 +## Author: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons), |cffbe5effLexie|r +## Version: 1.0.4 ## SavedVariablesPerCharacter: AtlasLootCharDB ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, DewdropLib, Ace2, EquipCompare, EQCompare diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index 249a049..ccb7901 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 = "0"; -local VERSION_BOSSES = "3"; +local VERSION_BOSSES = "4"; 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"; @@ -2863,6 +2863,7 @@ AtlasLoot_DewDropDown_SubTables = { { "Turtlhu, the Black Turtle of Doom", "Turtlhu" }, { "Nerubian Overseer", "Nerubian" }, { "Dark Reaver of Karazhan", "Reaver" }, + { "Ostarius", "Ostarius" }, }, ["RareSpawns"] = { { "Tarangos The Dampener", "Tarangos" }, @@ -2902,6 +2903,7 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Darnassus"], "Darnassus" }, { AL["Stormwind"], "Stormwind" }, { AL["Gnomeregan Exiles"], "GnomereganExiles" }, + { AL["Darkspear Trolls"], "DarkspearTrolls" }, { AL["Durotar Labor Union"], "DurotarLaborUnion" }, { AL["Undercity"], "Undercity" }, { AL["Orgrimmar"], "Orgrimmar" }, diff --git a/Core/ButtonRegistry.lua b/Core/ButtonRegistry.lua index e7453c5..1cea350 100644 --- a/Core/ButtonRegistry.lua +++ b/Core/ButtonRegistry.lua @@ -126,6 +126,11 @@ AtlasLoot_ButtonRegistry = { Back_Page = "REPMENU"; Back_Title = AL["Factions"]; }; + ["DarkspearTrolls"] = { + Title = AL["Darkspear Trolls"]; + Back_Page = "REPMENU"; + Back_Title = AL["Factions"]; + }; ["DurotarLaborUnion"] = { Title = AL["Durotar Labor Union"]; Back_Page = "REPMENU"; diff --git a/Core/Spells.lua b/Core/Spells.lua index f677144..88ccc1e 100644 --- a/Core/Spells.lua +++ b/Core/Spells.lua @@ -633,6 +633,14 @@ GetSpellInfoVanillaDB = { ["name"] = "Enchant 2H Weapon - Agility", ["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal", }, + [57030] = { + ["name"] = "Enchant Bracer - Greater Agility", + ["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal", + }, + [57028] = { + ["name"] = "Enchant Bracer - Spell Power", + ["icon"] = "Interface\\Icons\\Spell_Holy_GreaterHeal", + }, }, ["craftspells"] = { [6510] = { diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index 5c2bc0c..d876e93 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -521,6 +521,8 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { "e23803", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Mighty Spirit", "=ds=#sr# =so1=300 =so2=320 =so3=340 =so4=360" }, { "e22749", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Spell Power", "=ds=#sr# =so1=300 =so2=320 =so3=340 =so4=360" }, { "e20031", "Spell_Holy_GreaterHeal", "=ds=Enchant Weapon - Superior Striking", "=ds=#sr# =so1=300 =so2=320 =so3=340 =so4=360" }, + { "e57030", "Spell_Holy_GreaterHeal", "=ds=Enchant Bracer - Greater Agility", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, + { "e57028", "Spell_Holy_GreaterHeal", "=ds=Enchant Bracer - Spell Power", "=ds=#sr# =so1=300 =so2=300 =so3=300 =so4=300" }, }; --------------------- diff --git a/Factions/factions.lua b/Factions/factions.lua index 70da4c6..58966a2 100644 --- a/Factions/factions.lua +++ b/Factions/factions.lua @@ -374,7 +374,7 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 20131, "INV_Shirt_GuildTabard_01", "=q1=Battle Tabard of the Defilers", "=q1=#m4#: =ds=#s7#" }, }; GelkisClan1 = { - { 5748, "", "=q2", "=ds=#w4#"}, + { 5748, "", "=q2", "=ds=#w2#"}, { 0, "", "", "" }, { 0, "INV_Misc_Head_Centaur_01", "=q6=#r2#", "" }, { 6773, "INV_Chest_Chain_07", "=q2=Gelkis Marauder Chain", "=q1=#m4#: =ds=#s5#, #a3#" }, @@ -386,9 +386,9 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 60900, "", "=q2", "=ds=#s8#, #a2#"}, { 60901, "", "=q2", "=ds=#s1#, #a3#"}, { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, - { 0, "", "", "" }, + { 60854, "", "=q2", "=q1=#m4#"}, + { 60860, "", "=q2", "=q1=#m4#"}, + { 60859, "INV_Misc_Gem_CystalCut_01", "=q2", "=q1=#m4#"}, { 0, "", "", "" }, { 0, "", "", "" }, { 0, "INV_Misc_Head_Centaur_01", "=q6=#r4#", "" }, @@ -409,10 +409,34 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 20132, "INV_Shirt_GuildTabard_01", "=q1=Arathor Battle Tabard", "=q1=#m4#: =ds=#s7#" }, }; MagramClan1 = { - { 0, "", "", "" }, + { 5748, "", "=q2", "=ds=#w2#"}, + { 0, "", "", "" }, { 0, "INV_Misc_Head_Centaur_01", "=q6=#r2#", "" }, { 6789, "INV_Misc_Cape_12", "=q2=Ceremonial Centaur Blanket", "=q1=#m4#: =ds=#s4#" }, { 6788, "INV_Belt_11", "=q2=Magram Hunter's Belt", "=q1=#m4#: =ds=#s10#, #a2#" }, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "INV_Misc_Head_Centaur_01", "=q6=#r3#", "" }, + { 60879, "", "=q2", "=ds=#s12#, #a2#"}, + { 60880, "", "=q2", "=ds=#s5#, #a3#"}, + { 60881, "", "=q2", "=ds=#s10#, #a1#"}, + { 0, "", "", "" }, + { 60853, "", "=q2", "=q1=#m4#"}, + { 60854, "", "=q2", "=q1=#m4#"}, + { 60855, "", "=q2", "=q1=#m4#"}, + { 0, "", "", "" }, + { 0, "", "", "" }, + { 0, "INV_Misc_Head_Centaur_01", "=q6=#r4#", "" }, + { 60884, "", "=q3", "=ds=#h1#, #w4#"}, + { 60883, "", "=q3", "=ds=#s9#, #a4#"}, + { 60882, "", "=q3", "=ds=#w2#"}, + { 0, "", "", "" }, + { 0, "INV_Misc_Head_Centaur_01", "=q6=#r5#", "" }, + { 60905, "", "=q4", "=ds=#w9#"}, + { 60968, "", "=q3", "=ds=#p7# (300)"}, + { 60967, "", "=q3", "=ds=#p8# (300)"}, + { 60969, "", "=q3", "=ds=#p4# (300)"}, + }; Helf = { { 0, "INV_Staff_13", "=q2=Cloaks", "" }, @@ -565,13 +589,13 @@ AtlasLoot_Data["AtlasLootRepItems"] = { --{ 80647, "", "=q2=", "" }, }; Ironforge = { - { 0, "INV_Staff_13", "=q2=Honored", "" }, + { 0, "inv_drink_08", "=q6=#r3#", "" }, { 81211, "", "=q2=", "" }, { 81212, "", "=q2=", "" }, { 81215, "", "=q2=", "" }, { 81213, "", "=q2=", "" }, { 0, "", "", "" }, - { 0, "INV_Staff_13", "=q2=Exalted", "" }, + { 0, "inv_drink_08", "=q6=#r5#", "" }, { 80303, "", "=q2=", "" }, { 81233, "", "=q2=", "" }, }; @@ -603,6 +627,18 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 81195, "", "=q2=", "" }, { 80306, "", "=q2=", "" }, }; + DarkspearTrolls = { + { 0, "inv_misc_head_troll_01", "=q6=#r4#", "" }, + { 80806, "", "=q3=", "" }, + { 80785, "", "=q3=", "" }, + { 80797, "", "=q3=", "" }, + { 0, "", "", "" }, + { 0, "inv_misc_head_troll_01", "=q6=#r5#", "" }, + { 83064, "", "=q3=", "" }, + { 81183, "", "=q1=", "" }, + { 80304, "", "=q1=", "" }, + { 81182, "", "=q4=", "" }, + }, DurotarLaborUnion = { { 0, "INV_Staff_13", "=q2=Friendly", "" }, { 50068, "", "=q2=", "" }, @@ -616,7 +652,7 @@ AtlasLoot_Data["AtlasLootRepItems"] = { { 81089, "", "=q2=", "" }, }; Undercity = { - { 0, "INV_Staff_13", "=q2=Exalted", "" }, + { 0, "inv_misc_head_undead_02", "=q6=#r5#", "" }, { 81244, "", "=q2=", "" }, { 81245, "", "=q2=", "" }, { 81246, "", "=q2=", "" }, diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 5b1b1bb..9d4d41f 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -2815,16 +2815,18 @@ AtlasLoot_Data["AtlasLootItems"] = { { 80010, "INV_box_petcarrier_01", "=q1=Midnight", "=ds=#e15#", "5%" }, }; KCAlarus = { - { 83465, "INV_misc_cape_21", "=q3=Shroud of Haunted Torment", "=ds=#s4#, #a1#", "13%" }, - { 83466, "INV_pants_plate_20", "=q3=Baneforged Leggings", "=ds=#s11#, #a4#", "13%" }, - { 83467, "INV_wand_03", "=q3=Cryptwatcher's Call", "=ds=#w12#", "13%" }, - { 83468, "INV_jewelry_ring_09", "=q3=Corpsekeeper's Charge", "=ds=#s13#", "13%" }, - { 83469, "INV_crown_01", "=q3=Cryptstone Circlet", "=ds=#s1#, #a1#", "13%" }, - { 83470, "INV_pants_03", "=q3=Wraithscale Leggings", "=ds=#s11#, #a3#", "13%" }, - { 83471, "INV_staff_08", "=q3=Staff of Alarus", "=ds=#h2#, #w9#", "13%" }, - { 83472, "INV_helmet_15", "=q3=Cover of the Necromancer", "=ds=#s1#, #a1#", "13%" }, + { 83465, "INV_misc_cape_21", "=q3=Shroud of Haunted Torment", "=ds=#s4#, #a1#", "25%" }, + { 83466, "INV_pants_plate_20", "=q3=Baneforged Leggings", "=ds=#s11#, #a4#", "25%" }, + { 83467, "INV_wand_03", "=q3=Cryptwatcher's Call", "=ds=#w12#", "25%" }, + { 83468, "INV_jewelry_ring_09", "=q3=Corpsekeeper's Charge", "=ds=#s13#", "25%" }, + { 83469, "INV_crown_01", "=q3=Cryptstone Circlet", "=ds=#s1#, #a1#", "21%" }, + { 83470, "INV_pants_03", "=q3=Wraithscale Leggings", "=ds=#s11#, #a3#", "21%" }, + { 83471, "INV_staff_08", "=q3=Staff of Alarus", "=ds=#h2#, #w9#", "21%" }, + { 83472, "INV_helmet_15", "=q3=Cover of the Necromancer", "=ds=#s1#, #a1#", "21%" }, { 0, "", "", "" }, - { 83464, "INV_shoulder_11", "=q4=Mantle of Twisted Damnation", "=ds=#s3#, #a1#", "0.25%" }, + { 83464, "INV_shoulder_11", "=q4=Mantle of Twisted Damnation", "=ds=#s3#, #a1#", "1%" }, + { 0, "", "", "" }, + { 83571, "inv_misc_book_05", "=q3=Codex: Shadow Mend", "=ds=#c5#", "15" }, }; COTBMChronar = { { 50203, "INV_enchant_dustsoul", "=q2=Corrupted Sand", "=ds=#m3#", "100%" }, @@ -2941,6 +2943,9 @@ AtlasLoot_Data["AtlasLootItems"] = { { 60426, "INV_Chest_Plate08", "=q3=Guard-Captain's Chestplate", "=ds=#s5#, #a4#", "25%" }, { 60429, "INV_bracer_19", "=q3=Arcanite Shackles", "=ds=#s8#, #a4#", "25%" }, { 60430, "INV_boots_05", "=q3=Runewarder's Boots", "=ds=#s12#, #a1#", "25%" }, + { 60501, "INV_Misc_Crop_01", "=q3=Whip of Encouragement", "=ds=#s14#", "25%" }, + { 0, "", "", "" }, + { 83570, "inv_scroll_02", "=q3=Technique: Die by the Sword", "=ds=#c9#", "15%" }, }; HQHighForemanBargulBlackhammer = { { 60565, "INV_axe_14", "=q3=Hateforged Cleaver", "=ds=#h1#, #w1#", "20%" }, @@ -2949,6 +2954,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 60568, "INV_boots_01", "=q3=Incendosaur Skin Boots", "=ds=#s12#, #a2#", "20%" }, { 60569, "INV_jewelry_necklace_06", "=q3=Taskmaster's Tag", "=ds=#s2#", "20%" }, { 60570, "INV_misc_net_01", "=q3=Dark Iron Hooked Net", "=ds=#s14#", "15%" }, + { 0, "", "", "" }, + { 60775, "inv_misc_book_10", "=q3=Manual: Intervene", "=ds=#c9#", "15%" }, }; HQEngineerFiggles = { { 60540, "INV_helmet_47", "=q3=The Creator's Goggles", "=ds=#s1#, #a1#", "20%" }, diff --git a/Locale/locale.en.lua b/Locale/locale.en.lua index 987e876..003e510 100644 --- a/Locale/locale.en.lua +++ b/Locale/locale.en.lua @@ -1446,6 +1446,7 @@ AL:RegisterTranslations("enUS", function() return { ["Darnassus"] = true, ["Stormwind"] = true, ["Gnomeregan Exiles"] = true, + ["Darkspear Trolls"] = true, ["Durotar Labor Union"] = true, ["Undercity"] = true, ["Orgrimmar"] = true, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 2a93a6d..3f5c93d 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -612,6 +612,7 @@ AtlasLoot_TableNames = { ["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" }, ["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" }, ["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" }, + ["Ostarius"] = { "Ostarius", "AtlasLootWBItems" }, --Doom Lord Kazzak ["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" }, --Emrald Dragons @@ -713,6 +714,7 @@ AtlasLoot_TableNames = { ["Darnassus"] = { AL["Darnassus"], "AtlasLootRepItems" }, ["Stormwind"] = { AL["Stormwind"], "AtlasLootRepItems" }, ["GnomereganExiles"] = { AL["Gnomeregan Exiles"], "AtlasLootRepItems" }, + ["DarkspearTrolls"] = { AL["Darkspear Trolls"], "AtlasLootRepItems" }, ["DurotarLaborUnion"] = { AL["Durotar Labor Union"], "AtlasLootRepItems" }, ["Undercity"] = { AL["Undercity"], "AtlasLootRepItems" }, ["Orgrimmar"] = { AL["Orgrimmar"], "AtlasLootRepItems" }, @@ -1558,6 +1560,7 @@ AtlasLoot_TableNamesBoss = { ["Turtlhu"] = { "Turtlhu, the Black Turtle of Doom", "AtlasLootWBItems" }, ["Nerubian"] = { "Nerubian Overseer", "AtlasLootWBItems" }, ["Reaver"] = { "Dark Reaver of Karazhan", "AtlasLootWBItems" }, + ["Ostarius"] = { "Ostarius", "AtlasLootWBItems" }, --Doom Lord Kazzak ["KKazzak"] = { AL["Lord Kazzak"], "AtlasLootWBItems" }, --Emrald Dragons @@ -1647,6 +1650,7 @@ AtlasLoot_TableNamesBoss = { ["Darnassus"] = { AL["Darnassus"], "AtlasLootRepItems" }, ["Stormwind"] = { AL["Stormwind"], "AtlasLootRepItems" }, ["GnomereganExiles"] = { AL["Gnomeregan Exiles"], "AtlasLootRepItems" }, + ["DarkspearTrolls"] = { AL["Darkspear Trolls"], "AtlasLootRepItems" }, ["DurotarLaborUnion"] = { AL["Durotar Labor Union"], "AtlasLootRepItems" }, ["Undercity"] = { AL["Undercity"], "AtlasLootRepItems" }, ["Orgrimmar"] = { AL["Orgrimmar"], "AtlasLootRepItems" }, diff --git a/WorldBosses/worldbosses.en.lua b/WorldBosses/worldbosses.en.lua index 22d6e79..6c6910e 100644 --- a/WorldBosses/worldbosses.en.lua +++ b/WorldBosses/worldbosses.en.lua @@ -28,6 +28,9 @@ AtlasLootWBBossButtons = { Reaver = { "Reaver"; }; + Ostarius = { + "Ostarius"; + }; RareSpawns = { ""; ""; @@ -137,6 +140,35 @@ AtlasLoot_Data["AtlasLootWBItems"] = { { 50202, "INV_Egg_03", "=q3=Egg of Turtlhu", "=ds=#e15#", "100%" }, { 50203, "INV_Enchant_Dustsoul", "=q2=Corrupted Sand", "=ds=#e12#", "100%" }, }; + Ostarius = { + { 83480, "inv_misc_book_07", "=q4=Tome of Infalliable Truth", "=ds=#h4#, #s15#", "17%" }, + { 83481, "inv_mace_08", "=q4=Failsafe Activation Key", "=ds=#h4#, #s15#", "17%" }, + { 83482, "inv_wand_06", "=q4=Distress Signal Pulser", "=ds=#h4#, #s15#", "17%" }, + { 0,"","","" }, + { 83530, "inv_helmet_63", "=q4=Turban of Veiled Mists", "=ds=#s1#, #a1#", "17%" }, + { 0,"","","" }, + { 83531, "inv_belt_17", "=q4=Clutch of Mending Winds", "=ds=#s10#, #a2#", "17%" }, + { 83532, "inv_bracer_07", "=q4=Bracers of the Crescent Moon", "=ds=#s8#, #a2#", "17%" }, + { 0,"","","" }, + { 0,"","","" }, + { 83487, "inv_sword_01", "=q4=Blade of the Fallen Star", "=ds=#h3#, #w10#", "17%" }, + { 0,"","","" }, + { 0,"","","" }, + { 0,"","","" }, + { 0,"","","" }, + { 83484, "inv_jewelry_necklace_14", "=q4=Desert Wind Talisman", "=ds=#s2#", "17%" }, + { 83486, "inv_misc_cape_07", "=q4=Sandstalker's Shroud", "=ds=#s4#", "17%" }, + { 0,"","","" }, + { 0,"","","" }, + { 83488, "inv_boots_chain_02", "=q4=Uldum Construct Stompers", "=ds=#s12#, #a3#", "17%" }, + { 0,"","","" }, + { 83483, "inv_helmet_03", "=q4=Crown of Divine Justice", "=ds=#s1#, #a4#", "17%" }, + { 83485, "inv_gauntlets_16", "=q4=Fists of the Makers", "=ds=#s9#, #a4#", "17%" }, + { 0,"","","" }, + { 0,"","","" }, + { 83235, "inv_misc_pocketwatch_03", "=q4=Ancient Locking Mechanism", "", "100%" }, + { 17962,"INV_Misc_Bag_10_Blue","=q2=Blue Sack of Gems","=ds=#m23# =q2=#e33#", "25%" }, + }; KKazzak = { { 18546, "INV_Helmet_18", "=q4=Infernal Headcage", "=ds=#s1#, #a3#", "9.39%" }, { 17111, "INV_Jewelry_Talisman_01", "=q4=Blazefury Medallion", "=ds=#s2#", "10.95%" },