12,714
edits
Module:ModifierTables: Difference between revisions
From Melvor Idle
Use Module:Skills instead of Module:Skills/Gathering
(_getModifierTable: Add Astrology constelllations; Indent with tabs instead of spaces) |
(Use Module:Skills instead of Module:Skills/Gathering) |
||
| (2 intermediate revisions by the same user not shown) | |||
| Line 8: | Line 8: | ||
local Pets = require('Module:Pets') | local Pets = require('Module:Pets') | ||
local Items = require('Module:Items') | local Items = require('Module:Items') | ||
local | local Skills = require('Module:Skills') | ||
local Agility = require('Module:Skills/Agility') | local Agility = require('Module:Skills/Agility') | ||
local Prayer = require('Module:Prayer') | local Prayer = require('Module:Prayer') | ||
| Line 76: | Line 76: | ||
local itemList = Items.getItems( | local itemList = Items.getItems( | ||
function(item) | function(item) | ||
if item.golbinRaidExclusive ~= nil and item.golbinRaidExclusive then | |||
return false | |||
end | |||
for i, mod in Shared.skpairs(modifiers) do | for i, mod in Shared.skpairs(modifiers) do | ||
if p.getModifierValue(item.modifiers, mod, skill, getOpposites) ~= 0 then | if p.getModifierValue(item.modifiers, mod, skill, getOpposites) ~= 0 then | ||
| Line 106: | Line 109: | ||
modifiers = {modifiers} | modifiers = {modifiers} | ||
end | end | ||
local consList = | local consList = Skills.getConstellations( | ||
function(cons) | function(cons) | ||
local consMods = | local consMods = Skills._buildAstrologyModifierArray(cons, 1, true, true, true, true) | ||
for i, modifier in ipairs(modifiers) do | for i, modifier in ipairs(modifiers) do | ||
if p.getModifierValue(consMods, modifier, skill, getOpposites) ~= 0 then | if p.getModifierValue(consMods, modifier, skill, getOpposites) ~= 0 then | ||
| Line 173: | Line 176: | ||
local upgradeList = Shop.getPurchases( | local upgradeList = Shop.getPurchases( | ||
function(category, purchase) | function(category, purchase) | ||
if category == 'GolbinRaid' then | |||
return false | |||
end | |||
for i, mod in Shared.skpairs(modifiers) do | for i, mod in Shared.skpairs(modifiers) do | ||
if p.getModifierValue(purchase.contains.modifiers, mod, skill, getOpposites) ~= 0 then | if p.getModifierValue(purchase.contains.modifiers, mod, skill, getOpposites) ~= 0 then | ||
| Line 244: | Line 250: | ||
if overflowModCount > 1 then | if overflowModCount > 1 then | ||
-- Number of other modifiers for the object exceed the specified maximum | -- Number of other modifiers for the object exceed the specified maximum | ||
table.insert(otherModText, '<br/><span | table.insert(otherModText, '<br/><span class="mw-collapsible mw-collapsed" ') | ||
table.insert(otherModText, 'data-expandtext="Show ' .. Shared.formatnum(overflowModCount) .. ' more modifiers", data-collapsetext="Hide">') | table.insert(otherModText, 'data-expandtext="Show ' .. Shared.formatnum(overflowModCount) .. ' more modifiers", data-collapsetext="Hide">') | ||
table.insert(otherModText, table.concat(modTextArray['overflow'], '<br/>') .. '</span>') | table.insert(otherModText, table.concat(modTextArray['overflow'], '<br/>') .. '</span>') | ||
| Line 391: | Line 397: | ||
row.val = 15 -- Assume highest possible, the range is 1 to 15 inclusive | row.val = 15 -- Assume highest possible, the range is 1 to 15 inclusive | ||
local modList = | local modList = Skills._buildAstrologyModifierArray(cons, {1, 15}, true, true, true, true) | ||
row.modifierText, row.otherModifiers = getModText(modList) | row.modifierText, row.otherModifiers = getModText(modList) | ||
