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

Pok в 09:59, 2 апреля 2026

2026-04-02T09:59:37Z

← Предыдущая версия		Версия от 12:59, 2 апреля 2026
Строка 14:		Строка 14:
	local name = entity.name or ""		local name = entity.name or ""
	local label = mw.ustring.lower(entity.label or "")		local label = mw.ustring.lower(entity.label or "")
	local suffix = ~~mw.ustring.lower(entity.suffix or~~ "")		local suffix = ""

	if useSuffix ~~and~~ suffix ~= "" then		if useSuffix then
	local parts = {}		suffix = mw.ustring.lower(entity.suffix or "")
	for part in tostring(suffix):gmatch("[^,;]+") do
	part = part		if suffix ~= "" then
	if part ~= "" then		local parts = {}
	parts[#parts + 1] = part		for part in tostring(suffix):gmatch("[^,;]+") do
			part = mw.text.trim(part)
			if part ~= "" then
			parts[#parts + 1] = part
			end
	end		end
			suffix = table.concat(parts, ", ")
	end		end
	~~suffix = table.concat(parts, ", ")~~
	end		end

Pok в 10:03, 1 апреля 2026

2026-04-01T10:03:21Z

← Предыдущая версия		Версия от 13:03, 1 апреля 2026
Строка 10:		Строка 10:
	p.entities = safeLoad("entity prototypes.json")		p.entities = safeLoad("entity prototypes.json")
	p.name_overrides = safeLoad("entity name overrides.json")		p.name_overrides = safeLoad("entity name overrides.json")

	~~local function lower(value)~~
	~~return mw.ustring.lower(value)~~
	~~end~~

	local function buildName(entity, useSuffix)		local function buildName(entity, useSuffix)
	local name = entity.name or ""		local name = entity.name or ""
	local label = lower(entity.label or "")		local label = mw.ustring.lower(entity.label or "")
	local suffix = lower(entity.suffix or "")		local suffix = mw.ustring.lower(entity.suffix or "")

	if useSuffix and suffix ~= "" then		if useSuffix and suffix ~= "" then

Pok в 10:02, 1 апреля 2026

2026-04-01T10:02:40Z

← Предыдущая версия		Версия от 13:02, 1 апреля 2026
Строка 10:		Строка 10:
	p.entities = safeLoad("entity prototypes.json")		p.entities = safeLoad("entity prototypes.json")
	p.name_overrides = safeLoad("entity name overrides.json")		p.name_overrides = safeLoad("entity name overrides.json")

			local function lower(value)
			return mw.ustring.lower(value)
			end

	local function buildName(entity, useSuffix)		local function buildName(entity, useSuffix)
	local name = entity.name or ""		local name = entity.name or ""
	local label = ~~mw.text.trim~~(entity.label or ""~~):lower(~~)		local label = lower(entity.label or "")
	local suffix = ""		local suffix = lower(entity.suffix or "")

	if useSuffix ~~then~~		if useSuffix and suffix ~= "" then
	~~local rawSuffix = entity.~~suffix		local parts = {}
	~~if rawSuffix and mw.text.trim(rawSuffix)~~ ~= "" then		for part in tostring(suffix):gmatch("[^,;]+") do
	local parts = {}		part = part
	for part in tostring(~~rawSuffix~~):gmatch("[^,;]+") do		if part ~= "" then
	part = ~~mw.text.trim(~~part)		parts[#parts + 1] = part
	if part ~= "" then
	parts[#parts + 1] = part
	~~end~~
	~~end~~
	~~if #parts > 0 then~~
	~~suffix = table.concat(parts, ", "):lower()~~
	end		end
	end		end
			suffix = table.concat(parts, ", ")
	end		end

Строка 57:		Строка 56:
	local override = p.name_overrides[id]		local override = p.name_overrides[id]
	if override then		if override then
	return override		return lower(override)
	end		end

Строка 65:		Строка 64:
	end		end

	local useSuffix = frame.args and frame.args.suffix and ~~mw.text.trim(~~frame.args.suffix) ~= ""		local useSuffix = frame.args and frame.args.suffix and frame.args.suffix ~= ""
	return buildName(entity, useSuffix)		return buildName(entity, useSuffix)
	end		end

Pok в 09:58, 1 апреля 2026

2026-04-01T09:58:45Z

← Предыдущая версия		Версия от 12:58, 1 апреля 2026
Строка 27:		Строка 27:
	end		end
	if #parts > 0 then		if #parts > 0 then
	suffix = ~~string.lower(~~table.concat(parts, ", "))		suffix = table.concat(parts, ", "):lower()
	end		end
	end		end

Pok в 08:38, 1 апреля 2026

2026-04-01T08:38:31Z

← Предыдущая версия		Версия от 11:38, 1 апреля 2026
Строка 11:		Строка 11:
	p.name_overrides = safeLoad("entity name overrides.json")		p.name_overrides = safeLoad("entity name overrides.json")

	~~local IgnoredSuffixTokens = {}~~		local function buildName(entity, useSuffix)

	local function buildName(entity)
	local name = entity.name or ""		local name = entity.name or ""
	local label = mw.text.trim(entity.label or "")		local label = mw.text.trim(entity.label or ""):lower()
	local suffix = ""		local suffix = ""

	local rawSuffix = entity.suffix		if useSuffix then
	if rawSuffix and mw.text.trim(rawSuffix) ~= "" then		local rawSuffix = entity.suffix
	local parts = {}		if rawSuffix and mw.text.trim(rawSuffix) ~= "" then
	for part in tostring(rawSuffix):gmatch("[^,;]+") do		local parts = {}
	part = mw.text.trim(part)		for part in tostring(rawSuffix):gmatch("[^,;]+") do
	if part ~= "" ~~and not IgnoredSuffixTokens[part]~~ then		part = mw.text.trim(part)
	parts[#parts + 1] = part		if part ~= "" then
			parts[#parts + 1] = part
			end
			end
			if #parts > 0 then
			suffix = string.lower(table.concat(parts, ", "))
	end		end
	~~end~~
	~~if #parts > 0 then~~
	~~suffix = string.lower(table.concat(parts, ", "))~~
	end		end
	end		end

	if label ~= "" and suffix ~= "" and label~~:lower()~~ == suffix~~:lower()~~ then		if label ~= "" and suffix ~= "" and label == suffix then
	suffix = ""		suffix = ""
	end		end
Строка 51:		Строка 51:
	function p.getname(frame, entid) -- {{#invoke:Entity Lookup\|getname\|ProtoID}}		function p.getname(frame, entid) -- {{#invoke:Entity Lookup\|getname\|ProtoID}}
	local id = frame.args and frame.args[1] or entid		local id = frame.args and frame.args[1] or entid
	if not id then return "Не найдено" end		if not id then
			return "Не найдено"
			end

	local override = p.name_overrides[id]		local override = p.name_overrides[id]
	if override then return override end		if override then
			return override
			end

	local entity = p.entities[id]		local entity = p.entities[id]
	return ~~entity~~ and buildName(entity) ~~or "Не найдено"~~		if not entity then
			return "Не найдено"
			end

			local useSuffix = frame.args and frame.args.suffix and mw.text.trim(frame.args.suffix) ~= ""
			return buildName(entity, useSuffix)
	end		end

Pok: suffix

2026-04-01T08:35:16Z

suffix

← Предыдущая версия		Версия от 11:35, 1 апреля 2026
Строка 3:		Строка 3:

	local function safeLoad(page)		local function safeLoad(page)
	local moduleName = JsonPaths.get(page)		local moduleName = JsonPaths.get(page)
	local ok, data = pcall(mw.loadData, moduleName)		local ok, data = pcall(mw.loadData, moduleName)
	~~if not~~ ok ~~then~~		return ok and (data or {}) or {}
	~~return~~ {}
	~~end~~
	~~return data~~ or {}
	end		end

	p.entities = safeLoad("entity prototypes.json")		p.entities = safeLoad("entity prototypes.json")
	p.name_overrides = safeLoad("entity name overrides.json")		p.name_overrides = safeLoad("entity name overrides.json")

			local IgnoredSuffixTokens = {}

			local function buildName(entity)
			local name = entity.name or ""
			local label = mw.text.trim(entity.label or "")
			local suffix = ""

			local rawSuffix = entity.suffix
			if rawSuffix and mw.text.trim(rawSuffix) ~= "" then
			local parts = {}
			for part in tostring(rawSuffix):gmatch("[^,;]+") do
			part = mw.text.trim(part)
			if part ~= "" and not IgnoredSuffixTokens[part] then
			parts[#parts + 1] = part
			end
			end
			if #parts > 0 then
			suffix = string.lower(table.concat(parts, ", "))
			end
			end

			if label ~= "" and suffix ~= "" and label:lower() == suffix:lower() then
			suffix = ""
			end

			if label == "" and suffix == "" then
			return name
			elseif label == "" then
			return name .. " (" .. suffix .. ")"
			elseif suffix == "" then
			return name .. " (" .. label .. ")"
			else
			return name .. " (" .. label .. ") (" .. suffix .. ")"
			end
			end


Строка 21:		Строка 54:

	local override = p.name_overrides[id]		local override = p.name_overrides[id]
	if override then		if override then return override end
	return override
	end

	local entity = p.entities[id]		local entity = p.entities[id]
	~~if entity then~~		return entity and buildName(entity) or "Не найдено"
	~~local name = entity.name or ""~~
	if entity~~.label~~ and ~~entity.label ~= "" then~~
	~~name = name .. "~~ (~~" ..~~ entity~~.label .. "~~)"
	~~end~~
	~~return name~~
	~~end~~

	~~return~~ "Не найдено"
	end		end

Строка 50:		Строка 73:

	for id, entity in pairs(p.entities) do		for id, entity in pairs(p.entities) do
	if entity.name == name then		if entity.name == name or buildName(entity) == name then
	return id		return id
	end		end
Строка 57:		Строка 80:
	return "Не найдено"		return "Не найдено"
	end		end


	-- p.getname{args={"FreedomImplant"}}		-- p.getname{args={"FreedomImplant"}}
	function p.getdesc(frame, entid) -- {{#invoke:Entity Lookup\|getdesc\|ProtoID}}		function p.getdesc(frame, entid) -- {{#invoke:Entity Lookup\|getdesc\|ProtoID}}
	local out = ""		local out = ""
	local id = ""		local id = ""
	if frame.args[1] ~= nil then id = frame.args[1]		if frame.args[1] ~= nil then id = frame.args[1]
	else id = entid end		else id = entid end
	local entity = p.entities[id]		local entity = p.entities[id]
	if entity ~= nil then		if entity ~= nil then
	out = entity.desc		out = entity.desc
	else		else
	out = "Не найдено"		out = "Не найдено"
	end		end
	return out		return out
	end		end

Pok в 02:18, 20 марта 2026

2026-03-20T02:18:01Z

← Предыдущая версия		Версия от 05:18, 20 марта 2026
Строка 1:		Строка 1:
	local p = {}		local p = {}
			local JsonPaths = require('Module:JsonPaths')

	p.~~entities~~ = mw.loadData("~~Модуль:IanComradeBot/~~entity prototypes.json~~/data~~") ~~or {}~~		local function safeLoad(page)
	p.name_overrides = ~~mw.loadData~~("~~Модуль:IanComradeBot/~~entity name overrides.json~~/data~~") ~~or {}~~		local moduleName = JsonPaths.get(page)
			local ok, data = pcall(mw.loadData, moduleName)
			if not ok then
			return {}
			end
			return data or {}
			end

			p.entities = safeLoad("entity prototypes.json")
			p.name_overrides = safeLoad("entity name overrides.json")

Pok: label

2026-03-04T00:38:09Z

label

← Предыдущая версия		Версия от 03:38, 4 марта 2026
Строка 17:		Строка 17:
	local entity = p.entities[id]		local entity = p.entities[id]
	if entity then		if entity then
	~~return~~ entity.name		local name = entity.name or ""
			if entity.label and entity.label ~= "" then
			name = name .. " (" .. entity.label .. ")"
			end
			return name
	end		end

Pok в 00:14, 4 марта 2026

2026-03-04T00:14:28Z

← Предыдущая версия		Версия от 03:14, 4 марта 2026
Строка 1:		Строка 1:
	local entities = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data")		local p = {}
	~~local overrides~~ = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data")
			p.entities = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data") or {}
			p.name_overrides = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data") or {}

	~~local p = {}~~

	-- p.getname{args={"FreedomImplant"}}		-- p.getname{args={"FreedomImplant"}}
Строка 9:		Строка 10:
	if not id then return "Не найдено" end		if not id then return "Не найдено" end

	local override = p.~~overrides~~[id]		local override = p.name_overrides[id]
	if override then		if override then
	return override		return override
Строка 28:		Строка 29:
	if not name then return "Не найдено" end		if not name then return "Не найдено" end

	for id, overrideName in pairs(p.~~overrides~~) do		for id, overrideName in pairs(p.name_overrides) do
	if overrideName == name then		if overrideName == name then
	return id		return id

Pok в 00:09, 4 марта 2026

2026-03-04T00:09:59Z

← Предыдущая версия		Версия от 03:09, 4 марта 2026
Строка 1:		Строка 1:
	local ~~prototypes~~ = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data")		local entities = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data")
	local overrides = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data")		local overrides = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data")

	local p = {}		local p = {}
	~~p.entities = prototypes.entities~~
	~~p.name_overrides = overrides.name_overrides or {}~~


	-- p.getname{args={"FreedomImplant"}}		-- p.getname{args={"FreedomImplant"}}
Строка 12:		Строка 9:
	if not id then return "Не найдено" end		if not id then return "Не найдено" end

	local override = p.~~name_overrides~~[id]		local override = p.overrides[id]
	if override then		if override then
	return override		return override
Строка 31:		Строка 28:
	if not name then return "Не найдено" end		if not name then return "Не найдено" end

	for id, overrideName in pairs(p.~~name_overrides~~) do		for id, overrideName in pairs(p.overrides) do
	if overrideName == name then		if overrideName == name then
	return id		return id