Melvor Idle

Module:ModifierTables: Difference between revisions

Module Discussion

Module:ModifierTables (view source)

Revision as of 23:08, 15 October 2024

11,688 bytes added ,  15 October 2024
Add Mastery Pool Bonuses to Modifier Tables
(_getModifierTable: Amend Agility pillar links to use anchors)
(Add Mastery Pool Bonuses to Modifier Tables)
 
(29 intermediate revisions by 5 users not shown)
Line 6: Line 6:
local Constants = require('Module:Constants')
local Constants = require('Module:Constants')
local Shared = require('Module:Shared')
local Shared = require('Module:Shared')
local Common = require('Module:Common')
local Num = require('Module:Number')
local Icons = require('Module:Icons')
local GameData = require('Module:GameData')
local SkillData = GameData.skillData
local Modifiers = require('Module:Modifiers')
local SkillTree = require('Module:SkillTree')
local Items = require('Module:Items')
local Shop = require('Module:Shop')
local Pets = require('Module:Pets')
local Pets = require('Module:Pets')
local Items = require('Module:Items')
local Skills = require('Module:Skills')
local Skills = require('Module:Skills')
local Agility = require('Module:Skills/Agility')
local Agility = require('Module:Skills/Agility')
local Cartography = require('Module:Skills/Cartography')
local Prayer = require('Module:Prayer')
local Prayer = require('Module:Prayer')
local Shop = require('Module:Shop')
local Summoning = require('Module:Skills/Summoning')
local Icons = require('Module:Icons')
local Township = require('Module:Township')
 


--First up, functions to get all the things in a category that have a given modifier:
--First up, functions to get all the things in a category that have a given modifier:
function p.getModifierValue(modifiers, modifier, skill, getOpposites)
function p.getItemsWithModifier(modifierCriteria)
--Sometimes nil modifier sets will get here, which is fine. Just return 0 immediately
if modifiers == nil then
return 0
end
 
--Make sure we have the skillID and not the name
if skill ~= nil then
if skill == '' then
skill = nil
elseif Constants.getSkillID(skill) ~= nil then
-- skill is a skill name
skill = Constants.getSkillID(skill)
elseif Constants.getSkillName(skill) == nil then
-- skill is neither a skill name or ID
return 0
end
end
 
--By default, attempt to add the increased and decreased prefixes to the modifier
--But if getOpposites is false, only look for an exact match
local mods = {}
if getOpposites == nil or getOpposites then
mods.inc = 'increased'..modifier
mods.dec = 'decreased'..modifier
else
mods.inc = modifier
end
local magnitude = { inc = 0, dec = 0 }
for modType, modName in pairs(mods) do
if modifiers[modName] ~= nil then
local valueArray = nil
            if type(modifiers[modName]) ~= 'table' then
                valueArray = {modifiers[modName]}
            else
                valueArray = modifiers[modName]
            end
 
            for i, subVal in ipairs(valueArray) do
                if type(subVal) == 'table' then
if  subVal.skillID ~= nil then
-- Modifier value is skill specific
if skill == nil or skill == '' or subVal.skillID == skill then
magnitude[modType] = magnitude[modType] + subVal.value
end
else
-- Modifier value is a table of two numbers representing a range. Take the largest value
magnitude[modType] = magnitude[modType] + (subVal[2] or 0)
end
                else
                    magnitude[modType] = magnitude[modType] + subVal
                end
            end
end
end
 
    return magnitude.inc - magnitude.dec
end
 
function p.getItemsWithModifier(modifiers, skill, getOpposites)
if type(modifiers) == 'string' then
modifiers = {modifiers}
end
local itemList = Items.getItems(
local itemList = Items.getItems(
function(item)
function(item)
Line 87: Line 33:
return false
return false
end
end
for i, mod in ipairs(modifiers) do
local mods = Modifiers.getMatchingModifiers(item.modifiers, modifierCriteria)
if p.getModifierValue(item.modifiers, mod, skill, getOpposites) ~= 0 then
return not Shared.tableIsEmpty(mods.matched)
return true
end
end
return false
end)
end)
return itemList
return itemList
end
end


function p.getObstaclesWithModifier(modifiers, skill, getOpposites)
function p.getSkillTreeNodesWithModifier(modifierCriteria)
if type(modifiers) == 'string' then
    local nodesWithModifier = SkillTree.getSkillTreeNodes(
modifiers = {modifiers}
        function(node)
end
            if node.modifiers ~= nil then
                local mods = Modifiers.getMatchingModifiers(node.modifiers, modifierCriteria)
                if not Shared.tableIsEmpty(mods.matched) then
                    return true
                end
            end
            return false
        end
    )
    return nodesWithModifier
end
 
