Anonymous

Module:Items/UseTables: Difference between revisions

From Melvor Idle

Module:Items/UseTables (view source)

Revision as of 10:57, 5 December 2021

3,959 bytes added ,  5 December 2021
_getItemUses: Classify items with special attacks as used in combat
(Add missing skills to itemUseArray, resolves issue with Gold Emerald Ring)
(_getItemUses: Classify items with special attacks as used in combat)
(31 intermediate revisions by 2 users not shown)
Line 18: Line 18:
local itemUseArray = {
local itemUseArray = {
   Agility = {},
   Agility = {},
  Astrology = {'Stardust', 'Golden Stardust'},
   Attack = {},
   Attack = {},
   Combat = {'Gold Emerald Ring'},
   Combat = {'Gold Emerald Ring'},
Line 37: Line 38:
   Smithing = {'Smithing Gloves', 'Crown of Rhaelyx'},
   Smithing = {'Smithing Gloves', 'Crown of Rhaelyx'},
   Strength = {},
   Strength = {},
  Summoning = {'Crown of Rhaelyx'},
   Thieving = {'Chapeau Noir', 'Thieving Gloves', 'Gloves of Silence'},
   Thieving = {'Chapeau Noir', 'Thieving Gloves', 'Gloves of Silence'},
   Woodcutting = {},
   Woodcutting = {},
Line 65: Line 67:
   [22] = 'Combat',
   [22] = 'Combat',
   [23] = 'Combat',
   [23] = 'Combat',
   [24] = 'Agility'
   [24] = 'Agility',
  [25] = 'Summoning',
  [26] = 'Combat',
  [27] = 'Combat',
  [28] = 'Combat',
  [29] = 'Astrology'
}
}


Line 75: Line 82:


   --Before anything else, if this is a potion add it to the appropriate override section
   --Before anything else, if this is a potion add it to the appropriate override section
   if item.herbloreMasteryID ~= nil then
   if item.masteryID ~= nil and item.masteryID[1] == 19 then
    table.insert(itemUseArray[potionUseArray[item.herbloreMasteryID]], item.name)
  if potionUseArray[item.masteryID[2]] ~= nil then
  table.insert(itemUseArray[potionUseArray[item.masteryID[2]]], item.name)
  else
  table.insert(itemUseArray["Combat"], item.name)
end
   end
   end


   --If the item has any modifiers that affect a given skill, add it to those lists
   --If the item has any modifiers that affect a given skill, add it to those lists
   if item.modifiers ~= nil then
  --Added an exception for Mastery Tokens since they were being incorrectly flagged as usable for all skills
   if item.modifiers ~= nil and (item.isToken == nil or not item.isToken) then
     local skillArray = Constants.getModifierSkills(item.modifiers)
     local skillArray = Constants.getModifierSkills(item.modifiers)
     for i, skillName in Shared.skpairs(skillArray) do
     for i, skillName in Shared.skpairs(skillArray) do
