12,883
edits
Falterfire (talk | contribs) (tweaks to hopefully fix the table) |
(Include prayers) |
||
Line 9: | Line 9: | ||
local Items = require('Module:Items') | local Items = require('Module:Items') | ||
local Agility = require('Module:Skills/Agility') | local Agility = require('Module:Skills/Agility') | ||
local Prayer = require('Module:Prayer') | |||
local Shop = require('Module:Shop') | local Shop = require('Module:Shop') | ||
local Icons = require('Module:Icons') | local Icons = require('Module:Icons') | ||
Line 138: | Line 139: | ||
end) | end) | ||
return petList | return petList | ||
end | |||
function p.getPrayersWithModifier(modifiers, skill, getOpposites) | |||
if type(modifiers) == 'string' then | |||
modifiers = {modifiers} | |||
end | |||
local prayerList = Prayer.getPrayers( | |||
function(prayer) | |||
for i, mod in ipairs(modifiers) do | |||
if p.getModifierValue(prayer.modifiers, mod, skill, getOpposites) ~= 0 then | |||
return true | |||
end | |||
end | |||
return false | |||
end) | |||
return prayerList | |||
end | end | ||
Line 289: | Line 306: | ||
table.insert(tableArray, row) | table.insert(tableArray, row) | ||
end | end | ||
local prayerList = p.getPrayersWithModifier(modifiers, skill, getOpposites) | |||
for i, prayer in ipairs(prayerList) do | |||
local row = {} | |||
row.name = prayer.name | |||
row.icon = Icons.Icon({prayer.name, type='prayer'}) | |||
row.type = [[Prayer]] | |||
local totalVal = 0 | |||
for i, mod in ipairs(modifiers) do | |||
totalVal = totalVal + p.getModifierValue(prayer.modifiers, mod, skill, getOpposites) | |||
end | |||
row.val = totalVal | |||
row.modifierText, row.otherModifiers = getModText(prayer.modifiers) | |||
if string.len(row.otherModifiers) > 0 then | |||
hasOtherModifiers = true | |||
end | |||
table.insert(tableArray, row) | |||
end | |||
local upgradeList = p.getUpgradesWithModifier(modifiers, skill, getOpposites) | local upgradeList = p.getUpgradesWithModifier(modifiers, skill, getOpposites) | ||
for i, upgrade in Shared.skpairs(upgradeList) do | for i, upgrade in Shared.skpairs(upgradeList) do |