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

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

← Предыдущая правка Следующая правка →

@@ Строка 1: / Строка 1: @@
 local p = {}
 local JsonPaths = require('Module:JsonPaths')
+local function buildEntryKey(entry)
+	local parts = {}
+	if entry.sprite then
+		table.insert(parts, "sprite=" .. normalizeSpritePath(entry.sprite))
+	end
+	if entry.layers and type(entry.layers) == "table" then
+		local layers = {}
+		for _, layer in ipairs(entry.layers) do
+			local layerParts = {}
+			for k, v in pairs(layer) do
+				layerParts[#layerParts+1] = k .. "=" .. tostring(v)
+			end
+			table.sort(layerParts)
+			table.insert(layers, table.concat(layerParts, ","))
+		end
+		table.sort(layers)
+		table.insert(parts, "layers=" .. table.concat(layers, "|"))
+	end
+	return table.concat(parts, ";")
+end
 local function normalizeSpritePath(path)
@@ Строка 146: / Строка 174: @@
 	for id, entry in pairs(data) do
-		local found = false
+		local key = buildEntryKey(entry)
-		for _, group in pairs(spriteGroups) do
-			local g = group[1]
-			if entry.sprite == g.entry.sprite and entry.state == g.entry.state then
+		spriteGroups[key] = spriteGroups[key] or {}
-				table.insert(group, { id = id, entry = entry })
+		table.insert(spriteGroups[key], { id = id, entry = entry })
-				found = true
-				break
-			end
-		end
-		if not found then
-			table.insert(spriteGroups, {
-				{ id = id, entry = entry }
-			})
-		end
 	end
@@ Строка 171: / Строка 186: @@
 			local idLinks = {}
-			for _, obj in pairs(group) do
+			for _, obj in ipairs(group) do
 				local id = obj.id
 				local prefix = getPrefix(id, project)