Line 88: Line 100:


   --First things added to the list are non-skill things that are easy to check
   --First things added to the list are non-skill things that are easy to check
   if Items.hasCombatStats(item) or Shared.contains(itemUseArray.Combat, item.name) then
   if Items.hasCombatStats(item) or item.specialAttacks ~= nil or Shared.contains(itemUseArray.Combat, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Combat'}))
     table.insert(useArray, chr..Icons.Icon({'Combat'}))
   end
   end
Line 99: Line 111:
   if item.dropTable ~= nil then
   if item.dropTable ~= nil then
     table.insert(categoryArray, '[[Category:Openable Items]]')
     table.insert(categoryArray, '[[Category:Openable Items]]')
     table.insert(useArray, chr..'[[Chest Drop Tables|Can Be Opened]]')  
     table.insert(useArray, chr..'[[Chest Drop Tables|Can Be Opened]]')
  end
 
  -- Check if the item is an entry requirement for any Slayer area
  local isSlayerAreaReq = false
  if item.isEquipment then
    local slayerAreas = Areas.getAreas(function(area) return area.type == 'slayer' end)
    for i, area in pairs(slayerAreas) do
      if area.entryRequirements ~= nil and type(area.entryRequirements) == 'table' then
        for j, req in pairs(area.entryRequirements) do
          if req.type == "SlayerItem" and req.itemID == item.id then
            isSlayerAreaReq = true
            break
          end
        end
        if isSlayerAreaReq then break end
      end
    end
   end
   end


Line 109: Line 138:
   local canHerblore = false
   local canHerblore = false
   local canAgile = false
   local canAgile = false
  local canSummon = false
  local canCook = false
   if item.trimmedItemID ~= nil then
   if item.trimmedItemID ~= nil then
     canUpgrade = true
     canUpgrade = true
   else
   end
    for i, item2 in pairs(ItemData.Items) do
 
      if item2.itemsRequired ~= nil then
  for i, item2 in pairs(ItemData.Items) do
        for j, req in pairs(item2.itemsRequired) do
    if item2.itemsRequired ~= nil then
          if req[1] == item.id then
      for j, req in pairs(item2.itemsRequired) do
            canUpgrade = true
        if req[1] == item.id then
            break
          canUpgrade = true
          end
          break
         end
         end
       end
       end
    end


      if item2.craftReq ~= nil then
    if item2.craftReq ~= nil then
        for j, req in pairs(item2.craftReq) do
      for j, req in pairs(item2.craftReq) do
          if req.id == item.id then
        if req.id == item.id then
            canCraft = true
          canCraft = true
            break
          break
           end
        end
      end
    end
    if item2.fletchReq ~= nil then
      for j, req in pairs(item2.fletchReq) do
        if req.id == item.id then
           canFletch = true
          break
         end
         end
       end
       end
 
    end
      if item2.fletchReq ~= nil then
    if item2.runecraftReq ~= nil then
        for j, req in pairs(item2.fletchReq) do
      for j, req in pairs(item2.runecraftReq) do
          if req.id == item.id then
        if req.id == item.id then
            canFletch = true
          canRunecraft = true
            break
          break
          end
         end
         end
       end
       end
    end


      if item2.runecraftReq ~= nil then
    if item2.herbloreReq ~= nil then
        for j, req in pairs(item2.runecraftReq) do
      for j, req in pairs(item2.herbloreReq) do
          if req.id == item.id then
        if req.id == item.id then
            canRunecraft = true
          canHerblore = true
            break
          break
          end
         end
         end
       end
       end
    end


      if item2.herbloreReq ~= nil then
    if item2.summoningReq ~= nil then
        for j, req in pairs(item2.herbloreReq) do
      for j, reqSet in pairs(item2.summoningReq) do
        for k, req in pairs(reqSet) do
           if req.id == item.id then
           if req.id == item.id then
             canHerblore = true
             canSummon = true
             break
             break
           end
           end
         end
         end
       end
       end
    end
   
    --Handling for new Cooking method
    if item2.recipeRequirements ~= nil and item2.recipeRequirements[1] ~= nil then
    for j, reqSet in pairs(item2.recipeRequirements) do
    for k, req in pairs(reqSet) do
    if req.id == item.id then
    canCook = true
    break
    end
    end
    end
     end
     end
   end
   end
   --Check if Agility applies here
   --Check if Agility applies here
   canAgile = Shared.tableCount(Agility.getObstaclesForItem(item.id)) > 0
   canAgile = Shared.tableCount(Agility.getObstaclesForItem(item.id)) > 0


  if canUpgrade then
    if item.canUpgrade or (item.type == 'Armour' and item.canUpgrade == nil) then
      table.insert(categoryArray, '[[Category:Upgradeable Items]]')
    end
    table.insert(useArray, chr..'[[Upgrading Items]]')
  end
 
   --Agility
   --Agility
   if canAgile or Shared.contains(itemUseArray.Agility, item.name) then
   if canAgile or Shared.contains(itemUseArray.Agility, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Agility', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Agility', type='skill'}))
  end
  --Astrology
  if Shared.contains(itemUseArray.Astrology, item.name) then
    table.insert(useArray, chr..Icons.Icon({'Astrology', type='skill'}))
   end
   end
   --Cooking
   --Cooking
   if item.cookedItemID ~= nil or Shared.contains(itemUseArray.Cooking, item.name) then
   if canCook or Shared.contains(itemUseArray.Cooking, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Cooking', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Cooking', type='skill'}))
   end
   end
