Melvor Idle

Module:Calculator/AgilityObstacle: Difference between revisions

Module Discussion

Module:Calculator/AgilityObstacle (view source)

Revision as of 17:53, 22 July 2024

274 bytes added ,  22 July 2024
Add support for more currencies
No edit summary
(Add support for more currencies)
 
(11 intermediate revisions by 3 users not shown)
Line 4: Line 4:
local Num = require('Module:Number')
local Num = require('Module:Number')
local Constants = require('Module:Constants')
local Constants = require('Module:Constants')
local Modifiers = require('Module:Modifiers')
local Agility = require('Module:Skills/Agility')
local Agility = require('Module:Skills/Agility')
local Shared = require('Module:Shared')
local Shared = require('Module:Shared')
local Icons = require('Module:Icons')
local Icons = require('Module:Icons')
local iconTable = {
    ['GP']  = function(amount) return Icons._Currency('GP', amount) end,
    ['SC']  = function(amount) return Icons._Currency('SC', amount) end,
    ['AP']  = function(amount) return Icons._Currency('AP', amount) end,
    ['ASC'] = function(amount) return Icons._Currency('ASC', amount) end,
}
local currencies = {
'GP', 'SC', 'AP', 'ASC'
}


local function getItemIcon(itemName, amount)
local function getItemIcon(itemName, amount)
if itemName == 'GP' then
local iconFunc = iconTable[itemName]
return Icons.GP(amount)
    if iconFunc then
end
        return iconFunc(amount)
    else
if itemName == 'SC' then
        return Icons.Icon({itemName, type='item', qty = amount, notext=true})
return Icons.SC(amount)
    end
end
end
 
return Icons.Icon({itemName, type='item', qty = amount, notext=true})
local function getObstacleIcon(obstacle)
local obs = obstacle.Obstacle
return Icons.getExpansionIcon(obs.id) .. Icons.Icon({obs.name, type='agility'})  
end
end


Line 25: Line 39:
local obstacle = Agility.getObstacle(name) or Agility.getPillar(name)
local obstacle = Agility.getObstacle(name) or Agility.getPillar(name)
if obstacle == nil then
if obstacle == nil then
error("Unknown Agility obstacle or pillar name: " .. name)
error("Unknown Agility obstacle or pillar name: " .. (name or '<name is nil>'))
end
end


Line 36: Line 50:
slot = 'Pillar'
slot = 'Pillar'
end
end
elseif string.find(name, 'Obelisk') then
slot = 'Obelisk'
else
else
slot = obstacle.category + 1
slot = obstacle.category + 1
Line 78: Line 94:


function p.calculateCourse(obstacleNames, checkDoubleSlots, costReduction)
function p.calculateCourse(obstacleNames, checkDoubleSlots, costReduction)
local funcPoolCosts = function(tbl, item, amount)
function poolItems(tbl, item, amount)
Shared.addOrUpdate(tbl, item, function(x) x = x or 0 return x + amount end)
Shared.addOrUpdate(tbl, item, function(x) x = x or 0 return x + amount end)
end
end
local courseObstacles = getObstacles(obstacleNames, checkDoubleSlots, costReduction)


-- Calculate the highest level requirements and the total amount of items
-- Calculate the highest level requirements and the total amount of items
Line 90: Line 104:
['Items'] = {}
['Items'] = {}
}
}
local courseObstacles = getObstacles(obstacleNames, checkDoubleSlots, costReduction)
 
for _, obstacle in pairs(courseObstacles) do
for _, obstacle in pairs(courseObstacles) do
-- Pool together highest level requirements for the entire course.
-- Pool together highest level requirements for the entire course.
Line 102: Line 117:
-- Pool together total item costs to build the entire course course.
-- Pool together total item costs to build the entire course course.
local obstacleCosts = obstacle.ItemCosts
local obstacleCosts = obstacle.ItemCosts
if obstacleCosts['GP'] then funcPoolCosts(courseItemCosts, 'GP', obstacleCosts['GP']) end
if obstacleCosts['SC'] then funcPoolCosts(courseItemCosts, 'SC', obstacleCosts['SC']) end
-- Iterate over currencies and pool these costs
for _, curr in ipairs(currencies) do
if obstacleCosts[curr] then
poolItems(courseItemCosts, curr, obstacleCosts[curr])
end
end
for item, amount in pairs(obstacleCosts['Items']) do
for item, amount in pairs(obstacleCosts['Items']) do
funcPoolCosts(courseItemCosts['Items'], item, amount)
poolItems(courseItemCosts['Items'], item, amount)
end
end
end
end
Line 113: Line 133:
local sortFunc = function(a, b)
local sortFunc = function(a, b)
-- Special case to sort pillars AFTER all regular obstacles.
-- Special case to sort pillars AFTER all regular obstacles.
     local pillar = { ["Pillar"] = 99, ["Elite Pillar"] = 100 }
     local pillar = { ["Pillar"] = 99, ["Elite Pillar"] = 100, ["Obelisk"] = 60 }
