Модуль:Smelting - История изменений

MailGik в 09:40, 15 августа 2016

2016-08-15T09:40:44Z

MailGik в 09:38, 15 августа 2016

2016-08-15T09:38:00Z

MailGik в 09:33, 15 августа 2016

2016-08-15T09:33:38Z

MailGik в 09:29, 15 августа 2016

2016-08-15T09:29:39Z

MailGik в 09:24, 15 августа 2016

2016-08-15T09:24:35Z

MailGik в 09:23, 15 августа 2016

2016-08-15T09:23:05Z

MailGik в 09:20, 15 августа 2016

2016-08-15T09:20:30Z

MailGik: Новая страница: «local p = {} function p.table( f ) local args = f if f == mw.getCurrentFrame() then args = f:getParent().args else f = mw.getCurrentFrame() end local get…»

2016-08-15T09:15:35Z

Новая страница: «local p = {} function p.table( f ) local args = f if f == mw.getCurrentFrame() then args = f:getParent().args else f = mw.getCurrentFrame() end local get…»

Новая страница

local p = {}
function p.table( f )
local args = f
if f == mw.getCurrentFrame() then
args = f:getParent().args
else
f = mw.getCurrentFrame()
end
local getParts = require( 'Module:Inventory slot' ).getParts

-- Start table when appropriate
local multirow = f:callParserFunction( '#dplvar', 'multirow' )
if multirow ~= '1' then
multirow = nil
end
local head = args.head or ''
if multirow then
head = ''
elseif head ~= '' then
multirow = 1
f:callParserFunction( '#dplvar:set', 'multirow', '1' )
else
head = 1
end

-- End table when appropriate
local foot = args.foot or ''
if multirow then
if foot ~= '' then
multirow = nil
f:callParserFunction( '#dplvar:set', 'multirow', '0' )
end
else
foot = 1
end

local header = ''
if head ~= '' then
local name = ''
local description = ''
if args.showname == '1' or multirow and args.showname ~= '0' then
name = 'Name !! '
f:callParserFunction( '#dplvar:set', 'smeltingname', '1' )
end
if args.showdescription == '1' then
description = ' !! class="unsortable" | Description'
f:callParserFunction( '#dplvar:set', 'smeltingdescription', '1' )
end
local class = args.class or ''
local recipeClass = ''
if multirow then
class = 'sortable collapsible ' .. class
recipeClass = 'class="unsortable" |'
end
header = table.concat( {
' {| class="wikitable ' .. class .. '" data-description="Smelting recipes"',
'! ' .. name .. 'Ingredients !! ' .. recipeClass .. ' [[Smelting]] recipe' .. description,
'|-'
}, '\n' )
end

local input = mw.text.trim( args[1] or '' )
local output = mw.text.trim( args[2] or '' )
local fuel = args.fuel or ''
if fuel == '' then
fuel = 'Any fuel'
end

-- Name cell
local nameCell
if args.name or '' ~= '' then
nameCell = args.name
elseif multirow or f:callParserFunction( '#dplvar', 'smeltingname' ) == '1' then
local names = {}
local links = {}
for v in mw.text.gsplit( args[2] or '', '%s*;%s*' ) do
parts = getParts( v )
if not names[( parts.mod or '' ) .. parts.name] then
local link = ''
if parts.mod then
link = 'Mods/' .. parts.mod .. '/' .. parts.name .. '|'
end

if parts.name:find( '^Any ' ) then
table.insert( links, 'Any [[' .. link .. parts.name:sub( 4 ) .. ']]' )
else
table.insert( links, '[[' .. link .. parts.name .. ']]' )
end
names[( parts.mod or '' ) .. parts.name] = 1
end
end

nameCell = table.concat( links, ' or<br>' )
end

if nameCell and args.upcoming then
nameCell = nameCell .. '<br>([[' .. args.upcoming .. ']])'
end

-- Ingredients cell
local ingredientsCell
if args.ingredients or '' ~= '' then
ingredientsCell = args.ingredients
else
ingredientsCell = {}
local ingredients = {}
for k, v in ipairs{ input, fuel } do
local separator = ''
if k == 2 and next( ingredients ) then
separator = ' +<br>\n'
end
for item in mw.text.gsplit( v, '%s*;%s*' ) do
local parts = getParts( item )
if parts.name ~= '' and not ingredients[parts.name] and ( k == 2 or k == 1 and v ~= fuel ) then
local link = ''
if separator == '' and next( ingredients ) then
separator = ' or<br>\n'
end

if parts.mod then
link = 'Mods/'.. parts.mod .. '/' .. parts.name .. '|'
end

