Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Skillet:

-fixed rogue "IsCraft()" calls
-reworking some ARL support
-added test for linked skills (drycode)
  • Loading branch information...
commit d44cd8e505e2e70480ffcfa53400860e07341e04 1 parent f78f5b5
lilsparky authored
View
9 Skillet.lua
@@ -694,8 +694,13 @@ end
-- this means, the skill being shown is for the main toon (not an alt)
function Skillet:SkilletShow()
DebugSpam("SHOW WINDOW (was showing "..(self.currentTrade or "nil")..")");
-
- self.currentPlayer = (UnitName("player"))
+
+ if (IsTradeSkillLinked()) then
+ _, self.currentPlayer = IsTradeSkillLinked()
+ else
+ self.currentPlayer = (UnitName("player"))
+ end
+
--DEFAULT_CHAT_FRAME:AddMessage("SkilletShow")
View
2  SkilletQueue.lua
@@ -381,7 +381,7 @@ end
-- Removes an item from the queue
function Skillet:RemoveQueuedCommand(queueIndex)
- if queueIndex == 1 and not self:IsCraft() then
+ if queueIndex == 1 then
self:CancelCast()
end
View
8 TradeskillInfo.lua
@@ -246,11 +246,7 @@ end
function Skillet:GetTradeSkillLine()
local name, rank, maxRank = GetTradeSkillLine()
- if not name then
- name, rank, maxRank = GetCraftDisplaySkillLine()
- end
-
- if self.currentPlayer == (UnitName("player")) and self.currentTrade == name then
+ if self.currentPlayer == (UnitName("player")) then -- and self.currentTrade == name then
return name, rank, maxRank
else
local rankData = self.db.server.skillRanks[self.currentPlayer]
@@ -258,7 +254,7 @@ function Skillet:GetTradeSkillLine()
if rankData[self.currentPlayer] then
return self.currentTrade, rankData[self.currentTrade].rank, rankData[self.currentTrade].maxRank
else
- return "???", 1, 1
+ return "UNKNOWN", 1, 1
end
end
end
View
25 UI/MainFrame.lua
@@ -332,7 +332,7 @@ function Skillet:ResetTradeSkillWindow()
end
end
else
- SkilletPluginButton:Hide()
+-- SkilletPluginButton:Hide()
end
end
@@ -1866,23 +1866,19 @@ function Skillet:UpdateDetailsWindow(skillIndex)
ARLProfessionTable = ARLProfessionTableInit()
end
- if not AckisRecipeList.RecipeListing then -- and not AckisRecipeList.MissingRecipeListing then
+ if not AckisRecipeList.RecipeListing then
AckisRecipeList:InitializeRecipeArray()
ARLProfessionTable[recipe.tradeID](AckisRecipeList)
end
- if not AckisRecipeList.RecipeListing[recipe.name] then -- and not AckisRecipeList.MissingRecipeListing[recipe.name] then
+ if not AckisRecipeList.RecipeListing[recipe.name] then
ARLProfessionTable[recipe.tradeID](AckisRecipeList)
end
if AckisRecipeList.RecipeListing[recipe.name] then
extra_text = AckisRecipeList.RecipeListing[recipe.name]["Acquire"]
end
-
--- if AckisRecipeList.MissingRecipeListing and AckisRecipeList.MissingRecipeListing[recipe.name] then
--- extra_text = AckisRecipeList.MissingRecipeListing[recipe.name]["Acquire"]
--- end
end
@@ -1906,15 +1902,18 @@ function Skillet:UpdateDetailsWindow(skillIndex)
if not extra_text then
extra_text = "Trained ("..(TradeskillInfo:GetCombineLevel(tsiRecipeID) or "??")..")"
end
+
+ -- SkilletExtraDetailText.dataSource = "TradeSkillInfo Mod - version "..(TradeskillInfo.version or "?")
+-- local _, link = GetItemInfo(combineID)
+--DEFAULT_CHAT_FRAME:AddMessage("recipe: "..(link or combineID))
+ if bopCheck(combineID) then
+ bop = true
+ end
+
else
extra_text = "|cffff0000Unknown|r"
end
- -- SkilletExtraDetailText.dataSource = "TradeSkillInfo Mod - version "..(TradeskillInfo.version or "?")
- local _, link = GetItemInfo(combineID)
---DEFAULT_CHAT_FRAME:AddMessage("recipe: "..(link or combineID))
- if bopCheck(combineID) then
- bop = true
- end
+
else
extra_text = "can't find recipeID for item "..recipe.itemID
end
Please sign in to comment.
Something went wrong with that request. Please try again.