Editing Module:LeatherworkerList
Jump to navigation
Jump to search
The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
require('strict') |
require('strict') |
||
require('Module:Mw.html extension') |
require('Module:Mw.html extension') |
||
local lang = mw.getContentLanguage() |
|||
local plist = require('Module:ProfessionList') |
|||
local search = require('Module:RecipeTreeSearch') |
local search = require('Module:RecipeTreeSearch') |
||
local param = require( 'Module:Paramtest' ) |
|||
local currency = require('Module:Currency') |
|||
local discount = require('Module:MerchantHideDiscount') |
local discount = require('Module:MerchantHideDiscount') |
||
local lang = mw.getContentLanguage() |
|||
local purge = require('Module:Purge')._purge |
|||
local p = {} |
local p = {} |
||
Line 12: | Line 12: | ||
function p.main() |
function p.main() |
||
-- main query returns only directly needed parameter needed for the row, |
|||
local queryString = '[[Category:Leatherworker]] AND [[Category:Pages with recipes]]' |
|||
-- 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) |
|||
-- criterion for if an entry is a recipe, or a passive activity |
|||
local function screenFunction(item) |
|||
for _, item in ipairs(results) do |
|||
local product = (item.output and item.output[1] and item.output[1].name) or '' |
|||
item.passiveActivity = false -- no passives in this list |
|||
return string.find(product,'Leather') and (not item.passive) |
|||
end |
end |
||
local results = plist.generate_recipe_table(queryString,screenFunction) |
|||
results = p.formatResults(results) |
results = p.formatResults(results) |
||
Line 28: | Line 42: | ||
--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 |
||
-- New module for recipe searching |
|||
-- sole hide material |
|||
local fullRecipe = search.main(item.name) |
|||
item.material = (item.materials and item.materials[1] and item.materials[1].name) or '' |
|||
item.materials = fullRecipe.materials |
|||
item.outputQuantity = fullRecipe.output[1].quantity |
|||
item.buy = fullRecipe.buyPrice |
|||
item.XP = fullRecipe.xp |
|||
item.duration = fullRecipe.duration |
|||
-- discounted buy price is not included by the RecipeTreeSearch module, have to do it manually |
|||
-- list of all pages to edit, if edit is needed |
|||
item. |
item.buyDiscount = 0 |
||
for _, |
for _, material in ipairs(item.materials) do |
||
table.insert(item.allPageEdits,intermediate.name) |
|||
end |
|||
--with the merchant discount, buy price is sell price |
|||
-- poles will show as making 1 and using 0.5 log, which doesnt match the look of planks or staves |
|||
local shopPriceQuery = '[[:+]][[Sold item::' .. material.name .. ']]|?Shop sell price|mainlabel=' .. material.name |
|||
-- double them, |
|||
local shopPriceResult = mw.smw.ask(shopPriceQuery) or {} |
|||
if item.pageName and string.find(item.pageName,'Pole') then |
|||
local shopPrice = 0 |
|||
item.output[1].quantity = item.output and item.output[1] and item.output[1].quantity and item.output[1].quantity * 2 |
|||
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 |
|||
if shopPriceResult[1] and shopPriceResult[1]["Shop sell price"] then |
|||
for j,jtem in ipairs(item.materials) do |
|||
shopPrice = tonumber(shopPriceResult[1]["Shop sell price"]) or 0 |
|||
jtem.quantity = jtem.quantity and jtem.quantity * 2 |
|||
else |
|||
item.buyDiscount = nil |
|||
end |
end |
||
item.buyDiscount = item.buyDiscount and item.buyDiscount + shopPrice * material.quantity |
|||
end |
end |
||
-- |
-- direct values |
||
item. |
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.profitDiscount = item.sell and item.buyDiscount and item.sell - item.buyDiscount |
|||
-- 40 seconds to buy new supplies and travel and deposit and everything, per 12 potions |
|||
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 75: | Line 108: | ||
-- 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 = search.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 92: | Line 118: | ||
-- 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') |
||
:tag('caption') |
|||
:wikitext('This list is updated dynamically. '..purge()) |
|||
:done() |
|||
:tag('tr') |
:tag('tr') |
||
:tag('th') |
:tag('th') |
||
Line 109: | Line 126: | ||
:tag('th') |
:tag('th') |
||
:attr{ colspan = '3' } |
:attr{ colspan = '3' } |
||
:wikitext(' |
:wikitext('Product') |
||
:done() |
:done() |
||
:tag('th') |
:tag('th') |
||
:attr{ colspan = '3' } |
|||
:wikitext('Materials') |
:wikitext('Materials') |
||
:done() |
:done() |
||
Line 137: | Line 153: | ||
: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.lvl) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(unknown_value_cell) |
|||
:node(plist.unknown_value_edit_cell(item.pageName,1)) |
|||
: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() |
|||
:IF(not(item.passiveActivity)) |
|||
-- recipe |
|||
: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 |
|||
row |
|||
-- materials |
|||
: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( |
:node(currency_cell(item.profit)) |
||
:node(currency_cell(item.profitPerHour)) |
|||
:tag('td') |
:tag('td') |
||
Line 164: | Line 211: | ||
:wikitext(item.discountLevel) |
:wikitext(item.discountLevel) |
||
:done() |
:done() |
||
:node( |
:node(currency_cell(item.profitPerHourDiscount)) |
||
:IF(item.XP) |
|||
:IF(item.xp) |
|||
:tag('td') |
:tag('td') |
||
:wikitext(item. |
:wikitext(item.XP and lang:formatNum(tonumber(item.XP))) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node(unknown_value_cell) |
|||
:node(plist.unknown_value_edit_cell(item.allPageEdits,1)) |
|||
:END() |
:END() |
||
:IF(item.XPPerHour) |
|||
-- XP per hour |
|||
:IF(item.xpPerHour) |
|||
:tag('td') |
:tag('td') |
||
:wikitext(item. |
:wikitext(item.XPPerHour and lang:formatNum(tonumber(item.XPPerHour))) |
||
:done() |
:done() |
||
:ELSE() |
:ELSE() |
||
:node( |
:node(unknown_value_cell) |
||
:END() |
:END() |
||
:done() |
:done() |
||
end |
end |