Module:WoodcutterList: Difference between revisions
Jump to navigation
Jump to search
Content added Content deleted
(correctly parses coop and solo activities separately) |
(offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all tables) |
||
Line 1: | Line 1: | ||
require('strict') |
require('strict') |
||
require('Module:Mw.html extension') |
require('Module:Mw.html extension') |
||
local param = require( 'Module:Paramtest' ) |
|||
local currency = require('Module:Currency') |
|||
local lang = mw.getContentLanguage() |
local lang = mw.getContentLanguage() |
||
local plist = require('Module:ProfessionList') |
|||
local rts = require('Module:RecipeTreeSearch') |
|||
local p = {} |
local p = {} |
||
Line 10: | Line 10: | ||
function p.main() |
function p.main() |
||
local queryString = '[[Category:Woodcutter]] AND [[Category:Pages with activities]]' |
|||
-- returns only directly needed parameter needed for the row, |
|||
-- other parameters are determined by subqueries of chained pages |
|||
local |
local function screenFunction(item) |
||
return not item.passive |
|||
'[[Variant of::~*Tree||Brambles]]', |
|||
end |
|||
'?Variant of #- = variant', |
|||
'?Profession Level A = lvl', |
|||
local results = plist.generate_recipe_table(queryString,screenFunction) |
|||
'? #- = name', |
|||
'?Image #- = Image', |
|||
'?Activity XP = XP', |
|||
'?Activity duration = duration', |
|||
'?Activity coins = coins', |
|||
'?Skill node name = product', |
|||
'?Activity input #- = material', |
|||
'?Activity JSON = activityJSON', |
|||
'sort = Profession Level A', |
|||
'limit = 500' |
|||
} |
|||
local results = mw.smw.ask(query) |
|||
results = p.screenResults(results) |
|||
results = p.formatResults(results) |
results = p.formatResults(results) |
||
Line 40: | Line 27: | ||
end |
end |
||
-- do calculations and determine strings to go in cells |
|||
-- makes the html for the cells containing currency directly |
|||
function p.formatResults(results) |
|||
-- Replaces nil with an "unknown" cell |
|||
local function currency_cell(amount) |
|||
if not amount then |
|||
return mw.html.create('td') |
|||
:addClass('table-bg-gray') |
|||
:css{ ['text-align'] = 'center' } |
|||
:attr{ colspan = '10' } |
|||
:wikitext("''unknown''") |
|||
:done() |
|||
end |
|||
return currency._cell(amount, { html = 'yes' }) |
|||
end |
|||
-- goes through a list of results and culls the ones which are not needed for this table |
|||
function p.screenResults(results) |
|||
local resultsScreened = {} |
|||
--simple check for nil results |
|||
-- iterate through products |
|||
if results==nil or results[1]==nil then |
|||
return nil |
|||
-- if theres only one activity, wrap in table |
|||
if type(item.activityJSON)=='string' then |
|||
item.activityJSON = { item.activityJSON } |
|||
end |
|||
if item.activityJSON ~= nil then -- TEMPORARY LINE WHILE PAGES DONT ALL HAVE PROFESSION INFO |
|||
for j,json in ipairs(item.activityJSON) do |
|||
if string.find(json,'Log') or string.find(json,'Brambles') then |
|||
local itemNew = {} |
|||
itemNew.name = item.name |
|||
itemNew.Image = item.Image |
|||
local activityJSON = mw.text.jsonDecode(json) |
|||
itemNew.XP = activityJSON.xp |
|||
itemNew.lvl = activityJSON.level |
|||
itemNew.coop = activityJSON.coop |
|||
itemNew.duration = activityJSON.duration and tonumber(activityJSON.duration) |
|||
itemNew.product = activityJSON.output[1].name |
|||
table.insert(resultsScreened,itemNew) |
|||
end |
|||
end |
|||
end |
|||
end |
end |
||
-- sort the results by recipe level |
|||
table.sort(resultsScreened, function(item1, item2) |
|||
local lvl1 = item1.lvl |
|||
local lvl2 = item2.lvl |
|||
if (lvl1 == nil) ~= (lvl2 == nil) then --one of two are empty |
|||
return lvl2 == nil -- true if lvl2 is nil but not lvl1, false if lvl1 is nil but not lvl2 |
|||
end |
|||
if lvl1 == nil then |
|||
return false -- Both empty, equivalent |
|||
end |
|||
return lvl1 < lvl2 -- normal comparison |
|||
end) |
|||
return resultsScreened |
|||
end |
|||
-- do calculations and determine strings to go in cells |
|||
function p.formatResults(results) |
|||
-- iterate through products |
-- iterate through products |
||
for _, item in ipairs(results) do |
for _, item in ipairs(results) do |
||
--catch badly submitted data |
|||
item.material = item.material or '' |
|||
item.product = item.product or '' |
|||
-- price of resource |
|||
-- query is: there is a shop object page that has this item AND has buy price cannot be "N/A" |
|||
local query = mw.smw.ask('[[Sold item::' .. item.product .. ']][[Shop sell price::!~N/A]]|?Shop sell price=data|mainlabel=-') |
|||
if type(query)=='table' then |
|||
-- price is returned as a number |
|||
item.profit = tonumber(query[1].data) or 0 |
|||
else |
|||
-- will return nil if the item is not in a shop, or if it is in a shop but can only be sold to the shop |
|||
item.profit = nil |
|||
end |
|||
-- detect brambles |
-- detect brambles |
||
item. |
item.hideCells = string.find(item.pageName,'Brambles') |
||
-- profitability |
-- profitability |
||
item. |
item.profit = item.sellPrice |
||
item.profitPerXP = item.profit and item.xp and item.profit / item.xp |
|||
-- DOWNTIME VERY IMPORTANT FOR GATHERING TYPE PROFESSIONS |
-- DOWNTIME VERY IMPORTANT FOR GATHERING TYPE PROFESSIONS |
||
Line 138: | Line 51: | ||
-- properties per hour |
-- properties per hour |
||
item. |
item.xpPerHour = item.xp and item.productPerHour and math.floor(item.xp * item.productPerHour) |
||
item.profitPerHour = item.profit and item.productPerHour and math.floor(item.profit * item.productPerHour) |
item.profitPerHour = item.profit and item.productPerHour and math.floor(item.profit * item.productPerHour) |
||
end |
end |
||
Line 147: | Line 60: | ||
-- make the table |
-- make the table |
||
function p.displayTable(results) |
function p.displayTable(results) |
||
--simple check for nil results |
|||
if results ==nil or results[1] == nil then |
|||
return 'No data found for table' |
|||
end |
|||
local out = mw.html.create('table') |
local out = mw.html.create('table') |
||
:addClass('wikitable sortable') |
:addClass('wikitable sortable') |
||
Line 179: | Line 98: | ||
:done() |
:done() |
||
:done() |
:done() |
||
local unknown_value_cell = mw.html.create('td') |
|||
:addClass('table-bg-gray') |
|||
:css{ ['text-align'] = 'center' } |
|||
:wikitext("''unknown''") |
|||
for i, item in ipairs(results) do |
for i, item in ipairs(results) do |
||
Line 189: | Line 103: | ||
--level |
--level |
||
:IF(item. |
:IF(item.level) |
||
:tag('td') |
:tag('td') |
||
:css{ ['text-align'] = 'center' } |
:css{ ['text-align'] = 'center' } |
||
:wikitext(item. |
:wikitext(item.level) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(plist.unknown_value_edit_cell(item.pageName,1)) |
|||
:node(unknown_value_cell) |
|||
:END() |
:END() |
||
-- gathering node |
-- gathering node |
||
:node(plist.two_column_image_text(item.pageName,item.pageImage,item.pageName,item.pageName)) |
|||
:tag('td') |
|||
:css{ ['border-right'] = '0', ['text-align'] = 'right', ['max-width'] = '100px' } |
|||
:attr{ ['data-sort-value'] = item.name } |
|||
:wikitext(' [[' .. item.Image .. '|link=' .. item.name .. '|30x30px]]') |
|||
:done() |
|||
:tag('td') |
|||
:addClass('plinkt-link no-border') |
|||
:wikitext('[[' .. item.name .. '|' .. item.name ..']]') |
|||
:done() |
|||
-- resource |
-- resource |
||
:IF(item. |
:IF(item.hideCells) |
||
:tag('td') |
:tag('td') |
||
:addClass('table-na') |
:addClass('table-na') |
||
Line 217: | Line 123: | ||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
: |
:IF(item.coop) |
||
:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product .. ' (co-op)',item.product)) |
|||
:css{ ['border-right'] = '0', ['text-align'] = 'right', ['max-width'] = '100px' } |
|||
:ELSE() |
|||
:attr{ ['data-sort-value'] = item.product } |
|||
: |
:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product,item.product)) |
||
: |
:END() |
||
:tag('td') |
|||
:addClass('plinkt-link no-border') |
|||
:wikitext('[[' .. item.product .. ']]') |
|||
:IF(item.coop) |
|||
:wikitext(' (Co-op)') |
|||
:END() |
|||
:done() |
|||
-- resource/hr |
-- resource/hr |
||
:IF(item.productPerHour) |
:IF(item.productPerHour) |
||
Line 236: | Line 135: | ||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node( |
:node(plist.unknown_value_edit_cell(item.pageName,1)) |
||
:END() |
:END() |
||
-- economics |
-- economics |
||
:node(currency_cell(item.profit)) |
:node(plist.currency_cell(item.profit)) |
||
:node(currency_cell(item.profitPerHour)) |
:node(plist.currency_cell(item.profitPerHour)) |
||
:END() |
:END() |
||
-- XP |
-- XP |
||
:IF(item. |
:IF(item.xp) |
||
:tag('td') |
:tag('td') |
||
:wikitext(item. |
:wikitext(item.xp and lang:formatNum(tonumber(item.xp))) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(plist.unknown_value_edit_cell(item.pageName,1)) |
|||
:node(unknown_value_cell) |
|||
:END() |
:END() |
||
-- XP per hour |
-- XP per hour |
||
:IF(item. |
:IF(item.xpPerHour) |
||
:tag('td') |
:tag('td') |
||
:wikitext(item. |
:wikitext(item.xpPerHour and lang:formatNum(tonumber(item.xpPerHour))) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(unknown_value_cell) |
:node(plist.unknown_value_cell(1)) |
||
:END() |
:END() |
||