.

PHI-CL/data/b/gm-vp-c.lua

@@ -58,11 +58,6 @@ local items = {
         'thruster',
         'lab',
     },
-    ['technology_ingredient_removal'] = {
-        -- SPACE_AGE 0
-        ['agricultural-science-pack'] = true,
-        ['promethium-science-pack'] = true
-    },
     ['technology_reform'] = {
         -- BASE 0
         ['speed-module-2'] = {
@@ -320,6 +315,51 @@ local items = {
             effects = {{type = 'unlock-recipe', recipe = 'cryogenic-science-pack'}}
         },
     },
+    ['technology'] = {
+        -- SPACE_AGE 0
+        ['planet-discovery-vulcanus'] = true,
+        ['planet-discovery-gleba'] = true,
+        ['planet-discovery-fulgora'] = true,
+        ['planet-discovery-aquilo'] = true,
+        ['recycling'] = true,
+        -- SPACE_AGE 5
+        ['lightning-collector'] = true,
+        ['tungsten-carbide'] = true,
+        ['tungsten-steel'] = true,
+        ['yumako'] = true,
+        ['jellynut'] = true,
+        -- SPACE_AGE 10
+        ['bioflux'] = true,
+        ['artificial-soil'] = true,
+        ['overgrowth-soil'] = true,
+        ['bacteria-cultivation'] = true,
+        ['bioflux-processing'] = true,
+        -- SPACE_AGE 15
+        ['agricultural-science-pack'] = true,
+        ['captivity'] = true,
+        ['biter-egg-handling'] = true,
+        ['carbon-fiber'] = true,
+        ['fish-breeding'] = true,
+        -- SPACE_AGE 20
+        ['holmium-processing'] = true,
+        ['rail-support-foundations'] = true,
+        ['lithium-processing'] = true,
+        ['quantum-processor'] = true,
+        ['captive-biter-spawner'] = true,
+        -- SPACE_AGE 25
+        ['promethium-science-pack'] = true,
+        ['foundation'] = true,
+        ['scrap-recycling-productivity'] = true,
+        ['biochamber'] = true,
+        ['space-platform-thruster'] = true,
+        -- SPACE_AGE 30
+        ['space-platform'] = true,
+        ['asteroid-reprocessing'] = true,
+        ['advanced-asteroid-processing'] = true,
+        ['asteroid-productivity'] = true,
+        ['calcite-processing'] = true,
+        -- SPACE_AGE 35
+    },
     ['recipe_reform'] = {
         -- BASE 0
         ['stack-inserter'] = {
@@ -538,51 +578,6 @@ local items = {
         ['space-platform'] = true,
         ['spoilables'] = true
     },
-    ['technology'] = {
-        -- SPACE_AGE 0
-        ['planet-discovery-vulcanus'] = true,
-        ['planet-discovery-gleba'] = true,
-        ['planet-discovery-fulgora'] = true,
-        ['planet-discovery-aquilo'] = true,
-        ['recycling'] = true,
-        -- SPACE_AGE 5
-        ['lightning-collector'] = true,
-        ['tungsten-carbide'] = true,
-        ['tungsten-steel'] = true,
-        ['yumako'] = true,
-        ['jellynut'] = true,
-        -- SPACE_AGE 10
-        ['bioflux'] = true,
-        ['artificial-soil'] = true,
-        ['overgrowth-soil'] = true,
-        ['bacteria-cultivation'] = true,
-        ['bioflux-processing'] = true,
-        -- SPACE_AGE 15
-        ['agricultural-science-pack'] = true,
-        ['captivity'] = true,
-        ['biter-egg-handling'] = true,
-        ['carbon-fiber'] = true,
-        ['fish-breeding'] = true,
-        -- SPACE_AGE 20
-        ['holmium-processing'] = true,
-        ['rail-support-foundations'] = true,
-        ['lithium-processing'] = true,
-        ['quantum-processor'] = true,
-        ['captive-biter-spawner'] = true,
-        -- SPACE_AGE 25
-        ['promethium-science-pack'] = true,
-        ['foundation'] = true,
-        ['scrap-recycling-productivity'] = true,
-        ['biochamber'] = true,
-        ['space-platform-thruster'] = true,
-        -- SPACE_AGE 30
-        ['space-platform'] = true,
-        ['asteroid-reprocessing'] = true,
-        ['advanced-asteroid-processing'] = true,
-        ['asteroid-productivity'] = true,
-        ['calcite-processing'] = true,
-        -- SPACE_AGE 35
-    },
     ['achievement'] = {
         -- SPACE_AGE 0
         ['logistic-network-embargo'] = 'dont-build-entity-achievement',

PHI-CL/data/b/gm-vp.lua

@@ -262,13 +262,6 @@ if data.raw['lab'] and data.raw['lab']['biolab'] then
     data.raw['lab']['biolab'].energy_source.emissions_per_minute = nil
 end
 
--- GM-VP C 1 BASE ENTITY
--- GM-VP C 1 SPACE_AGE ENTITY
-if data.raw['lab'] then
-    for _, v in pairs(data.raw['lab']) do
-        v.inputs = {'automation-science-pack', 'logistic-science-pack', 'military-science-pack', 'chemical-science-pack', 'production-science-pack', 'utility-science-pack', 'metallurgic-science-pack', 'electromagnetic-science-pack', 'cryogenic-science-pack', 'space-science-pack'}
-    end
-end
 
 -- GM-VP C 1 SPACE_AGE ENTITY
 if data.raw['electric-turret'] and data.raw['electric-turret']['tesla-turret'] then
@@ -398,6 +391,20 @@ if data.raw.item['ice'] then
     }})
 end
 
+-- GM-VP C 1 BASE ENTITY
+-- GM-VP C 1 SPACE_AGE ENTITY
+if data.raw['lab'] then
+    for _, v in pairs(data.raw['lab']) do
+        v.inputs = {}
+
+        for _, v2 in pairs(data.raw['tool']) do
+            if not v2.hidden then
+                table.insert(v.inputs, v2.name)
+            end
+        end
+    end
+end
+
 -- GM-VP C 26 BASE RESEARCH
 -- GM-VP C 32 SPACE_AGE RESEARCH
 -- GM-VP H 35 SPACE_AGE RESEARCH
@@ -430,7 +437,7 @@ if data.raw.technology and items['technology'] and items['technology_reform'] th
 
         elseif v.unit and v.unit.ingredients then
             for i = #v.unit.ingredients, 1, -1 do
-                if items['technology_ingredient_removal'][v.unit.ingredients[i][1]] then
+                if data.raw['tool'][v.unit.ingredients[i][1]].hidden then
                     table.remove(v.unit.ingredients, i)
                 end
             end