return (pillar[a.Slot] or a.Slot) < (pillar[b.Slot] or b.Slot)
return (pillar[a.Slot] or a.Slot) < (pillar[b.Slot] or b.Slot)
end
end
Line 174: Line 194:
:wikitext(v.Slot)
:wikitext(v.Slot)
:tag('td')
:tag('td')
:wikitext(Icons.Icon({v.Name, type='agility'}))
:wikitext(getObstacleIcon(v))
end
end
Line 186: Line 206:
    
    
     local courseItems = courseRequirements.CourseItemCosts
     local courseItems = courseRequirements.CourseItemCosts
     -- Put GP and SC at the top, and remove them from the list
     -- Put currencies at the top.
     -- to avoid sorting and re-adding them below.
     for _, curr in ipairs(currencies) do
    if courseItems['GP'] then ul:tag('li'):wikitext(getItemIcon('GP', courseItems['GP'])) end
    if courseItems[curr] then
     if courseItems['SC'] then ul:tag('li'):wikitext(getItemIcon('SC', courseItems['SC'])) end
    ul:tag('li'):wikitext(getItemIcon(curr, courseItems[curr]))
    end
     end


     local itemList = Shared.sortDictionary(courseItems['Items'],  
     local itemList = Shared.sortDictionary(courseItems['Items'],  
Line 226: Line 248:
--== Local Functions for formatting Obstacle MetaData ==--
--== Local Functions for formatting Obstacle MetaData ==--
local function getBonusses(obstacle)
local function getBonusses(obstacle)
local bonuses = {}
if obstacle.modifiers == nil then
for bonusName, bonusValue in pairs(obstacle.modifiers) do
return '<span style="color:red">None :(</span>'
table.insert(bonuses, Constants._getModifierText(bonusName, bonusValue))
else
end
return Modifiers.getModifiersText(obstacle.modifiers, true, false, 10)
if Shared.tableIsEmpty(bonuses) then
table.insert(bonuses, '<span style="color:red">None :(</span>')
end
end
return table.concat(bonuses, '<br/>')
end
end
Line 250: Line 269:
local function getCosts(costsTable)
local function getCosts(costsTable)
local res = {}
local res = {}
   
-- Order table with GP, SC first, then the other items.
-- Order table with GP, SC first, then the other items.
     if costsTable['GP'] then table.insert(res, getItemIcon('GP', costsTable['GP'])) end
     for _, curr in ipairs(currencies) do
    if costsTable['SC'] then table.insert(res, getItemIcon('SC', costsTable['SC'])) end
    if costsTable[curr] then  
    table.insert(res, getItemIcon(curr, costsTable[curr]))
    end
    end    


     local sortedCosts = Shared.sortDictionary(costsTable['Items'],  
     local sortedCosts = Shared.sortDictionary(costsTable['Items'],  
Line 266: Line 288:
local function getTotalBonuses(obstacles)
local function getTotalBonuses(obstacles)
--[==[
local bonuses = {}
local bonuses = {}
for _, obstacle in pairs(obstacles) do
for _, obstacle in pairs(obstacles) do
Line 284: Line 307:
return table.concat(ret, '<br/>')
return table.concat(ret, '<br/>')
--]==]
return ''
end
end


--== Parse optional parameters==--
--== Parse optional parameters==--
local showTotals = yesno(args['showtotals'], false)
local showTotals = yesno(args['showtotals'], false)
local showbonus = yesno(args['obstacleMastery'], true)
local showbonus = yesno(args['showbonus'], true)
local showrequirements = yesno(args['obstacleMastery'], true)
local showrequirements = yesno(args['showrequirements'], true)
local showcosts = yesno(args['obstacleMastery'], true)
local showcosts = yesno(args['showcosts'], true)
local obstacleMastery = yesno(args['obstacleMastery'], false)
local obstacleMastery = yesno(args['obstacleMastery'], false)


Line 305: Line 330:
local tbl = mw.html.create("table")
local tbl = mw.html.create("table")
       :addClass("wikitable stickyheader")
       :addClass("wikitable stickyheader")
     
   
     tbl :tag('tr')
     local thr = tbl:tag('tr')
:tag('th'):wikitext('Slot')
    thr:tag('th'):wikitext('Slot')
:tag('th'):wikitext('Obstacle')
thr:tag('th'):wikitext('Obstacle')
if showbonus then
if showbonus then
tbl:tag('th'):wikitext('Bonuses')
thr:tag('th'):wikitext('Bonuses')
end
end
if showrequirements then
if showrequirements then
tbl:tag('th'):wikitext('Requirements')
thr:tag('th'):wikitext('Requirements')
end
end
if showcosts then
if showcosts then
tbl:tag('th'):wikitext('Costs')
thr:tag('th'):wikitext('Costs')
end
end


Line 325: Line 350:
:css('text-align', 'right')
:css('text-align', 'right')
:wikitext(obstacle.Slot)
:wikitext(obstacle.Slot)
:tag('td'):wikitext(Icons.Icon({obstacle.Name, type='agility'}))
:tag('td'):wikitext(getObstacleIcon(obstacle))
if showbonus then
if showbonus then
Line 344: Line 369:
:wikitext('Totals')
:wikitext('Totals')
if showbonus then
if showbonus then
tr:wikitext(getTotalBonuses(courseRequirements.Obstacles))
tr :tag('td')
:wikitext(getTotalBonuses(courseRequirements.Obstacles))
end
end
if showrequirements then
if showrequirements then
tr:wikitext(getRequirements(courseRequirements.CourseLevelRequirements))
tr :tag('td')
:wikitext(getRequirements(courseRequirements.CourseLevelRequirements))
end
end
if showcosts then
if showcosts then
tr:wikitext(getCosts(courseRequirements.CourseItemCosts))
tr :tag('td')
:wikitext(getCosts(courseRequirements.CourseItemCosts))
end
end
end
end
Line 357: Line 385:
end
end


function p.test()
local obstacles = {"Rope Climb","Monkey Bars"," Balance Seesaw","Elite Pillar of Conflict"}
local obs = p.calculateCourse(obstacles)
end
return p
return p
Ricewind
2,877

edits

Retrieved from "https://testwiki.melvoridle.com/w/Special:MobileDiff/67611...78081"