Editing Module:CraftingParser
From Eco - English Wiki
Your changes will be displayed to readers once an authorized user accepts them. (help)
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: | ||
local p = {} | local p = {} | ||
-- Grabs args from the parent frame | |||
local | -- Trims and parses the args into a table, then returns the table | ||
function norm( origArgs ) | |||
origArgs = mw.getCurrentFrame():getParent().args | |||
local args = {} | |||
for k, v in pairs( origArgs ) do | |||
v = mw.text.trim( tostring( v ) ) | |||
if v ~= '' then | |||
args[k] = v | |||
end | |||
end | |||
return args | |||
end | |||
-- Compares two recipes ( a < b ? true : false ) | -- Compares two recipes ( a < b ? true : false ) | ||
function recipeCompare(a, b) | function recipeCompare(a, b) | ||
--not in v0.9 | --not in v0.9 | ||
--if not a.efficiencySkills[1] and not b.efficiencySkills[1] then return false | --if not a.efficiencySkills[1] and not b.efficiencySkills[1] then return false | ||
Line 14: | Line 28: | ||
--elseif a.efficiencySkills[1] > b.efficiencySkills[1] then return false | --elseif a.efficiencySkills[1] > b.efficiencySkills[1] then return false | ||
if (a.skillNeeds[1] ~= nil and b.skillNeeds[1] ~= nil) then | |||
if a.skillNeeds[1][1] < b.skillNeeds[1][1] then return true | |||
elseif a.skillNeeds[1][1] > b.skillNeeds[1][1] then return false | |||
elseif not a.skillNeeds[1][2] and b.skillNeeds[1][2] then return true | |||
elseif a.skillNeeds[1][2] and not b.skillNeeds[1][2] then return false | |||
elseif a.skillNeeds[1][2] and a.skillNeeds[1][2] < b.skillNeeds[1][2] then return true | |||
elseif a.skillNeeds[1][2] and a.skillNeeds[1][2] > b.skillNeeds[1][2] then return false | |||
end | |||
elseif a.defaultVariant[1] < b.defaultVariant[1] then return true | |||
elseif a.defaultVariant[1] > b.defaultVariant[1] then return false | |||
else return a.defaultVariant[1] <= b.defaultVariant[1] | |||
elseif a.defaultVariant < b.defaultVariant then | |||
elseif a.defaultVariant > b.defaultVariant then | |||
end | end | ||
end | end | ||
Line 73: | Line 79: | ||
function formatRecipes( recipes ) | function formatRecipes( recipes ) | ||
-- Sort recipes | -- Sort recipes | ||
table.sort( recipes, recipeCompare ) | table.sort( recipes, function( a, b ) return recipeCompare( a, b ) end ) | ||
return recipes | return recipes | ||
end | end | ||
-- Seperates a list of recipes into two tables | |||
function seperate( recipes, item ) | |||
local sepRecipes = { {}, {} } | |||
for i = 1, #recipes do | |||
--v0.8 if recipes[i].products[1][1] == item then | |||
--v0.9 need to find product in recipes[i].variants object, using pairs | |||
--cycle variants ingredients to build 'used in' list | |||
if recipes[i].defaultVariant == item then | |||
table.insert(sepRecipes[1], recipes[i] ) | |||
for k, v in pairs(recipes[i].variants) do | |||
--if v.products[1][1] == item then | |||
-- table.insert( sepRecipes[1], recipes[i] ) | |||
--if v.products[2] ~= nil and v.products[2][2] == item then | |||
--table.insert( sepRecipes[1], recipes[i] ) | |||
--TODO REWRITE this section to cycle through ingredients properly - not hard check to prevent errors. | |||
for j = 1, #v.ingredients do | |||
if v.ingredients[j][2] == item then | |||
table.insert( sepRecipes[2], recipes[i]) | |||
end | |||
end | |||
--TODO REWRITE this section to cycle through k, v properly - not hard check to prevent errors. | |||
--if v.ingredients[1][2] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[2][1] ~= nil and v.ingredients[2][2] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[3][1] ~= nil and v.ingredients[3][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[4][1] ~= nil and v.ingredients[4][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[5][1] ~= nil and v.ingredients[5][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[6][1] ~= nil and v.ingredients[6][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[7][1] ~= nil and v.ingredients[7][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--elseif v.ingredients[8][1] ~= nil and v.ingredients[8][1] == item then | |||
--table.insert( sepRecipes[2], recipes[i] ) | |||
--end | |||
end | |||
end | |||
end | |||
return sepRecipes | |||
end | |||
-- Called from Template:RecipeTable | -- Called from Template:RecipeTable | ||
Line 83: | Line 138: | ||
function p.raw( f ) | function p.raw( f ) | ||
-- get args from the Template, parse them into recipes | -- get args from the Template, parse them into recipes | ||
local recipes = frameParse( | local recipes = frameParse( norm( f ) ) | ||
-- Format the recipes | -- Format the recipes | ||
Line 89: | Line 144: | ||
-- Call RecipeTable | -- Call RecipeTable | ||
local recipeTable = require( "Module: | local recipeTable = require( "Module:TestRecipeTable" ) | ||
return recipeTable.main( recipes ) | return recipeTable.main( recipes ) | ||
end | end | ||
Line 95: | Line 150: | ||
-- Called from Module:GetRecipes | -- Called from Module:GetRecipes | ||
-- Calls Module: | -- Calls Module:RecipTable | ||
-- Returns the wikitext returned by Module:RecipeTable | -- Returns the wikitext returned by Module:RecipeTable | ||
function p.formattedItem( | function p.formattedItem( recipes, item ) | ||
-- Seperate recipes into crafting recipes and used in recipes | |||
local sepRecipes = seperate( recipes, item ) | |||
-- Format the recipes, and call RecipeTable on each table | -- Format the recipes, and call RecipeTable on each table | ||
local recipeTable = require( "Module: | local recipeTable = require( "Module:TestRecipeTable" ) | ||
local returnVal = '=== | local returnVal = '=== Crafting Recipes ===\n\n' | ||
if | if #sepRecipes[1] == 0 then | ||
returnVal = returnVal .. | returnVal = returnVal .. "''None''\n\n=== Used in Recipes ===\n\n " | ||
else | else | ||
returnVal = returnVal .. | returnVal = returnVal .. recipeTable.main( formatRecipes( sepRecipes[1] ) ) .. '\n\n=== Used in Recipes ===\n\n' | ||
end | end | ||
if #sepRecipes[2] == 0 then | |||
if | returnVal = returnVal .. "''None''\n" | ||
returnVal = returnVal .. | |||
else | else | ||
returnVal = returnVal .. | returnVal = returnVal .. recipeTable.main( formatRecipes( sepRecipes[2] ) ) | ||
end | end | ||
Line 123: | Line 181: | ||
function p.formattedTable( recipes, table ) | function p.formattedTable( recipes, table ) | ||
-- Format the recipes, and call RecipeTable | -- Format the recipes, and call RecipeTable | ||
local recipeTable = require( "Module: | local recipeTable = require( "Module:TestRecipeTable" ) | ||
local returnVal = '=== ' .. | local returnVal = '=== Recipes at ' .. table .. ' ===\n\n' | ||
if #recipes == 0 then | if #recipes == 0 then | ||
returnVal = returnVal .. "' | returnVal = returnVal .. "''None''\n" | ||
else | else | ||
returnVal = returnVal .. recipeTable.main( formatRecipes( recipes ) ) | returnVal = returnVal .. recipeTable.main( formatRecipes( recipes ) ) | ||
Line 140: | Line 198: | ||
function p.formattedGroup( recipes, group ) | function p.formattedGroup( recipes, group ) | ||
-- Format the recipes, and call RecipeTable | -- Format the recipes, and call RecipeTable | ||
local recipeTable = require( "Module: | local recipeTable = require( "Module:TestRecipeTable" ) | ||
local returnVal = '=== ' .. | local returnVal = '=== ' .. group .. ' Recipes ===\n\n' | ||
if #recipes == 0 then | if #recipes == 0 then | ||
returnVal = returnVal .. "' | returnVal = returnVal .. "''None''\n" | ||
else | else | ||
returnVal = returnVal .. recipeTable.main( formatRecipes( recipes ) ) | returnVal = returnVal .. recipeTable.main( formatRecipes( recipes ) ) |