Module:LeatherworkerPassiveList: Difference between revisions

offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all table
m (smaller icons for materials, since they have multiple per line of the table)
(offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all table)
Line 1:
require('strict')
require('Module:Mw.html extension')
local param = require( 'Module:Paramtest' )
local currency = require('Module:Currency')
local lang = mw.getContentLanguage()
local plist = require('Module:ProfessionList')
local rts = require('Module:RecipeTreeSearch')
 
local p = {}
Line 10:
function p.main()
local queryString = '[[Category:Leatherworker]] AND [[Category:Pages with recipes]] OR [[Category:Pages with activities]]'
-- main query returns only directly needed parameter needed for the row,
-- other parameters are determined by subqueries of chained pages
local query = {
'[[-Sold item.Sold by::Leather Goods]] OR [[Variant of::Upholstery]]',
'?Variant of #- = variant',
'?Profession Level A = lvl',
'? #- = name',
'?Recipe JSON = recipeJSON',
'?Activity XP = XP',
'?Activity duration = duration',
'?Value = sell',
'?Activity coins = coins',
'sort = Profession Level A',
'limit = 500'
}
local results = mw.smw.ask(query)
local function screenFunction(item)
-- criterion for if an entry is a psasive recipe, or a passive activity
return item.passive and item.profession=='Leatherworker' -- needs this second term as some merchant activities have leatherworker levels, and hence category
for _, item in ipairs(results) do
item.passiveActivity = (item.variant=='Upholstery')
end
local results = plist.generate_recipe_table(queryString,screenFunction)
 
results = p.formatResults(results)
 
Line 39 ⟶ 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
for _, item in ipairs(results) do
-- Ebsworth work
-- recipe in a workable format
if item.passiveActivitytype=='activity' then
item.profit = item.coins
-- if it is a passive activity that is not a recipe
-- some fields are easy to work out
item.outputQuantity = 1
item.materials = {}
item.intermediates = {}
item.buy = 0
item.sell = item.coins
 
else
local unpackJSON = mw.text.jsonDecode(item.recipeJSON)
item.outputQuantity = unpackJSON.output[1].quantity
 
-- SECTION REMOVED
-- do not need to extensively search for through recipe tree,
-- passive recipes only ever have one step
item.materials = unpackJSON.materials
-- iterate through materials, adding buy price to running total (individuals not needed)
item.buy = 0
for _, material in ipairs(item.materials) do
--shamelessley lifted from Module:Products
local shopPriceQuery = '[[:+]][[Sold item::' .. material.name .. ']]|?Shop buy price|mainlabel=' .. material.name
local shopPriceResult = mw.smw.ask(shopPriceQuery) or {}
local shopPrice = 0
if shopPriceResult[1] and shopPriceResult[1]["Shop buy price"] then
shopPrice = tonumber(shopPriceResult[1]["Shop buy price"]) or 0
else
item.buy = nil
end
item.buy = item.buy and item.buy + shopPrice * material.quantity
end
end
-- direct valuesprofitability
item.sellprofitPerXP = item.sellprofit and item.outputQuantityxp and item.sellprofit */ item.outputQuantityxp
item.profit = item.sell and item.buy and item.sell - item.buy
-- no downtime for passives
item.profitPerXP = item.profit and item.XP and math.floor(item.profit / item.XP * 100) / 100
 
-- passive acitivities have no downtime
local batchSize = 200
local downtime = 0
item.duration = item.duration and item.duration + downtime/batchSize
item.productPerHour = item.duration and 1 / item.duration * 3600
 
-- 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 124 ⟶ 59:
-- 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 ⟶ 73:
:tag('th')
:attr{ colspan = '3' }
:wikitext('ProductProducts')
:done()
:tag('th')
Line 164 ⟶ 105:
: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
local row = out:tag('tr')
:IF(item.lvl)
--level
:IF(item.level)
: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()
 
:tag('td')
:css{ ['border-right'] = '0', ['padding-right'] = '0', ['text-align'] = 'right' }
:attr{ ['data-sort-value'] = item.name }
:wikitext(item.outputQuantity .. ' &times;')
:done()
:tag('td')
:addClass('plinkt-image no-border')
:css{ ['border-left'] = '0', ['padding-left'] = '0' }
:wikitext('[[File:' .. item.name .. '.png|link=' .. item.name .. '|30px]]')
:done()
:tag('td')
:addClass('plinkt-link no-border')
:wikitext('[[' .. item.name .. ']]')
:done()
-- recipe
:IF(not(item.passiveActivity))
:node(plist.three_column_image_text(item.product,item.output[1].quantity,'File:' .. item.product .. '.png',item.product,item.product))
 
local materialCell = row:tag('td')
for i, _ in ipairs(item.materials) do
materialCell:wikitext(item.materials[i].quantity .. '&times; [[File:' .. item.materials[i].name .. '.png|18px|link=' .. item.materials[i].name .. ']] [[' .. item.materials[i].name .. ']]<br>')
end
-- materials
row
:node(currency_cellIF(item.buy)type=='recipe')
:node(currency_cellplist.one_column_image_text(item.sellmaterials))
:node(plist.currency_cell(item.buyPrice))
:node(plist.currency_cell(item.sellPrice))
:ELSE()
:tagELSE('td')
:addClasstag('table-natd')
:attr{ colspan = addClass('21table-na' })
:css{ ['text-align'] = 'center' }
:wikitext('N/A')
:attr{ colspan = '21' }
:done()
:ENDwikitext('N/A')
:done()
:END()
:IF(item.type=='activity' and not item.profit)
:node(plist.unknown_value_edit_cell(item.pageName,10))
:ELSE()
:node(plist.currency_cell(item.profit))
:END()
:node(plist.currency_cell(item.profitprofitPerHour))
:node(currency_cell(item.profitPerHour))
 
:IF(item.-- XP)
:IF(item.xp)
: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.XPPerHour)
:IF(item.xpPerHour)
:tag('td')
:wikitext(item.XPPerHourxpPerHour and lang:formatNum(tonumber(item.XPPerHourxpPerHour)))
:done()
:ELSE()
:node(plist.unknown_value_cell(1))
:END()
 
-- XP per hour
:node(currency_cell(item.profitPerXP))
:node(plist.currency_cell(item.profitPerXP))
 
:done()
end
21,691

edits