Skip to content

Commit

Permalink
Fix issue #57
Browse files Browse the repository at this point in the history
  • Loading branch information
b-morgan committed Oct 13, 2021
1 parent cf4335f commit 215745c
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 12 deletions.
6 changes: 2 additions & 4 deletions Skillet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -715,10 +715,8 @@ function Skillet:OnEnable()
self.currentGroupLabel = "Blizzard"
self.currentGroup = nil
self.skippedQueue = {}
--
-- run the upgrade code to convert any old settings
--
self:UpgradeDataAndOptions()
self:UpgradeDataAndOptions() -- run the upgrade code to convert any old settings
self:ConvertIgnoreListData()
self:CollectTradeSkillData()
self:CollectCurrencyData()
self:ScanPlayerTradeSkills()
Expand Down
31 changes: 23 additions & 8 deletions SkilletData.lua
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@ end
local TradeSkillIgnoredMats = {
[11479] = 1 , -- Transmute: Iron to Gold
[11480] = 1 , -- Transmute: Mithril to Truesilver
[60350] = 1 , -- Transmute: Titanium
[17559] = 1 , -- Transmute: Air to Fire
[17560] = 1 , -- Transmute: Fire to Earth
[17561] = 1 , -- Transmute: Earth to Water
[17562] = 1 , -- Transmute: Water to Air
[17563] = 1 , -- Transmute: Undeath to Water
[17565] = 1 , -- Transmute: Life to Earth
[17566] = 1 , -- Transmute: Earth to Life
[28022] = 1 , -- large prismatic shard
[28585] = 1 , -- Transmute: Primal Earth to Life
[28566] = 1 , -- Transmute: Primal Air to Fire
[28567] = 1 , -- Transmute: Primal Earth to Water
Expand All @@ -214,6 +214,9 @@ local TradeSkillIgnoredMats = {
[28582] = 1 , -- Transmute: Primal Mana to Fire
[28583] = 1 , -- Transmute: Primal Fire to Mana
[28584] = 1 , -- Transmute: Primal Life to Earth
[42613] = 1 , -- nexus transformation
[42615] = 1 , -- small prismatic shard
[45765] = 1 , -- Void Shatter
[53771] = 1 , -- Transmute: Eternal Life to Shadow
[53773] = 1 , -- Transmute: Eternal Life to Fire
[53774] = 1 , -- Transmute: Eternal Fire to Water
Expand All @@ -226,13 +229,10 @@ local TradeSkillIgnoredMats = {
[53782] = 1 , -- Transmute: Eternal Earth to Shadow
[53783] = 1 , -- Transmute: Eternal Water to Air
[53784] = 1 , -- Transmute: Eternal Water to Fire
[45765] = 1 , -- Void Shatter
[42615] = 1 , -- small prismatic shard
[42613] = 1 , -- nexus transformation
[28022] = 1 , -- large prismatic shard
[118239] = 1 , -- sha shatter
[118238] = 1 , -- ethereal shard shatter
[60350] = 1 , -- Transmute: Titanium
[118237] = 1 , -- mysterious diffusion
[118238] = 1 , -- ethereal shard shatter
[118239] = 1 , -- sha shatter
[181637] = 1 , -- Transmute: Sorcerous-air-to-earth
[181633] = 1 , -- Transmute: Sorcerous-air-to-fire
[181636] = 1 , -- Transmute: Sorcerous-air-to-water
Expand All @@ -247,7 +247,22 @@ local TradeSkillIgnoredMats = {
[181634] = 1 , -- Transmute: Sorcerous-water-to-fire
[181643] = 1 , -- Transmute: Savage Blood
}
Skillet.TradeSkillIgnoredMats = TradeSkillIgnoredMats

function Skillet:ConvertIgnoreListData()
DA.DEBUG(0,"ConvertIgnoreListData()")
self.TradeSkillIgnoredMats = {}
for id in pairs(TradeSkillIgnoredMats) do
local name = GetSpellInfo(id)
--DA.DEBUG(1,"ConvertIgnoreListData: id= "..tostring(id)..", name= "..tostring(name))
if name then
self.TradeSkillIgnoredMats[name] = id
self.TradeSkillIgnoredMats[id] = name
else
--DA.DEBUG(1,"ConvertIgnoreListData: id= "..tostring(id).." is unknown")
self.TradeSkillIgnoredMats[id] = 1
end
end
end

--
-- Enchants that produce items
Expand Down

0 comments on commit 215745c

Please sign in to comment.