From 542fba00e46055e26d8c68e6df56b16005558c37 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Thu, 4 Jun 2026 18:38:14 +0900
Subject: [PATCH] .

---
 PHI-CL/data/b/gm-vp-c.lua | 98 ++++++++++++++++++---------------------
 PHI-CL/data/b/gm-vp.lua   | 10 +++-
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua
index 2a3f5c0..aae63f5 100644
--- a/PHI-CL/data/b/gm-vp-c.lua
+++ b/PHI-CL/data/b/gm-vp-c.lua
@@ -1,70 +1,62 @@
 local items = {
     ['entity_surface_conditions'] = {
         -- BASE 0
-        ['rocket-silo'] = 'rocket-silo',
-        ['cargo-landing-pad'] = 'cargo-landing-pad',
-        ['flamethrower-turret'] = 'fluid-turret',
-        ['stone-furnace'] = 'furnace',
-        ['steel-furnace'] = 'furnace',
+        'rocket-silo',
+        'cargo-landing-pad',
+        'fluid-turret',
+        -- 2X
+        'furnace',
         -- BASE 5
-        ['burner-mining-drill'] = 'mining-drill',
-        ['burner-inserter'] = 'inserter',
-        ['boiler'] = 'boiler',
-        ['roboport'] = 'roboport',
-        ['car'] = 'car',
+        'mining-drill',
+        'inserter',
+        'boiler',
+        'roboport',
+        'spider-vehicle',
         -- BASE 10
-        ['tank'] = 'car',
-        ['spidertron'] = 'spider-vehicle',
-        ['locomotive'] = 'locomotive',
-        ['cargo-wagon'] = 'cargo-wagon',
-        ['fluid-wagon'] = 'fluid-wagon',
+        -- 2X
+        'car',
+        'locomotive',
+        'cargo-wagon',
+        'fluid-wagon',
         -- BASE 15
-        ['artillery-wagon'] = 'artillery-wagon',
-        ['train-stop'] = 'train-stop',
-        ['rail-signal'] = 'rail-signal',
-        ['rail-chain-signal'] = 'rail-chain-signal',
-        ['straight-rail'] = 'straight-rail',
+        'artillery-wagon',
+        'train-stop',
+        'rail-signal',
+        'rail-chain-signal',
+        'straight-rail',
         -- BASE 20
-        ['legacy-curved-rail'] = 'legacy-curved-rail',
-        ['legacy-straight-rail'] = 'legacy-straight-rail',
-        ['curved-rail-a'] = 'curved-rail-a',
-        ['curved-rail-b'] = 'curved-rail-b',
-        ['half-diagonal-rail'] = 'half-diagonal-rail',
+        'legacy-curved-rail',
+        'legacy-straight-rail',
+        'curved-rail-a',
+        'curved-rail-b',
+        'half-diagonal-rail',
         -- BASE 25
-        ['wooden-chest'] = 'container',
-        ['iron-chest'] = 'container',
-        ['steel-chest'] = 'container',
-        ['passive-provider-chest'] = 'logistic-container',
-        ['active-provider-chest'] = 'logistic-container',
+        -- 5X
+        'logistic-container',
         -- BASE 30
-        ['storage-chest'] = 'logistic-container',
-        ['buffer-chest'] = 'logistic-container',
-        ['requester-chest'] = 'logistic-container',
+        -- 3X
+        'container',
         -- ELEVATED_RAIL 0
-        ['rail-support'] = 'rail-support',
-        ['rail-ramp'] = 'rail-ramp',
-        ['elevated-straight-rail'] = 'elevated-straight-rail',
-        ['elevated-half-diagonal-rail'] = 'elevated-half-diagonal-rail',
-        ['elevated-curved-rail-a'] = 'elevated-curved-rail-a',
+        'rail-support',
+        'rail-ramp',
+        'elevated-straight-rail',
+        'elevated-half-diagonal-rail',
+        'elevated-curved-rail-a',
         -- ELEVATED_RAIL 5
-        ['elevated-curved-rail-b'] = 'elevated-curved-rail-b',
+        'elevated-curved-rail-b',
         -- SPACE_AGE 0
-        ['captive-biter-spawner'] = 'assembling-machine',
-        ['biochamber'] = 'assembling-machine',
-        ['crusher'] = 'assembling-machine',
-        ['cryogenic-plant'] = 'assembling-machine',
-        ['electromagnetic-plant'] = 'assembling-machine',
+        -- 6X
+        'assembling-machine',
         -- SPACE_AGE 5
-        ['foundry'] = 'assembling-machine',
-        ['agricultural-tower'] = 'agricultural-tower',
-        ['asteroid-collector'] = 'asteroid-collector',
-        ['fusion-reactor'] = 'fusion-reactor',
-        ['fusion-generator'] = 'fusion-generator',
+        'agricultural-tower',
+        'asteroid-collector',
+        'fusion-reactor',
+        'fusion-generator',
         -- SPACE_AGE 10
-        ['heating-tower'] = 'reactor',
-        ['recycler'] = 'furnace',
-        ['thruster'] = 'thruster',
-        ['biolab'] = 'lab',
+        'reactor',
+        'furnace',
+        'thruster',
+        'lab',
     },
     ['technology_ingredient_removal'] = {
         -- SPACE_AGE 0
diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index 5450bf6..ab79a07 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -18,8 +18,14 @@ end
 -- GM-VP C 33 BASE ENTITY
 -- GM-VP C 6 ELEVATED_RAILS ENTITY
 -- GM-VP C 14 SPACE_AGE ENTITY
-for k, v in pairs(items['entity_surface_conditions']) do
-    data.raw[v][k].surface_conditions = nil
+if items['entity_surface_conditions'] then
+    for _, v in pairs(items['entity_surface_conditions']) do
+        if data.raw[v] then
+            for _, v2 in pairs(data.raw[v]) do
+                v2.surface_conditions = nil
+            end
+        end
+    end
 end
 
 -- GM-VP C 1 BASE UTILITY_CONSTANTS