From a8b50bea0f18ede2586977e99cdece5565800d35 Mon Sep 17 00:00:00 2001 From: Destroses5100 <61999697+Destroses5100@users.noreply.github.com> Date: Thu, 20 Apr 2023 01:51:23 -0500 Subject: [PATCH 1/3] Adding Missing items to misc bosses --- Core/AtlasLoot.lua | 1 + Crafting/crafting.en.lua | 2 +- Instances/instances.en.lua | 40 +++++++++++++++++++++++++++++++++ TableRegister/loottables.en.lua | 2 ++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index e76e2b2..4baa693 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -2429,6 +2429,7 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Corrosis"], "HQCorrosis" }, { AL["Hatereaver Annihilator"], "HQHatereaverAnnihilator" }, { AL["Hargesh Doomcaller"], "HQHargeshDoomcaller" }, + { AL["Trash Mobs"], "HQTrash" }, }, ["BlackrockDepths"] = { { AL["Lord Roccor"], "BRDLordRoccor" }, diff --git a/Crafting/crafting.en.lua b/Crafting/crafting.en.lua index f125010..7f8775b 100644 --- a/Crafting/crafting.en.lua +++ b/Crafting/crafting.en.lua @@ -64,7 +64,7 @@ AtlasLoot_Data["AtlasLootCrafting"] = { { 19693, "INV_Chest_Plate08", "=q3=Darksoul Breastplate", "=ds=#s5#, #a4#" }, { 19694, "INV_Pants_Plate_21", "=q3=Darksoul Leggings", "=ds=#s11#, #a4#" }, }; - + ------------------------------- --- Blacksmithing Mail Sets --- ------------------------------- diff --git a/Instances/instances.en.lua b/Instances/instances.en.lua index 9e1c336..9e94221 100644 --- a/Instances/instances.en.lua +++ b/Instances/instances.en.lua @@ -668,6 +668,7 @@ AtlasLootBossButtons = { "HQCorrosis"; "HQHatereaverAnnihilator"; "HQHargeshDoomcaller"; + "HQTrash"; }; TheDeadmines = { ""; @@ -3038,6 +3039,18 @@ AtlasLoot_Data["AtlasLootItems"] = { { 60550, "INV_belt_09", "=q3=Shadowruned Girdle", "=ds=#s10#, #a2#", "20%" }, { 60551, "spell_shadow_antishadow", "=q4=Pendant of the Faceless", "=ds=#s14#", "0.005%" }, }; + HQTrash = { + { 84010, "INV_Scroll_05", "=q3=Plans: Hateforge Belt", "=ds=#p2# #m19#", "0.005%" }, + { 84011, "INV_Scroll_05", "=q3=Plans: Hateforge Boots", "=ds=#p2# #m19#", "0.005%" }, + { 84012, "INV_Scroll_05", "=q4=Plans: Hateforge Grips", "=ds=#p2# #m19#", "0.005%" }, + { 84013, "INV_Scroll_05", "=q3=Plans: Hateforge Cuirass", "=ds=#p2# #m19#", "0.005%" }, + { 84014, "INV_Scroll_05", "=q3=Plans: Hateforge Helmet", "=ds=#p2# #m19#", "0.005%" }, + { 84015, "INV_Scroll_05", "=q3=Plans: Hateforge Leggings", "=ds=#p2# #m19#", "0.005%" }, + { 0, "", "", "" }, + { 60582, "INV_gauntlets_05", "=q3=Incendosaur Skin Gloves", "=ds=#s9#, #a2#", "0.005%" }, + { 60572, "INV_Shoulder_23", "=q3=Incendosaur Skin Pauldrons", "=ds=#s3#, #a2#", "0.1%" }, + { 60572, "INV_Shoulder_23", "=q3=Incendosaur Skin Pauldrons", "From Elites Outside Dungeon" }, + }; DMRhahkZor = { { 872, "INV_ThrowingAxe_01", "=q2=Rockslicer", "=ds=#h2#, #w1#", "3.13%" }, { 0, "", "", "" }, @@ -4017,6 +4030,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 11932, "INV_Staff_30", "=q3=Guiding Stave of Wisdom", "=ds=#w9#", "15.01%" }, { 0, "", "", "" }, { 12033, "INV_Misc_Bag_17", "=q1=Thaurissan Family Jewels", "=ds=#m23#. #p13# #m16#", "2.87%" }, + { 0, "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; BRDPrincess = { { 12557, "INV_Shoulder_25", "=q3=Ebonsteel Spaulders", "=ds=#s3#, #a4#", "12.11%" }, @@ -4206,6 +4221,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 18310, "INV_Sword_18", "=q3=Fiendish Machete", "=ds=#h1#, #w10#", "15.39%" }, { 18314, "INV_Jewelry_Ring_31", "=q3=Ring of Demonic Guile", "=ds=#s13#", "13.71%" }, { 18315, "INV_Jewelry_Ring_28", "=q3=Ring of Demonic Potency", "=ds=#s13#", "15.40%" }, + { 0, "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; DMEShard = { { 18501, "INV_Enchant_ShardRadientSmall", "=q1=Felvine Shard", "=ds=#m8#" }, @@ -4369,6 +4386,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 18780, "INV_Misc_Note_06", "=q3=Top Half of Advanced Armorsmithing: Volume I", "=ds=#m8#", "6.00%" }, { 12727, "INV_Scroll_05", "=q3=Plans: Enchanted Thorium Breastplate", "=q1=#m4# =ds=#p2# #m14#" }, { 12618,"INV_Chest_Plate10","=q3=Enchanted Thorium Breastplate","=ds=#s5#, #a4#" }, + { 0,"","","" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; DMNChoRush = { { 18490, "INV_Helmet_41", "=q3=Insightful Hood", "=ds=#s1#, #a2#", "21.46%" }, @@ -4507,6 +4526,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 18376, "INV_Mace_07", "=q3=Timeworn Mace", "=ds=#h1#, #w6#", "14.40%" }, { 18392, "INV_Weapon_ShortBlade_05", "=q3=Distracting Dagger", "=ds=#h4#, #w4#", "14.70%" }, { 70056, "inv_helmet_25", "=q3=Horned Helm of Ancient Kings", "", "6%" }, + { 0, "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; DMWShendralarProvisioner = { { 18487, "INV_Scroll_03", "=q1=Pattern: Mooncloth Robe", "=ds=#p8# #m14#" }, @@ -4690,6 +4711,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 16730,"INV_Chest_Plate03","=q3=Breastplate of Valor", "=ds=#s5#, #a4# (D1, =q17=#c9#=ds=)", "5.83%" }, { 0, "", "", "", "" }, { 13090, "", "=q3=", "" }, + { 0, "", "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; UBRSTrash = { { 24102, "INV_Misc_Book_14", "=q3=Manual of Eviscerate IX", "=ds=#e20# =q12=#c6# =q7=#x60#", "0.94%" }, @@ -4838,6 +4861,17 @@ AtlasLoot_Data["AtlasLootItems"] = { { 13520, "INV_Scroll_06", "=q2=Recipe: Flask of Distilled Wisdom", "=ds=#p1# #m14#", "1.94%" }, { 0, "", "", "", "" }, { 13250, "Spell_Shadow_Possession", "=q1=Head of Balnazzar", "=ds=#m2#" }, + { 0, "", "", "", "" }, + { 83501, "INV_Scroll_06", "=q3=Plans: Rune-Etched Greaves", "=ds=#p2# #m14#", "17%" }, + { 83502, "INV_Scroll_06", "=q3=Plans: Rune-Etched Legplates", "=ds=#p2# #m14#", "17%" }, + { 83503, "INV_Scroll_06", "=q3=Plans: Rune-Etched Breastplate", "=ds=#p2# #m14#", "17%" }, + { 83504, "INV_Scroll_06", "=q3=Plans: Rune-Etched Crown", "=ds=#p2# #m14#", "17%" }, + { 83505, "INV_Scroll_06", "=q3=Plans: Rune-Etched Mantle", "=ds=#p2# #m14#", "17%" }, + { 83506, "INV_Scroll_06", "=q3=Plans: Rune-Etched Grips", "=ds=#p2# #m14#", "17%" }, + { 0, "", "", "", "" }, + { 83500, "INV_Scroll_05", "=q3=Plans: Untempered Runeblade", "=ds=#p2# #m14#", "5%" }, + { 0, "", "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; STRATSothosJarien = { { 0, "INV_Misc_Bag_09", "=q6=#j3#", "=q5=Sothos & Jarien" }, @@ -4958,6 +4992,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 16668, "INV_Pants_03", "=q3=Kilt of Elements", "=ds=#s11#, #a3# (D1, =q15=#c7#=ds=)", "3.02%" }, { 16728, "INV_Pants_04", "=q3=Lightforge Legplates", "=ds=#s11#, #a4# (D1, =q16=#c4#=ds=)", "4.20%" }, { 16732, "INV_Pants_04", "=q3=Legplates of Valor", "=ds=#s11#, #a4# (D1, =q17=#c9#=ds=)", "5.74%" }, + { 0, "", "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; STRATPostmaster = { { 13390, "INV_Misc_Bandage_15", "=q3=The Postmaster's Band", "=ds=#s1#, #a1#", "18.58%" }, @@ -5119,6 +5155,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 13965, "INV_Misc_ArmorKit_09", "=q3=Blackhand's Breadth", "=q1=#m4# =ds=#s14#" }, { 0, "", "", "", "" }, { 80760, "", "=q3=", "" }, + { 0, "", "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; LBRSGrimaxe = { { 12637, "INV_Gauntlets_26", "=q3=Backusarian Gauntlets", "=ds=#s9#, #a4#", "26.44%" }, @@ -5482,6 +5520,8 @@ AtlasLoot_Data["AtlasLootItems"] = { { 19276, "INV_Misc_Ticket_Tarot_Portal_01", "=q3=Ace of Portals", "=ds=#e19#", "2.20%" }, { 0, "", "", "", "" }, { 13501, "INV_Scroll_06", "=q2=Recipe: Major Mana Potion", "=ds=#p1# #m15#", "8.64%" }, + { 0, "", "", "", "" }, + { 51217, "INV_misc_ribbon_01", "=q2=Fashion Coin", "=ds=#e27#", "100%" }, }; SCHOLOTrash = { { 16685, "INV_Belt_08", "=q3=Magister's Belt", "=ds=#s10#, #a1# (D1, =q10=#c3#=ds=)", "0.22%" }, diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 67ac435..bbfee85 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -360,6 +360,7 @@ AtlasLoot_TableNames = { ["HQCorrosis"] = { AL["Corrosis"], "AtlasLootItems" }, ["HQHatereaverAnnihilator"] = { AL["Hatereaver Annihilator"], "AtlasLootItems" }, ["HQHargeshDoomcaller"] = { AL["Hargesh Doomcaller"], "AtlasLootItems" }, + ["HQTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, -- The Cresant Grove ["TCGGrovetenderEngryss"] = { AL["Grovetender Engryss"], "AtlasLootItems" }, ["TCGKeeperRanathos"] = { AL["Keeper Ranathos"], "AtlasLootItems" }, @@ -1028,6 +1029,7 @@ AtlasLoot_TableNamesBoss = { ["HQCorrosis"] = { AL["Corrosis"], "AtlasLootItems" }, ["HQHatereaverAnnihilator"] = { AL["Hatereaver Annihilator"], "AtlasLootItems" }, ["HQHargeshDoomcaller"] = { AL["Hargesh Doomcaller"], "AtlasLootItems" }, + ["HQTrash"] = { AL["Trash Mobs"], "AtlasLootItems" }, }, ["The Crescent Grove"] = { ["TCGGrovetenderEngryss"] = { AL["Grovetender Engryss"], "AtlasLootItems" }, From 3d4631f9fd6dc8285cd6871107f07c58c963eb5c Mon Sep 17 00:00:00 2001 From: Doorknob66 Date: Thu, 11 May 2023 11:54:17 +0200 Subject: [PATCH 2/3] added missing bosses to loottable localization for karazhan crypt. This fixes adding items from these bosses to the wishlist. --- TableRegister/loottables.en.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TableRegister/loottables.en.lua b/TableRegister/loottables.en.lua index 67ac435..c287190 100644 --- a/TableRegister/loottables.en.lua +++ b/TableRegister/loottables.en.lua @@ -309,7 +309,7 @@ AtlasLoot_TableNames = { ["SWStTargorr"] = { AL["Targorr the Dread"], "AtlasLootItems" }, ["SWStKamDeepfury"] = { AL["Kam Deepfury"], "AtlasLootItems" }, ["SWStHamhock"] = { AL["Hamhock"], "AtlasLootItems" }, - ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"}, + ["SWStDextren"] = { AL["Dextren Ward"], "AtlasLootItems"}, ["SWStBazil"] = { AL["Bazil Thredd"], "AtlasLootItems" }, ["SWStBruegalIronknuckle"] = { AL["Bruegal Ironknuckle"] .. " (" .. AL["Rare"] .. ")", "AtlasLootItems" }, ["SWStTrash"] = { AL["Trash Mobs"] .. " (" .. AL["The Stockade"] .. ")", "AtlasLootItems" }, @@ -1040,8 +1040,11 @@ AtlasLoot_TableNamesBoss = { ["KCMarrowspike"] = { AL["Marrowspike"], "AtlasLootItems" }, ["KCHivaxxis"] = { AL["Hivaxxis"], "AtlasLootItems" }, ["KCCorpsemuncher"] = { AL["Corpsemuncher"], "AtlasLootItems" }, + ["KCGuardCaptainGort"] = { AL["Guard Captain Gort"], "AtlasLootItems" }, ["KCArchlichEnkhraz"] = { AL["Archlich Enkhraz"], "AtlasLootItems" }, + ["KCCommanderAnderson"] = { AL["Commander Anderson"], "AtlasLootItems" }, ["KCAlarus"] = { AL["Alarus"], "AtlasLootItems" }, + ["KCTreasure"] = { AL["Half-Buried Treasure Chest"], "AtlasLootItems" }, }, ["Caverns of Time: Black Morass"] = { ["COTBMChronar"] = { AL["Chronar"], "AtlasLootItems" }, From 554191a4095c9736dd50cec68b7212ba201e4eba Mon Sep 17 00:00:00 2001 From: Doorknob66 Date: Thu, 11 May 2023 12:00:47 +0200 Subject: [PATCH 3/3] fix sending craft links when WIM is not installed; --- Core/AtlasLoot.lua | 180 +++++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 89 deletions(-) diff --git a/Core/AtlasLoot.lua b/Core/AtlasLoot.lua index e76e2b2..65feb8b 100644 --- a/Core/AtlasLoot.lua +++ b/Core/AtlasLoot.lua @@ -239,7 +239,7 @@ AtlasLootDefaultFrame_OnShow: Called whenever the loot browser is shown and sets up buttons and loot tables ]] function AtlasLootDefaultFrame_OnShow() - --Definition of where I want the loot table to be shown + --Definition of where I want the loot table to be shown pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" }; --Having the Atlas and loot browser frames shown at the same time would --cause conflicts, so I hide the Atlas frame when the loot browser appears @@ -604,7 +604,7 @@ end --[[ AtlasLoot_AtlasScrollBar_Update: -Hooks the Atlas scroll frame. +Hooks the Atlas scroll frame. Required as the Atlas function cannot deal with the AtlasLoot button template or the added Atlasloot entries ]] function AtlasLoot_AtlasScrollBar_Update() @@ -830,7 +830,7 @@ function AtlasLoot_Atlas_OnShow() AtlasLootPanel:Hide(); else AtlasLootPanel:Show(); - end + end pFrame = AtlasFrame; end @@ -860,7 +860,7 @@ function AtlasLootBoss_OnClick(name) getglobal(name.."_Loot"):Show(); AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame.activeBoss = nil; - else + else --If an loot table is associated with the button, show it. Note multiple tables need to be checked due to the database structure if (AtlasLootBossButtons[zoneID] ~= nil and AtlasLootBossButtons[zoneID][id] ~= nil and AtlasLootBossButtons[zoneID][id] ~= "") then if AtlasLoot_IsLootTableAvailable(AtlasLootBossButtons[zoneID][id]) then @@ -1232,7 +1232,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) else quantityFrame = getglobal("AtlasLootItem_"..i.."_Quantity"); quantityFrame:SetText("") - end + end end --Store data about the state of the items frame to allow minor tweaks or a recall of the current loot page AtlasLootItemsFrame.refresh = {dataID, dataSource_backup, boss, pFrame}; @@ -1530,7 +1530,7 @@ Called when a button in AtlasLoot_Dewdrop is clicked function AtlasLoot_DewDropClick(tablename, text, tabletype) --Definition of where I want the loot table to be shown pFrame = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", "2", "-2" }; - + --If the button clicked was linked to a loot table if tabletype == "Table" then --Show the loot table @@ -2041,7 +2041,7 @@ AtlasLootButton_UpdatePosition: Function to move the minimap button around the minimap. ]] function AtlasLootMinimapButton_UpdatePosition() - AtlasLootMinimapButtonFrame:SetPoint( + AtlasLootMinimapButtonFrame:SetPoint( "TOPLEFT", "Minimap", "TOPLEFT", @@ -2100,10 +2100,10 @@ AtlasLootButton_BeingDragged: Function to move the minimap button around the minimap. ]] function AtlasLootMinimapButton_BeingDragged() - local xpos,ypos = GetCursorPosition() - local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom() - xpos = xmin-xpos/UIParent:GetScale()+70 - ypos = ypos/UIParent:GetScale()-ymin-70 + local xpos,ypos = GetCursorPosition() + local xmin,ymin = Minimap:GetLeft(), Minimap:GetBottom() + xpos = xmin-xpos/UIParent:GetScale()+70 + ypos = ypos/UIParent:GetScale()-ymin-70 AtlasLootMinimapButton_SetPosition(math.deg(math.atan2(ypos,xpos))); end @@ -2158,34 +2158,34 @@ end AtlasLoot_DewDropDown = { [1] = { [AL["Dungeons & Raids"]] = { - [1] = { + [1] = { { AL["Ragefire Chasm"], "RagefireChasm", "Submenu" }, }, - [2] = { + [2] = { { AL["Wailing Caverns"], "WailingCaverns", "Submenu" }, }, - [3] = { + [3] = { { AL["The Deadmines"], "Deadmines", "Submenu" }, }, - [4] = { + [4] = { { AL["Shadowfang Keep"], "ShadowfangKeep", "Submenu" }, }, - [5] = { + [5] = { { AL["Blackfathom Deeps"], "BlackfathomDeeps", "Submenu" }, }, - [6] = { + [6] = { { AL["The Stockade"], "TheStockade", "Submenu" }, }, - [7] = { + [7] = { { AL["Gnomeregan"], "Gnomeregan", "Submenu" }, }, - [8] = { + [8] = { { AL["Razorfen Kraul"], "RazorfenKraul", "Submenu" }, }, - [9] = { + [9] = { { AL["The Crescent Grove"], "TheCrescentGrove", "Submenu" }, }, - [10] = { + [10] = { [AL["Scarlet Monastery"]] = { { AL["Scarlet Monastery"].." "..AL["Graveyard"], "SMGraveyard", "Submenu" }, { AL["Scarlet Monastery"].." "..AL["Library"], "SMLibrary", "Submenu" }, @@ -2193,74 +2193,74 @@ AtlasLoot_DewDropDown = { { AL["Scarlet Monastery"].." "..AL["Cathedral"], "SMCathedral", "Submenu" }, }, }, - [11] = { + [11] = { { AL["Razorfen Downs"], "RazorfenDowns", "Submenu" }, }, - [12] = { + [12] = { { AL["Uldaman"], "Uldaman", "Submenu" }, }, - [13] = { + [13] = { { AL["Maraudon"], "Maraudon", "Submenu" }, }, - [14] = { + [14] = { { AL["Zul'Farrak"], "ZulFarrak", "Submenu" }, }, - [15] = { + [15] = { { AL["The Sunken Temple"], "SunkenTemple", "Submenu" }, }, - [16] = { + [16] = { { AL["Hateforge Quarry"], "HateforgeQuarry", "Submenu" }, }, - [17] = { + [17] = { { AL["Blackrock Depths"], "BlackrockDepths", "Submenu" }, }, - [18] = { + [18] = { [AL["Dire Maul"]] = { { AL["Dire Maul"].." "..AL["East"], "DireMaulEast", "Submenu" }, { AL["Dire Maul"].." "..AL["West"], "DireMaulWest", "Submenu" }, { AL["Dire Maul"].." "..AL["North"], "DireMaulNorth", "Submenu" }, - }, + }, }, - [19] = { + [19] = { { AL["Scholomance"], "Scholomance", "Submenu" }, }, - [20] = { + [20] = { { AL["Stratholme"], "Stratholme", "Submenu" }, }, - [21] = { + [21] = { { AL["Lower Blackrock Spire"], "LowerBlackrock", "Submenu" }, }, - [22] = { + [22] = { { AL["Upper Blackrock Spire"], "UpperBlackrock", "Submenu" }, }, - [23] = { + [23] = { { AL["Karazhan Crypt"], "KarazhanCrypt", "Submenu" }, }, - [24] = { + [24] = { { AL["Caverns of Time: Black Morass"], "CavernsOfTimeBlackMorass", "Submenu" }, }, - [25] = { + [25] = { { AL["Stormwind Vault"], "StormwindVault", "Submenu" }, }, - [26] = { + [26] = { { AL["Zul'Gurub"], "ZulGurub", "Submenu" }, }, - [27] = { + [27] = { { AL["Ruins of Ahn'Qiraj"], "RuinsofAQ", "Submenu" }, }, - [28] = { + [28] = { { AL["Molten Core"], "MoltenCore", "Submenu" }, }, - [29] = { + [29] = { { AL["Onyxia's Lair"], "Onyxia", "Submenu" }, }, - [30] = { + [30] = { { AL["Blackwing Lair"], "BlackwingLair", "Submenu" }, }, - [31] = { + [31] = { { AL["Temple of Ahn'Qiraj"], "TempleofAQ", "Submenu" }, }, - [32] = { + [32] = { { AL["Naxxramas"], "Naxxramas", "Submenu" }, }, }, @@ -2273,65 +2273,65 @@ AtlasLoot_DewDropDown = { }, [4] = { [AL["PvP Rewards"]] = { - [1] = { + [1] = { { AL["PvP Armor Sets"], "PvPArmorSets", "Submenu" }, }, - [2] = { + [2] = { { AL["PvP Accessories"], "PvP60Accessories1", "Table" }, }, - [3] = { + [3] = { { AL["Rank 14 Weapons"], "PVPWeapons1", "Table" }, }, - [4] = { + [4] = { { AL["PvP Mounts"], "PvPMountsPvP", "Table" }, }, - [5] = { + [5] = { { AL["Blood Ring"], "BRRewards", "Submenu" }, }, - [6] = { + [6] = { { AL["Alterac Valley"], "AVRewards", "Submenu" }, }, - [7] = { + [7] = { { AL["Arathi Basin"], "ABRewards", "Submenu" }, }, - [8] = { + [8] = { { AL["Warsong Gulch"], "WSGRewards", "Submenu" }, }, }, }, [5] = { [AL["Sets/Collections"]] = { - [1] = { + [1] = { { AL["Pre 60 Sets"], "Pre60Sets", "Submenu" }, }, - [2] = { + [2] = { { AL["Dungeon 1/2 Sets"], "DungeonSets12", "Submenu" }, }, - [3] = { + [3] = { { AL["Ruins of Ahn'Qiraj Sets"], "AQ20Sets", "Submenu" }, }, - [4] = { + [4] = { { AL["Temple of Ahn'Qiraj Sets"], "AQ40Sets", "Submenu" }, }, - [5] = { + [5] = { { AL["Zul'Gurub Sets"], "ZGSets", "Submenu" }, }, - [6] = { + [6] = { { AL["Tier 1 Sets"], "T1Sets", "Submenu" }, }, - [7] = { + [7] = { { AL["Tier 2 Sets"], "T2Sets", "Submenu" }, }, - [8] = { + [8] = { { AL["Tier 3 Sets"], "T3Sets", "Submenu" }, }, - [9] = { + [9] = { { AL["Legendary Items"], "Legendaries", "Table" }, }, [10] = { { AL["Rare Pets"], "RarePets1", "Table" }, }, - [11] = { + [11] = { { AL["Rare Mounts"], "RareMounts", "Table" }, }, [12] = { @@ -2353,43 +2353,43 @@ AtlasLoot_DewDropDown = { }, [7] = { [AL["World Events"]] = { - [1] = { + [1] = { { AL["Abyssal Council"], "AbyssalCouncil1", "Submenu" }, }, - [2] = { + [2] = { { AL["Children's Week"], "ChildrensWeek", "Table" }, }, - [3] = { + [3] = { { AL["Elemental Invasion"], "ElementalInvasion", "Table" }, }, - [4] = { + [4] = { { AL["Feast of Winter Veil"], "Winterviel1", "Table" }, }, - [5] = { + [5] = { { AL["Gurubashi Arena Booty Run"], "GurubashiArena", "Table" }, }, - [6] = { + [6] = { { AL["Hallow's End"], "Halloween1", "Table" }, }, - [7] = { + [7] = { { AL["Harvest Festival"], "HarvestFestival", "Table" }, }, - [8] = { + [8] = { { AL["Love is in the Air"], "Valentineday", "Table" }, }, - [9] = { + [9] = { { AL["Lunar Festival"], "LunarFestival1", "Table" }, }, - [10] = { + [10] = { { AL["Midsummer Fire Festival"], "MidsummerFestival", "Table" }, }, - [11] = { + [11] = { { AL["Noblegarden"], "Noblegarden", "Table" }, }, - [12] = { + [12] = { { AL["Scourge Invasion"], "ScourgeInvasionEvent1", "Table" }, }, - [13] = { + [13] = { { AL["Stranglethorn Fishing Extravaganza"], "FishingExtravaganza", "Table" }, }, }, @@ -2408,12 +2408,12 @@ AtlasLoot_DewDropDown = { [10] = { { (AL["First Aid"]), "FirstAid1", "Table" }, }, [11] = { { (AL["Survival"]), "Survival1", "Table" }, }, [12] = { { (AL["Poisons"]), "Poisons1", "Table" }, }, - [13] = { + [13] = { [AL["Crafted Sets"]] = { { (AL["Blacksmithing"]), "CraftSetBlacksmith", "Submenu" }, { (AL["Leatherworking"]), "CraftSetLeatherwork", "Submenu" }, { (AL["Tailoring"]), "CraftSetTailoring", "Submenu" }, - }, + }, }, [14] = { { AL["Crafted Epic Weapons"], "CraftedWeapons1", "Table" }, }, }, @@ -2760,7 +2760,7 @@ AtlasLoot_DewDropDown_SubTables = { { AL["Lord Hel'nurath"].." ("..AL["Rare"]..")", "DMWHelnurath" }, { AL["Prince Tortheldrin"], "DMWPrinceTortheldrin" }, { AL["Trash Mobs"], "DMWTrash" }, - { AL["Dire Maul Books"], "DMBooks" }, + { AL["Dire Maul Books"], "DMBooks" }, }, ["DireMaulNorth"] = { { AL["Guard Mol'dar"], "DMNGuardMoldar" }, @@ -3423,7 +3423,7 @@ function AtlasLootItem_OnClick(arg1) elseif(iteminfo and IsShiftKeyDown()) and this.itemID ~= 0 then if WIM_EditBoxInFocus then WIM_EditBoxInFocus:Insert(color.."|Hitem:"..this.itemID..":0:0:0|h["..name.."]|h|r"); - elseif ( ChatFrameEditBox:IsVisible() ) then + elseif ( ChatFrameEditBox:IsVisible() ) then ChatFrameEditBox:Insert(color.."|Hitem:"..this.itemID..":0:0:0|h["..name.."]|h|r"); end elseif IsShiftKeyDown() and iteminfo and this.itemID ~= 0 then @@ -3513,7 +3513,7 @@ function AtlasLootItem_OnClick(arg1) chatnumber = ChatFrameEditBox.tellTarget elseif channel == "CHANNEL" then chatnumber = ChatFrameEditBox.channelTarget - end + end SendChatMessage(AtlasLoot_GetChatLink(GetSpellInfoVanillaDB["craftspells"][tonumber(string.sub(this.itemID, 2))]["craftItem"]),channel,nil,chatnumber); end end @@ -3557,7 +3557,7 @@ local function idFromLink(itemlink) local _,_,id = string.find(itemlink, "|Hitem:([^:]+)%:") return tonumber(id) end - return nil + return nil end function AtlasLoot_CheckBagsForItems(id, qty) @@ -3594,18 +3594,20 @@ function AtlasLoot_SayItemReagents(id, color, name, safe) if not id then return end local chatline = ""; local itemCount = 0; - + local tListActivity = {} local tCount = 0 - for key in WIM_IconItems do - table.insert(tListActivity, key) - tCount = tCount + 1 - end + if (WIM_IconItems and WIM_Icon_SortByActivity) then + for key in WIM_IconItems do + table.insert(tListActivity, key) + tCount = tCount + 1 + end - table.sort(tListActivity, WIM_Icon_SortByActivity) + table.sort(tListActivity, WIM_Icon_SortByActivity) + end - if tListActivity[1] and WIM_Windows[tListActivity[1]].is_visible then + if tListActivity[1] and WIM_Windows and WIM_Windows[tListActivity[1]].is_visible then channel = "WHISPER"; chatnumber = tListActivity[1]; else @@ -3722,7 +3724,7 @@ local localversion = tonumber(major*10000 + minor*100 + fix) local remoteversion = tonumber(AtlasLoot_updateavailable) or 0 local loginchannels = { "BATTLEGROUND", "RAID", "GUILD" } local groupchannels = { "BATTLEGROUND", "RAID" } - + AtlasLoot_updater = CreateFrame("Frame") AtlasLoot_updater:RegisterEvent("CHAT_MSG_ADDON") AtlasLoot_updater:RegisterEvent("PLAYER_ENTERING_WORLD")