Модуль:Prototypes/Роль: различия между версиями

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

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

@@ Строка 15: / Строка 15: @@
 -- Форматирование времени
-local function formatTime(seconds)
+local function formatTime(time)
-	return "{{#invoke:Code/Формат/Время|main|seconds|" .. seconds .. "}}"
+	return "{{#invoke:Code/Формат/Время|main|" .. time .. "}}"
 end
@@ Строка 43: / Строка 43: @@
 	if mode == "requirements" then
-		if job.requirements then
+	    if job.requirements then
-			for _, req in ipairs(job.requirements) do
+	        for _, req in ipairs(job.requirements) do
-				if req["!type"] == "DepartmentTimeRequirement" and req.department and req.time then
+	            if req["!type"] == "DepartmentTimeRequirement" and req.department and req.time then
-					result = result .. "<li>[[{{ucfirst:{{#invoke:Ftl|main|translation|department-" .. req.department .. "}}}}]]: " ..
+	                result = result .. "<li>[[{{ucfirst:{{#invoke:Ftl|main|translation|department-" .. req.department .. "}}}}]]: " ..
-						formatTime(req.time) .. "</li>"
+	                    formatTime(req.time) .. "</li>"
-				elseif req["!type"] == "RoleTimeRequirement" and req.role and req.time then
+	            elseif req["!type"] == "RoleTimeRequirement" and req.role and req.time then
-					result = result .. "<li>[[{{ucfirst:{{#invoke:Ftl|main|translation|" .. req.role .. "}}}}]]: " ..
+	                result = result .. "<li>[[{{ucfirst:{{#invoke:Ftl|main|translation|" .. req.role .. "}}}}]]: " ..
-						formatTime(req.time) .. "</li>"
+	                    formatTime(req.time) .. "</li>"
-				end
+	            elseif req["!type"] == "OverallPlaytimeRequirement" and req.time then
-			end
+	                result = result .. "<li>Общее время: " .. formatTime(req.time) .. "</li>"
-		end
+	            end
+	        end
+	    end
+	    result = "<ul>" .. result .. "</ul>"
 	elseif mode == "access" then
-		-- Сначала проверяем наличие accessGroups
+	    local accesses = {}
-		if job.accessGroups then
+	    if job.accessGroups then
-			for _, group in ipairs(job.accessGroups) do
+	        local groups = type(job.accessGroups[1]) == "table" and job.accessGroups or { job.accessGroups }
-				for _, access in ipairs(group) do
+	        for _, group in ipairs(groups) do
-					result = result .. "<li>" .. wrapAccess(access) .. "</li>"
+	            for _, access in ipairs(group) do
-				end
+	                table.insert(accesses, wrapAccess(access))
-			end
+	            end
-		-- Если accessGroups отсутствует, используем access
+	        end
-		elseif job.access then
+	    elseif job.access then
-			for _, access in ipairs(job.access) do
+	        for _, access in ipairs(job.access) do
-				result = result .. "<li>" .. wrapAccess(access) .. "</li>"
+	            table.insert(accesses, wrapAccess(access))
-			end
+	        end
-		end
+	    end
+	    result = table.concat(accesses, ", ")
 	elseif mode == "name" then
 		if job.name then