Module:Magic: Difference between revisions

Module:Magic (view source)

Revision as of 12:25, 5 March 2022

2,003 bytes added , 5 March 2022

Update for v1.0.3

Auron956

Interface administrators, Administrators

12,704

edits

@@ Line 2: / Line 2: @@
 local MagicData = mw.loadData('Module:Magic/data')
+local SkillData = mw.loadData('Module:Skills/data')
 local Areas = require('Module:CombatAreas')
@@ Line 219: / Line 220: @@
 end
-function p.getSpellsForRune(runeID)
+-- If includeConsumes = true, then checks for Alt Magic spell resource consumptions as well as
+-- the rune cost of spells
+function p.getSpellsForItem(itemID, includeConsumes)
+ if type(includeConsumes) ~= 'boolean' then
+ includeConsumes = false
+ end
+ -- The superheat table is built later as & when needed
+ local superheatCosts, coalID = nil, nil
  local spellList = {}
- for secName, secArray in Shared.skpairs(MagicData) do
+ for secName, secArray in pairs(MagicData) do
- for i, spell in pairs(secArray) do
+ for i, spell in ipairs(secArray) do
  local foundSpell = false
  for j, req in pairs(spell.runesRequired) do
- if req.id == runeID then
+ if req.id == itemID then
- table.insert(spellList, processSpell(secName, i))
  foundSpell = true
  break
  end
  end
- if spell.runesRequiredAlt ~= nil and not foundSpell then
+ if not foundSpell and spell.runesRequiredAlt ~= nil then
  for j, req in pairs(spell.runesRequiredAlt) do
- if req.id == runeID then
+ if req.id == itemID then
- table.insert(spellList, processSpell(secName, i))
+ foundSpell = true
  break
  end
  end
+ end
+ if includeConsumes and not foundSpell and spell.consumes ~= nil and spell.consumes > 0 then
+ -- The consumes property of Alt Magic spells is as follows:
+ -- 0 = Any item
+ -- 1 = Junk item
+ -- 2 = Superheat/ores with Coal
+ -- 3 = Superheat/ores without Coal
+ -- 4 = Nothing
+ -- 5 = Coal ore
+ -- We ignore 4 (no resource consumption) and 0 (as this would flag every item unhelpfully)
+ -- Determine the coal ID for the first time if we need it
+ if coalID == nil and Shared.contains({2, 3, 5}, spell.consumes) then
+ local coalItem = Items.getItem('Coal Ore')
+ if coalItem ~= nil then
+ coalID = coalItem.id
+ end
+ end
+ if spell.consumes == 1 and Shared.contains(SkillData.Fishing.JunkItems, itemID) then
+ foundSpell = true
+ elseif spell.consumes == 2 or spell.consumes == 3 then
+ if superheatCosts == nil then
+ -- Initialize the superheatItems table
+ superheatCosts = {}
+ for j, recipe in ipairs(SkillData.Smithing.Recipes) do
+ if recipe.category == 0 then
+ -- Bar recipe
+ for k, itemCost in ipairs(recipe.itemCosts) do
+ if itemCost.id ~= coalID then
+ superheatCosts[itemCost.id] = true
+ end
+ end
+ end
+ end
+ end
+ local ignoreCoal = (spell.consumes == 3)
+ if superheatCosts[itemID] or (not ignoreCoal and itemID == coalID) then
+ foundSpell = true
+ end
+ elseif spell.consumes == 5 and itemID == coalID then
+ foundSpell = true
+ end
+ end
+ if foundSpell then
+ table.insert(spellList, processSpell(secName, i))
  end
  end
@@ Line 249: / Line 301: @@
  end)
  return spellList
+end
+-- The below function is included for backwards compatibility
+function p.getSpellsForRune(runeID)
+ return p.getSpellsForItem(runeID, false)
 end