diff --git a/ARLFrame.lua b/ARLFrame.lua index 5bcb7c9..303665b 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -342,10 +342,6 @@ do if ((worldmap == true) and (minimap == true)) then - --@debug@ - addon:Print("Setting up mini-map and world map icons with TomTom.") - --@end-debug@ - local icontext = "Interface\\AddOns\\AckisRecipeList\\img\\enchant_up" for i,k in pairs(SortedProfessions) do @@ -415,7 +411,7 @@ do if ((zone) and (continent)) then --@debug@ - addon:Print("Adding vendor ID: " .. k .. " to the world map at coords " .. vendorDB[k]["Coordx"] .. "," .. vendorDB[k]["Coordy"].. " with continent ID: " .. continent .. " and zone ID: " .. zone .. ".") + --addon:Print("Adding vendor ID: " .. k .. " to the world map at coords " .. vendorDB[k]["Coordx"] .. "," .. vendorDB[k]["Coordy"].. " with continent ID: " .. continent .. " and zone ID: " .. zone .. ".") --@end-debug@ local iconuid = TomTom:AddZWaypoint(continent, zone, vendorDB[k]["Coordx"], vendorDB[k]["Coordy"], vendorDB[k]["Name"], false, minimap, worldmap) tinsert(iconlist,iconuid) @@ -2638,57 +2634,36 @@ function addon.RecipeItem_OnClick(button) if (isRecipe) then if (isExpanded) then - -- get rid of our expanded lines traverseIndex = clickedIndex + 1 - while (DisplayStrings[traverseIndex].IsRecipe == false) do - tremove(DisplayStrings, traverseIndex) - -- if this is the last entry in the whole list, we should break out if not DisplayStrings[traverseIndex] then - break - end - end - DisplayStrings[clickedIndex].IsExpanded = false - else - -- add in our expanded lines expandEntry(clickedIndex) -- set our current recipe to expanded DisplayStrings[clickedIndex].IsExpanded = true - end - else - -- this inherently implies that we're on an expanded recipe -- first, back up in the list of buttons until we find our recipe line traverseIndex = clickedIndex - 1 - while (DisplayStrings[traverseIndex].IsRecipe == false) do - traverseIndex = traverseIndex - 1 - end - -- unexpand it DisplayStrings[traverseIndex].IsExpanded = false -- now remove the expanded lines until we get to a recipe again traverseIndex = traverseIndex + 1 - while (DisplayStrings[traverseIndex].IsRecipe == false) do - tremove(DisplayStrings, traverseIndex) - end - end -- finally, call our scrollframe updater diff --git a/Locals/ARLLocals-enUS.lua b/Locals/ARLLocals-enUS.lua index 8348f4b..1867c11 100644 --- a/Locals/ARLLocals-enUS.lua +++ b/Locals/ARLLocals-enUS.lua @@ -1051,7 +1051,6 @@ L["Lesser Infernal"] = true L["Librarian Erickson"] = true L["Lieutenant General Andorov"] = true L["Lieutenant Mancuso"] = true -L["Lightsworn Vindicator"] = true L["Lillehoff"] = true L["Lilliam Sparkspindle"] = true L["Lilly"] = true diff --git a/RecipeDB/ARL-Alchemy.lua b/RecipeDB/ARL-Alchemy.lua index 3858c00..f397484 100644 --- a/RecipeDB/ARL-Alchemy.lua +++ b/RecipeDB/ARL-Alchemy.lua @@ -942,7 +942,7 @@ function addon:InitAlchemy(RecipeDB) recipecount = recipecount + 1 self:addTradeSkill(RecipeDB,28590,370,22861,1,2259) self:addTradeFlags(RecipeDB,28590,1,2,12,21,22,23,24,25,26,27,28,29,30,36,41) - self:addTradeAcquire(RecipeDB,28590,1,22861,8,1) + self:addTradeAcquire(RecipeDB,28590,8,1) -- Flask of Pure Death -- 28591 recipecount = recipecount + 1 diff --git a/RecipeDB/ARL-Trainer.lua b/RecipeDB/ARL-Trainer.lua index 327c6a7..9410404 100644 --- a/RecipeDB/ARL-Trainer.lua +++ b/RecipeDB/ARL-Trainer.lua @@ -334,7 +334,6 @@ function addon:InitTrainer(TrainerDB) self:addLookupList(TrainerDB,22835,L["Cenarion Dreamwarden"],BZONE["Moonglade"],71.76,62.09,0) self:addLookupList(TrainerDB,22848,L["Storm Fury"],BZONE["Black Temple"],0,0,0) self:addLookupList(TrainerDB,22853,L["Illidari Defiler"],BZONE["Black Temple"],0,0,0) - self:addLookupList(TrainerDB,22861,L["Lightsworn Vindicator"],BZONE["Ironforge"],60.92,69.06,1) self:addLookupList(TrainerDB,23734,L["Anchorite Yazmina"],BZONE["Howling Fjord"],60.08,62.29,1) self:addLookupList(TrainerDB,24315,L["Ancient Female Vrykul"],BZONE["Howling Fjord"],60.42,49.80,0) self:addLookupList(TrainerDB,24868,L["Niobe Whizzlespark"],BZONE["Shadowmoon Valley"],37.38,54.95,1) @@ -394,7 +393,7 @@ function addon:InitTrainer(TrainerDB) self:addLookupList(TrainerDB,28701,L["Timothy Jones"],BZONE["Orgrimmar"],36.24,30.08,0) self:addLookupList(TrainerDB,28702,L["Professor Pallin"],BZONE["Dalaran"],42.21,37.09,0) self:addLookupList(TrainerDB,28703,L["Linzy Blackbolt"],BZONE["Dalaran"],41.74,31.90,0) - self:addLookupList(TrainerDB,28705,L["Katherine Lee"],BZONE["Ironforge"],36.06,30.89,1) + self:addLookupList(TrainerDB,28705,L["Katherine Lee"],BZONE["Dalaran"],36.06,30.89,1) self:addLookupList(TrainerDB,28706,L["Olisarra the Kind"],BZONE["Dalaran"],37.31,36.73,0) self:addLookupList(TrainerDB,29194,L["Amal'thazad"],BZONE["Eastern Plaguelands"],80.59,46.22,0) self:addLookupList(TrainerDB,29195,L["Lady Alistra"],BZONE["Eastern Plaguelands"],83.69,43.89,0)