Module:Craft - Revision history

Raw Salad: Merged two invoke-able functions into one.

2026-04-09T00:15:42Z

Merged two invoke-able functions into one.

← Older revision		Revision as of 00:15, 9 April 2026
Line 157:		Line 157:
	end		end

	function p.draw_ingredient_table(f)		local function draw_ingredient_table(wt,ingredient,category,data)
	~~local ingredient = f.args.~~ingredient
	~~local category = f.args.~~category
	~~local~~ data ~~= mw.loadJsonData(CATEGORY[category].Data~~)
	local merchants = data[category] and data[category][ingredient] and data[category][ingredient].incraftingrecipefor or {}		local merchants = data[category] and data[category][ingredient] and data[category][ingredient].incraftingrecipefor or {}
	if count(merchants) == 0 then return "" end		if count(merchants) == 0 then return "" end

	~~local wt = {}~~
	wt[#wt+1] = "<h2>Ingredient</h2>"		wt[#wt+1] = "<h2>Ingredient</h2>"
	wt[#wt+1] = ingredient		wt[#wt+1] = ingredient
Line 176:		Line 172:
	end		end
	wt[#wt+1] = BASIC_TABLE.close		wt[#wt+1] = BASIC_TABLE.close

	~~return table.concat(wt)~~
	end		end

	function p.draw_craftable_table(f)		local function draw_craftable_table(wt,item,category,data)
	~~local item = f.args.~~item
	~~local category = f.args.~~category
	~~local~~ data ~~= mw.loadJsonData(CATEGORY[category].Data~~)
	local merchants = data[category] and data[category][item] and data[category][item].iscraftableby or {}		local merchants = data[category] and data[category][item] and data[category][item].iscraftableby or {}
	if count(merchants) == 0 then return "" end		if count(merchants) == 0 then return "" end

	~~local wt = {}~~
	wt[#wt+1] = "<h2>Craftable</h2>"		wt[#wt+1] = "<h2>Craftable</h2>"
	wt[#wt+1] = item		wt[#wt+1] = item
Line 197:		Line 187:
	end		end
	wt[#wt+1] = BASIC_TABLE.close		wt[#wt+1] = BASIC_TABLE.close
			end

			function p.page(f)
			local category = f.args.category
			local item = f.args.item
			local data = mw.loadJsonData(CATEGORY[category].Data)

			local wt = {}
			draw_craftable_table(wt,item,category,data)
			draw_ingredient_table(wt,item,category,data)
	return table.concat(wt)		return table.concat(wt)

	end		end

Line 210:		Line 208:
	-- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ingot"}}))		-- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ingot"}}))

	-- mw.log(p.~~draw_ingredient_table~~({args={~~ingredient~~="Iron Ingot",category="Misc"}}))		-- mw.log(p.page({args={item="Void Blade",category="Weapon"}}))
			-- mw.log(p.page({args={item="Iron Ingot",category="Misc"}}))
	-- mw.log(p.~~draw_craftable_table~~({args={item="~~Void Blade~~",category="~~Weapon~~"}}))		-- mw.log(p.page({args={item="Iron Ore",category="Misc"}}))

Raw Salad: Some data minor validation

2026-04-08T23:39:39Z

Some data minor validation

← Older revision		Revision as of 23:39, 8 April 2026
Line 161:		Line 161:
	local category = f.args.category		local category = f.args.category
	local data = mw.loadJsonData(CATEGORY[category].Data)		local data = mw.loadJsonData(CATEGORY[category].Data)
	local merchants = data[category][ingredient].incraftingrecipefor		local merchants = data[category] and data[category][ingredient] and data[category][ingredient].incraftingrecipefor or {}
	if count(merchants) == 0 then return "" end		if count(merchants) == 0 then return "" end

Line 184:		Line 184:
	local category = f.args.category		local category = f.args.category
	local data = mw.loadJsonData(CATEGORY[category].Data)		local data = mw.loadJsonData(CATEGORY[category].Data)
	local merchants = data[category][item].iscraftableby		local merchants = data[category] and data[category][item] and data[category][item].iscraftableby or {}
	if count(merchants) == 0 then return "" end		if count(merchants) == 0 then return "" end

Raw Salad: Made iconbox slightly more dynamic. Changed merchant td to display iconbox instead of a plain link.

2026-04-08T20:28:46Z

Made iconbox slightly more dynamic. Changed merchant td to display iconbox instead of a plain link.

← Older revision		Revision as of 20:28, 8 April 2026
Line 6:		Line 6:
	local function iconbox(wt,name,amount,rarity,has_caption)		local function iconbox(wt,name,amount,rarity,has_caption)
	wt[#wt+1] = "<div class='iconbox' style='width:max-content;align-items:center'><div class='rarity"..rarity.." rounded relative'>"		wt[#wt+1] = "<div class='iconbox' style='width:max-content;align-items:center'><div class='rarity"..rarity.." rounded relative'>"
	wt[#wt+1] = "[[File:"..name..".png\|x80px\|link="..name.."]]"		wt[#wt+1] = "[[File:"..name..".png\|x80px\|link="..name.."]]"
	wt[#wt+1] = "<span class='iconamount' style='pointer-events:none;color:#EEEA;font-size:16px'>"..amount.."</span>"		if amount then
	wt[#wt+1] = "</div>"		wt[#wt+1] = "<span class='iconamount' style='pointer-events:none;color:#EEEA;font-size:16px'>"..amount.."</span>"
	if has_caption then wt[#wt+1] = "<br>[["..name.."\|<b class=cr"..rarity..">"..name.."</b>]]" end		end
			wt[#wt+1] = "</div>"
			if has_caption then
			wt[#wt+1] = "<br>[["..name.."\|<b class=cr"..rarity..">"..name.."</b>]]"
			end
	wt[#wt+1] = "</div>"		wt[#wt+1] = "</div>"
	end		end
Line 37:		Line 41:
	if is_header then wt[#wt+1] = "<th style='width:2%'>Merchant</th>" return end		if is_header then wt[#wt+1] = "<th style='width:2%'>Merchant</th>" return end

	wt[#wt+1] = "<td>[["		wt[#wt+1] = "<td>"
	wt~~[#wt+~~1~~] = merchant_name~~		iconbox(wt,merchant_name,false,"-1",true)
	wt[#wt+1] = "]]</td>"		wt[#wt+1] = "</td>"
	end		end

Raw Salad: Added invoke-able functions to generate filtered ingredient and filtered crafting tables.

2026-04-08T20:19:51Z

Added invoke-able functions to generate filtered ingredient and filtered crafting tables.

@@ Line 23: / Line 23: @@
 local function ingredients(wt,is_header,craft,merchant_name)
 	if is_header then wt[#wt+1] = "<th style='width:5%'>Ingredients</th>" return end
 	wt[#wt+1] = "<td>"
 	for _,ingredient in ipairs(craft.ingredients) do
@@ Line 54: / Line 53: @@
 local function craft_row(wt,is_header,craft,merchant_name)
 	wt[#wt+1] = "<tr>"
-	for _,table_data in ipairs(ROW.Default) do
+	for _,craft_td in ipairs(ROW.Default) do
-		table_data(wt,is_header,craft,merchant_name)
+		craft_td(wt,is_header,craft,merchant_name)
 	end
 	wt[#wt+1] = "</tr>"
@@ Line 100: / Line 99: @@
 end
-local function get_list(args)
+local function get_craft_list(args)
 	local list = {}
 	if args.item then
@@ Line 120: / Line 119: @@
 	return list
 end
 function p.draw_table(f)
-	local item_list = get_list(f.args)
+	local item_list = get_craft_list(f.args)
-	local merchant = f.args.merchant
+	local merchant_name = f.args.merchant
 	local wt = {}
-	wt[#wt+1] = "<table cellspacing='0' class='wikitable sortable jquery-tablesorter' style='width:70%;min-width:500px;text-align:center;vertical-align:middle'>"
+	wt[#wt+1] = "<h2>Ingredient</h2>"
-	if #item_list ~= 0 then
+	wt[#wt+1] = ingredient
-		craft_table_header(wt)
+	wt[#wt+1] = " is used in the following [[crafting]] recipes."
-		for _,craft_name in ipairs(item_list) do
+	wt[#wt+1] = BASIC_TABLE.open
-			craft_row(wt,false,MD[merchant].crafts[craft_name],merchant)
+	craft_table_header(wt)
 		end
 	end
-	wt[#wt+1] = "</table>"
+	wt[#wt+1] = BASIC_TABLE.close
 	return table.concat(wt)
 end
@@ Line 143: / Line 201: @@
 -- mw.log(p.draw_table({args={item="Void Blade",merchant="Weaponsmith"}}))
 -- mw.log(p.draw_table({args={merchant="Weaponsmith"}}))
--- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ore"}}))
+-- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ingot"}}))

Raw Salad: Working state

2026-04-08T00:19:45Z

Working state

New page

--Either draw table of all craftable weapons for a merchant, or a singular item table

local p = {}
local MD = mw.loadJsonData("Data:Merchant.json") --Global var holding tables from Data:Merchant.json

local function iconbox(wt,name,amount,rarity,has_caption)
wt[#wt+1] = "<div class='iconbox' style='width:max-content;align-items:center'><div class='rarity"..rarity.." rounded relative'>"
wt[#wt+1] = "[[File:"..name..".png|x80px|link="..name.."]]"
wt[#wt+1] = "<span class='iconamount' style='pointer-events:none;color:#EEEA;font-size:16px'>"..amount.."</span>"
wt[#wt+1] = "</div>"
if has_caption then wt[#wt+1] = "<br>[["..name.."|<b class=cr"..rarity..">"..name.."</b>]]" end
wt[#wt+1] = "</div>"
end

local function name(wt,is_header,craft,merchant_name)
if is_header then wt[#wt+1] = "<th style='width:2%'>Name</th>" return end

wt[#wt+1] = "<td>"
iconbox(wt,craft.itemname,craft.quantity,craft.rarity,true)
wt[#wt+1] = "</td>"
end

local function ingredients(wt,is_header,craft,merchant_name)
if is_header then wt[#wt+1] = "<th style='width:5%'>Ingredients</th>" return end

wt[#wt+1] = "<td>"
for _,ingredient in ipairs(craft.ingredients) do
local amount = string.match(ingredient,"^(%d*)-")
local ingredient_name = string.match(ingredient,"-(.*)-")
local rarity = string.match(ingredient,"-.*-(.*)$")
iconbox(wt,ingredient_name,amount,rarity)
end
wt[#wt+1] = "</td>"
end

local function merchant(wt,is_header,craft,merchant_name)
if is_header then wt[#wt+1] = "<th style='width:2%'>Merchant</th>" return end

wt[#wt+1] = "<td>[["
wt[#wt+1] = merchant_name
wt[#wt+1] = "]]</td>"
end

local function affinity_to_unlock(wt,is_header,craft,merchant)
if is_header then wt[#wt+1] = "<th class='tooltip' style='width:2%'>[[Template:Merchant Affinity|Affinity to Unlock]]<span class='tooltiptext-left' style='left:50%; transform:translate(-50%); bottom:75%; width:100%'>Affinity values are collected manually by the community. If you spot an error, please follow the link and fix it!</span></th></tr>" return end

end

local ROW = {
["Default"] = {name,ingredients,merchant}
}

local function craft_row(wt,is_header,craft,merchant_name)
wt[#wt+1] = "<tr>"
for _,table_data in ipairs(ROW.Default) do
table_data(wt,is_header,craft,merchant_name)
end
wt[#wt+1] = "</tr>"
end

local function craft_table_header(wt)
craft_row(wt,true)
end

local function spairs(dict)
if not dict then return function() return nil,nil end end

local set = {}
for key,_ in pairs(dict) do
if key ~= "order" then
set[#set+1] = key
end
end

table.sort(set,function(a,b)
if type(a) ~= type(b) then
return tostring(a) < tostring(b)
else
return a < b
end
end)

local i = 0
return function()
i = i + 1
local key = set[i]
if key ~= nil then
return key, dict[key]
end
end
end

local function has_ingredient(list,ingredient)
for _,val in ipairs(list) do
if string.match(val,ingredient) then return true end
end

return false
end

local function get_list(args)
local list = {}
if args.item then
list[#list+1] = args.item
else
for craft_name,craft in spairs(MD[args.merchant].crafts) do
-- if filtering for ingredients, ensure the craft requires the ingredient
if args.ingredient then
if has_ingredient(craft.ingredients,args.ingredient) then
list[#list+1] = craft_name
end
-- else include all crafts
elseif args.merchant ~= nil then
list[#list+1] = craft_name
end
end
end

return list
end

function p.draw_table(f)
local item_list = get_list(f.args)
local merchant = f.args.merchant

local wt = {}
wt[#wt+1] = "<table cellspacing='0' class='wikitable sortable jquery-tablesorter' style='width:70%;min-width:500px;text-align:center;vertical-align:middle'>"
if #item_list ~= 0 then
craft_table_header(wt)
for _,craft_name in ipairs(item_list) do
craft_row(wt,false,MD[merchant].crafts[craft_name],merchant)
end
else
return "Failure"
end
wt[#wt+1] = "</table>"

return table.concat(wt)
end

return p

-- mw.log(p.draw_table({args={item="Void Blade",merchant="Weaponsmith"}}))
-- mw.log(p.draw_table({args={merchant="Weaponsmith"}}))
-- mw.log(p.draw_table({args={merchant="Weaponsmith",ingredient="Iron Ore"}}))