From 587228faa9d273460376eb8b129f18c61ba50da2 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Wed, 5 Mar 2025 18:44:54 +0900
Subject: [PATCH] .

---
 PHI-CL/data.lua  | 31 ++++++++++---------------------
 PHI-CL/info.json |  4 ++--
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index cae8478..e64360d 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -494,28 +494,17 @@ if settings.startup['PHI-SA'].value then
     end
 
     if settings.startup['PHI-SA-RESTRICTION'].value and mods['space-age'] then
-        if tonumber(mods['space-age']:match('(%d+)$') or 0) < 34 then
-            for _, v in pairs(data.raw['virtual-signal']) do
-                local s = {table.unpack(v)}
+        local location = '__PHI-CL__/graphics/' .. ((tonumber(mods['space-age']:match('(%d+)$') or 0) < 34 and 'signal-2') or 'signal-1') .. '/'
 
-                if s.subgroup ~= 'virtual-signal-special' then
-                    s.name = s.name .. '-2'
-                    s.order = s.order .. '-2'
-                    s.icon = '__PHI-CL__/graphics/signal-2/' .. v.name .. '.png'
-                    data:extend({s})
-                end
-            end
-
-        else
-            for _, v in pairs(data.raw['virtual-signal']) do
-                local s = {table.unpack(v)}
-
-                if s.subgroup ~= 'virtual-signal-special' then
-                    s.name = s.name .. '-2'
-                    s.order = s.order .. '-2'
-                    s.icon = '__PHI-CL__/graphics/signal-1/' .. v.name .. '.png'
-                    data:extend({s})
-                end
+        for _, v in pairs(data.raw['virtual-signal']) do
+            if v.subgroup ~= 'virtual-signal-special' then
+                data:extend({
+                    type = 'virtual-signal',
+                    name = v.name .. '-2',
+                    icon = location .. v.name .. '.png',
+                    subgroup = v.subgroup,
+                    order = v.order .. '-2'
+                })
             end
         end
 
diff --git a/PHI-CL/info.json b/PHI-CL/info.json
index 575350b..433233b 100644
--- a/PHI-CL/info.json
+++ b/PHI-CL/info.json
@@ -1,8 +1,8 @@
 {
     "name": "PHI-CL",
-    "version": "3.0.67",
+    "version": "3.0.68",
     "factorio_version": "2.0",
-    "date": "2025-03-05",
+    "date": "2025-03-06",
     "title": "Phidias Collection",
     "author": "PHIDIAS0303",
     "contributers": "",