Module:GathererList: Difference between revisions

offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all tables
m (spacing around images)
(offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all tables)
Line 1:
require('strict')
require('Module:Mw.html extension')
local param = require( 'Module:Paramtest' )
local currency = require('Module:Currency')
local lang = mw.getContentLanguage()
local paramplist = require( 'Module:ParamtestProfessionList' )
local currencyrts = require('Module:CurrencyRecipeTreeSearch')
 
local p = {}
Line 10:
function p.main()
local queryString = '[[Category:Gatherer]] AND [[Category:Pages with activities]]'
-- returns only directly needed parameter needed for the row,
}
-- other parameters are determined by subqueries of chained pages
local queryfunction = {screenFunction(item)
return not item.passive
'[[Category:Gatherer]] AND [[~*(skill node)]]',
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',
'?Skill node name = product',
'?Activity input #- = material',
'sort = Profession Level A',
'limit = 500'
}
local results = mw.smw.ask(query)
 
results = p.formatResults(results)
Line 34 ⟶ 25:
--return '<pre>'..mw.text.jsonEncode(results, mw.text.JSON_PRETTY)..'</pre>'
 
end
 
-- makes the html for the cells containing currency directly
-- 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
 
-- do calculations and determine strings to go in cells
function p.formatResults(results)
--simple check for nil results
if results ==nil or results[1] == nil then
return nil
end
-- iterate through products
Line 57 ⟶ 39:
 
--catch badly submitted data
item.material = item.material or ''
item.product = item.product or ''
item.ImagepageImage = item.ImagepageImage 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
-- profitability
item.profitPerXPprofit = item.profit and item.XP and item.profit / item.XPsellPrice
item.profitPerXP = item.profit and item.xp and item.profit / item.xp
-- DOWNTIME VERY IMPORTANT FOR GATHERING TYPE PROFESSIONS
Line 81 ⟶ 52:
 
-- properties per hour
item.XPPerHourxpPerHour = item.XPxp and item.productPerHour and math.floor(item.XPxp * item.productPerHour)
item.profitPerHour = item.profit and item.productPerHour and math.floor(item.profit * item.productPerHour)
end
Line 90 ⟶ 61:
-- make the table
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')
:addClass('wikitable sortable')
Line 132 ⟶ 109:
--level
:IF(item.lvllevel)
:tag('td')
:css{ ['text-align'] = 'center' }
:wikitext(item.lvllevel)
:done()
:ELSE()
:node(plist.unknown_value_edit_cell(item.pageName,1))
:node(unknown_value_cell)
:END()
-- 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.product ..']]')
:done()
-- resource
:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product,item.product))
:tag('td')
:css{ ['border-right'] = '0', ['text-align'] = 'right', ['max-width'] = '100px' }
:attr{ ['data-sort-value'] = item.product }
:wikitext('[[File:' .. item.product .. '.png|link=' .. item.product .. '|30x30px]]')
:done()
:tag('td')
:addClass('plinkt-link no-border')
:wikitext('[[' .. item.product .. ']]')
:done()
-- resource/hr
Line 169 ⟶ 130:
:done()
:ELSE()
:node(plist.unknown_value_edit_cell(item.pageName,1))
:node(unknown_value_cell)
:END()
-- economics
:node(plist.currency_cell(item.profit))
:node(plist.currency_cell(item.profitPerHour))
 
-- XP
:IF(item.XPxp)
:tag('td')
:wikitext(item.XPxp and lang:formatNum(tonumber(item.XPxp)))
:done()
:ELSE()
:node(plist.unknown_value_edit_cell(item.pageName,1))
:node(unknown_value_cell)
:END()
-- XP per hour
:IF(item.XPPerHourxpPerHour)
:tag('td')
:wikitext(item.XPPerHourxpPerHour and lang:formatNum(tonumber(item.XPPerHourxpPerHour)))
:done()
:ELSE()
:node(plist.unknown_value_cell(1))
:END()
 
11,305

edits