12,714
edits
Module:ModifierTables: Difference between revisions
From Melvor Idle
_getModifierTable: Amend Agility pillar links to use anchors
(Use printError function) |
(_getModifierTable: Amend Agility pillar links to use anchors) |
||
| (4 intermediate revisions by 2 users not shown) | |||
| Line 197: | Line 197: | ||
end | end | ||
function p._getModifierTable(modifiers, skill, columnName, getOpposites, displayOtherMods, maxOtherMods) | function p._getModifierTable(modifiers, skill, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort) | ||
local modifierNames = {} | local modifierNames = {} | ||
if type(modifiers) == 'string' then | if type(modifiers) == 'string' then | ||
| Line 329: | Line 329: | ||
local obstList = p.getObstaclesWithModifier(modifiers, skill, getOpposites) | local obstList = p.getObstaclesWithModifier(modifiers, skill, getOpposites) | ||
table.sort(obstList, function(a, b) return a.category < b.category end) | |||
for i, obst in Shared.skpairs(obstList) do | for i, obst in Shared.skpairs(obstList) do | ||
local row = {} | local row = {} | ||
row.name = obst.name | row.name = obst.name | ||
row.icon = Icons.Icon({'Agility', obst.name, type='skill'}) | row.icon = Icons.Icon({'Agility%23'..string.gsub(obst.name, ' ', ''), obst.name, type='skill', img='Agility'}) | ||
row.expIcon = Icons.getExpansionIcon(obst.id) | row.expIcon = Icons.getExpansionIcon(obst.id) | ||
row.type = '[[Agility#Obstacles|Agility Obstacle '..tostring(tonumber(obst.category)+1)..']]' | row.type = '[[Agility#Obstacles|Agility Obstacle '..tostring(tonumber(obst.category)+1)..']]' | ||
row.typeText = 'Agility Obstacle '.. | row.typeText = 'Agility Obstacle '..string.format("%02d", (obst.category + 1)) | ||
local totalVal = 0 | local totalVal = 0 | ||
for i, mod in pairs(modifiers) do | for i, mod in pairs(modifiers) do | ||
| Line 355: | Line 356: | ||
local row = {} | local row = {} | ||
row.name = pillar.name | row.name = pillar.name | ||
row.icon = Icons.Icon({'Agility', pillar.name, type='skill'}) | row.icon = Icons.Icon({'Agility%23'..string.gsub(pillar.name, ' ', ''), pillar.name, type='skill', img='Agility'}) | ||
row.expIcon = Icons.getExpansionIcon(pillar.id) | row.expIcon = Icons.getExpansionIcon(pillar.id) | ||
row.type = '[[Agility#Passive Pillars|Agility Pillar]]' | row.type = '[[Agility#Passive Pillars|Agility Pillar]]' | ||
| Line 422: | Line 423: | ||
local constellationList = p.getConstellationsWithModifier(modifiers, skill, getOpposites) | local constellationList = p.getConstellationsWithModifier(modifiers, skill, getOpposites) | ||
for i, cons in ipairs(constellationList) do | for i, cons in ipairs(constellationList) do | ||
local modList = Skills._buildAstrologyModifierArray(cons, nil, true, true, true, true) | |||
local row = {} | local row = {} | ||
row.name = cons.name | row.name = cons.name | ||
| Line 428: | Line 430: | ||
row.type = '[[Astrology#Constellations|Constellation]]' | row.type = '[[Astrology#Constellations|Constellation]]' | ||
row.typeText = 'Constellation' | row.typeText = 'Constellation' | ||
row.modifierText, row.otherModifiers = getModText(modList) | row.modifierText, row.otherModifiers = getModText(modList) | ||
local totalVal = 0 | |||
for i, mod in pairs(modifiers) do | |||
totalVal = totalVal + p.getModifierValue(modList, mod, skill, getOpposites) | |||
end | |||
row.val = totalVal | |||
if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then | if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then | ||
| Line 448: | Line 453: | ||
--Otherwise sort alphabetically by type, then name | --Otherwise sort alphabetically by type, then name | ||
table.sort(tableArray, function(a, b) | table.sort(tableArray, function(a, b) | ||
if modifierCount == 1 and a.val ~= b.val then | if (modifierCount == 1 or forceMagnitudeSort) and a.val ~= b.val then | ||
return a.val > b.val | return a.val > b.val | ||
elseif a. | elseif a.typeText ~= b.typeText then | ||
return a. | return a.typeText < b.typeText | ||
else | else | ||
return a.name < b.name | return a.name < b.name | ||
| Line 476: | Line 481: | ||
local displayOtherMods = frame.args ~= nil and frame.args.displayOtherMods or frame.displayOtherMods | local displayOtherMods = frame.args ~= nil and frame.args.displayOtherMods or frame.displayOtherMods | ||
local maxOtherMods = frame.args ~= nil and tonumber(frame.args.maxOtherMods) or 5 | local maxOtherMods = frame.args ~= nil and tonumber(frame.args.maxOtherMods) or 5 | ||
local forceMagnitudeSort = frame.args ~= nil and string.upper(tostring(frame.args.forceMagnitudeSort)) == 'TRUE' or false | |||
if Shared.contains(modifier, ',') then | if Shared.contains(modifier, ',') then | ||
| Line 493: | Line 499: | ||
end | end | ||
return p._getModifierTable(modifier, skill, columnName, getOpposites, displayOtherMods, maxOtherMods) | return p._getModifierTable(modifier, skill, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort) | ||
end | end | ||
