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

@@ Строка 2: / Строка 2: @@
 local JsonPaths = require('Module:JsonPaths')
 local prefix = JsonPaths.prefixFile()
-local entityIds = JsonPaths.loadEntityIds(project)
-local function filterByEntityIds(spriteData, entityIds)
-	if not entityIds then
-		return spriteData
-	end
+local function filterSpriteData(spriteData, prototypeData, whitelistSet, blacklistSet, project)
 	local result = {}
 	for id, entry in pairs(spriteData) do
-		if entityIds[id] ~= nil then
+		local protoEntry = prototypeData and prototypeData[id] or entry
-			result[id] = entry
+		if shouldIncludeEntry(protoEntry, whitelistSet, blacklistSet) then
+			if project == "" or JsonPaths.has(id, project) then
+				result[id] = entry
+			end
 		end
 	end
@@ Строка 345: / Строка 344: @@
 	local whitelistSet = buildSet(frame.args.whitelistParent)
 	local blacklistSet = buildSet(frame.args.blacklistParent)
+	local filteredData = filterSpriteData(spriteData, prototypeData, whitelistSet, blacklistSet, project)
-	local filteredData = filterSpriteData(spriteData, prototypeData, whitelistSet, blacklistSet)
-	filteredData = filterByEntityIds(filteredData, entityIds)
 	if action == "repeat" then