Module:Sandbox/User:Alsang/PassivePotionList: Difference between revisions
Jump to navigation
Jump to search
Content added Content deleted
m (Recipe fields to Activity fields) |
(allow both passive potions and ebsworth work to appear on the same table) |
||
Line 11: | Line 11: | ||
-- returns almost every parameter needed for the row, except buy values for reagents |
-- returns almost every parameter needed for the row, except buy values for reagents |
||
local query = { |
local query = { |
||
'[[Uses facility::Passive Potion Station]] OR [[Variant of::Ebsworth Work]]', |
|||
'[[Category:Potions]]', |
|||
'[[Uses facility::Passive Potion Station]]', |
|||
'?Profession Level A = lvl', |
'?Profession Level A = lvl', |
||
'? #- = name', |
'? #- = name', |
||
'?Uses item #- = reagents', |
'?Uses item #- = reagents', |
||
'?Value = sell', |
'?Value = sell', |
||
'?Activity |
'?Activity coins = coins', |
||
'?Activity |
'?Activity XP = XP', |
||
'?Activity duration = |
'?Activity duration = duration', |
||
'?Variant of #- = variant', |
|||
'sort = Profession Level A' |
'sort = Profession Level A' |
||
} |
} |
||
Line 28: | Line 28: | ||
return p.displayTable(results) |
return p.displayTable(results) |
||
--return '<pre>'..mw.text.jsonEncode(results, mw.text.JSON_PRETTY)..'</pre>' |
|||
end |
end |
||
Line 48: | Line 50: | ||
for i, item in ipairs(results) do |
for i, item in ipairs(results) do |
||
-- potions have reagents, but passive ebsworth work does not |
|||
if item.variant=='Ebsworth Work' then |
|||
-- iterate through reagents, adding buy price to running total (individuals not needed) |
|||
-- starting value 20 is for bottle |
|||
item.buy = 20 |
|||
for j, reagent in ipairs(item.reagents) do |
|||
-- if it is ebsworth work, sub in different fields for the buy and sell values |
|||
--shamelessley lifted from Module:Products |
|||
item.buy = 0 |
|||
local shopPriceQuery = '[[:+]][[Sold item::' .. reagent .. ']]|?Shop buy price|mainlabel=' .. reagent |
|||
item.sell = item.coins |
|||
local shopPriceResult = mw.smw.ask(shopPriceQuery) or {} |
|||
else |
|||
local shopPrice = 0 |
|||
-- iterate through reagents, adding buy price to running total (individuals not needed) |
|||
-- starting value 20 is for bottle |
|||
item.buy = 20 |
|||
for j, reagent in ipairs(item.reagents) do |
|||
--shamelessley lifted from Module:Products |
|||
local shopPriceQuery = '[[:+]][[Sold item::' .. reagent .. ']]|?Shop buy price|mainlabel=' .. reagent |
|||
local shopPriceResult = mw.smw.ask(shopPriceQuery) or {} |
|||
local shopPrice = 0 |
|||
if shopPriceResult[1] and shopPriceResult[1]["Shop buy price"] then |
if shopPriceResult[1] and shopPriceResult[1]["Shop buy price"] then |
||
shopPrice = tonumber(shopPriceResult[1]["Shop buy price"]) or 0 |
shopPrice = tonumber(shopPriceResult[1]["Shop buy price"]) or 0 |
||
end |
end |
||
item.buy = item.buy + shopPrice |
item.buy = item.buy + shopPrice |
||
end |
|||
end |
end |
||
-- sanitise data, set to 0 if its not there |
-- sanitise data, set to 0 if its not there |
||
Line 71: | Line 79: | ||
local buy = item.buy or 0 |
local buy = item.buy or 0 |
||
local sell = item.sell or 0 |
local sell = item.sell or 0 |
||
local |
local XP = item.XP or 0 |
||
local |
local KP = item.KP or 0 |
||
local |
local duration = item.duration or 0 |
||
-- flags for if data values should be shown |
|||
item.hasBuy = param.has_content(item.buy) |
|||
item.hasSell = param.has_content(item.sell) |
|||
item.hasProfit = item.hasBuy and item.hasSell |
|||
item.hasXP = param.has_content(item.XP) |
|||
item.hasDuration = param.has_content(item.duration) |
|||
-- direct values |
-- direct values |
||
item. |
if item.variant=='Ebsworth Work' then |
||
item. |
item.profit = sell - buy |
||
else |
|||
item.profit = (sell - buy )*0.005 -- passive potions all have quantity 0.005 per action |
|||
item.profitPerXP = math.floor(item.profit / item.XP * 100) / 100 |
|||
end |
|||
item.XP = XP |
|||
if item.XP==0 then |
|||
item.profitPerXP = 0 |
|||
else |
|||
item.profitPerXP = math.floor(item.profit / (item.XP) * 100) / 100 |
|||
end |
|||
-- passive activities have no downtime |
-- passive activities have no downtime |
||
item.duration = |
item.duration = duration |
||
item. |
if item.duration == 0 then |
||
item.potionPerHour = 0 |
|||
else |
|||
item.potionPerHour = 1 / (item.duration) * 3600 |
|||
end |
|||
-- properties per hour |
-- properties per hour |
||
item.XPPerHour = math.floor(item.XP * item.potionPerHour) |
item.XPPerHour = math.floor(item.XP * item.potionPerHour) |
||
item.profitPerHour = math.floor(item.profit * item.potionPerHour) |
|||
item.profitPerHour = math.floor(item.profit * item.potionPerHour)*0.005 |
|||
-- flags for if data values should be shown |
|||
item.hasBuy = param.has_content(item.buy) |
|||
item.hasSell = param.has_content(item.sell) |
|||
item.hasProfit = item.hasBuy and item.hasSell |
|||
item.hasXP = param.has_content(item.brewXP) |
|||
--item.hasKP = param.has_content(item.brewKP) |
|||
item.hasDuration = param.has_content(item.brewDuration) |
|||
-- XP/KP strings, if the requisite data isnt there then display "unknown" |
-- XP/KP strings, if the requisite data isnt there then display "unknown" |
||
if item.hasXP then |
if item.hasXP then |
||
--item.xp = lang:formatNum(item.xp) -- format to include commas |
|||
item.XP = item.XP -- format to include commas |
item.XP = item.XP -- format to include commas |
||
else |
else |
||
item.XP = 'Unknown' |
item.XP = 'Unknown' |
||
end |
end |
||
--if item.hasKP then |
|||
-- item.KP = item.KP .. '%' -- want 1 decimal place |
|||
--else |
|||
-- item.KP = 'Unknown' |
|||
--end |
|||
if item.hasXP and item.hasDuration then |
if item.hasXP and item.hasDuration then |
||
Line 118: | Line 129: | ||
item.XPPerHour = 'Unknown' |
item.XPPerHour = 'Unknown' |
||
end |
end |
||
--if item.hasKP and item.hasDuration then |
|||
-- item.KPPerHour = item.KPPerHour -- want 2 decimal places |
|||
--else |
|||
-- item.KPPerHour = 'Unknown' |
|||
--end |
|||
end |
end |
||
Line 140: | Line 145: | ||
:done() |
:done() |
||
:tag('th') |
:tag('th') |
||
:wikitext('Potion') |
:wikitext('Potion or Activity') |
||
:done() |
:done() |
||
:tag('th') |
:tag('th') |
||
Line 171: | Line 176: | ||
:wikitext('Coins/XP') |
:wikitext('Coins/XP') |
||
:done() |
:done() |
||
--:tag('th') |
|||
-- :wikitext('KP') |
|||
--:done() |
|||
--:tag('th') |
|||
-- :wikitext('KP/hr') |
|||
--:done() |
|||
:done() |
:done() |
||
for i,item in ipairs(results) do |
for i,item in ipairs(results) do |
||
-- if its not ebsworth work, need a list of reagents |
|||
-- need to generate the text for the reagent cell before starting the row |
|||
local reagentCell = '' |
local reagentCell = '' |
||
if item.variant=='Ebsworth Work' then |
|||
for j, reagent in ipairs(item.reagents) do |
|||
reagentCell = 'N/A' |
|||
reagentCell = reagentCell .. '[[File:' .. reagent .. '.png|30px|link=' .. reagent .. ']] [[' .. reagent .. ']]<br>' |
|||
else |
|||
-- need to generate the text for the reagent cell before starting the row |
|||
for j, reagent in ipairs(item.reagents) do |
|||
reagentCell = reagentCell .. '[[File:' .. reagent .. '.png|30px|link=' .. reagent .. ']] [[' .. reagent .. ']]<br>' |
|||
end |
|||
end |
end |
||
Line 211: | Line 217: | ||
:done() |
:done() |
||
:wikitext(currency_cell(item.profitPerXP,item.hasXP and item.hasProfit)) |
:wikitext(currency_cell(item.profitPerXP,item.hasXP and item.hasProfit)) |
||
--:tag('td') |
|||
-- :wikitext(item.KP) |
|||
--:done() |
|||
--:tag('td') |
|||
-- :wikitext(item.KPPerHour) |
|||
--:done() |
|||
:done() |
:done() |
||