diff --git a/ARLFrame.lua b/ARLFrame.lua
index 7af89b0..daee444 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -2656,7 +2656,7 @@ do
for i = 1, select('#', ...), 1 do
c[i] = select(i, ...)
--- if c[i] == BZ["Isle of Quel'Danas"] then
+-- if c[i] == BZ["The Storm Peaks"] then
-- addon:Print("We have a match.")
-- end
end
@@ -2743,10 +2743,10 @@ do
local INSTANCE_LOCATIONS = {
[BZ["Ahn'kahet: The Old Kingdom"]] = {
- ["loc"] = c1[BZ["Dragonblight"]],
+ ["loc"] = c4[BZ["Dragonblight"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 28.49,
+ ["y"] = 51.73,
},
[BZ["Auchenai Crypts"]] = {
["loc"] = c1[BZ["Terokkar Forest"]],
@@ -2755,10 +2755,10 @@ do
["y"] = 0,
},
[BZ["Azjol-Nerub"]] = {
- ["loc"] = c1[BZ["Dragonblight"]],
+ ["loc"] = c4[BZ["Dragonblight"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 26.01,
+ ["y"] = 50.83,
},
[BZ["Blackrock Depths"]] = {
["loc"] = c1[BZ["Searing Gorge"]],
@@ -2797,16 +2797,16 @@ do
["y"] = 0,
},
[BZ["Halls of Lightning"]] = {
- ["loc"] = c1[BZ["The Storm Peaks"]],
+ ["loc"] = c4[BZ["The Storm Peaks"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 45.40,
+ ["y"] = 21.37,
},
[BZ["Halls of Stone"]] = {
- ["loc"] = c1[BZ["The Storm Peaks"]],
+ ["loc"] = c4[BZ["The Storm Peaks"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 39.49,
+ ["y"] = 26.92,
},
[BZ["Karazhan"]] = {
["loc"] = c1[BZ["Deadwind Pass"]],
@@ -2827,10 +2827,10 @@ do
["y"] = 0,
},
[BZ["The Oculus"]] = {
- ["loc"] = c1[BZ["Borean Tundra"]],
+ ["loc"] = c4[BZ["Borean Tundra"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 27.52,
+ ["y"] = 26.71,
},
[BZ["Old Hillsbrad Foothills"]] = {
["loc"] = c1[BZ["Tanaris"]],
@@ -2911,10 +2911,10 @@ do
["y"] = 0,
},
[BZ["The Nexus"]] = {
- ["loc"] = c1[BZ["Borean Tundra"]],
+ ["loc"] = c4[BZ["Borean Tundra"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 27.50,
+ ["y"] = 25.97,
},
[BZ["The Shattered Halls"]] = {
["loc"] = c1[BZ["Hellfire Peninsula"]],
@@ -2941,22 +2941,22 @@ do
["y"] = 0,
},
[BZ["The Violet Hold"]] = {
- ["loc"] = c1[BZ["Dalaran"]],
+ ["loc"] = c4[BZ["Dalaran"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 66.78,
+ ["y"] = 68.19,
},
[BZ["Utgarde Keep"]] = {
- ["loc"] = c1[BZ["Howling Fjord"]],
+ ["loc"] = c4[BZ["Howling Fjord"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 57.28,
+ ["y"] = 46.73,
},
[BZ["Utgarde Pinnacle"]] = {
- ["loc"] = c1[BZ["Howling Fjord"]],
+ ["loc"] = c4[BZ["Howling Fjord"]],
["c"] = 4,
- ["x"] = 0,
- ["y"] = 0,
+ ["x"] = 57.26,
+ ["y"] = 46.67,
},
[BZ["Zul'Gurub"]] = {
["loc"] = c1[BZ["Stranglethorn Vale"]],
diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua
index e171c05..1968c8d 100644
--- a/AckisRecipeList.lua
+++ b/AckisRecipeList.lua
@@ -390,11 +390,11 @@ function addon:OnInitialize()
-- Create the scan button, then set its parent and scripts.
-------------------------------------------------------------------------------
local scan_button = CreateFrame("Button", nil, UIParent, "UIPanelButtonTemplate")
+ scan_button:SetHeight(20)
-- Add to Skillet interface
if Skillet and Skillet:IsActive() then
scan_button:SetParent(SkilletFrame)
- scan_button:Show()
Skillet:AddButtonToTradeskillWindow(scan_button)
scan_button:SetWidth(80)
elseif MRTUIUtils_RegisterWindowOnShow then
@@ -405,8 +405,39 @@ function addon:OnInitialize()
scan_button:SetWidth(scan_button:GetTextWidth() + 10)
scan_button:Show()
end)
- end
- scan_button:SetHeight(20)
+ elseif ATSWFrame then
+ scan_button:SetParent(ATSWFrame)
+ scan_button:ClearAllPoints()
+
+ if TradeJunkieMain and TJ_OpenButtonATSW then
+ scan_button:SetPoint("RIGHT", TJ_OpenButtonATSW, "LEFT", 0, 0)
+ else
+ scan_button:SetPoint("RIGHT", ATSWOptionsButton, "LEFT", 0, 0)
+ end
+ scan_button:SetHeight(ATSWOptionsButton:GetHeight())
+ scan_button:SetWidth(ATSWOptionsButton:GetWidth())
+ elseif CauldronFrame then
+ scan_button:SetParent(CauldronFrame)
+ scan_button:ClearAllPoints()
+ scan_button:SetPoint("TOP", CauldronFrame, "TOPRIGHT", -58, -52)
+ scan_button:SetWidth(90)
+ else
+ scan_button:SetParent(TradeSkillFrame)
+ scan_button:ClearAllPoints()
+
+ local loc = addon.db.profile.scanbuttonlocation
+
+ if loc == "TR" then
+ scan_button:SetPoint("RIGHT",TradeSkillFrameCloseButton,"LEFT",4,0)
+ elseif loc == "TL" then
+ scan_button:SetPoint("LEFT",TradeSkillFramePortrait,"RIGHT",2,12)
+ elseif loc == "BR" then
+ scan_button:SetPoint("TOP",TradeSkillCancelButton,"BOTTOM",0,-5)
+ elseif loc == "BL" then
+ scan_button:SetPoint("TOP",TradeSkillCreateAllButton,"BOTTOM",0,-5)
+ end
+ scan_button:SetWidth(addon.scan_button:GetTextWidth() + 10)
+ end
scan_button:RegisterForClicks("LeftButtonUp")
scan_button:SetScript("OnClick",
function(self, button, down)
@@ -714,10 +745,8 @@ do
local IsTradeSkillLinked = _G.IsTradeSkillLinked
function addon:TRADE_SKILL_SHOW()
- local is_linked = IsTradeSkillLinked()
-
-- If this is our own skill, save it, if not don't save it
- if not is_linked then
+ if not IsTradeSkillLinked() then
local tradelink = GetTradeSkillListLink()
if tradelink then
@@ -733,46 +762,7 @@ do
addon.db.global.tradeskill[prealm][pname][tradename] = tradelink
end
end
-
- if Skillet then
- return
- end
- local scan_button = self.scan_button
-
- if ATSWFrame then
- scan_button:SetParent(ATSWFrame)
- scan_button:ClearAllPoints()
-
- if TradeJunkieMain and TJ_OpenButtonATSW then
- scan_button:SetPoint("RIGHT", TJ_OpenButtonATSW, "LEFT", 0, 0)
- else
- scan_button:SetPoint("RIGHT", ATSWOptionsButton, "LEFT", 0, 0)
- end
- scan_button:SetHeight(ATSWOptionsButton:GetHeight())
- scan_button:SetWidth(ATSWOptionsButton:GetWidth())
- elseif CauldronFrame then
- scan_button:SetParent(CauldronFrame)
- scan_button:ClearAllPoints()
- scan_button:SetPoint("TOP", CauldronFrame, "TOPRIGHT", -58, -52)
- scan_button:SetWidth(90)
- else
- scan_button:SetParent(TradeSkillFrame)
- scan_button:ClearAllPoints()
-
- local loc = addon.db.profile.scanbuttonlocation
-
- if loc == "TR" then
- scan_button:SetPoint("RIGHT",TradeSkillFrameCloseButton,"LEFT",4,0)
- elseif loc == "TL" then
- scan_button:SetPoint("LEFT",TradeSkillFramePortrait,"RIGHT",2,12)
- elseif loc == "BR" then
- scan_button:SetPoint("TOP",TradeSkillCancelButton,"BOTTOM",0,-5)
- elseif loc == "BL" then
- scan_button:SetPoint("TOP",TradeSkillCreateAllButton,"BOTTOM",0,-5)
- end
- scan_button:SetWidth(addon.scan_button:GetTextWidth() + 10)
- end
- scan_button:Show()
+ self.scan_button:Show()
end
end