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

BombasterDS в 16:47, 28 января 2024

2024-01-28T16:47:59Z

← Предыдущая версия		Версия от 18:47, 28 января 2024
Строка 35:		Строка 35:
	table.sort(keys, compareByCost)		table.sort(keys, compareByCost)

	for _, k in ipairs(keys) do		for _, k in ipairs(keys) do
	local ~~productKeys~~ = {}		local firstProduct = nil
	for productKey, _ in pairs(p.store[k].product) do		for productKey, _ in pairs(p.store[k].product) do
	~~table.insert(productKeys,~~ productKey)		firstProduct = productKey
			break
	end		end

	~~local firstProduct = productKeys[1]~~

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}

2024-01-28T16:42:02Z

← Предыдущая версия		Версия от 18:42, 28 января 2024
Строка 11:		Строка 11:
	local out = ""		local out = ""
	local store = frame.args[1]		local store = frame.args[1]
	~~for _, productData in ipairs(~~p.store[store].product~~) do~~		local firstproduct = p.store[store].product[1]
	for id, ~~quantity~~ in pairs(~~productData~~) do		for id, content in pairs(p.store[store].product) do
	out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = ~~quantity~~ }}		out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = content }}
	~~end~~
	end		end

			return out
	end		end

Строка 35:		Строка 36:

	for _, k in ipairs(keys) do		for _, k in ipairs(keys) do
	local ~~productArray~~ = p.store[k].product		local productKeys = {}
			for productKey, _ in pairs(p.store[k].product) do
	~~if type~~(~~productArray~~) ~~== "table" and #productArray > 0 then~~		table.insert(productKeys, productKey)
	~~local firstProduct = productArray[1]~~		end

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct }}		local firstProduct = productKeys[1]
	~~end~~
			out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}
	end		end

2024-01-28T16:40:59Z

← Предыдущая версия		Версия от 18:40, 28 января 2024
Строка 35:		Строка 35:

	for _, k in ipairs(keys) do		for _, k in ipairs(keys) do
	local ~~productKeys~~ = {}		local productArray = p.store[k].product
	~~for productKey, _ in pairs(~~p.store[k].product) do
	~~table~~.~~insert(productKeys~~, ~~productKey)~~		if type(productArray) == "table" and #productArray > 0 then
			local firstProduct = productArray[1]

			out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct }}
	end		end

	~~local firstProduct = productKeys[1]~~

	~~out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}~~
	end		end

2024-01-28T16:38:23Z

← Предыдущая версия		Версия от 18:38, 28 января 2024
Строка 12:		Строка 12:
	local store = frame.args[1]		local store = frame.args[1]
	for _, productData in ipairs(p.store[store].product) do		for _, productData in ipairs(p.store[store].product) do
	for id, quantity in pairs(productData) do		for id, quantity in pairs(productData) do
	out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = quantity }}		out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = quantity }}
	end		end
	end		end
	end		end

2024-01-28T16:34:44Z

Попытка изменить структуру в JSON

← Предыдущая версия		Версия от 18:34, 28 января 2024
Строка 11:		Строка 11:
	local out = ""		local out = ""
	local store = frame.args[1]		local store = frame.args[1]
	~~local firstproduct =~~ p.store[store].product~~[1]~~		for _, productData in ipairs(p.store[store].product) do
	for id, ~~content~~ in pairs(~~p.store[store].product~~) do		for id, quantity in pairs(productData) do
	out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = ~~content~~ }}		out = out .. frame:expandTemplate{ title = "SupplyContent", args = { prototype = id, quantity = quantity }}
			end
	end		end

	~~return out~~
	end		end

2024-01-28T16:29:27Z

← Предыдущая версия		Версия от 18:29, 28 января 2024
Строка 40:		Строка 40:
	table.insert(productKeys, productKey)		table.insert(productKeys, productKey)
	end		end

	local firstProduct		local firstProduct = productKeys[1]
	~~for _, key in ipairs(~~productKeys~~) do~~
	~~firstProduct = key~~
	~~break~~
	~~end~~

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}

2024-01-28T16:21:49Z

← Предыдущая версия		Версия от 18:21, 28 января 2024
Строка 1:		Строка 1:
	~~local json = require("json")~~

	local prototypes = mw.loadData("Module:Supply Lookup/data")		local prototypes = mw.loadData("Module:Supply Lookup/data")

Строка 43:		Строка 41:
	end		end

	local ~~orderedProductKeys = json.decode('[' .. table.concat~~(productKeys~~, ',') .. ']'~~)		local firstProduct
	~~local~~ firstProduct = ~~orderedProductKeys[1]~~		for _, key in ipairs(productKeys) do
			firstProduct = key
			break
			end

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}

2024-01-28T11:35:13Z

← Предыдущая версия		Версия от 13:35, 28 января 2024
Строка 1:		Строка 1:
			local json = require("json")

	local prototypes = mw.loadData("Module:Supply Lookup/data")		local prototypes = mw.loadData("Module:Supply Lookup/data")

Строка 41:		Строка 43:
	end		end

	local ~~firstProduct~~		local orderedProductKeys = json.decode('[' .. table.concat(productKeys, ',') .. ']')
	~~for _, key in ipairs~~(productKeys) do		local firstProduct = orderedProductKeys[1]
	firstProduct = ~~key~~
	~~break~~
	~~end~~

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}

2024-01-28T11:32:57Z

← Предыдущая версия		Версия от 13:32, 28 января 2024
Строка 41:		Строка 41:
	end		end

	local ~~orderedProductKeys = json.decode('[' .. table.concat~~(productKeys~~, ',') .. ']'~~)		local firstProduct
			for _, key in ipairs(productKeys) do
	~~local firstProduct = orderedProductKeys[1]~~		firstProduct = key
			break
			end

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}

2024-01-28T11:31:27Z

← Предыдущая версия		Версия от 13:31, 28 января 2024
Строка 41:		Строка 41:
	end		end

	table.~~sort~~(productKeys)		local orderedProductKeys = json.decode('[' .. table.concat(productKeys, ',') .. ']')

	local firstProduct = ~~productKeys~~[1]		local firstProduct = orderedProductKeys[1]

	out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}		out = out .. frame:expandTemplate{ title = "Supply", args = { prototype = k, firstproduct = firstProduct}}