Модуль:Entity Lookup: различия между версиями

Интерактивная навигация по истории

← Предыдущая правка

@@ Строка 1: / Строка 1: @@
-local prototypes = mw.loadData("Модуль:IanComradeBot/entity prototypes.json/data")
+local p = {}
-local overrides = mw.loadData("Модуль:IanComradeBot/entity name overrides.json/data")
+local JsonPaths = require('Module:JsonPaths')
+local function safeLoad(page)
+	local moduleName = JsonPaths.get(page)
+	local ok, data = pcall(mw.loadData, moduleName)
+	return ok and (data or {}) or {}
+end
+p.entities = safeLoad("entity prototypes.json")
+p.name_overrides = safeLoad("entity name overrides.json")
+local function buildName(entity, useSuffix)
+	local name = entity.name or ""
+	local label = mw.ustring.lower(entity.label or "")
+	local suffix = ""
+	if useSuffix then
+		suffix = mw.ustring.lower(entity.suffix or "")
-local p = {}
+		if suffix ~= "" then
-p.entities = prototypes.entities
+			local parts = {}
-p.name_overrides = overrides.name_overrides or {}
+			for part in tostring(suffix):gmatch("[^,;]+") do
+				part = mw.text.trim(part)
+				if part ~= "" then
+					parts[#parts + 1] = part
+				end
+			end
+			suffix = table.concat(parts, ", ")
+		end
+	end
+	if label ~= "" and suffix ~= "" and label == suffix 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
@@ Строка 10: / Строка 50: @@
 function p.getname(frame, entid) -- {{#invoke:Entity Lookup|getname|ProtoID}}
 	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]
 	if override then
-		return override
+		return lower(override)
 	end
 	local entity = p.entities[id]
-	if entity then
+	if not entity then
-		return entity.name
+		return "Не найдено"
 	end
-	return "Не найдено"
+	local useSuffix = frame.args and frame.args.suffix and frame.args.suffix ~= ""
+	return buildName(entity, useSuffix)
 end
@@ Строка 38: / Строка 81: @@
 	for id, entity in pairs(p.entities) do
-		if entity.name == name then
+		if entity.name == name or buildName(entity) == name then
 			return id
 		end
@@ Строка 45: / Строка 88: @@
 	return "Не найдено"
 end
 -- p.getname{args={"FreedomImplant"}}
 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
 end