function p.getObstaclesWithModifier(modifierCriteria)
local obstList = Agility.getObstacles(
local obstList = Agility.getObstacles(
function(obst)
function(obst)
for i, mod in ipairs(modifiers) do
if obst.modifiers ~= nil then
if p.getModifierValue(obst.modifiers, mod, skill, getOpposites) ~= 0 then
local mods = Modifiers.getMatchingModifiers(obst.modifiers, modifierCriteria)
return true
return not Shared.tableIsEmpty(mods.matched)
end
end
end
return false
return false
Line 113: Line 66:
end
end


function p.getConstellationsWithModifier(modifiers, skill, getOpposites)
function p.getConstellationsWithModifier(modifierCriteria)
if type(modifiers) == 'string' then
modifiers = {modifiers}
end
local consList = Skills.getConstellations(
local consList = Skills.getConstellations(
function(cons)
function(cons)
local consMods = Skills._buildAstrologyModifierArray(cons, 1, true, true, true, true)
local consMods = Skills._getConstellationModifiers(cons)
for i, modifier in ipairs(modifiers) do
for modType, modsForType in pairs(consMods) do
if p.getModifierValue(consMods, modifier, skill, getOpposites) ~= 0 then
local modData = {}
-- Compile player modifiers
for _, mods in ipairs(modsForType) do
if mods.modifiers ~= nil then
for modKey, modDefn in pairs(mods.modifiers) do
if type(modData[modKey]) == 'table' and modData[modKey][1] ~= nil then
for _, v in ipairs(modDefn) do
table.insert(modData[modKey], v)
end
else
modData[modKey] = modDefn
end
end
end
end
local mods = Modifiers.getMatchingModifiers(modData, modifierCriteria)
if not Shared.tableIsEmpty(mods.matched) then
return true
return true
end
end
Line 130: Line 96:
end
end


function p.getPillarsWithModifier(modifiers, skill, getOpposites)
 
if type(modifiers) == 'string' then
function p.getPillarsWithModifier(modifierCriteria)
modifiers = {modifiers}
end
local pillarList = Agility.getPillars(
local pillarList = Agility.getPillars(
function(pillar)
function(pillar)
for i, mod in ipairs(modifiers) do
if pillar.modifiers ~= nil then
if p.getModifierValue(pillar.modifiers, mod, skill, getOpposites) ~= 0 then
local mods = Modifiers.getMatchingModifiers(pillar.modifiers, modifierCriteria)
return true
return not Shared.tableIsEmpty(mods.matched)
end
end
end
return false
return false
Line 146: Line 109:
end
end


function p.getPetsWithModifier(modifiers, skill, getOpposites)
function p.getPetsWithModifier(modifierCriteria)
if type(modifiers) == 'string' then
modifiers = {modifiers}
end
local petList = Pets.getPets(
local petList = Pets.getPets(
function(pet)
function(pet)
for i, mod in ipairs(modifiers) do
if pet.modifiers ~= nil then
if p.getModifierValue(pet.modifiers, mod, skill, getOpposites) ~= 0 then
local mods = Modifiers.getMatchingModifiers(pet.modifiers, modifierCriteria)
return true
return not Shared.tableIsEmpty(mods.matched)
end
end
end
return false
return false
Line 162: Line 121:
end
end


function p.getPrayersWithModifier(modifiers, skill, getOpposites)
function p.getPrayersWithModifier(modifierCriteria)
if type(modifiers) == 'string' then
modifiers = {modifiers}
end
local prayerList = Prayer.getPrayers(
local prayerList = Prayer.getPrayers(
function(prayer)
function(prayer)
for i, mod in ipairs(modifiers) do
if prayer.modifiers ~= nil then
if p.getModifierValue(prayer.modifiers, mod, skill, getOpposites) ~= 0 then
local mods = Modifiers.getMatchingModifiers(prayer.modifiers, modifierCriteria)
return true
return not Shared.tableIsEmpty(mods.matched)
end
end
end
return false
return false
Line 178: Line 133:
end
end


function p.getUpgradesWithModifier(modifiers, skill, getOpposites)
function p.getUpgradesWithModifier(modifierCriteria)
if type(modifiers) == 'string' then
modifiers = {modifiers}
end
local upgradeList = Shop.getPurchases(
local upgradeList = Shop.getPurchases(
function(purchase)
function(purchase)
if purchase.category == 'melvorD:GolbinRaid' then
if purchase.category == 'melvorD:GolbinRaid'
or purchase.contains == nil
or purchase.contains.modifiers == nil
or Shared.tableIsEmpty(purchase.contains.modifiers) then
return false
end
local mods = Modifiers.getMatchingModifiers(purchase.contains.modifiers, modifierCriteria)
return not Shared.tableIsEmpty(mods.matched)
end)
return upgradeList
end
 
function p.getPOIsWithModifier(modifierCriteria)
local POIList = Cartography.getPointsOfInterest(
function(POI)
if POI.activeStats == nil or POI.activeStats.modifiers == nil then
return false
end
local mods = Modifiers.getMatchingModifiers(POI.activeStats.modifiers, modifierCriteria)
return not Shared.tableIsEmpty(mods.matched)
end)
return POIList
end
 
function p.getCartoMasteryBonusesWithModifier(modifierCriteria)
local bonusList = Cartography.getMasteryBonuses(
function(bonus)
if bonus.modifiers == nil or Shared.tableIsEmpty(bonus.modifiers) then
return false
end
local mods = Modifiers.getMatchingModifiers(bonus.modifiers, modifierCriteria)
return not Shared.tableIsEmpty(mods.matched)
end)
 
return bonusList
end
 
function p.getAncientRelicsWithModifiers(modifierCriteria)
local matchedRelics = {}
 
for i, relic in ipairs(GameData.rawData.ancientRelics) do
if relic.modifiers ~= nil then
local mods = Modifiers.getMatchingModifiers(relic.modifiers, modifierCriteria)
if not Shared.tableIsEmpty(mods.matched) then
table.insert(matchedRelics, relic)
end
end
end
 
return matchedRelics
end
 
function p.getBuildingsWithModifiers(modifierCriteria)
local buildingList = Township.getBuildings(
function(building)
if building.modifiers == nil or Shared.tableIsEmpty(building.modifiers) then
return false
end
local mods = Modifiers.getMatchingModifiers(building.modifiers, modifierCriteria)
return not Shared.tableIsEmpty(mods.matched)
end)
 
return buildingList
end
 
function p.getSeasonsWithModifiers(modifierCriteria)
local seasonList = Township.getSeasons(
function(season)
if season.modifiers == nil or Shared.tableIsEmpty(season.modifiers) then
return false
end
local mods = Modifiers.getMatchingModifiers(season.modifiers, modifierCriteria)
return not Shared.tableIsEmpty(mods.matched)
end)
 
return seasonList
end
 
function p.getSummoningSynergiesWithModifiers(modifierCriteria)
local synergyList = Summoning.getSynergies(
function(synergy)
if synergy.modifiers == nil or Shared.tableIsEmpty(synergy.modifiers) then
return false
return false
end
end
for i, mod in ipairs(modifiers) do
local mods = Modifiers.getMatchingModifiers(synergy.modifiers, modifierCriteria)
if p.getModifierValue(purchase.contains.modifiers, mod, skill, getOpposites) ~= 0 then
return not Shared.tableIsEmpty(mods.matched)
return true
end)
 
return synergyList
end
 
function p.getMasteryPoolModifiers(modifierCriteria)
local masteryPoolList = {}
for skillName, skillData in pairs(SkillData) do
if skillData.masteryPoolBonuses ~= nil then
for i, masteryPool in ipairs(skillData.masteryPoolBonuses) do
local mods = Modifiers.getMatchingModifiers(masteryPool.modifiers, modifierCriteria)
if not Shared.tableIsEmpty(mods.matched) then
table.insert(masteryPoolList, { [skillName] = masteryPool })
end
end
end
end
return false
end
end)
end
return upgradeList
 
return masteryPoolList
end
end


function p._getModifierTable(modifiers, skill, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort)
function p._getModifierTable(modifiers, globalProps, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort, collapsed)
local modifierNames = {}
local modifierIDs = {}
if type(modifiers) == 'string' then
if type(modifiers) == 'string' then
modifiers = {modifiers}
modifiers = {modifiers}
end
end
for i, modifier in pairs(modifiers) do
for i, modifier in ipairs(modifiers) do
if getOpposites then
-- Ensure only the local ID is used in case the provided modifier ID is namespaced
table.insert(modifierNames, 'increased'..modifier)
local modNS, modID = Shared.getLocalID(modifier.id)
table.insert(modifierNames, 'decreased'..modifier)
-- Convert modifier & global property names to IDs
local globalPropIDs = Modifiers.convertCriteriaNamesToIDs(globalProps or {})
local modPropIDs = Modifiers.convertCriteriaNamesToIDs(modifier.props or {})
-- Combine properties, mod props must be last as the highest priority
local combinedProps = Modifiers.combineDataCriteria({ globalPropIDs, modPropIDs })
 
if Modifiers.getModifierByID(modID) ~= nil then
-- Provided ID is a modifier ID (as opposed to an alias)
table.insert(modifierIDs, {
["id"] = modID,
["type"] = 'id',
["props"] = combinedProps
})
else
else
table.insert(modifierNames, modifier)
-- Assume modID is a modifier alias
if getOpposites then
local incModAlias, decModAlias = 'increased' .. modID, 'decreased' .. modID
local incMod, decMod = Modifiers.getModifierByAlias(incModAlias), Modifiers.getModifierByAlias(decModAlias)
-- If neither alias resolves to a modifier, then let user know this is invalid
if incMod == nil and decMod == nil then
error('No such modifier alias: ' .. modID, 2)
end
-- Don't include increased or decreased variants if they don't resolve to a modifier,
-- as doing so will generate an error about an invalid alias later
if incMod ~= nil then
table.insert(modifierIDs, {
["id"] = incModAlias,
["type"] = 'alias',
["props"] = combinedProps
})
end
if decMod ~= nil then
table.insert(modifierIDs, {
["id"] = decModAlias,
["type"] = 'alias',
["props"] = combinedProps
})
end
else
table.insert(modifierIDs, {
["id"] = modID,
["type"] = 'alias',
["props"] = combinedProps
})
end
end
end
end
end
local modifierCriteria = Modifiers.getMatchCriteriaFromIDs(modifierIDs)


local hasOtherModifiers = false
local hasOtherModifiers = false
local modifierCount = Shared.tableCount(modifiers)
local modifierCount = Shared.tableCount(modifiers)
if skill ~= nil then
if skill == '' then
skill = nil
elseif Constants.getSkillID(skill) ~= nil then
-- skill is a skill name
skill = Constants.getSkillID(skill)
elseif Constants.getSkillName(skill) == nil then
-- skill is neither a skill name or ID
return Shared.printError('Failed to find a skill ID for "' .. skill .. '"')
end
end


local getModText =
local getModText =
function(modifiers)
function(modifiers)
local modTextArray = { ["visible"] = {}, ["overflow"] = {} }
local matchedMods = Modifiers.getMatchingModifiers(modifiers, modifierCriteria)
local otherModCount = 0
local mainModText = Modifiers.getModifiersText(matchedMods.matched, true, false, maxOtherMods)
local mainModText = {}
local otherModText = Modifiers.getModifiersText(matchedMods.unmatched, true, false, maxOtherMods)
for modName, modValue in Shared.skpairs(modifiers) do
return mainModText, otherModText, matchedMods
                local includedMod = Shared.contains(modifierNames, modName)
                local valueArray = nil
                if type(modValue) ~= 'table' then
                    valueArray = {modValue}
                else
                    valueArray = modValue
                end
 
                for j, subVal in ipairs(valueArray) do
                    local includeInMainText = includedMod
                    if type(subVal) == 'table' and subVal.skillID ~= nil then
                        -- Modifier value is skill specific
                        if includeInMainText then
                            -- If the skill doesn't match then don't include in the main text
                            includeInMainText = skill == nil or skill == '' or subVal.skillID == skill
                        end
                        subVal = {subVal}
                    end
 
                    if includeInMainText then
                        table.insert(mainModText, Constants._getModifierText(modName, subVal))
                    else
                        otherModCount = otherModCount + 1
                        local key = ((maxOtherMods == nil or otherModCount <= maxOtherMods) and 'visible') or 'overflow'
                        table.insert(modTextArray[key], Constants._getModifierText(modName, subVal))
                    end
                end
            end
 
local overflowModCount = Shared.tableCount(modTextArray['overflow'])
if overflowModCount == 1 then
table.insert(modTextArray['visible'], modTextArray['overflow'][1])
end
local otherModText = {table.concat(modTextArray['visible'], '<br/>')}
 
if overflowModCount > 1 then
-- Number of other modifiers for the object exceed the specified maximum
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, table.concat(modTextArray['overflow'], '<br/>') .. '</span>')
end
return table.concat(mainModText, '<br/>'), table.concat(otherModText)
end
end


local tableArray = {}
local tableArray = {}
--Going through each type of thing to add to the array
--Going through each type of thing to add to the array
local itemList = p.getItemsWithModifier(modifiers, skill, getOpposites)
 
local itemList = p.getItemsWithModifier(modifierCriteria)
for i, item in ipairs(itemList) do
for i, item in ipairs(itemList) do
local row = {}
local row = {}
row.name = item.name
row.name = item.name
row.icon = Icons.Icon({item.name, type='item'})
row.icon = Icons.Icon({item.name, type='item'})
row.expIcon = Icons.getExpansionIcon(item.id)
row.expIcon = Icons.getDLCColumnIcon(item.id)
row.expSort = Icons.getExpansionID(item.id)
row.type = 'Item'
row.type = 'Item'
row.typeText = row.type
--For equipment, show the slot they go in
--For equipment, show the slot they go in
if item.validSlots ~= nil then
if item.validSlots ~= nil and not Shared.tableIsEmpty(item.validSlots) then
row.type = row.type..' ('..table.concat(Shared.clone(item.validSlots), ', ')..')'
local rowTypePart = {}
end
for j, slot in ipairs(item.validSlots) do
row.typeText = row.type
table.insert(rowTypePart, Common.getEquipmentSlotLink(slot))
local totalVal = 0
end
for i, mod in pairs(modifiers) do
row.typeText = row.typeText .. ' (' .. table.concat(item.validSlots, ', ') .. ')'
totalVal = totalVal + p.getModifierValue(item.modifiers, mod, skill, getOpposites)
row.type = row.type .. ' (' .. table.concat(rowTypePart, ', ') .. ')'
end
end
row.val = totalVal


row.modifierText, row.otherModifiers = getModText(item.modifiers)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(item.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
Line 305: Line 346:
end
end


local petList = p.getPetsWithModifier(modifiers, skill, getOpposites)
local petList = p.getPetsWithModifier(modifierCriteria)
for i, pet in Shared.skpairs(petList) do
for i, pet in Shared.skpairs(petList) do
local row = {}
local row = {}
row.name = pet.name
row.name = pet.name
row.icon = Icons.Icon({pet.name, type='pet'})
row.icon = Icons.Icon({pet.name, type='pet'})
row.expIcon = Icons.getExpansionIcon(pet.id)
row.expIcon = Icons.getDLCColumnIcon(pet.id)
row.expSort = Icons.getExpansionID(pet.id)
row.type = '[[Pets|Pet]]'
row.type = '[[Pets|Pet]]'
row.typeText = 'Pet'
row.typeText = 'Pet'
local totalVal = 0
for i, mod in pairs(modifiers) do
totalVal = totalVal + p.getModifierValue(pet.modifiers, mod, skill, getOpposites)
end
row.val = totalVal


row.modifierText, row.otherModifiers = getModText(pet.modifiers)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(pet.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end


table.insert(tableArray, row)
table.insert(tableArray, row)
end
local nodeList = p.getSkillTreeNodesWithModifier(modifierCriteria)
for _, node in ipairs(nodeList) do
    local row = {}
    row.name = node.skillName .. " - " .. node.name
   
    local firstIcon = Icons.Icon({"", img='Skill Tree', nolink=true})
    local secondIcon = Icons.Icon({node.skillName..'%23#Skill_Tree', node.name, type='skill', img=node.skillName})
    row.icon = firstIcon .. " " .. secondIcon
   
    row.expIcon = Icons.getDLCColumnIcon(node.id)
    row.expSort = Icons.getExpansionID(node.id)
    row.type = '[[Skill Tree#Nodes|Skill Tree Node]]'
    row.typeText = 'Skill Tree Node'
    local objMods = nil
    row.modifierText, row.otherModifiers, objMods = getModText(node.modifiers)
    row.val = Modifiers.getModifierValue(objMods.matched)
    if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
        hasOtherModifiers = true
    end
    table.insert(tableArray, row)
end
end


local obstList = p.getObstaclesWithModifier(modifiers, skill, getOpposites)
 
local obstList = p.getObstaclesWithModifier(modifierCriteria)
table.sort(obstList, function(a, b) return a.category < b.category end)
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
Line 334: Line 399:
row.name = obst.name
row.name = obst.name
row.icon = Icons.Icon({'Agility%23'..string.gsub(obst.name, ' ', ''), obst.name, type='skill', img='Agility'})
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.getDLCColumnIcon(obst.id)
row.expSort = Icons.getExpansionID(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 '..string.format("%02d", (obst.category + 1))
row.typeText = 'Agility Obstacle '..string.format("%02d", (obst.category + 1))
local totalVal = 0
for i, mod in pairs(modifiers) do
totalVal = totalVal + p.getModifierValue(obst.modifiers, mod, skill, getOpposites)
end
row.val = totalVal


row.modifierText, row.otherModifiers = getModText(obst.modifiers)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(obst.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
Line 352: Line 415:
end
end


local pillarList = p.getPillarsWithModifier(modifiers, skill, getOpposites)
local pillarList = p.getPillarsWithModifier(modifierCriteria)
for i, pillar in ipairs(pillarList) do
for i, pillar in ipairs(pillarList) do
local row = {}
local row = {}
row.name = pillar.name
row.name = pillar.name
row.icon = Icons.Icon({'Agility%23'..string.gsub(pillar.name, ' ', ''), pillar.name, type='skill', img='Agility'})
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.getDLCColumnIcon(pillar.id)
row.expSort = Icons.getExpansionID(pillar.id)
row.type = '[[Agility#Passive Pillars|Agility Pillar]]'
row.type = '[[Agility#Passive Pillars|Agility Pillar]]'
row.typeText = 'Agility Pillar'
row.typeText = 'Agility Pillar'
local totalVal = 0
for i, mod in pairs(modifiers) do
totalVal = totalVal + p.getModifierValue(pillar.modifiers, mod, skill, getOpposites)
end
row.val = totalVal


row.modifierText, row.otherModifiers = getModText(pillar.modifiers)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(pillar.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
Line 375: Line 436:
end
end


local prayerList = p.getPrayersWithModifier(modifiers, skill, getOpposites)
local prayerList = p.getPrayersWithModifier(modifierCriteria)
for i, prayer in ipairs(prayerList) do
for i, prayer in ipairs(prayerList) do
local row = {}
local row = {}
row.name = prayer.name
row.name = prayer.name
row.icon = Icons.Icon({prayer.name, type='prayer'})
row.icon = Icons.Icon({prayer.name, type='prayer'})
row.expIcon = Icons.getExpansionIcon(prayer.id)
row.expIcon = Icons.getDLCColumnIcon(prayer.id)
row.expSort = Icons.getExpansionID(prayer.id)
row.type = [[Prayer]]
row.type = [[Prayer]]
row.typeText = 'Prayer'
row.typeText = '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)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(prayer.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
Line 398: Line 457:
end
end


local upgradeList = p.getUpgradesWithModifier(modifiers, skill, getOpposites)
local upgradeList = p.getUpgradesWithModifier(modifierCriteria)
for i, upgrade in ipairs(upgradeList) do
for i, upgrade in ipairs(upgradeList) do
local row = {}
local row = {}
row.name = Shop._getPurchaseName(upgrade)
row.name = Shop._getPurchaseName(upgrade)
row.icon = Icons.Icon({row.name, type='upgrade'})
row.icon = Icons.Icon({row.name, type='upgrade'})
row.expIcon = Icons.getExpansionIcon(upgrade.id)
row.expIcon = Icons.getDLCColumnIcon(upgrade.id)
row.expSort = Icons.getExpansionID(upgrade.id)
row.type = '[[Shop|Upgrade]]'
row.type = '[[Shop|Upgrade]]'
row.typeText = 'Upgrade'
row.typeText = 'Upgrade'
local totalVal = 0
for i, mod in pairs(modifiers) do
totalVal = totalVal + p.getModifierValue(upgrade.contains.modifiers, mod, skill, getOpposites)
end
row.val = totalVal


row.modifierText, row.otherModifiers = getModText(upgrade.contains.modifiers)
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(upgrade.contains.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
Line 421: Line 478:
end
end


local constellationList = p.getConstellationsWithModifier(modifiers, skill, getOpposites)
local constellationList = p.getConstellationsWithModifier(modifierCriteria)
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 modListByType = Skills._getConstellationModifiers(cons)
local modList = {}
-- Combine all mods into single list
for modType, modsForType in pairs(modListByType) do
for _, mod in ipairs(modsForType) do
if mod.modifiers ~= nil then
for modKey, modDefn in pairs(mod.modifiers) do
if type(modList[modKey]) == 'table' and modList[modKey][1] ~= nil then
for _, v in ipairs(modDefn) do
table.insert(modList[modKey], v)
end
else
modList[modKey] = modDefn
end
end
end
end
end
 
local row = {}
local row = {}
row.name = cons.name
row.name = cons.name
row.icon = Icons.Icon({cons.name, type='constellation'})
row.icon = Icons.Icon({cons.name, type='constellation'})
row.expIcon = Icons.getExpansionIcon(cons.id)
row.expIcon = Icons.getDLCColumnIcon(cons.id)
row.expSort = Icons.getExpansionID(cons.id)
row.type = '[[Astrology#Constellations|Constellation]]'
row.type = '[[Astrology#Constellations|Constellation]]'
row.typeText = 'Constellation'
row.typeText = 'Constellation'
row.modifierText, row.otherModifiers = getModText(modList)
 
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(modList)
row.val = Modifiers.getModifierValue(objMods.matched)
 
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
 
table.insert(tableArray, row)
end
local POIList = p.getPOIsWithModifier(modifierCriteria)
for i, POI in ipairs(POIList) do
local row = {}
row.name = POI.name
row.icon = Icons.Icon({POI.name, type='poi'})
row.expIcon = Icons.getDLCColumnIcon(POI.id)
row.expSort = Icons.getExpansionID(POI.id)
row.type = '[[Cartography|Point of Interest]]'
row.typeText = 'Point of Interest'
 
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(POI.activeStats.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)
 
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
 
table.insert(tableArray, row)
end
local cartoBonusList = p.getCartoMasteryBonusesWithModifier(modifierCriteria)
for i, bonus in ipairs(cartoBonusList) do
local row = {}
row.name = Num.formatnum(bonus.masteredHexes) .. ' Hexes Mastered'
row.icon = Icons.Icon({'Cartography', Num.formatnum(bonus.masteredHexes) .. ' Hexes Mastered', type='skill'})
row.expIcon = Icons.getDLCColumnIcon(bonus.id)
row.expSort = Icons.getExpansionID(bonus.id)
row.type = Icons.Icon({'Cartography', 'Mastery Bonus', section='Mastery Unlocks', type='skill', noicon=true})
row.typeText = 'Mastery Bonus'
 
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(bonus.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)
 
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
local totalVal = 0
table.insert(tableArray, row)
for i, mod in pairs(modifiers) do
end
totalVal = totalVal + p.getModifierValue(modList, mod, skill, getOpposites)
 
local ancientRelicList = p.getAncientRelicsWithModifiers(modifierCriteria)
for i, relic in ipairs(ancientRelicList) do
local row = {}
local relicName = relic.name
local sectionName = 'Melvor Realm'
if string.find(relic.id, 'Abyssal') ~= nil then
relicName = 'Abyssal ' .. relicName
sectionName = 'Abyssal Realm'
end
end
row.val = totalVal
row.name = relicName
row.icon = Icons.Icon({'Ancient Relics', relicName, section=sectionName})
row.expIcon = Icons.getDLCColumnIcon(relic.id)
row.expSort = Icons.getExpansionID(relic.id)
row.type = Icons.Icon({'Ancient Relics', 'Ancient Relic', noicon=true})
row.typeText = 'Ancient Relic'
 
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(relic.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)


if not hasOtherModifiers and string.len(row.otherModifiers) > 0 then
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
hasOtherModifiers = true
end
end
table.insert(tableArray, row)
end
local buildingList = p.getBuildingsWithModifiers(modifierCriteria)
for i, building in ipairs(buildingList) do
local row = {}
row.name = building.name
row.icon = Icons.Icon({building.name, type='building'})
row.expIcon = Icons.getDLCColumnIcon(building.id)
row.expSort = Icons.getExpansionID(building.id)
row.type = Icons.Icon({'Township', 'Building', section='Buildings', type='skill', noicon=true})
row.typeText = 'Building'


local modList = {}
-- Multiply mod value by max upgrades to get the total modifier value
for modID, value in pairs(building.modifiers) do
if type(value) == 'table' then
modList[modID] = value[1].value * building.maxUpgrades
else
modList[modID] = value * building.maxUpgrades
end
end
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(modList)
row.val = Modifiers.getModifierValue(objMods.matched)
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
table.insert(tableArray, row)
end
local seasonList = p.getSeasonsWithModifiers(modifierCriteria)
for i, season in ipairs(seasonList) do
local row = {}
row.name = season.name
row.icon = Icons.Icon({season.name, type='township'})
row.expIcon = Icons.getDLCColumnIcon(season.id)
row.expSort = Icons.getExpansionID(season.id)
row.type = Icons.Icon({'Township', 'Season', section='Seasons', type='skill', noicon=true})
row.typeText = 'Season'
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(season.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
table.insert(tableArray, row)
table.insert(tableArray, row)
end
end


local result = '{| class="wikitable sortable stickyHeader"'
local summoningSynergyList = p.getSummoningSynergiesWithModifiers(modifierCriteria)
result = result..'\r\n|- class="headerRow-0"'
for i, synergy in ipairs(summoningSynergyList) do
result = result..'\r\n!Source!!Type!!'..columnName
local row = {}
if hasOtherModifiers and displayOtherMods then result = result..'!!Other Modifiers' end
local famProduct1 = Summoning.getFamiliarRecipeByID(synergy.summonIDs[1])
local familiar1 = nil
local famProduct2 = Summoning.getFamiliarRecipeByID(synergy.summonIDs[2])
local familiar2 = nil
 
if famProduct1 ~= nil then
familiar1 = Items.getItemByID(famProduct1.productID)
end
if famProduct2 ~= nil then
familiar2 = Items.getItemByID(famProduct2.productID)
end
 
if familiar1 == nil or familiar2 == nil then
return
end
 
row.name = familiar1.name .. familiar2.name .. ' Synergy'
row.icon = Icons.Icon({familiar1.name, type='item'}) .. ' ' .. Icons.Icon({'SynergyIcon', notext=true, nolink=true}) .. ' ' .. Icons.Icon({familiar2.name, type='item'}) .. ' Synergy'
row.expIcon = Icons.getDLCColumnIcon(familiar2.id)
row.expSort = Icons.getExpansionID(familiar2.id)
row.type = Icons.Icon({'Summoning', 'Summoning Synergy', section='Synergies', type='skill', noicon=true})
row.typeText = 'Synergy'
 
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(synergy.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)
 
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
table.insert(tableArray, row)
end
local masteryPools = p.getMasteryPoolModifiers(modifierCriteria)
for i, masteryPoolData in ipairs(masteryPools) do
for skillName, masteryPool in pairs(masteryPoolData) do
local row = {}
local isAbyssal = masteryPool.realm == 'melvorItA:Abyssal' and 'Abyssal ' or ''
row.name = isAbyssal .. masteryPool.percent .. '% Mastery Pool Bonus'
row.icon = Icons.Icon({skillName, row.name, section='Mastery Pool Checkpoints', type='skill'})
row.expIcon = Icons.getDLCColumnIcon(masteryPool.realm)
row.expSort = Icons.getExpansionID(masteryPool.realm)
row.type = Icons.Icon({skillName, 'Mastery Pool Bonus', section='Mastery Pool Checkpoints', type='skill', noicon=true})
row.typeText = 'Mastery Pool Bonus'
local objMods = nil
row.modifierText, row.otherModifiers, objMods = getModText(masteryPool.modifiers)
row.val = Modifiers.getModifierValue(objMods.matched)
if not hasOtherModifiers and not Shared.tableIsEmpty(objMods.unmatched) then
hasOtherModifiers = true
end
table.insert(tableArray, row)
end
end
 
local html = mw.html.create('table')
:addClass("wikitable sortable stickyHeader mw-collapsible")
if collapsed == true then
html:addClass("mw-collapsed")
end
local header = html:tag('tr'):addClass("headerRow-0")
header:tag('th'):wikitext('Source')
  :tag('th'):wikitext('Type')
  :tag('th'):wikitext('[[DLC]]')
  :tag('th'):wikitext(columnName)
 
if hasOtherModifiers and displayOtherMods then  
header:tag('th'):wikitext('Other Modifiers')
end


--Sort by value if only one modifier was passed in
--Sort by value if only one modifier was passed in
Line 462: Line 728:
end)
end)
for i, row in ipairs(tableArray) do
for i, row in ipairs(tableArray) do
result = result..'\r\n|-'
local datarow = html:tag('tr')
result = result..'\r\n|data-sort-value="'..row.name..'"|'..row.icon
datarow:tag('td'):wikitext(row.icon)
result = result..'|| data-sort-value="'..row.typeText..'" | '..row.expIcon..row.type..'||data-sort-value="'..row.val..'"| '..row.modifierText
  :attr('data-sort-value', row.name)
datarow:tag('td'):wikitext(row.type)
  :attr('data-sort-value', row.typeText)
datarow:tag('td'):wikitext(row.expIcon)
  :css('text-align', 'center')
  :attr('data-sort-value', row.expSort)
datarow:tag('td'):wikitext(row.modifierText)
  :attr('data-sort-value', row.val)
 
if hasOtherModifiers and displayOtherMods then
if hasOtherModifiers and displayOtherMods then
result = result..'|| '..row.otherModifiers
datarow:tag('td'):wikitext(row.otherModifiers)
end
end
end
end


result = result..'\r\n|}'
return tostring(html)
return result
end
end


function p.getModifierTable(frame)
function p.getModifierTable(frame)
local modifier = frame.args ~= nil and frame.args[1] or frame[1]
local args = frame.args ~= nil and frame.args or frame
local skill = frame.args ~= nil and frame.args.skill or frame.skill
local modifier = args[1]
local columnName = frame.args ~= nil and frame.args[2] or frame[2]
local columnName = args[2]
local getOpposites = frame.args ~= nil and frame.args[3] or frame[3]
local getOpposites = args[3]
local displayOtherMods = frame.args ~= nil and frame.args.displayOtherMods or frame.displayOtherMods
local displayOtherMods = args.displayOtherMods
local maxOtherMods = frame.args ~= nil and tonumber(frame.args.maxOtherMods) or 5
local maxOtherMods = tonumber(args.maxOtherMods) or 5
local forceMagnitudeSort = frame.args ~= nil and string.upper(tostring(frame.args.forceMagnitudeSort)) == 'TRUE' or false
local forceMagnitudeSort = string.upper(tostring(args.forceMagnitudeSort)) == 'TRUE' or false
 
local globalPropsText = args.filters
if Shared.contains(modifier, ',') then
local collapsed = string.upper(tostring(args.collapsed)) == 'TRUE' or false
modifier = Shared.splitString(modifier, ',')
end


if getOpposites ~= nil then
if getOpposites ~= nil then
Line 499: Line 770:
end
end


return p._getModifierTable(modifier, skill, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort)
-- Given a text string following format 'key1=val1;key2=val2;...', returns
-- a table: { key1 = val1, key2 = val2, ... }
local function modPropTextToTable(propText)
local propTable = {}
local propParts = Shared.splitString(propText, ';')
for _, propPart in ipairs(propParts) do
local valueStartIdx, _ = string.find(propPart, ':')
if valueStartIdx ~= nil then
local k = string.sub(propPart, 1, valueStartIdx - 1)
local v = string.sub(propPart, valueStartIdx + 1, -1)
propTable[k] = v
end
end
return propTable
end
 
local globalProps = {}
if globalPropsText ~= nil then
globalProps = modPropTextToTable(globalPropsText)
end
 
local modifierList = {}
local modifierListCrude = Shared.splitString(modifier, ',')
-- At this point, modifierListCrude requires further processing to separate modifier IDs
-- and properties
for _, modEntry in ipairs(modifierListCrude) do
local modID, modProps = nil, {}
local propStartIdx, _ = string.find(modEntry, '[[]') -- Matches plain text '['
if propStartIdx == nil then
-- No properties specified, the entire string is a modifier ID
modID = modEntry
else
modID = string.sub(modEntry, 1, propStartIdx - 1)
local modPropText = string.sub(modEntry, propStartIdx + 1, -2)
modProps = modPropTextToTable(modPropText)
end
table.insert(modifierList, {
["id"] = modID,
["props"] = modProps
})
end
 
return p._getModifierTable(modifierList, globalProps, columnName, getOpposites, displayOtherMods, maxOtherMods, forceMagnitudeSort, collapsed)
end
end


-- Function to list all available modifiers for the relevant templates.
function p.getAllModifiers()
local tabl = mw.html.create('table')
:addClass('mw-collapsible mw-collapsed')
tabl:tag('caption')
:css('min-width', '200px')
:tag('b')
:wikitext('All Modifiers List')
-- First, sort modifiers
local modifierNames = {}
for k, _ in pairs(Modifiers.ModifierIndex.localID) do
table.insert(modifierNames, k)
end
table.sort(modifierNames)
-- Then add modifiers to output table
for _, v in pairs(modifierNames) do
tabl:tag('tr')
:tag('td')
:tag('code')
:wikitext(tostring(v)):done()
:done()
:done()
end
return tostring(tabl)
end
--Function for console testing of modifier tables
--Function for console testing of modifier tables
function p.getModifierTableTest()
function p.getModifierTableTest()
return p.getModifierTable({args = {'MeleeMaxHit', 'GP Boosts'}})
return p.getModifierTable({args = {'id:flatBaseRandomProductQuantity[item=Abyssal Stardust]', 'GP Boosts', filters = 'skill=Astrology'}})
end
end


return p
return p
Retrieved from "https://testwiki.melvoridle.com/w/Special:MobileDiff/60402...83192"