if parts.name:find( '^Any ' ) then
table.insert( ingredientsCell, separator .. 'Any [[' .. link .. parts.name:sub( 4 ) .. ']]' )
else
table.insert( ingredientsCell, separator .. '[[' .. link .. parts.name .. ']]' )
end
separator = ''

ingredients[parts.name] = 1
end
end
end

ingredientsCell = table.concat( ingredientsCell )
end

-- Any args we want to pass along
local newArgs = {
Input = args[1],
Output = args[2],
Fuel = fuel,
Ititle = args.Ititle,
Otitle = args.Otitle,
Ftitle = args.Ftitle
}

-- Recipe cell
local recipeCell = require( 'Module:UI' ).furnace( newArgs )

local row = {
'\n' .. ingredientsCell,
'style="padding:1px" |\n' .. recipeCell
}
if nameCell then
table.insert( row, 1, nameCell )
end
if f:callParserFunction( '#dplvar', 'smeltingdescription' ) == '1' then
table.insert( row, args.description or '' )
end
row = table.concat( row, '\n|' )

if nameCell then
row = '!\n' .. row
else
row = '|\n' .. row
end

local footer = ''
if foot ~= '' then
footer = '|}'
f:callParserFunction( '#dplvar:set', 'smeltingname', '0', 'smeltingdescription', '0' )
end

local title = mw.title.getCurrentTitle()
local category = ''
if args.upcoming and args.nocat ~= '1' and title.namespace == 0 and not title.isSubpage then
category = '[[Category:Upcoming]]'
end

return header .. '\n' .. row .. '\n|-\n' .. footer .. category
end
return p

@@ Строка 160: / Строка 160: @@
 	-- Any args we want to pass along
-	local newArgs = {}
+	local newArgs = {
-		newArgs.Input = args[1]
+		Input = args[1],
-		newArgs.Output = args[2]
+		Output = args[2],
-		newArgs.Fuel = fuel
+		Fuel = fuel,
-		newArgs.Ititle = args.Ititle
+		Ititle = args.Ititle,
-		newArgs.Otitle = args.Otitle
+		Otitle = args.Otitle,
-		newArgs.Ftitle = args.Ftitle
+		Ftitle = args.Ftitle,
-         newArgs.Mod = args.Mod
+         Mod = args.Mod,
+        Progress = args.Progress
 	-- Recipe cell
 	local recipeCell = require( 'Module:UI' ).furnace( newArgs )

@@ Строка 160: / Строка 160: @@
 	-- Any args we want to pass along
-	local newArgs = {
+	local newArgs = {}
-		Input = args[1],
+		newArgs.Input = args[1]
-		Output = args[2],
+		newArgs.Output = args[2]
-		Fuel = fuel,
+		newArgs.Fuel = fuel
-		Ititle = args.Ititle,
+		newArgs.Ititle = args.Ititle
-		Otitle = args.Otitle,
+		newArgs.Otitle = args.Otitle
-		Ftitle = args.Ftitle,
+		newArgs.Ftitle = args.Ftitle
-         Mod = args.Mod
+         newArgs.Mod = args.Mod
 	-- Recipe cell

@@ Строка 133: / Строка 133: @@
 			end
 			for item in mw.text.gsplit( v, '%s*;%s*' ) do
-				local parts = getParts( item )
+				local parts = getParts( item, args.Mod )
 				if parts.name ~= '' and not ingredients[parts.name] and ( k == 2 or k == 1 and v ~= fuel ) then
 					local link = ''

@@ Строка 88: / Строка 88: @@
 	end
 	-- Name cell
 	local nameCell
-	if f:callParserFunction( '#dplvar', 'smeltingname' ) == '1' then
+	if args.name or '' ~= '' then
-		if args.name or '' ~= '' then
+		nameCell = args.name
-			nameCell = args.name
+	elseif multirow or f:callParserFunction( '#dplvar', 'smeltingname' ) == '1' then
-		else
+		local names = {}
-			local names = {}
+		local links = {}
-			local links = {}
+		for v in mw.text.gsplit( args[2] or '', '%s*;%s*' ) do
-			for v in mw.text.gsplit( args.Output or '', '%s*;%s*' ) do
+			parts = getParts( v, args.Mod )
-				parts = getParts( v, args.Mod )
+			if not names[( parts.mod or '' ) .. parts.name] then
-				parts.mod = parts.mod or ''
+				local link = ''
-				if not names[parts.mod .. ':' .. parts.name] then
+				if parts.mod then
-					table.insert( links, prefixedLink( parts.name, parts.mod ) )
+					link = 'Mods/' .. parts.mod .. '/' .. parts.name .. '|'
 				end
 			end
 		end
 	end
-−
 	if nameCell and args.upcoming then
 		nameCell = nameCell .. '<br>([[' .. args.upcoming .. ']])'