Editing Module:ForagerList

require('strict')
require('Module:Mw.html extension')
local lang = mw.getContentLanguage()
local plist = require('Module:ProfessionList')
local rts = require('Module:RecipeTreeSearch')

local p = {}

-- non dynamic module, no inputs
function p.main()
	
	local queryString = '[[Category:Forager]] AND [[Category:Pages with activities]]'
	
	local function screenFunction(item)
		return not item.passive
	end
	
	local results = plist.generate_recipe_table(queryString,screenFunction)

	results = p.formatResults(results)

	return p.displayTable(results)
	
	--for debugging
	--return '<pre>'..mw.text.jsonEncode(results, mw.text.JSON_PRETTY)..'</pre>'

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

		--catch badly submitted data	
		item.product = item.product or ''
		item.pageImage = item.pageImage or ''
		
		-- profitability
		item.profit = item.sellPrice
		item.profitPerXP = item.profit and item.xp and item.profit / item.xp
		
		-- DOWNTIME VERY IMPORTANT FOR GATHERING TYPE PROFESSIONS
		item.downtime = 60 -- THIS IS AN INITIAL GUESS, DO NOT USE THIS VALUE
		item.batch = 24
		item.productPerHour = item.duration and 1 / (item.duration + item.downtime / item.batch) * 3600

		-- properties per hour
		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)
	end

	return results
end

-- 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')
		:tag('tr')
			:tag('th')
				:wikitext('[[File:Forager small icon.png|15px]]  Level')
			:done()
			:tag('th')
				:attr{ colspan = '2' }
				:wikitext('Foraging node')
			:done()
			:tag('th')
				:attr{ colspan = '2' }
				:wikitext('Resource')
			:done()
			:tag('th')
				:wikitext('Resource/hr')
			:done()
			:tag('th')
				:attr{ colspan = '10' }
				:wikitext('Profit')
			:done()
			:tag('th')
				:attr{ colspan = '10' }
				:wikitext('Profit/hr')
			:done()
			:tag('th')
				:wikitext('XP')
			:done()
			:tag('th')
				:wikitext('XP/hr')
			:done()
		:done()

	for i, item in ipairs(results) do
		local row = out:tag('tr')
		
			--level
			:IF(item.level)
				:tag('td')
					:css{ ['text-align'] = 'center' }
					:wikitext(item.level)
				:done()
			:ELSE()
				:node(plist.unknown_value_edit_cell(item.pageName,1))
			:END()
			
			-- foraging node
			:node(plist.two_column_image_text(item.pageName,item.pageImage,item.pageName,item.pageName))
			
			-- resource
			:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product,item.product))
			
			-- resource/hr
			:IF(item.productPerHour)
				:tag('td')
					:wikitext(item.productPerHour and math.floor(tonumber(item.productPerHour)*10)/10)
				:done()
			:ELSE()
				:node(plist.unknown_value_edit_cell(item.pageName,1))
			:END()
			
			-- economics
			:node(plist.currency_cell(item.profit))
			:node(plist.currency_cell(item.profitPerHour))

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

		:done()
	end

	return out
end

return p
@@ Line 3: / Line 3: @@
 local lang = mw.getContentLanguage()
 local plist = require('Module:ProfessionList')
-local purge = require('Module:Purge')._purge
+local rts = require('Module:RecipeTreeSearch')
 local p = {}
--- non dynamic module, no inputscleanup required modules
+-- non dynamic module, no inputs
 function p.main()
@@ Line 17: / Line 17: @@
 	local results = plist.generate_recipe_table(queryString,screenFunction)
 	results = p.formatResults(results)
@@ Line 29: / Line 29: @@
 -- 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
@@ Line 38: / Line 38: @@
 	for _, item in ipairs(results) do
