Module:LeatherworkerList: Difference between revisions
Jump to navigation
Jump to search
Content added Content deleted
(switch from using Infobox Recipe function _getTrueRawMaterials to a purpose built module RecipeTreeSearch designed for combining multi-stage recipes) |
(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 discount = require('Module:MerchantHideDiscount') |
|||
local lang = mw.getContentLanguage() |
local lang = mw.getContentLanguage() |
||
local plist = require('Module:ProfessionList') |
|||
local rts = require('Module:RecipeTreeSearch') |
|||
local discount = require('Module:MerchantHideDiscount') |
|||
local p = {} |
local p = {} |
||
Line 12: | Line 11: | ||
function p.main() |
function p.main() |
||
local queryString = '[[Category:Leatherworker]] AND [[Category:Pages with recipes]]' |
|||
-- 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 stall]]', |
|||
'[[Recipe JSON::~*]]', -- the stall sells scraps and we need to ignore those |
|||
'?Uses facility #- = facility', |
|||
'?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 recipe, or a passive activity |
|||
local product = (item.output and item.output[1] and item.output[1].name) or '' |
|||
for _, item in ipairs(results) do |
|||
return string.find(product,'Leather') and (not item.passive) |
|||
item.passiveActivity = false -- no passives in this list |
|||
end |
end |
||
local results = plist.generate_recipe_table(queryString,screenFunction) |
|||
results = p.formatResults(results) |
results = p.formatResults(results) |
||
Line 42: | Line 27: | ||
--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 |
||
-- sole hide material |
|||
-- New module for recipe searching |
|||
item.material = (item.materials and item.materials[1] and item.materials[1].name) or '' |
|||
local fullRecipe = search.main(item.name) |
|||
item.materials = fullRecipe.materials |
|||
item.outputQuantity = fullRecipe.output[1].quantity |
|||
item.buy = fullRecipe.buyPrice |
|||
item.XP = fullRecipe.xp |
|||
item.duration = fullRecipe.duration |
|||
-- list of all pages to edit, if edit is needed |
|||
-- discounted buy price is not included by the RecipeTreeSearch module, have to do it manually |
|||
item. |
item.allPageEdits = { item.pageName } |
||
for _, |
for _,intermediate in ipairs(item.intermediateMaterials) do |
||
table.insert(item.allPageEdits,intermediate.name) |
|||
end |
|||
-- poles will show as making 1 and using 0.5 log, which doesnt match the look of planks or staves |
|||
--with the merchant discount, buy price is sell price |
|||
-- double them, |
|||
local shopPriceQuery = '[[:+]][[Sold item::' .. material.name .. ']]|?Shop sell price|mainlabel=' .. material.name |
|||
if item.pageName and string.find(item.pageName,'Pole') then |
|||
local shopPriceResult = mw.smw.ask(shopPriceQuery) or {} |
|||
item.output[1].quantity = item.output and item.output[1] and item.output[1].quantity and item.output[1].quantity * 2 |
|||
local shopPrice = 0 |
|||
item.buyPrice = item.buyPrice and item.buyPrice * 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 |
|||
for j,jtem in ipairs(item.materials) do |
|||
if shopPriceResult[1] and shopPriceResult[1]["Shop sell price"] then |
|||
jtem.quantity = jtem.quantity and jtem.quantity * 2 |
|||
shopPrice = tonumber(shopPriceResult[1]["Shop sell price"]) or 0 |
|||
else |
|||
item.buyDiscount = nil |
|||
end |
end |
||
item.buyDiscount = item.buyDiscount and item.buyDiscount + shopPrice * material.quantity |
|||
end |
end |
||
-- |
-- profitability |
||
item. |
item.profitPerXP = item.profit and item.xp and item.profit / item.xp |
||
item.profit = item.sell and item.buy and item.sell - item.buy |
|||
-- 40 seconds to buy new supplies and travel and deposit and everything, per 12 potions |
|||
item.profitDiscount = item.sell and item.buyDiscount and item.sell - item.buyDiscount |
|||
item.profitPerXP = item.profit and item.XP and math.floor(item.profit / item.XP * 100) / 100 |
|||
item.profitPerXPDiscount = item.profitDiscount and item.XP and math.floor(item.profitDiscount / item.XP * 100) / 100 |
|||
local hideName = string.gsub(item.name,'Leather','Hide') |
|||
item.discountLevel = discount[hideName] |
|||
-- a lot of downtime in leatherworker, but large batch sizes |
|||
-- 1min 40s to go from hide stall to tannery, run round the tannery, run to leather stall, then back to hide stall |
|||
local batchSize = 24 |
local batchSize = 24 |
||
local downtime = 100 |
local downtime = 100 |
||
Line 108: | Line 74: | ||
-- 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) |
||
item.profitPerHourDiscount = item.profit and item.productPerHour and math.floor(item.profit * item.productPerHour) |
|||
-- discounted buy price is not provided by the search, have to do it manually |
|||
item.discountLevel = discount[item.material] |
|||
item.buyPriceDiscount = rts.getShopSellPrice(item.material) |
|||
item.profitDiscount = item.sellPrice and item.buyPriceDiscount and item.sellPrice - item.buyPriceDiscount |
|||
item.profitPerHourDiscount = item.profitDiscount and item.productPerHour and math.floor(item.profitDiscount * item.productPerHour) |
item.profitPerHourDiscount = item.profitDiscount and item.productPerHour and math.floor(item.profitDiscount * item.productPerHour) |
||
end |
end |
||
Line 118: | Line 93: | ||
-- 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 126: | Line 107: | ||
:tag('th') |
:tag('th') |
||
:attr{ colspan = '3' } |
:attr{ colspan = '3' } |
||
:wikitext(' |
:wikitext('Products') |
||
:done() |
:done() |
||
:tag('th') |
:tag('th') |
||
:attr{ colspan = '3' } |
|||
:wikitext('Materials') |
:wikitext('Materials') |
||
:done() |
:done() |
||
Line 153: | Line 135: | ||
: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. |
:wikitext(item.level) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(plist.unknown_value_edit_cell(item.pageName,1)) |
|||
:node(unknown_value_cell) |
|||
:END() |
:END() |
||
:tag('td') |
|||
:css{ ['border-right'] = '0', ['padding-right'] = '0', ['text-align'] = 'right' } |
|||
:attr{ ['data-sort-value'] = item.name } |
|||
:wikitext(item.outputQuantity .. ' ×') |
|||
: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,1,'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 .. '× [[File:' .. item.materials[i].name .. '.png|30px|link=' .. item.materials[i].name .. ']] [[' .. item.materials[i].name .. ']]<br>') |
|||
end |
|||
-- materials |
|||
row |
|||
:node(plist.three_column_image_text(item.material,1,'File:' .. item.material .. '.png',item.material,item.material)) |
|||
:ELSE() |
|||
:tag('td') |
|||
:addClass('table-na') |
|||
:attr{ colspan = '21' } |
|||
:wikitext('N/A') |
|||
:done() |
|||
:END() |
|||
:node(plist.currency_cell(item.profit)) |
|||
:node(currency_cell(item. |
:node(plist.currency_cell(item.profitPerHour)) |
||
:node(currency_cell(item.profitPerHour)) |
|||
:tag('td') |
:tag('td') |
||
Line 211: | Line 162: | ||
:wikitext(item.discountLevel) |
:wikitext(item.discountLevel) |
||
:done() |
:done() |
||
:node(currency_cell(item.profitPerHourDiscount)) |
:node(plist.currency_cell(item.profitPerHourDiscount)) |
||
-- XP |
|||
: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.allPageEdits,1)) |
|||
:node(unknown_value_cell) |
|||
:END() |
:END() |
||
-- XP per hour |
|||
:IF(item.XPPerHour) |
|||
: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() |
||
:done() |
:done() |
||
end |
end |