2,877
edits
Module:Skills/Artisan: Difference between revisions
From Melvor Idle
no edit summary
No edit summary |
No edit summary |
||
| Line 12: | Line 12: | ||
local Icons = require('Module:Icons') | local Icons = require('Module:Icons') | ||
local ItemSourceTables = require('Module:Items/SourceTables') | local ItemSourceTables = require('Module:Items/SourceTables') | ||
local Num = require('Module:Number') | |||
function p.getCookedItemsTable(frame) | function p.getCookedItemsTable(frame) | ||
| Line 46: | Line 48: | ||
local getHealingCell = function(item, qty) | local getHealingCell = function(item, qty) | ||
if item ~= nil then | if item ~= nil then | ||
return 'data-sort-value="'..(math.floor(item.healsFor) * qty)..'"|'..Icons.Icon({"Hitpoints", type="skill", notext=true})..' '.. | return 'data-sort-value="'..(math.floor(item.healsFor) * qty)..'"|'..Icons.Icon({"Hitpoints", type="skill", notext=true})..' '..Num.formatnum(math.floor(item.healsFor * 10))..(qty > 1 and ' (x'..qty..')' or '') | ||
else | else | ||
return ' ' | return ' ' | ||
| Line 94: | Line 96: | ||
table.insert(resultPart, Icons.Icon({item.name, type='item', noicon = true})) | table.insert(resultPart, Icons.Icon({item.name, type='item', noicon = true})) | ||
table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. level .. '"|' .. reqText) | table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. level .. '"|' .. reqText) | ||
table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. baseInt .. '"|' .. | table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. baseInt .. '"|' .. Num.round(baseInt, 2, 0)) | ||
table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. baseXP .. '"|' .. | table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. baseXP .. '"|' .. Num.formatnum(baseXP)) | ||
table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. xpRate .. '"|' .. | table.insert(resultPart, '||style="text-align:right" data-sort-value="' .. xpRate .. '"|' .. Num.formatnum(Num.round(xpRate, 2, 0))) | ||
table.insert(resultPart, '||'..getHealingCell(item, qty)..'||'..getHealingCell(perfectItem, qty)) | table.insert(resultPart, '||'..getHealingCell(item, qty)..'||'..getHealingCell(perfectItem, qty)) | ||
table.insert(resultPart, '||'..getSaleValueCell(item, qty)..'||'..getSaleValueCell(perfectItem, qty)) | table.insert(resultPart, '||'..getSaleValueCell(item, qty)..'||'..getSaleValueCell(perfectItem, qty)) | ||
| Line 184: | Line 186: | ||
row:tag('td'):attr('rowspan', 4):wikitext(level) | row:tag('td'):attr('rowspan', 4):wikitext(level) | ||
:css('text-align', 'center') | :css('text-align', 'center') | ||
row:tag('td'):attr('rowspan', 4):wikitext( | row:tag('td'):attr('rowspan', 4):wikitext(Num.formatnum(baseXP)) | ||
:attr('data-sort-value', baseXP) | :attr('data-sort-value', baseXP) | ||
:css('text-align', 'right') | :css('text-align', 'right') | ||
| Line 301: | Line 303: | ||
row:tag('td'):wikitext(level) | row:tag('td'):wikitext(level) | ||
:css('text-align', 'center') | :css('text-align', 'center') | ||
row:tag('td'):wikitext( | row:tag('td'):wikitext(Num.formatnum(xp)) | ||
:css('text-align', 'right') | :css('text-align', 'right') | ||
row:tag('td'):wikitext(ingreds.herbs) | row:tag('td'):wikitext(ingreds.herbs) | ||
| Line 586: | Line 588: | ||
table.insert(resultPart, '\n|' .. spanStr .. 'style="text-align:right"| ' .. level) | table.insert(resultPart, '\n|' .. spanStr .. 'style="text-align:right"| ' .. level) | ||
elseif colID == 'SkillXP' then | elseif colID == 'SkillXP' then | ||
table.insert(resultPart, '\n|' .. spanStr .. 'data-sort-value="' .. baseXP ..'" style="text-align:right"| ' .. | table.insert(resultPart, '\n|' .. spanStr .. 'data-sort-value="' .. baseXP ..'" style="text-align:right"| ' .. Num.formatnum(baseXP)) | ||
elseif colID == 'Currency' then | elseif colID == 'Currency' then | ||
local val = math.floor(item.sellsFor) | local val = math.floor(item.sellsFor) | ||
