Module:Items/ComparisonTables: Difference between revisions

Swapping over to Auron's v0.21 test version
(adding a category real quick to check if a specific bit of code is actually in use anywhere)
(Swapping over to Auron's v0.21 test version)
Line 1: Line 1:
local p = {}
local p = {}


local MonsterData = mw.loadData('Module:Monsters/data')
local ItemData = mw.loadData('Module:Items/data')
local ItemData = mw.loadData('Module:Items/data')
local SkillData = mw.loadData('Module:Skills/data')


local Constants = require('Module:Constants')
local Constants = require('Module:Constants')
local Shared = require('Module:Shared')
local Shared = require('Module:Shared')
local Magic = require('Module:Magic')
local Areas = require('Module:CombatAreas')
local Icons = require('Module:Icons')
local Icons = require('Module:Icons')
local Items = require('Module:Items')
local Items = require('Module:Items')
local ItemSourceTables = require('Module:Items/SourceTables')
local ItemUseTables = require('Module:Items/UseTables')


local weaponTypes = {'Magic Staff', 'Magic Wand', 'Ranged Weapon', 'Weapon'}
local weaponTypes = {'Magic Staff', 'Magic Wand', 'Ranged Weapon', 'Weapon'}
Line 31: Line 25:


   if(Shared.tableCount(itemList) == 0) then
   if(Shared.tableCount(itemList) == 0) then
     return 'ERROR: you must select at least one item to get stats for'
     return 'ERROR: you must select at least one item to get stats for[[Category:Pages with script errors]]'
   end
   end


   local isWeaponType = Shared.contains(weaponTypes, itemList[1].type)
   local isWeaponType = itemList[1].validSlots ~= nil and Shared.contains(itemList[1].validSlots, 'Weapon') and Shared.contains(weaponTypes, itemList[1].type)


   --Now that we have a preliminary list, let's figure out which columns are irrelevant (IE are zero for all items in the selection)
   --Now that we have a preliminary list, let's figure out which columns are irrelevant (IE are zero for all items in the selection)
Line 67: Line 61:
     end
     end
   end
   end
 
 
   --Alright, let's start the table by building the shared header
   --Alright, let's start the table by building the shared header
   local result = '{| class="wikitable sortable stickyHeader"\r\n|-class="headerRow-0"'
   local resultPart = {}
  table.insert(resultPart, '{| class="wikitable sortable stickyHeader"\r\n|-class="headerRow-0"')
   if isWeaponType then
   if isWeaponType then
     --Weapons have extra columns here for Attack Speed and "Two Handed?"
     --Weapons have extra columns here for Attack Speed and "Two Handed?"
     result = result..'\r\n!colspan="4"|'
     table.insert(resultPart, '\r\n!colspan="4"|')
   else
   else
     result = result..'\r\n!colspan="2"|'
     table.insert(resultPart, '\r\n!colspan="2"|')
   end
   end
   if attBonusCols > 0 then
   if attBonusCols > 0 then
     result = result..'\r\n!colspan="'..attBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Attack Bonus'
     table.insert(resultPart, '\r\n!colspan="'..attBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Attack Bonus')
   end
   end
   if strBonusCols > 0 then
   if strBonusCols > 0 then
     result = result..'\r\n!colspan="'..strBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Str. Bonus'
     table.insert(resultPart, '\r\n!colspan="'..strBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Str. Bonus')
   end
   end
   if Shared.contains(statColumns, 'magicDamageBonus') then
   if Shared.contains(statColumns, 'magicDamageBonus') then
     result = result..'\r\n!colspan="1"style="padding:0 0.5em 0 0.5em;"|% Dmg Bonus'
     table.insert(resultPart, '\r\n!colspan="1"style="padding:0 0.5em 0 0.5em;"|% Dmg Bonus')
   end
   end
   if defBonusCols > 0 then
   if defBonusCols > 0 then
     result = result..'\r\n!colspan="'..defBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Defence Bonus'
     table.insert(resultPart, '\r\n!colspan="'..defBonusCols..'"style="padding:0 0.5em 0 0.5em;"|Defence Bonus')
   end
   end
   if Shared.contains(statColumns, 'damageReduction') then
   if Shared.contains(statColumns, 'damageReduction') then
     result = result..'\r\n!colspan="1"style="padding:0 0.5em 0 0.5em;"|DR'
     table.insert(resultPart, '\r\n!colspan="1"style="padding:0 0.5em 0 0.5em;"|DR')
   end
   end
   if lvlReqCols > 0 then
   if lvlReqCols > 0 then
     result = result..'\r\n!colspan="'..lvlReqCols..'"style="padding:0 0.5em 0 0.5em;"|Lvl Req'
     table.insert(resultPart, '\r\n!colspan="'..lvlReqCols..'"style="padding:0 0.5em 0 0.5em;"|Lvl Req')
   end
   end
   if includeModifiers and includeDescription then
   if includeModifiers and includeDescription then
     result = result..'\r\n!colspan="3"|'
     table.insert(resultPart, '\r\n!colspan="2"|')
   elseif includeModifiers or includeDescription then
   elseif includeModifiers or includeDescription then
     result = result..'\r\n!colspan="2"|'
     table.insert(resultPart, '\r\n!colspan="1"|')
  else
    result = result..'\r\n!colspan="1"|'
   end
   end
   --One header row down, one to go
   --One header row down, one to go
   result = result..'\r\n|-class="headerRow-1"'
   table.insert(resultPart, '\r\n|-class="headerRow-1"')
   result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Item'
   table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Item')
   result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Name'
   table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Name')
   --Weapons have Attack Speed here
   --Weapons have Attack Speed here
   if isWeaponType then
   if isWeaponType then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Attack Speed'
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Attack Speed')
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Two Handed?'
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Two Handed?')
   end
   end
   --Attack bonuses
   --Attack bonuses
   if Shared.contains(statColumns, 'slashAttackBonus') then
   if Shared.contains(statColumns, 'slashAttackBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Attack', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Attack', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'stabAttackBonus') then
   if Shared.contains(statColumns, 'stabAttackBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Strength', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Strength', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'blockAttackBonus') then
   if Shared.contains(statColumns, 'blockAttackBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'rangedAttackBonus') then
   if Shared.contains(statColumns, 'rangedAttackBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'magicAttackBonus') then
   if Shared.contains(statColumns, 'magicAttackBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'}))
   end
   end
   --Strength bonuses
   --Strength bonuses
   if Shared.contains(statColumns, 'strengthBonus') then
   if Shared.contains(statColumns, 'strengthBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Strength', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Strength', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'rangedStrengthBonus') then
   if Shared.contains(statColumns, 'rangedStrengthBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'magicDamageBonus') then
   if Shared.contains(statColumns, 'magicDamageBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'}))
   end
   end
   --Defence bonuses
   --Defence bonuses
   if Shared.contains(statColumns, 'defenceBonus') then
   if Shared.contains(statColumns, 'defenceBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'rangedDefenceBonus') then
   if Shared.contains(statColumns, 'rangedDefenceBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'magicDefenceBonus') then
   if Shared.contains(statColumns, 'magicDefenceBonus') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'damageReduction') then
   if Shared.contains(statColumns, 'damageReduction') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'}))
   end
   end
   --Level requirements
   --Level requirements
   if Shared.contains(statColumns, 'attackLevelRequired') then
   if Shared.contains(statColumns, 'attackLevelRequired') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Attack', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Attack', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'defenceLevelRequired') then
   if Shared.contains(statColumns, 'defenceLevelRequired') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Defence', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'rangedLevelRequired') then
   if Shared.contains(statColumns, 'rangedLevelRequired') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Ranged', type='skill', notext='true'}))
   end
   end
   if Shared.contains(statColumns, 'magicLevelRequired') then
   if Shared.contains(statColumns, 'magicLevelRequired') then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'})
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|'..Icons.Icon({'Magic', type='skill', notext='true'}))
   end
   end
   --If includeModifiers is set to 'true', add the Modifiers column
   --If includeModifiers is set to 'true', add the Modifiers column
   if includeModifiers then
   if includeModifiers then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Modifiers'
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Modifiers')
   end
   end
   --If includeDescription is set to 'true', add the Description column
   --If includeDescription is set to 'true', add the Description column
   if includeDescription then
   if includeDescription then
     result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Description'
     table.insert(resultPart, '\r\n!style="padding:0 1em 0 0.5em;"|Description')
   end
   end
  --And finally Sources
  result = result..'\r\n!style="padding:0 1em 0 0.5em;"|Sources'


   table.sort(itemList, function(a, b) return a.id < b.id end)
   table.sort(itemList, function(a, b) return a.id < b.id end)
Line 178: Line 168:
     if isWeaponType then
     if isWeaponType then
       --Building rows for weapons
       --Building rows for weapons
       result = result..'\r\n|-'
       table.insert(resultPart, '\r\n|-')
       result = result..'\r\n|style ="text-align: left;padding: 0 0 0 0;"|'..Icons.Icon({item.name, type='item', size=50, notext=true})
       table.insert(resultPart, '\r\n|style ="text-align: left;padding: 0 0 0 0;"|'..Icons.Icon({item.name, type='item', size=50, notext=true}))
       result = result..'\r\n|style ="text-align: left;padding: 0 0.5em 0 0.5em;"|[['..item.name..']]'
       table.insert(resultPart, '\r\n|style ="text-align: left;padding: 0 0.5em 0 0.5em;"|[['..item.name..']]')
       result = result..'\r\n| style ="text-align: right;padding: 0 0.5em 0 0;" |'..Shared.formatnum(item.attackSpeed)
       table.insert(resultPart, '\r\n| style ="text-align: right;padding: 0 0.5em 0 0;" |'..Shared.formatnum(Items._getItemStat(item, 'attackSpeed', true)))
       --That's the first list out of the way, now for 2-Handed
       --That's the first list out of the way, now for 2-Handed
       result = result..'\r\n| style ="text-align: right;"|'
       table.insert(resultPart, '\r\n| style ="text-align: right;"|')
       if item.isTwoHanded then result = result..'Yes' else result = result..'No' end
       table.insert(resultPart, Items._getItemStat(item, 'isTwoHanded') and 'Yes' or 'No')
       for j, statName in pairs(statColumns) do
       for j, statName in pairs(statColumns) do
         local statValue = Items._getItemStat(item, statName, true)
         local statValue = Items._getItemStat(item, statName, true)
         result = result..'\r\n| style ="text-align: right;padding: 0 0.5em 0 0;'
         table.insert(resultPart, '\r\n| style ="text-align: right;padding: 0 0.5em 0 0;')
         if not Shared.contains(statName, 'LevelRequired') then
         if string.find(statName, '^(.+)LevelRequired$') == nil then
           if statValue > 0 then
           if statValue > 0 then
             result = result..'background-color:lightgreen;'
             table.insert(resultPart, 'background-color:lightgreen;')
           elseif statValue < 0 then
           elseif statValue < 0 then
             result = result..'background-color:lightpink;'
             table.insert(resultPart, 'background-color:lightpink;')
           end
           end
         end
         end
         result = result..'"|'..Shared.formatnum(statValue)
         table.insert(resultPart, '"|'..Shared.formatnum(statValue))
         if statName == 'magicDamageBonus' or statName == 'damageReduction' then result = result..'%' end
         if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end
       end
       end
       --If requested, add the item Modifiers
       --If requested, add the item Modifiers
       if includeModifiers then
       if includeModifiers then
         result = result..'\r\n|style="text-align:left;white-space:nowrap;padding:0 0.5em 0 0.5em;"|'
         table.insert(resultPart, '\r\n|style="text-align:left;white-space:nowrap;padding:0 0.5em 0 0.5em;"|')
         result = result..Constants.getModifiersText(item.modifiers, true)
         table.insert(resultPart, Constants.getModifiersText(item.modifiers, true))
       end
       end
       --If requested, add description
       --If requested, add description
       if includeDescription then
       if includeDescription then
         result = result..'\r\n|style="text-align:left;padding:0 0.5em 0 0.5em;"|'
         table.insert(resultPart, '\r\n|style="text-align:left;padding:0 0.5em 0 0.5em;"|')
         result = result..(item.description ~= nil and item.description or '')
         table.insert(resultPart, item.description ~= nil and item.description or '')
       end
       end
      --Finally, the Sources
      result = result..'\r\n| style ="text-align: right;padding: 0 0.5em 0 0.5em;" |'
      result = result..ItemSourceTables._getItemSources(item)
     else
     else
       --Building rows for armour
       --Building rows for armour
       result = result..'\r\n|-'
       table.insert(resultPart, '\r\n|-')
       result = result..'\r\n|style ="text-align: left;padding: 0 0 0 0;"|'..Icons.Icon({item.name, type='item', size=50, notext=true})
       table.insert(resultPart, '\r\n|style ="text-align: left;padding: 0 0 0 0;"|'..Icons.Icon({item.name, type='item', size=50, notext=true}))
       result = result..'\r\n|style ="text-align: left;padding: 0 0.5em 0 0.5em;"|[['..item.name..']]'
       table.insert(resultPart, '\r\n|style ="text-align: left;padding: 0 0.5em 0 0.5em;"|[['..item.name..']]')
       for j, statName in pairs(statColumns) do
       for j, statName in pairs(statColumns) do
         local statValue = Items._getItemStat(item, statName, true)
         local statValue = Items._getItemStat(item, statName, true)
         result = result..'\r\n| style ="text-align: right;padding: 0 0.5em 0 0;'
         table.insert(resultPart, '\r\n| style ="text-align: right;padding: 0 0.5em 0 0;')
         if statValue > 0 then
         if statValue > 0 then
           result = result..'background-color:lightgreen;'
           table.insert(resultPart, 'background-color:lightgreen;')
         elseif statValue < 0 then
         elseif statValue < 0 then
           result = result..'background-color:lightpink;'
           table.insert(resultPart, 'background-color:lightpink;')
         end
         end
         result = result..'"|'..Shared.formatnum(statValue)
         table.insert(resultPart, '"|'..Shared.formatnum(statValue))
         if statName == 'magicDamageBonus' or statName == 'damageReduction' then result = result..'%' end
         if statName == 'magicDamageBonus' or statName == 'damageReduction' then table.insert(resultPart, '%') end
       end
       end
       --If requested, add the item Modifiers
       --If requested, add the item Modifiers
       if includeModifiers then
       if includeModifiers then
         result = result..'\r\n|style="text-align:left;white-space:nowrap;padding:0 0.5em 0 0.5em;"|'
         table.insert(resultPart, '\r\n|style="text-align:left;white-space:nowrap;padding:0 0.5em 0 0.5em;"|')
         result = result..Constants.getModifiersText(item.modifiers, true)
         table.insert(resultPart, Constants.getModifiersText(item.modifiers, true))
       end
       end
       --If requested, add description
       --If requested, add description
       if includeDescription then
       if includeDescription then
         result = result..'\r\n|style="text-align:left;padding:0 0.5em 0 0.5em;"|'
         table.insert(resultPart, '\r\n|style="text-align:left;padding:0 0.5em 0 0.5em;"|')
         result = result..(item.description ~= nil and item.description or '')
         table.insert(resultPart, item.description ~= nil and item.description or '')
       end
       end
      --Finally, the Sources
      result = result..'\r\n| style ="text-align: right;padding: 0 0.5em 0 0.5em;" |'
      result = result..ItemSourceTables._getItemSources(item)
     end
     end
   end
   end


   result = result..'\r\n|}'
   table.insert(resultPart, '\r\n|}')
   return result
 
   return table.concat(resultPart)
end
end


Line 251: Line 236:
   local type = args.type
   local type = args.type
   local tier = args.tier
   local tier = args.tier
   local slotStr = args.slot
   local slot = args.slot
   local ammoTypeStr = args.ammoType
   local ammoTypeStr = args.ammoType
   local category = args.category ~= nil and args.category or 'Combat'
   local category = args.category ~= nil and args.category or 'Combat'
Line 269: Line 254:
   end
   end


  --Find out what slot we're working with
  local slot = nil
  if slotStr ~= nil then
    slot = Constants.getEquipmentSlotID(slotStr)
  end
 
   local isWeaponType = Shared.contains(weaponTypes, type)
   local isWeaponType = Shared.contains(weaponTypes, type)


Line 289: Line 268:
       --Now for handling armour
       --Now for handling armour
       if type == "Armour" or type == "Melee" then
       if type == "Armour" or type == "Melee" then
         listItem = item.defenceLevelRequired ~= nil or (item.category == 'Combat' and item.type == 'Armour')
         listItem = Items._getItemStat(item, 'defenceLevelRequired') ~= nil or (item.category == 'Combat' and item.type == 'Armour')
       elseif type == "Ranged Armour" or type == "Ranged" then
       elseif type == "Ranged Armour" or type == "Ranged" then
         listItem = item.rangedLevelRequired ~= nil or (item.category == 'Combat' and item.type == 'Ranged Armour')
         listItem = Items._getItemStat(item, 'rangedLevelRequired') ~= nil or (item.category == 'Combat' and item.type == 'Ranged Armour')
       elseif type == "Magic Armour" or type == "Magic" then
       elseif type == "Magic Armour" or type == "Magic" then
         listItem = item.magicLevelRequired ~= nil or (item.category == 'Combat' and item.type == 'Magic Armour')
         listItem = Items._getItemStat(item, 'magicLevelRequired') or (item.category == 'Combat' and item.type == 'Magic Armour')
       else
       else
         listItem = item.type == type and item.category ~= 'Combat'
         listItem = item.type == type and item.category ~= 'Combat'
       end
       end
       if ammoType ~= nil then listItem = listItem and item.ammoType == ammoType end
       if ammoType ~= nil then listItem = listItem and item.ammoType == ammoType end
       if slot ~= nil then listItem = listItem and item.equipmentSlot == slot end
       if slot ~= nil then listItem = listItem and Shared.contains(item.validSlots, slot) end
     end
     end
     if listItem then
     if listItem then
Line 305: Line 284:
   end
   end


   return p._getEquipmentTable(itemList).."[[Category:getEquipmentTable]]"
   local result = p._getEquipmentTable(itemList).."[[Category:getEquipmentTable]]"
 
  return result
end
end


function p._getCategoryTable(style, slot, other, includeModifiers, includeDescription)
function p._getCategoryTable(style, slot, other, includeModifiers, includeDescription)
   if type(slot) == 'string' then
   if type(slot) == 'number' then
     slot = Constants.getEquipmentSlotID(slot)
     slot = Constants.getEquipmentSlotName(slot)
   end
   end


Line 316: Line 297:
       local isMatch = true
       local isMatch = true
       if style == 'Melee' then
       if style == 'Melee' then
         if (item.defenceLevelRequired == nil and item.attackLevelRequired == nil) and not Shared.contains(styleOverrides.Melee, item.name) then isMatch = false end
         if (Items._getItemStat(item, 'defenceLevelRequired') == nil and Items._getItemStat(item, 'attackLevelRequired') == nil) and not Shared.contains(styleOverrides.Melee, item.name) then isMatch = false end
       elseif style == 'Ranged' then
       elseif style == 'Ranged' then
         if item.rangedLevelRequired == nil and not Shared.contains(styleOverrides.Ranged, item.name) then isMatch = false end
         if Items._getItemStat(item, 'rangedLevelRequired') == nil and not Shared.contains(styleOverrides.Ranged, item.name) then isMatch = false end
       elseif style == 'Magic' then
       elseif style == 'Magic' then
         if item.magicLevelRequired == nil and not Shared.contains(styleOverrides.Magic, item.name) then isMatch = false end
         if Items._getItemStat(item, 'magicLevelRequired') == nil and not Shared.contains(styleOverrides.Magic, item.name) then isMatch = false end
       elseif style == 'None' then
       elseif style == 'None' then
         if (item.defenceLevelRequired ~= nil or item.rangedLevelRequired ~= nil or item.magicLevelRequired ~= nil or
         if (Items._getItemStat(item, 'defenceLevelRequired') ~= nil or Items._getItemStat(item, 'rangedLevelRequired') ~= nil or Items._getItemStat(item, 'magicLevelRequired') ~= nil or
           Shared.contains(styleOverrides.Melee, item.name) or Shared.contains(styleOverrides.Ranged, item.name) or Shared.contains(styleOverrides.Magic, item.name)) and
           Shared.contains(styleOverrides.Melee, item.name) or Shared.contains(styleOverrides.Ranged, item.name) or Shared.contains(styleOverrides.Magic, item.name)) and
           not Shared.contains(styleOverrides.None, item.name) then
           not Shared.contains(styleOverrides.None, item.name) then
Line 328: Line 309:
         end
         end
       end
       end
 
       if slot == nil or not Shared.contains(item.validSlots, slot) then isMatch = false end
       if slot == nil or slot ~= item.equipmentSlot then isMatch = false end


       if isMatch and other ~= nil then
       if isMatch and other ~= nil then
         if slot == 4 then --For quiver slot or weapon slot, 'other' is the ammo type
         if slot == 'Weapon' then --For quiver slot or weapon slot, 'other' is the ammo type
           if other == 'Arrows' then
           if other == 'Arrows' then
             if item.ammoTypeRequired ~= 0 then isMatch = false end
             if item.ammoTypeRequired ~= 0 then isMatch = false end
Line 338: Line 318:
             if item.ammoTypeRequired ~= 1 then isMatch = false end
             if item.ammoTypeRequired ~= 1 then isMatch = false end
           end
           end
         elseif slot == 9 then
         elseif slot == 'Quiver' then
           if other == 'Arrows' then
           if other == 'Arrows' then
             if item.ammoType ~= 0 then isMatch = false end
             if item.ammoType ~= 0 then isMatch = false end
Line 356: Line 336:
     end)
     end)


   return p._getEquipmentTable(itemList, includeModifiers, includeDescription)
   local result = p._getEquipmentTable(itemList, includeModifiers, includeDescription)
 
  return result
end
end


Line 380: Line 362:


   local itemList = {}
   local itemList = {}
   local errMsg = 'ERROR: Some items not found in database: '
   local errMsg = 'ERROR: Some items not found in database: [[Category:Pages with script errors]]'
   local hasErr = false
   local hasErr = false
   for i, name in Shared.skpairs(itemNames) do
   for i, name in Shared.skpairs(itemNames) do
Line 397: Line 379:
     return p._getEquipmentTable(itemList, includeModifiers)
     return p._getEquipmentTable(itemList, includeModifiers)
   end
   end
end
function p.getDoubleLootTable(frame)
  local itemList = Items.getItems(function(item) return item.chanceToDoubleLoot ~= nil and item.chanceToDoubleLoot > 0 end)
  table.sort(itemList, function(a, b) return a.id < b.id end)
  local result = '{| class="wikitable sortable stickyHeader"\r\n|-class="headerRow-0"'
  result = result..'\r\n!colspan="2"|Name!!Bonus!!Description!!Sources'
  for i, item in Shared.skpairs(itemList) do
    result = result..'\r\n|-'
    result = result..'\r\n|data-sort-value="'..item.name..'"|'..Icons.Icon({item.name, type='item', size=50, notext=true})
    result = result..'||[['..item.name..']]'
    result = result..'||style ="text-align: right;" data-sort-value="'..item.chanceToDoubleLoot..'"|'..item.chanceToDoubleLoot..'%'
    result = result..'||'..item.description
    result = result..'\r\n| style ="text-align: right;white-space: nowrap;padding: 0 0.5em 0 0.5em;" |'
    result = result..ItemSourceTables._getItemSources(item)
  end
  result = result..'\r\n|}'
  return result
end
function p.getItemTableRows(frame)
  local startID = frame.args ~= nil and frame.args[1] or frame[1]
  local rowCount = frame.args ~= nil and frame.args[2] or frame[2]
  if type(startID ) == 'string' then startID = tonumber(startID) end
  if rowCount == nil then rowCount = 200 end
  if type(rowCount) == 'string' then rowCount = tonumber(rowCount) end
 
  local rowResult = {}
  for i = startID, startID + rowCount - 1, 1 do
    local item = Items.getItemByID(i)
    if item == nil then break end
    local rowTxt = '|-\r\n|'..Icons.Icon({item.name, type='item', size='50', notext=true})..'||[['..item.name..']]'
    rowTxt = rowTxt..'||style="text-align:right;"|'..i..'||'..item.category..'||'..item.type
    rowTxt = rowTxt..'||style="text-align:right;" data-sort-value="'..item.sellsFor..'"|'..Icons.GP(item.sellsFor)
    rowTxt = rowTxt..'||style="text-align:right;"|'..ItemSourceTables._getItemSources(item, false, 'false')
    rowTxt = rowTxt..'||style="text-align:right;"|'..ItemUseTables._getItemUses(item, false, 'false')
    table.insert(rowResult, rowTxt)
  end
  return table.concat(rowResult, '\r\n')..'[[Category:Double loot table]]'
end
end


Line 455: Line 396:


   --Unfortunately just gonna have to manually check all the changes I think...
   --Unfortunately just gonna have to manually check all the changes I think...
   local attBon1 = item1.attackBonus ~= nil and item1.attackBonus or {0, 0, 0}
   local statList = {
  local attBon2 = item2.attackBonus ~= nil and item2.attackBonus or {0, 0, 0}
    -- {'statName', 'statDescription'}
  getSpecificStatString(attBon1[1], attBon2[1], '{V} '..Icons.Icon({'Melee', notext=true})..' Stab Bonus')
    {'stabAttackBonus', '{V} '..Icons.Icon({'Melee', notext=true})..' Stab Bonus'},
  getSpecificStatString(attBon1[2], attBon2[2], '{V} '..Icons.Icon({'Melee', notext=true})..' Slash Bonus')
    {'slashAttackBonus', '{V} '..Icons.Icon({'Melee', notext=true})..' Slash Bonus'},
  getSpecificStatString(attBon1[3], attBon2[3], '{V} '..Icons.Icon({'Melee', notext=true})..' Block Bonus')
    {'blockAttackBonus', '{V} '..Icons.Icon({'Melee', notext=true})..' Block Bonus'},
 
    {'meleeStrengthBonus', '{V} '..Icons.Icon({'Strength', type='skill', notext=true})..' Strength Bonus'},
  getSpecificStatString(item1.strengthBonus, item2.strengthBonus, '{V} '..Icons.Icon({'Strength', type='skill', notext=true})..' Strength Bonus')
    {'rangedStrengthBonus', '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Strength Bonus'},
  getSpecificStatString(item1.rangedStrengthBonus, item2.rangedStrengthBonus, '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Strength Bonus')
    {'magicStrengthBonus', '{V}% '..Icons.Icon({'Magic', type='skill', notext=true})..' Damage Bonus'},
  getSpecificStatString(item1.magicDamageBonus, item2.magicDamageBonus, '{V}% '..Icons.Icon({'Magic', type='skill', notext=true})..' Damage Bonus')
    {'meleeDefenceBonus', '{V} '..Icons.Icon({'Defence', type='skill', notext=true})..' Defence Bonus'},
 
    {'rangedDefenceBonus', '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Defence Bonus'},
  getSpecificStatString(item1.defenceBonus, item2.defenceBonus, '{V} '..Icons.Icon({'Defence', type='skill', notext=true})..' Defence Bonus')
    {'magicDefenceBonus', '{V} '..Icons.Icon({'Magic', type='skill', notext=true})..' Defence Bonus'},
  getSpecificStatString(item1.rangedDefenceBonus, item2.rangedDefenceBonus, '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Defence Bonus')
    {'damageReduction', '{V}% Damage Reduction'},
  getSpecificStatString(item1.magicDefenceBonus, item2.magicDefenceBonus, '{V} '..Icons.Icon({'Magic', type='skill', notext=true})..' Defence Bonus')
    {'increasedSlayerXP', '{V}% '..Icons.Icon({'Slayer', type='skill', notext=true})..' Bonus XP'},
  getSpecificStatString(item1.damageReduction, item2.damageReduction, '{V}% Damage Reduction')
    {'attackLevelRequired', '{V} '..Icons.Icon({'Attack', type='skill', notext=true})..' Level Required'},
 
    {'defenceLevelRequired', '{V} '..Icons.Icon({'Defence', type='skill', notext=true})..' Level Required'},
  local SlayBon1 = Items._getItemModifier(item1, 'increasedSkillXP', 'Slayer')
    {'rangedLevelRequired', '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Level Required'},
  local SlayBon2 = Items._getItemModifier(item2, 'increasedSkillXP', 'Slayer')
    {'magicLevelRequired', '{V} '..Icons.Icon({'Magic', type='skill', notext=true})..' Level Required'},
  getSpecificStatString(SlayBon1, SlayBon2, '{V}% '..Icons.Icon({'Slayer', type='skill', notext=true})..' Bonus XP')
  }
 
  for i, stat in ipairs(statList) do
  getSpecificStatString(item1.attackLevelRequired, item1.attackLevelRequired, '{V} '..Icons.Icon({'Attack', type='skill', notext=true})..' Level Required')
    if stat[1] == 'increasedSlayerXP' then
  getSpecificStatString(item1.defenceLevelRequired, item1.defenceLevelRequired, '{V} '..Icons.Icon({'Defence', type='skill', notext=true})..' Level Required')
      getSpecificStatString(Items._getItemModifier(item1, stat[1], 'Slayer'), Items._getItemModifier(item2, stat[1], 'Slayer'), stat[2])
  getSpecificStatString(item1.rangedLevelRequired, item1.rangedLevelRequired, '{V} '..Icons.Icon({'Ranged', type='skill', notext=true})..' Level Required')
    else
  getSpecificStatString(item1.magicLevelRequired, item1.magicLevelRequired, '{V} '..Icons.Icon({'Magic', type='skill', notext=true})..' Level Required')
      getSpecificStatString(Items._getItemStat(item1, stat[1]), Items._getItemStat(item2, stat[1]), stat[2])
    end
  end


   return table.concat(changeArray, '<br/>')
   return table.concat(changeArray, '<br/>')
Line 490: Line 433:
     itemArray = Items.getItems(function(item) return Shared.contains(item.name, 'Potion') and item.itemsRequired ~= nil end)
     itemArray = Items.getItems(function(item) return Shared.contains(item.name, 'Potion') and item.itemsRequired ~= nil end)
   elseif string.upper(category) == 'OTHER' then
   elseif string.upper(category) == 'OTHER' then
     itemArray = Items.getItems(function(item)  
     itemArray = Items.getItems(function(item)
           return not Shared.contains(item.name, 'Potion') and item.itemsRequired ~= nil and item.equipmentSlot == nil
           return not Shared.contains(item.name, 'Potion') and item.itemsRequired ~= nil and item.validSlots == nil
         end)
         end)
   else
   else
     local equipSlot = Constants.getEquipmentSlotID(category)
     if Constants.getEquipmentSlotID(category) == nil then
    if equipSlot == nil then
       return 'ERROR: Invalid option. Choose either an equipment slot, Potion, or Other[[Category:Pages with script errors]]'
       return 'ERROR: Invalid option. Choose either an equipment slot, Potion, or Other[[Category:Pages with script errors]]'
     end
     end
     isEquipment = true
     isEquipment = true
     itemArray = Items.getItems(function(item)  
     itemArray = Items.getItems(function(item)
           return item.itemsRequired ~= nil and item.equipmentSlot == equipSlot
           return item.itemsRequired ~= nil and Shared.contains(item.validSlots, category)
         end)
         end)
   end
   end
   table.sort(itemArray, function(a, b) return a.id < b.id end)
   table.sort(itemArray, function(a, b) return a.id < b.id end)


   local result = '{| class="wikitable sortable stickyHeader"'
   local resultPart = {}
   result = result..'\r\n|- class="headerRow-0"'
  table.insert(resultPart, '{| class="wikitable sortable stickyHeader"')
   result = result..'\r\n!colspan="2"|Upgraded Item!!Ingredients'
   table.insert(resultPart, '\r\n|- class="headerRow-0"')
   if isEquipment then result = result..'!!Stat Change' end
   table.insert(resultPart, '\r\n!colspan="2"|Upgraded Item!!Ingredients')
   if isEquipment then table.insert(resultPart, '!!Stat Change') end


   for i, item in Shared.skpairs(itemArray) do
   for i, item in Shared.skpairs(itemArray) do
     result = result..'\r\n|-'
     table.insert(resultPart, '\r\n|-')
     result = result..'\r\n|'..Icons.Icon({item.name, type='item', size='50', notext=true})..'||[['..item.name..']]'
     table.insert(resultPart, '\r\n|'..Icons.Icon({item.name, type='item', size='50', notext=true})..'||[['..item.name..']]')


     local matArray = {}
     local matArray = {}
Line 520: Line 463:
       table.insert(matArray, Icons.Icon({mat.name, type='item', qty=row[2]}))
       table.insert(matArray, Icons.Icon({mat.name, type='item', qty=row[2]}))


       if item.equipmentSlot ~= nil and mat.equipmentSlot ~= nil and statChangeString == '' then
       if item.validSlots ~= nil and mat.validSlots ~= nil and statChangeString == '' then
         statChangeString = p.getStatChangeString(item, mat)
         statChangeString = p.getStatChangeString(item, mat)
       end
       end
Line 527: Line 470:
       table.insert(matArray, Icons.GP(item.trimmedGPCost))
       table.insert(matArray, Icons.GP(item.trimmedGPCost))
     end
     end
     result = result..'||'..table.concat(matArray, '<br/>')
     table.insert(resultPart, '||'..table.concat(matArray, '<br/>'))


     if isEquipment then
     if isEquipment then
       result = result..'||'..statChangeString
       table.insert(resultPart, '||'..statChangeString)
     end
     end
   end
   end


   result = result..'\r\n|}'
   table.insert(resultPart, '\r\n|}')
   return result
   return table.concat(resultPart)
end
end


return p
return p