+		--catch badly submitted data
-		-- downtime is very important for gathering-type professions
+		item.product = item.product or ''
-		-- initial values, it will be obvious if these get used
-		item.productPerHour = 1
+		item.pageImage = item.pageImage or ''
-		item.productPerHourDropping = 1
-		-- these numbers are from the strategy guides for each node
-		if string.find(item.pageName,'Kelp') then
-			item.productPerHour = 313
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Wallplant') then
-			item.productPerHour = 366
-			item.productPerHourDropping = 440
-		elseif string.find(item.pageName,'Periwinkle') then
-			item.productPerHour = 366
-			item.productPerHourDropping = 440
-		elseif string.find(item.pageName,'Shell') then
-			item.productPerHour = 313
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Potato') then
-			item.productPerHour = 273
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Pond Weed') then
-			item.productPerHour = 366
-			item.productPerHourDropping = 440
-		elseif string.find(item.pageName,'Bellplant') then
-			item.productPerHour = 291
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Monument Piece') then
-			item.productPerHour = 407
-			item.productPerHourDropping = 450
-		elseif string.find(item.pageName,'Water Lily') then
-			item.productPerHour = 288
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Starfish') then
-			item.productPerHour = 273
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Hogberries') then
-			item.productPerHour = 257
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Limpet') then
-			item.productPerHour = 242
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Nettle') then
-			item.productPerHour = 313
-			item.productPerHourDropping = 337
-		elseif string.find(item.pageName,'Wrack') then
-			item.productPerHour = 257
-			item.productPerHourDropping = 337
-		end
 		-- profitability
 		item.profit = item.sellPrice
+		item.profitPerXP = item.profit and item.xp and item.profit / item.xp
+		-- DOWNTIME VERY IMPORTANT FOR GATHERING TYPE PROFESSIONS
+		item.downtime = 60 -- THIS IS AN INITIAL GUESS, DO NOT USE THIS VALUE
+		item.batch = 24
+		item.productPerHour = item.duration and 1 / (item.duration + item.downtime / item.batch) * 3600
 		-- properties per hour
 		item.xpPerHour = item.xp and item.productPerHour and math.floor(item.xp * item.productPerHour)
-		item.xpPerHourDropping = item.xp and item.productPerHourDropping and math.floor(item.xp * item.productPerHourDropping)
 		item.profitPerHour = item.profit and item.productPerHour and math.floor(item.profit * item.productPerHour)
 	end
@@ Line 110: / Line 69: @@
 	local out = mw.html.create('table')
 		:addClass('wikitable sortable')
-		:tag('caption')
-			:wikitext('This list is updated dynamically. '..purge())
-		:done()
 		:tag('tr')
 			:tag('th')
@@ Line 119: / Line 75: @@
 			:tag('th')
 				:attr{ colspan = '2' }
-				:wikitext('Node')
+				:wikitext('Foraging node')
-			:done()
-			:tag('th')
-				:attr{ colspan = '2' }
-				:wikitext('Tool')
 			:done()
 			:tag('th')
@@ Line 145: / Line 97: @@
 			:tag('th')
 				:wikitext('XP/hr')
-			:done()
-			:tag('th')
-				:wikitext('XP/hr<br>(Discarding)')
 			:done()
 		:done()
@@ Line 164: / Line 113: @@
 			:END()
-			-- gathering node
+			-- foraging node
 			:node(plist.two_column_image_text(item.pageName,item.pageImage,item.pageName,item.pageName))
-			:IF(item.tool)
-				:node(plist.two_column_image_text(item.tool,'File:'..(item.tool or '')..' (grade 1).png',(item.tool or ''),(item.tool or '')))
-			:ELSE()
-				:tag('td')
-					:addClass('table-na')
-					:attr{ colspan = '2' }
-					:wikitext('N/A')
-				:done()
-			:END()
 			-- resource
+			:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product,item.product))
-			:IF(item.coop)
-				:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product .. ' (co-op)',item.product))
-			:ELSE()
-				:node(plist.two_column_image_text(item.product,'File:' .. item.product .. '.png',item.product,item.product))
-			:END()
 			-- resource/hr
@@ Line 192: / Line 127: @@
 				:node(plist.unknown_value_edit_cell(item.pageName,1))
 			:END()
 			-- economics
 			:node(plist.currency_cell(item.profit))
@@ Line 210: / Line 145: @@
 				:tag('td')
 					:wikitext(item.xpPerHour and lang:formatNum(tonumber(item.xpPerHour)))
-				:done()
-			:ELSE()
-				:node(plist.unknown_value_cell(1))
-			:END()
-			-- XP per hour
-			:IF(item.xpPerHourDropping)
-				:tag('td')
-					:wikitext(item.xpPerHourDropping and lang:formatNum(tonumber(item.xpPerHourDropping)))
 				:done()
 			:ELSE()