Initial support for 11.1.7 D.I.S.C. belt

Author: seriallos

Simulationcraft.toc

@@ -1,9 +1,9 @@
-## Interface: 110100, 110105
+## Interface: 110105, 110107
 ## Title: Simulationcraft
 ## IconTexture: Interface\Addons\SimulationCraft\logo
 ## Notes: Constructs SimC export strings
 ## Author: Theck, navv_, seriallos
-## Version: 11.1.5-01
+## Version: 11.1.7-alpha01
 ## OptionalDependencies: Ace3, LibRealmInfo, LibDBIcon, LibDataBroker-1.1
 ## SavedVariables: SimulationCraftDB
 

core.lua

@@ -31,6 +31,8 @@ LibDBIcon = LibStub("LibDBIcon-1.0")
 
 local SimcFrame = nil
 local OptionsDB = nil
+local SpellCache = {}
+local SpellCacheLoaded = false
 
 local OFFSET_ITEM_ID = 1
 local OFFSET_ENCHANT_ID = 2
@@ -516,6 +518,11 @@ local function GetItemStringFromItemLink(slotNum, itemLink, debugOutput)
     simcItemOptions[#simcItemOptions + 1] = 'crafting_quality=' .. craftingQuality
   end
 
+  -- 11.1.7 Belt
+  if itemId == 242664 or itemId == 245964 or itemId == 245965 or itemId == 245966 then
+    simcItemOptions[#simcItemOptions + 1] = 'titan_disc_id=' .. Simulationcraft:GetDiscBeltSpell()
+  end
+
   local itemStr = ''
   itemStr = itemStr .. (simcSlotNames[slotNum] or 'unknown') .. "=" .. table.concat(simcItemOptions, ',')
   if debugOutput then
@@ -671,6 +678,53 @@ function Simulationcraft:GetItemUpgradeAchievements()
   return table.concat(achieves, '/')
 end
 
+function LoadSpellsAsync(callback)
+  local spellIds = Simulationcraft.preloadSpellIds
+
+  -- Build up the SpellCache asynchronously
+  local numLoaded = 0
+  function onLoad()
+    numLoaded = numLoaded + 1
+
+    if numLoaded == #spellIds then
+      SpellCacheLoaded = true
+      if callback then
+        callback(SpellCache)
+      end
+    end
+  end
+
+  for index=1, #spellIds do
+    local spellId = spellIds[index]
+    local spell = Spell:CreateFromSpellID(spellId)
+    if not spell:IsSpellEmpty() then
+      spell:ContinueOnSpellLoad(function()
+        SpellCache[spellId] = spell
+        onLoad()
+      end)
+    else
+      onLoad()
+    end
+  end
+end
+
+-- This requires the SpellCache with the right spell IDs to be loaded
+function Simulationcraft:GetDiscBeltSpell()
+  local activeSpell = nil
+  local beltDescription = SpellCache[Simulationcraft.discBeltSpell]:GetSpellDescription()
+  if not beltDescription then
+    error('Unable to get spell description for DISC Belt spell')
+  end
+  for k, v in pairs(Simulationcraft.discBeltEffectSpells) do
+    local effectDesc = SpellCache[k]:GetSpellDescription()
+    if beltDescription:find(effectDesc) then
+      activeSpell = v
+    end
+  end
+
+  return activeSpell
+end
+
 function Simulationcraft:GetMainFrame(text)
   -- Frame code largely adapted from https://www.wowinterface.com/forums/showpost.php?p=323901&postcount=2
   if not SimcFrame then
@@ -909,8 +963,7 @@ function Simulationcraft:GetSimcProfile(debugOutput, noBags, showMerchant, links
     "# " .. playerName .. ' - ' .. playerSpec
     .. ' - ' .. date('%Y-%m-%d %H:%M') .. ' - '
     .. playerRegion .. '/' .. playerRealm
- )
-
+  )
 
   -- Construct SimC-compatible strings from the basic information
   local player = Tokenize(playerClass) .. '="' .. playerName .. '"'
@@ -1127,8 +1180,10 @@ end
 
 -- This is the workhorse function that constructs the profile
 function Simulationcraft:PrintSimcProfile(debugOutput, noBags, showMerchant, links)
-  local simulationcraftProfile, simcPrintError = Simulationcraft:GetSimcProfile(debugOutput, noBags, showMerchant, links)
+  LoadSpellsAsync(function()
+    simulationcraftProfile, simcPrintError = Simulationcraft:GetSimcProfile(debugOutput, noBags, showMerchant, links)
 
-  local f = Simulationcraft:GetMainFrame(simcPrintError or simulationcraftProfile)
-  f:Show()
+    local f = Simulationcraft:GetMainFrame(simcPrintError or simulationcraftProfile)
+    f:Show()
+  end)
 end

extras.lua

@@ -310,6 +310,36 @@ Simulationcraft.upgradeAchievements = {
   40945, -- Gilded
 }
 
+-- 11.1.7 Belt spells
+
+Simulationcraft.discBeltSpell = 1233515
+Simulationcraft.discBeltEffectSpells = {
+  [1241240] = 1236279,
+  [1241241] = 1236278,
+  [1241242] = 1236277,
+  [1241243] = 1236961,
+  [1241244] = 1236109,
+  [1241245] = 1236122,
+  [1241246] = 1236272,
+  [1241250] = 1236275,
+  [1241251] = 1236273,
+}
+
+-- Spells to load by LoadSpellsAsync and to store in SpellCache
+Simulationcraft.preloadSpellIds = {
+  -- 11.1.7 DISC Belt Spells
+  1233515,
+  1241240,
+  1241241,
+  1241242,
+  1241243,
+  1241244,
+  1241245,
+  1241246,
+  1241250,
+  1241251,
+}
+
 -- Catalyst currency
 
 Simulationcraft.catalystCurrencies = {