Line 186: Line 237:
   end
   end
   --Firemaking
   --Firemaking
   if SkillData.Firemaking[item.id + 1] ~= nil or Shared.contains(itemUseArray.Firemaking, item.name) then
   if item.firemakingID ~= nil or Shared.contains(itemUseArray.Firemaking, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Firemaking', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Firemaking', type='skill'}))
   end
   end
Line 215: Line 266:
   end
   end
   --Slayer
   --Slayer
   if item.slayerCost ~= nil or Shared.contains(itemUseArray.Slayer, item.name) then
   if isSlayerAreaReq or Shared.contains(itemUseArray.Slayer, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Slayer', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Slayer', type='skill'}))
   end
   end
Line 221: Line 272:
   if item.type == 'Bar' or item.type == 'Ore' or Shared.contains(itemUseArray.Smithing, item.name) then
   if item.type == 'Bar' or item.type == 'Ore' or Shared.contains(itemUseArray.Smithing, item.name) then
     table.insert(useArray, chr..Icons.Icon({'Smithing', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Smithing', type='skill'}))
  end
  --Summoning
  if canSummon or (item.type == 'Shard' and item.category == 'Summoning') or item.type == 'Familiar' or Shared.contains(itemUseArray.Summoning, item.name) then
    table.insert(useArray, chr..Icons.Icon({'Summoning', type='skill'}))
   end
   end
   --Thieving
   --Thieving
Line 230: Line 285:
     table.insert(useArray, chr..Icons.Icon({'Woodcutting', type='skill'}))
     table.insert(useArray, chr..Icons.Icon({'Woodcutting', type='skill'}))
   end
   end
 
 
   --Other odds and ends:
   --Other odds and ends:


   --Mastery Tokens are tied to 'Mastery'
   --Mastery Tokens are tied to 'Mastery'
   if item.type == 'Token' then
   if item.isToken and item.skill ~= nil then
     table.insert(useArray, chr..Icons.Icon({'Mastery'}))
     table.insert(useArray, chr..Icons.Icon({'Mastery'}))
   end
   end


   --Skillcapes are tied to the appropriate skill
   --Skillcapes are tied to the appropriate skill
   --Except Max Skillcape, which is tied to all skills. (And so is the Signet Ring)
   --Except Maximum Skillcape, which is tied to all skills. (And so is the Signet Ring)
   --And combat skillcapes, since combat skills don't get special treatment
   --And combat skillcapes, since combat skills don't get special treatment
 
 
   local ignoreCapes = {'Ranged Skillcape', 'Attack Skillcape', 'Strength Skillcape', 'Hitpoints Skillcape', 'Defence Skillcape'}
   local ignoreCapes = {'Ranged Skillcape', 'Attack Skillcape', 'Strength Skillcape', 'HP Skillcape', 'Defence Skillcape'}
   if item.name == 'Max Skillcape' or item.name == 'Aorpheat's Signet Ring' or item.name == 'Cape of Completion' then
   if Shared.contains({'Maximum Skillcape', 'Aorpheat's Signet Ring', 'Cape of Completion'}, item.name) then
     table.insert(useArray, chr..'All skills')
     table.insert(useArray, chr..'All skills')
   elseif item.name == 'Magic Skillcape' then
   elseif item.name == 'Magic Skillcape' then
Line 250: Line 305:
   elseif Shared.contains(item.name, 'Skillcape') and not Shared.contains(ignoreCapes, item.name) then
   elseif Shared.contains(item.name, 'Skillcape') and not Shared.contains(ignoreCapes, item.name) then
     local skillName = Shared.splitString(item.name, ' ')[1]
     local skillName = Shared.splitString(item.name, ' ')[1]
     table.insert(useArray, chr..Icons.Icon({skillName, type='skill'}))
     --Avoiding double-listing the same skill twice
    if not Shared.contains(itemUseArray[skillName], item.name) then
      table.insert(useArray, chr..Icons.Icon({skillName, type='skill'}))
    end
   end
   end


Line 266: Line 324:
   end
   end


   local result = asList and table.concat(useArray,'\r\n') or table.concat(useArray, '<br/>')
  if canUpgrade then
   if addCategories then result = result..table.concat(categoryArray, '') end
    if item.canUpgrade or (item.type == 'Armour' and item.canUpgrade == nil) then
   return result
      table.insert(categoryArray, '[[Category:Upgradeable Items]]')
    end
    table.insert(useArray, chr..'[[Upgrading Items]]')
  end
 
   local resultPart = {}
  table.insert(resultPart, asList and table.concat(useArray,'\r\n') or table.concat(useArray, '<br/>'))
   if addCategories then table.insert(resultPart, table.concat(categoryArray, '')) end
   return table.concat(resultPart)
end
end


Line 276: Line 342:
   local addCategories = false
   local addCategories = false
   local asList = true
   local asList = true
   if frame.args ~= nil then  
   if frame.args ~= nil then
     addCategories = frame.args.addCategories ~= nil and frame.args.addCategories ~= '' and frame.args.addCategories ~= 'false'
     addCategories = frame.args.addCategories ~= nil and frame.args.addCategories ~= '' and frame.args.addCategories ~= 'false'
     asList = frame.args.addCategories == nil or frame.args.addCategories == '' or frame.args.addCategories == 'true'
     asList = frame.args.addCategories == nil or frame.args.addCategories == '' or frame.args.addCategories == 'true'
Line 315: Line 381:
           local rowReq = item2.craftingLevel
           local rowReq = item2.craftingLevel
           local qty = item2.craftQty
           local qty = item2.craftQty
           table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Crafting', req = rowReq, xp = xp})
           table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Crafting', req = rowReq, xp = xp, gp = item2.craftGPCost})
           break
           break
         end
         end
Line 348: Line 414:
         end
         end
       end
       end
    end
    --Handling for new Cooking method
    if item2.recipeRequirements ~= nil then
    for j, reqSet in pairs(item2.recipeRequirements) do
    for k, req in pairs(reqSet) do
    if req.id == item.id then
    local mat = reqSet
    local xp = item2.cookingXP
    local rowReq = item2.cookingLevel
    local qty = item2.cookingQty
    table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Cooking', req = rowReq, xp = xp})
   
    if item2.perfectItem ~= nil then
    local perfectItem = Items.getItemByID(item2.perfectItem)
    table.insert(useArray, {item = perfectItem, qty = qty, mats = mat, skill = 'Cooking', req = rowReq, xp = xp})
    end
    end
    end
    end
     end
     end
     if item2.runecraftReq ~= nil then
     if item2.runecraftReq ~= nil then
Line 364: Line 449:
       for j, req in pairs(item2.herbloreReq) do
       for j, req in pairs(item2.herbloreReq) do
         if req.id == item.id then
         if req.id == item.id then
           local potionData = SkillData.Herblore.ItemData[item2.herbloreMasteryID + 1]
           local potionData = SkillData.Herblore.ItemData[item2.masteryID[2] + 1]
           local mat = item2.herbloreReq
           local mat = item2.herbloreReq
           local xp = potionData.herbloreXP
           local xp = potionData.herbloreXP
           --Potions do have upgrade requirements though
           --Potions do have upgrade requirements though
           local rowReq = Icons._SkillReq('Herblore', potionData.herbloreLevel)
           local rowReq = Icons._SkillReq('Herblore', potionData.level)
           local masteryLvl = potTierMastery[item2.potionTier]
           local masteryLvl = potTierMastery[item2.potionTier]
           if masteryLvl > 0 then
           if masteryLvl > 0 then
             rowReq = rowReq..'<br/>'..Icons._MasteryReq(item2.name, masteryLvl)
             rowReq = rowReq..'<br/>'..Icons._MasteryReq(item2.name, masteryLvl)
           end
           end
           local reqVal = potionData.herbloreLevel + (masteryLvl * 0.01)
           local reqVal = potionData.level + (masteryLvl * 0.01)
           table.insert(useArray, {item = item2, qty = 1, mats = mat, skill = 'Herblore', reqVal = reqVal, req = rowReq, xp = xp})
           table.insert(useArray, {item = item2, qty = 1, mats = mat, skill = 'Herblore', reqVal = reqVal, req = rowReq, xp = xp})
           break
           break
        end
      end
    end
    if item2.summoningReq ~= nil then
      for j, reqSet in pairs(item2.summoningReq) do
        for k, req in pairs(reqSet) do
          if req.id == item.id then
            local mat = Shared.clone(reqSet)
            mat[k].qty = math.max(math.floor(1000 / math.max(item.sellsFor, 20)), 1)
            local xp = 5 + 2 * math.floor(item2.summoningLevel * 0.2)
            local rowReq = item2.summoningLevel
            table.insert(useArray, {item = item2, qty = 25, mats = mat, skill = 'Summoning', req = rowReq, xp = xp})
          end
         end
         end
       end
       end
Line 385: Line 484:
     local xp = item.farmingXP
     local xp = item.farmingXP
     local rowReq = item.farmingLevel
     local rowReq = item.farmingLevel
     local qty = 5
     local qty = (item.tier ~= nil and item.tier == 'Tree' and 35 or 15)
     table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Farming', req = rowReq, xp = xp})
     table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Farming', req = rowReq, xp = xp})
  end
  if item.cookedItemID ~= nil then
    local item2 = Items.getItemByID(item.cookedItemID)
    local mat = {{id = item.id, qty = 1}}
    local xp = item.cookingXP
    local rowReq = item.cookingLevel
    local qty = 1
    table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Cooking', req = rowReq, xp = xp})
  end
  if item.burntItemID ~= nil then
    local item2 = Items.getItemByID(item.burntItemID)
    local mat = {{id = item.id, qty = 1}}
    local xp = 1
    local rowReq = item.cookingLevel
    local qty = 1
    table.insert(useArray, {item = item2, qty = qty, mats = mat, skill = 'Cooking', req = rowReq, xp = xp})
   end
   end


Line 430: Line 513:


   local spellUseTable = p._getSpellUseTable(item)
   local spellUseTable = p._getSpellUseTable(item)
   local result = ''
   local resultPart = {}
   if Shared.tableCount(useArray) == 0 and Shared.tableCount(obstacles) == 0 then
   if Shared.tableCount(useArray) == 0 and Shared.tableCount(obstacles) == 0 then
     if string.len(spellUseTable) > 0 then
     if string.len(spellUseTable) > 0 then
Line 438: Line 521:
     end
     end
   end
   end
   result = result..'{| class="wikitable sortable"'
   table.insert(resultPart, '{| class="wikitable sortable"')
   result = result..'\r\n!colspan=2|Item Created!!Type!!Requirements!!XP!!Ingredients'
   table.insert(resultPart, '\r\n!colspan=2|Item Created!!Type!!Requirements!!XP!!Ingredients')
   for i, row in pairs(useArray) do
   for i, row in pairs(useArray) do
     local qty = row.qty ~= nil and row.qty or 1
     local qty = row.qty ~= nil and row.qty or 1
     local iconType = row.type ~= nil and row.type or 'item'
     local iconType = row.type ~= nil and row.type or 'item'
     result = result..'\r\n|-\r\n|data-sort-value="'..row.item.name..'"|'
     table.insert(resultPart, '\r\n|-\r\n|data-sort-value="'..row.item.name..'"|')
     result = result..Icons.Icon({row.item.name, type=iconType, notext=true, size=50})..'||'
     table.insert(resultPart, Icons.Icon({row.item.name, type=iconType, notext=true, size=50})..'||')
     if qty > 1 then result = result.."'''"..qty.."x''' " end
     if qty > 1 then table.insert(resultPart, "'''"..qty.."x''' ") end
     result = result..'[['..row.item.name..']]'
     table.insert(resultPart, Icons.Icon({row.item.name, type='item', noicon=true}))
     if row.skill == 'Upgrade' then
     if row.skill == 'Upgrade' then
       result = result..'||data-sort-value="Upgrade"|[[Upgrading Items|Upgrade]]'
       table.insert(resultPart, '||data-sort-value="Upgrade"|[[Upgrading Items|Upgrade]]')
     elseif row.skill == 'Shop' then
     elseif row.skill == 'Shop' then
       result = result..'||data-sort-value="Shop"|'..Icons.Icon({'Shop'})
       table.insert(resultPart, '||data-sort-value="Shop"|'..Icons.Icon({'Shop'}))
     else
     else
       result = result..'||data-sort-value="'..row.skill..'"|'..Icons.Icon({row.skill, type='skill'})
       table.insert(resultPart, '||data-sort-value="'..row.skill..'"|'..Icons.Icon({row.skill, type='skill'}))
     end
     end
     if type(row.req) == 'number' then
     if type(row.req) == 'number' then
       result = result..'|| data-sort-value="'..row.req..'"|'..Icons._SkillReq(row.skill, row.req)
       table.insert(resultPart, '|| style="text-align:right" data-sort-value="'..row.req..'"|'..Icons._SkillReq(row.skill, row.req))
     elseif row.reqVal ~= nil then
     elseif row.reqVal ~= nil then
       result = result..'|| data-sort-value="'..row.reqVal..'"|'..row.req
       table.insert(resultPart, '|| style="text-align:right" data-sort-value="'..row.reqVal..'"|'..row.req)
     else
     else
       result = result..'||'..row.req
       table.insert(resultPart, '||'..row.req)
     end
     end
     if type(row.xp) == 'string' then
     if type(row.xp) == 'string' then
       result = result..'||data-sort-value="0"|'..row.xp
       table.insert(resultPart, '||style="text-align:right" data-sort-value="0"|'..row.xp)
     else
     else
       result = result..'||data-sort-value="'..row.xp..'"|'..row.xp..' '..Icons.Icon({row.skill, type='skill', notext=true})..' XP'
       table.insert(resultPart, '||style="text-align:right" data-sort-value="'..row.xp..'"|'..row.xp..' '..Icons.Icon({row.skill, type='skill', notext=true})..' XP')
     end
     end
     result = result..'||'
     table.insert(resultPart, '||')
     for i, mat in Shared.skpairs(row.mats) do
     for i, mat in Shared.skpairs(row.mats) do
       local matID = mat.id ~= nil and mat.id or mat[1]
       local matID = mat.id ~= nil and mat.id or mat[1]
       local matQty = mat.qty ~= nil and mat.qty or mat[2]
       local matQty = mat.qty ~= nil and mat.qty or mat[2]
       matItem = Items.getItemByID(matID)
       local matText = ''
       if i > 1 then result = result..'<br/>' end
 
       result = result..Icons.Icon({matItem.name, type='item', qty=matQty})
       if i > 1 then table.insert(resultPart, '<br/>') end
       if matID >= 0 then
        -- Item
        local matItem = Items.getItemByID(matID)
        if matItem == nil then
          matText = 'ERROR: Failed to find item with ID ' .. matID .. '[[Category:Pages with Script Errors]]'
        else
          matText = Icons.Icon({matItem.name, type='item', qty=matQty})
        end
      elseif matID == -4 then
        -- GP
        matText = Icons.GP(SkillData.Summoning.Settings.recipeGPCost)
      elseif matID == -5 then
        -- Slayer Coins
        matText = Icons.SC(SkillData.Summoning.Settings.recipeGPCost)
      else
        matText = 'ERROR: Unknown item ID: ' .. matID .. ' [[Category:Pages with Script Errors]]'
      end
      table.insert(resultPart, matText)
     end
     end
     if row.gp ~= nil then result = result..'<br/>'..Icons.GP(row.gp) end
     if row.gp ~= nil then table.insert(resultPart, '<br/>'..Icons.GP(row.gp)) end
   end
   end


   --Agility obstacles are weird and get their own section
   --Agility obstacles are weird and get their own section
   for i, obst in Shared.skpairs(obstacles) do
   for i, obst in Shared.skpairs(obstacles) do
     result = result..'\r\n|-\r\n|'
     table.insert(resultPart, '\r\n|-\r\n|')
     result = result..Icons.Icon({"Agility", type="skill", size="50", notext=true})
     table.insert(resultPart, Icons.Icon({"Agility", type="skill", size="50", notext=true}))
     result = result..'||[[Agility#Obstacles|'..obst.name..']]'
     table.insert(resultPart, '||[[Agility#Obstacles|'..obst.name..']]')
     result = result..'||'..Icons.Icon({"Agility", type="skill"})
     table.insert(resultPart, '||'..Icons.Icon({"Agility", type="skill"}))


     --Adding the requirements for the Agility Obstacle
     --Adding the requirements for the Agility Obstacle
Line 497: Line 598:
       end
       end
     end
     end
     result = result..'||'..table.concat(reqArray, '<br/>')
     table.insert(resultPart, '||style="text-align:right"|'..table.concat(reqArray, '<br/>'))


     --Just including 'N/A' for XP since it doesn't really apply for Agility Obstacles
     --Just including 'N/A' for XP since it doesn't really apply for Agility Obstacles
     result = result..'||N/A'
     table.insert(resultPart, '||style="text-align:right"|N/A')


     --Finally the cost
     --Finally the cost
Line 515: Line 616:
       table.insert(costArray, Icons.Icon({item.name, type="item", qty=mat[2]}))
       table.insert(costArray, Icons.Icon({item.name, type="item", qty=mat[2]}))
     end
     end
   
 
     result = result..'||'..table.concat(costArray, '<br/>')
     table.insert(resultPart, '||'..table.concat(costArray, '<br/>'))


   end
   end


   result = result..'\r\n|}'
   table.insert(resultPart, '\r\n|}')
   if string.len(spellUseTable) > 0 then
   if string.len(spellUseTable) > 0 then
     result = result..'\r\n==='..Icons.Icon({'Magic', type='skill', size='30'})..'===\r\n'..spellUseTable
     table.insert(resultPart, '\r\n==='..Icons.Icon({'Magic', type='skill', size='30'})..'===\r\n'..spellUseTable)
   end
   end
   return '==Uses==\r\n'..result
   return '==Uses==\r\n'..table.concat(resultPart)
end
end


Line 544: Line 645:
   end
   end


   local result = '{|class="wikitable sortable"\r\n!colspan="2"|Spell'
   local resultPart = {}
   result = result..'!!Requirements'
  table.insert(resultPart, '{|class="wikitable sortable"\r\n!colspan="2"|Spell')
   result = result..'!!Type!!style="width:275px"|Description'
   table.insert(resultPart, '!!Requirements')
   result = result..'!!Runes'
   table.insert(resultPart, '!!Type!!style="width:275px"|Description')
   table.insert(resultPart, '!!Runes')
   for i, spell in pairs(spellList) do
   for i, spell in pairs(spellList) do
     local rowTxt = '\r\n|-\r\n|data-sort-value="'..spell.name..'"|'
     local rowPart = {}
     if spell.type == 'Auroras' then
    table.insert(rowPart, '\r\n|-\r\n|data-sort-value="'..spell.name..'"|')
      rowTxt = rowTxt..Icons.Icon({spell.name, type='aurora', notext=true, size=50})
     local iconType = (spell.type == 'Auroras' and 'aurora') or (spell.type == 'Curses' and 'curse') or 'spell'
    elseif spell.type == 'Curses' then
    table.insert(rowPart, Icons.Icon({spell.name, type=iconType, notext=true, size=50}))
      rowTxt = rowTxt..Icons.Icon({spell.name, type='curse', notext=true, size=50})
     table.insert(rowPart, '||'..Icons.Icon({spell.name, type=iconType, noicon=true}))
     else
     table.insert(rowPart, '||data-sort-value="'..spell.level..'"|'..Icons._SkillReq('Magic', spell.level))
      rowTxt = rowTxt..Icons.Icon({spell.name, type='spell', notext=true, size=50})
     end
    rowTxt = rowTxt..'||[['..spell.name..']]'
    rowTxt = rowTxt..'||data-sort-value="'..spell.magicLevelRequired..'"|'..Icons._SkillReq('Magic', spell.magicLevelRequired)
     --Handle required items/dungeon clears
     --Handle required items/dungeon clears
     if spell.requiredItem ~= nil and spell.requiredItem >= 0 then
     if spell.requiredItem ~= nil and spell.requiredItem >= 0 then
       local reqItem = Items.getItemByID(spell.requiredItem)
       local reqItem = Items.getItemByID(spell.requiredItem)
       rowTxt = rowTxt..'<br/>'..Icons.Icon({reqItem.name, type='item', notext=true})..' equipped'
       table.insert(rowPart, '<br/>'..Icons.Icon({reqItem.name, type='item', notext=true})..' equipped')
     end
     end
     if spell.requiredDungeonCompletion ~= nil then
     if spell.requiredDungeonCompletion ~= nil then
       local dung = Areas.getAreaByID('dungeon', spell.requiredDungeonCompletion[1])
       local dung = Areas.getAreaByID('dungeon', spell.requiredDungeonCompletion[1])
       rowTxt = rowTxt..'<br/>'..Icons.Icon({dung.name, type='dungeon', notext=true, qty=spell.requiredDungeonCompletion[2]})..' Clears'
       table.insert(rowPart, '<br/>'..Icons.Icon({dung.name, type='dungeon', notext=true, qty=spell.requiredDungeonCompletion[2]})..' Clears')
    end
    rowTxt = rowTxt..'||data-sort-value="'..Magic.getSpellTypeIndex(spell.type)..'"|'
    rowTxt = rowTxt..Magic.getSpellTypeLink(spell.type)
    if spell.type == 'Spells' then
      rowTxt = rowTxt..'||Combat spell with a max hit of '..(spell.maxHit * 10)
    else
      rowTxt = rowTxt..'||'..spell.description
     end
     end
     rowTxt = rowTxt..'||style="text-align:center"|'
     table.insert(rowPart, '||data-sort-value="'..Magic.getSpellTypeIndex(spell.type)..'"|')
     rowTxt = rowTxt..Magic._getSpellRunes(spell)
    table.insert(rowPart, Magic.getSpellTypeLink(spell.type))
     result = result..rowTxt
    table.insert(rowPart, '||'..Magic._getSpellStat(spell, 'description'))
    table.insert(rowPart, '||style="text-align:center"|')
     table.insert(rowPart, Magic._getSpellRunes(spell))
     table.insert(resultPart, table.concat(rowPart))
   end
   end
   --Add the table end and add the table to the result string
   --Add the table end and add the table to the result string
   result = result..'\r\n|}'
   table.insert(resultPart, '\r\n|}')
   return result
   return table.concat(resultPart)
end
end


Retrieved from "https://wiki.melvoridle.com/w/Special:MobileDiff/44520...48538"