Module:Craft - Revision history

Iodred: Refactored craft list filtering for draw_ingredients_table. Split get_craft_list calls into get_craft_names_list:string[ ] and get_crafts_by_ingredient:obj[ ]

2026-05-01T09:56:43Z

Refactored craft list filtering for draw_ingredients_table. Split get_craft_list calls into get_craft_names_list:string[ ] and get_crafts_by_ingredient:obj[ ]

← Older revision		Revision as of 09:56, 1 May 2026
Line 103:		Line 103:
	end		end

	local function ~~get_craft_list~~(args)		-- args: item?, ingredient?, merchant? -- return: array of strings (names)
			local function get_craft_names_list(args)
	local list = {}		local list = {}
	if args.item then		if args.item then
	list[#list+1] = args.item		list[#list+1] = args.item
	else		else
			local set = {}
	for craft_name,craft in spairs(MD[args.merchant].crafts) do		for craft_name,craft in spairs(MD[args.merchant].crafts) do
	-- if filtering for ingredients, ensure the craft requires the ingredient		-- if filtering for ingredients, ensure the craft requires the ingredient
	if args.ingredient then		if args.ingredient then
	for _,value in spairs(craft.rarities) do		for _,value in spairs(craft.rarities) do
	if has_ingredient(value.ingredients,args.ingredient) then		if has_ingredient(value.ingredients,args.ingredient) and set[args.ingredient] ~= true then
			-- Mock hashset of ingredient names so that ingredients are only added once to list
			set[args.ingredient] = true
	list[#list+1] = craft_name		list[#list+1] = craft_name
	end		end
Line 123:		Line 127:
	end		end

			return list
			end

			-- return object <{itemname, rarity, ingredients, quantity}[]>
			local function map_rarity_to_craft(name, rarityIndex, rarityObject)
			local mappedCraft = {}
			mappedCraft["itemname"] = name
			mappedCraft["rarity"] = rarityIndex
			mappedCraft["ingredients"] = rarityObject.ingredients
			mappedCraft["quantity"] = rarityObject.quantity
			return mappedCraft
			end

			-- args: ingredient, merchant -- return: array <{itemname, rarity, ingredients, quantity}[]>
			local function get_crafts_by_ingredient(args)
			local list = {}
			if args.ingredient ~= nil then
			for craft_name,craft in spairs(MD[args.merchant].crafts) do
			for index,value in spairs(craft.rarities) do
			if has_ingredient(value.ingredients,args.ingredient) then
			list[#list+1] = map_rarity_to_craft(craft_name,index,value)
			end
			end
			end
			end
	return list		return list
	end		end
Line 129:		Line 158:
	local craft = MD[merchant_name].crafts[craft_name]		local craft = MD[merchant_name].crafts[craft_name]
	for index,value in spairs(craft.rarities) do		for index,value in spairs(craft.rarities) do
	~~local mappedCraft = {}~~		craft_row(wt,false,map_rarity_to_craft(craft.itemname,index,value),merchant_name)
	~~mappedCraft["itemname"] = craft.itemname~~
	~~mappedCraft["rarity"] = index~~
	~~mappedCraft["ingredients"] = value.ingredients~~
	~~mappedCraft["quantity"] = value.quantity~~
	craft_row(wt,false,~~mappedCraft~~,merchant_name)
	end		end
	end		end
Line 142:		Line 166:

	function p.draw_table(f)		function p.draw_table(f)
	local item_list = ~~get_craft_list~~(f.args)		local item_list = get_craft_names_list(f.args)
	local merchant_name = f.args.merchant		local merchant_name = f.args.merchant
	if #item_list == 0 then return "" end		if #item_list == 0 then return "" end
Line 211:		Line 235:
	craft_table_header(wt)		craft_table_header(wt)
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	for _,~~craft_name~~ in ipairs(~~get_craft_list~~({ingredient=ingredient,merchant=merchant_name})) do		for _,craft in ipairs(get_crafts_by_ingredient({ingredient=ingredient,merchant=merchant_name})) do
	~~craft_row_for_each_rarity~~(wt,merchant_name~~,craft_name~~)		craft_row(wt,false,craft,merchant_name)
	end		end
	end		end

Raw Salad: Order matters

2026-04-30T23:32:38Z

Order matters

← Older revision		Revision as of 23:32, 30 April 2026
Line 111:		Line 111:
	-- if filtering for ingredients, ensure the craft requires the ingredient		-- if filtering for ingredients, ensure the craft requires the ingredient
	if args.ingredient then		if args.ingredient then
	for ~~index~~,value in ~~pairs~~(craft.rarities) do		for _,value in spairs(craft.rarities) do
	if has_ingredient(value.ingredients,args.ingredient) then		if has_ingredient(value.ingredients,args.ingredient) then
	list[#list+1] = craft_name		list[#list+1] = craft_name
	end		end
	end		end

	-- else include all crafts		-- else include all crafts
	elseif args.merchant ~= nil then		elseif args.merchant ~= nil then

Raw Salad: Forgot to replace code

2026-04-30T23:17:43Z

Forgot to replace code

@@ Line 111: / Line 111: @@
 			-- if filtering for ingredients, ensure the craft requires the ingredient
 			if args.ingredient then
 				for index,value in pairs(craft.rarities) do
 					if has_ingredient(value.ingredients,args.ingredient) then
 						list[#list+1] = craft_name
@@ Line 125: / Line 125: @@
 	return list
 end
@@ Line 139: / Line 151: @@
 	craft_table_header(wt)
 	for _,craft_name in ipairs(item_list) do
-		craft = MD[merchant_name].crafts[craft_name]
+		craft_row_for_each_rarity(wt,merchant_name,craft_name)
 	end
 	wt[#wt+1] = BASIC_TABLE.close
@@ Line 197: / Line 200: @@
 	for _ in pairs(t) do c = c + 1 end
 	return c
 end

Raw Salad: Moved code block to separate function since it was identical.

2026-04-30T23:11:47Z

Moved code block to separate function since it was identical.

← Older revision		Revision as of 23:11, 30 April 2026
Line 197:		Line 197:
	for _ in pairs(t) do c = c + 1 end		for _ in pairs(t) do c = c + 1 end
	return c		return c
			end

			local function craft_row_for_each_rarity(wt,merchant_name,craft_name)
			local craft = MD[merchant_name].crafts[craft_name]
			for index,value in spairs(craft.rarities) do
			local mappedCraft = {}
			mappedCraft["itemname"] = craft.itemname
			mappedCraft["rarity"] = index
			mappedCraft["ingredients"] = value.ingredients
			mappedCraft["quantity"] = value.quantity
			craft_row(wt,false,mappedCraft,merchant_name)
			end

	end		end

Line 210:		Line 223:
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do		for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do
	~~craft = MD[merchant_name].crafts[craft_name]~~		craft_row_for_each_rarity(wt,merchant_name,craft_name)
	~~for index,value in spairs(craft.rarities) do~~
	~~mappedCraft = {}~~
	~~mappedCraft["itemname"] = craft.itemname~~
	~~mappedCraft["rarity"] = index~~
	~~mappedCraft["ingredients"] = value.ingredients~~
	~~mappedCraft["quantity"] = value.quantity~~
	~~craft_row~~(wt~~,false,mappedCraft~~,merchant_name)
	~~end~~
	~~-- craft_row(wt,false~~,~~MD[merchant_name].crafts[~~craft_name~~],merchant_name~~)
	end		end
	end		end
Line 235:		Line 239:
	craft_table_header(wt)		craft_table_header(wt)
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	~~craft = MD[merchant_name].crafts[item]~~		craft_row_for_each_rarity(wt,merchant_name,item)
	~~for index,value in spairs(craft.rarities) do~~
	~~mappedCraft = {}~~
	~~mappedCraft["itemname"] = craft.itemname~~
	~~mappedCraft["rarity"] = index~~
	~~mappedCraft["ingredients"] = value.ingredients~~
	~~mappedCraft["quantity"] = value.quantity~~
	~~craft_row~~(wt,~~false~~,~~mappedCraft,merchant_name~~)
	~~end~~
	end		end
	wt[#wt+1] = BASIC_TABLE.close		wt[#wt+1] = BASIC_TABLE.close
Line 262:		Line 258:


	-- Test on the wiki with these console inputs		--[=[
	-- mw.log(p.draw_table({args={item="Void Blade",merchant="Weaponsmith"}}))		Test on the wiki with these console inputs
	-- mw.log(p.draw_table({args={merchant="Weaponsmith"}}))		mw.log(p.draw_table({args={item="Void Blade",merchant="Weaponsmith"}}))
	-- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ingot"}}))		mw.log(p.draw_table({args={merchant="Weaponsmith"}}))
			mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ingot"}}))
	-- mw.log(p.page({args={item="Void Blade",category="Weapon"}}))		mw.log(p.page({args={item="Void Blade",category="Weapon"}}))
	-- mw.log(p.page({args={item="Iron Ingot",category="Misc"}}))		mw.log(p.page({args={item="Iron Ingot",category="Misc"}}))
	-- mw.log(p.page({args={item="Iron Ore",category="Misc"}}))		mw.log(p.page({args={item="Iron Ore",category="Misc"}}))
			]=]

Raw Salad: Indentation fix

2026-04-30T22:15:14Z

Indentation fix

← Older revision		Revision as of 22:15, 30 April 2026
Line 140:		Line 140:
	for _,craft_name in ipairs(item_list) do		for _,craft_name in ipairs(item_list) do
	craft = MD[merchant_name].crafts[craft_name]		craft = MD[merchant_name].crafts[craft_name]
	for index,value in spairs(craft.rarities) do		for index,value in spairs(craft.rarities) do
	mappedCraft = {}		mappedCraft = {}
	mappedCraft["itemname"] = craft.itemname		mappedCraft["itemname"] = craft.itemname
	mappedCraft["rarity"] = index		mappedCraft["rarity"] = index
	mappedCraft["ingredients"] = value.ingredients		mappedCraft["ingredients"] = value.ingredients
	mappedCraft["quantity"] = value.quantity		mappedCraft["quantity"] = value.quantity
	craft_row(wt,false,mappedCraft,merchant_name)		craft_row(wt,false,mappedCraft,merchant_name)
	end		end
	-- craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)		-- craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)
	end		end

Iodred: Implemented previous fix to p.draw_table (called in p.crafting_page) as well. Replaced pairs() indexing with spairs() (sorted) on added rarity loops

2026-04-30T21:35:57Z

Implemented previous fix to p.draw_table (called in p.crafting_page) as well. Replaced pairs() indexing with spairs() (sorted) on added rarity loops

← Older revision		Revision as of 21:35, 30 April 2026
Line 139:		Line 139:
	craft_table_header(wt)		craft_table_header(wt)
	for _,craft_name in ipairs(item_list) do		for _,craft_name in ipairs(item_list) do
	craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)		craft = MD[merchant_name].crafts[craft_name]
			for index,value in spairs(craft.rarities) do
			mappedCraft = {}
			mappedCraft["itemname"] = craft.itemname
			mappedCraft["rarity"] = index
			mappedCraft["ingredients"] = value.ingredients
			mappedCraft["quantity"] = value.quantity
			craft_row(wt,false,mappedCraft,merchant_name)
			end
			-- craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)
	end		end
	wt[#wt+1] = BASIC_TABLE.close		wt[#wt+1] = BASIC_TABLE.close
Line 202:		Line 211:
	for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do		for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do
	craft = MD[merchant_name].crafts[craft_name]		craft = MD[merchant_name].crafts[craft_name]
	for index,value in ~~pairs~~(craft.rarities) do		for index,value in spairs(craft.rarities) do
	mappedCraft = {}		mappedCraft = {}
	mappedCraft["itemname"] = craft.itemname		mappedCraft["itemname"] = craft.itemname
Line 227:		Line 236:
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	craft = MD[merchant_name].crafts[item]		craft = MD[merchant_name].crafts[item]
	for index,value in ~~pairs~~(craft.rarities) do		for index,value in spairs(craft.rarities) do
	mappedCraft = {}		mappedCraft = {}
	mappedCraft["itemname"] = craft.itemname		mappedCraft["itemname"] = craft.itemname

Iodred: Fixed draw_ingredient_table and draw_craftable_table. Since ingredients are now listed under the rarities key, iterate over rarities and print a row for each rarity that matches ingredient list

2026-04-30T19:41:43Z

Fixed draw_ingredient_table and draw_craftable_table. Since ingredients are now listed under the rarities key, iterate over rarities and print a row for each rarity that matches ingredient list

← Older revision		Revision as of 19:41, 30 April 2026
Line 111:		Line 111:
	-- if filtering for ingredients, ensure the craft requires the ingredient		-- if filtering for ingredients, ensure the craft requires the ingredient
	if args.ingredient then		if args.ingredient then
	if has_ingredient(~~craft~~.ingredients,args.ingredient) then		for index,value in pairs(craft.rarities) do
	list[#list+1] = craft_name		if has_ingredient(value.ingredients,args.ingredient) then
			list[#list+1] = craft_name
			end
	end		end

	-- else include all crafts		-- else include all crafts
	elseif args.merchant ~= nil then		elseif args.merchant ~= nil then
Line 198:		Line 201:
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do		for _,craft_name in ipairs(get_craft_list({ingredient=ingredient,merchant=merchant_name})) do
	craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)		craft = MD[merchant_name].crafts[craft_name]
			for index,value in pairs(craft.rarities) do
			mappedCraft = {}
			mappedCraft["itemname"] = craft.itemname
			mappedCraft["rarity"] = index
			mappedCraft["ingredients"] = value.ingredients
			mappedCraft["quantity"] = value.quantity
			craft_row(wt,false,mappedCraft,merchant_name)
			end
			-- craft_row(wt,false,MD[merchant_name].crafts[craft_name],merchant_name)
	end		end
	end		end
Line 214:		Line 226:
	craft_table_header(wt)		craft_table_header(wt)
	for _,merchant_name in ipairs(merchants) do		for _,merchant_name in ipairs(merchants) do
	~~craft_row(wt,false,~~MD[merchant_name].crafts[item],merchant_name)		craft = MD[merchant_name].crafts[item]
			for index,value in pairs(craft.rarities) do
			mappedCraft = {}
			mappedCraft["itemname"] = craft.itemname
			mappedCraft["rarity"] = index
			mappedCraft["ingredients"] = value.ingredients
			mappedCraft["quantity"] = value.quantity
			craft_row(wt,false,mappedCraft,merchant_name)
			end
	end		end
	wt[#wt+1] = BASIC_TABLE.close		wt[#wt+1] = BASIC_TABLE.close

Iodred: Undo revision 66380 by Iodred (talk)

2026-04-30T18:04:53Z

Undo revision 66380 by Iodred (talk)

← Older revision		Revision as of 18:04, 30 April 2026
Line 19:		Line 19:
	local function name(wt,is_header,craft,merchant_name)		local function name(wt,is_header,craft,merchant_name)
	if is_header then wt[#wt+1] = "<th style='width:2%'>Name</th>" return end		if is_header then wt[#wt+1] = "<th style='width:2%'>Name</th>" return end
	~~mw.logObject(craft)~~
	wt[#wt+1] = "<td>"		wt[#wt+1] = "<td>"
	iconbox(wt,craft.itemname,craft.quantity,craft.rarity,true)		iconbox(wt,craft.itemname,craft.quantity,craft.rarity,true)

Iodred: p.page({args={item="Iron Ingot",category="Misc"}})

2026-04-30T18:04:31Z

p.page({args={item="Iron Ingot",category="Misc"}})

← Older revision		Revision as of 18:04, 30 April 2026
Line 19:		Line 19:
	local function name(wt,is_header,craft,merchant_name)		local function name(wt,is_header,craft,merchant_name)
	if is_header then wt[#wt+1] = "<th style='width:2%'>Name</th>" return end		if is_header then wt[#wt+1] = "<th style='width:2%'>Name</th>" return end
			mw.logObject(craft)
	wt[#wt+1] = "<td>"		wt[#wt+1] = "<td>"
	iconbox(wt,craft.itemname,craft.quantity,craft.rarity,true)		iconbox(wt,craft.itemname,craft.quantity,craft.rarity,true)

Iodred: Undo revision 66378 by Iodred (talk)

2026-04-30T17:58:00Z

Undo revision 66378 by Iodred (talk)

← Older revision		Revision as of 17:58, 30 April 2026
Line 57:		Line 57:
	local function craft_row(wt,is_header,craft,merchant_name)		local function craft_row(wt,is_header,craft,merchant_name)
	wt[#wt+1] = "<tr>"		wt[#wt+1] = "<tr>"
	~~mw.logObject(craft)~~
	for _,craft_td in ipairs(ROW.Default) do		for _,craft_td in ipairs(ROW.Default) do
	craft_td(wt,is_header,craft,merchant_name)		craft_td(wt,is_header,craft,merchant_name)