Module:CarpenterList: Difference between revisions

Jump to navigation Jump to search
Browse history interactively
Content added Content deleted
m (ajust table headings)
(offload much of the search, screen, and format functions to the new ProfessionList module, so they work the same for all table)
Line 1: Line 1:
require('strict')
require('strict')
require('Module:Mw.html extension')
require('Module:Mw.html extension')
local search = require('Module:RecipeTreeSearch')
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 9:
-- non dynamic module, no inputs
-- non dynamic module, no inputs
function p.main()
function p.main()
-- returns only directly needed parameter needed for the row,
local queryString = '[[Category:Carpenter]] AND [[Category:Pages with recipes]]'
-- other parameters are determined by subqueries of chained pages
local query = {
local function screenFunction(item)
'[[-Sold item.Sold by::Timber Merchant Shop]]',
local product = (item.output and item.output[1] and item.output[1].name) or ''
'?Profession Level A = lvl',
return not (item.passive or string.find(product,'Post'))
'? #- = name',
end
'?Recipe JSON = recipeJSON',
'?Activity XP = finalXP',
local results = plist.generate_recipe_table(queryString,screenFunction)
'?Activity duration = duration',
'?Value = sell',
'sort = Profession Level A',
'limit = 500'
}
local results = mw.smw.ask(query)


results = p.formatResults(results)
results = p.formatResults(results)
Line 32: Line 26:
--return '<pre>'..mw.text.jsonEncode(results, mw.text.JSON_PRETTY)..'</pre>'
--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
end


-- do calculations and determine strings to go in cells
-- do calculations and determine strings to go in cells
function p.formatResults(results)
function p.formatResults(results)

--simple check for nil results
if results ==nil or results[1] == nil then
return nil
end
-- iterate through products
-- iterate through products
for _, item in ipairs(results) do
for _, item in ipairs(results) do
-- list of all pages to edit, if edit is needed
-- New module for recipe searching
local fullRecipe = search.main(item.name)
item.allPageEdits = { item.pageName }
for _,intermediate in ipairs(item.intermediateMaterials) do
item.materials = fullRecipe.materials
table.insert(item.allPageEdits,intermediate.name)
item.outputQuantity = fullRecipe.output[1].quantity
end
item.buy = fullRecipe.buyPrice
item.XP = fullRecipe.xp
item.duration = fullRecipe.duration
-- poles will show as making 1 and using 0.5 log, which doesnt match the look of planks or staves
-- poles will show as making 1 and using 0.5 log, which doesnt match the look of planks or staves
-- double them,
-- double them,
if item.name and string.find(item.name,'Pole') then
if item.pageName and string.find(item.pageName,'Pole') then
item.outputQuantity = item.outputQuantity and item.outputQuantity * 2
item.output[1].quantity = item.output and item.output[1] and item.output[1].quantity and item.output[1].quantity * 2
item.buy = item.buy and item.buy * 2
item.buyPrice = item.buyPrice and item.buyPrice * 2
item.XP = item.XP and item.XP * 2
item.sellPrice = item.sellPrice and item.sellPrice * 2
item.profit = item.profit and item.profit * 2
item.xp = item.xp and item.xp * 2
item.duration = item.duration and item.duration * 2
item.duration = item.duration and item.duration * 2
for j,jtem in ipairs(item.materials) do
for j,jtem in ipairs(item.materials) do
jtem.quantity = jtem.quantity * 2
jtem.quantity = jtem.quantity and jtem.quantity * 2
end
end
end
end
-- direct values
item.sell = item.sell and item.outputQuantity and item.sell * item.outputQuantity
item.profit = item.sell and item.buy and item.sell - item.buy
item.profitPerXP = item.profit and item.XP and math.floor(item.profit / item.XP * 100) / 100


-- profitability
-- 40 seconds to buy new supplies and travel and deposit and everything, per 12 products
item.profitPerXP = item.profit and item.xp and item.profit / item.xp
-- (without doubling up for poles, was assuming 6 logs to 12 poles per bach)
-- 40 seconds to buy new supplies and travel and deposit and everything, per 12 potions
local batchSize = 12
local batchSize = 12
local downtime = 60
local downtime = 60
Line 88: Line 70:


-- properties per hour
-- properties per hour
item.XPPerHour = item.XP and item.productPerHour and math.floor(item.XP * item.productPerHour)
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 97: Line 79:
-- 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 120: Line 108:
:tag('th')
:tag('th')
:attr{ colspan = '10' }
:attr{ colspan = '10' }
:wikitext('Profit<br>(per log)')
:wikitext('Profit')
:done()
:done()
:tag('th')
:tag('th')
Line 127: Line 115:
:done()
:done()
:tag('th')
:tag('th')
:wikitext('XP<br>(per log)')
:wikitext('XP')
:done()
:done()
:tag('th')
:tag('th')
Line 137: Line 125:
: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
local row = out:tag('tr')
local row = out:tag('tr')
:IF(item.lvl)
--level
:IF(item.level)
:tag('td')
:tag('td')
:css{ ['text-align'] = 'center' }
:css{ ['text-align'] = 'center' }
:wikitext(item.lvl)
:wikitext(item.level)
:done()
:done()
:ELSE()
:ELSE()
:node(plist.unknown_value_edit_cell(item.pageName,1))
:node(unknown_value_cell)
:END()
:END()
-- recipe
:node(plist.three_column_image_text(item.product,item.output[1].quantity,'File:' .. item.product .. '.png',item.product,item.product))
-- materials
:IF(item.type=='recipe')
:node(plist.one_column_image_text(item.materials))
:node(plist.currency_cell(item.buyPrice))
:node(plist.currency_cell(item.sellPrice))
:ELSE()
:tag('td')
:addClass('table-na')
:css{ ['text-align'] = 'center' }
:attr{ colspan = '21' }
:wikitext('N/A')
:done()
:END()
:node(plist.currency_cell(item.profit))
:node(plist.currency_cell(item.profitPerHour))


:tag('td')
-- XP
:IF(item.xp)
: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()

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|30px|link=' .. item.materials[i].name .. ']] [[' .. item.materials[i].name .. ']]<br>')
end
row
:node(currency_cell(item.buy))
:node(currency_cell(item.sell))
:node(currency_cell(item.profit))
:node(currency_cell(item.profitPerHour))

:IF(item.XP)
:tag('td')
:tag('td')
:wikitext(item.XP and lang:formatNum(tonumber(item.XP)))
:wikitext(item.xp and lang:formatNum(tonumber(item.xp)))
:done()
:done()
:ELSE()
:ELSE()
:node(plist.unknown_value_edit_cell(item.allPageEdits,1))
:node(unknown_value_cell)
:END()
:END()

-- XP per hour
:IF(item.XPPerHour)
:IF(item.xpPerHour)
:tag('td')
:tag('td')
:wikitext(item.XPPerHour and lang:formatNum(tonumber(item.XPPerHour)))
: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()

-- XP per hour
:node(currency_cell(item.profitPerXP))
:node(plist.currency_cell(item.profitPerXP))

:done()
:done()
end
end
Retrieved from ‘https://brightershoreswiki.org/w/Module:CarpenterList’