diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua index abfb212..3e61a81 100644 --- a/PHI-CL/data/b/gm-vp-c.lua +++ b/PHI-CL/data/b/gm-vp-c.lua @@ -66,6 +66,14 @@ local items = { ['thruster'] = 'thruster', ['biolab'] = 'lab', }, + ['technology_ingredient_removal'] = { + -- SPACE_AGE 0 + ['metallurgic-science-pack'] = true, + ['agricultural-science-pack'] = true, + ['electromagnetic-science-pack'] = true, + ['cryogenic-science-pack'] = true, + ['promethium-science-pack'] = true + }, ['technology_reform'] = { -- BASE 0 ['speed-module-2'] = { diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index ff0482e..74d5cac 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -179,24 +179,6 @@ if data.raw.technology['automation'] and data.raw.technology['automation'].effec table.insert(data.raw.technology['automation'].effects, {type = 'create-ghost-on-entity-death', modifier = true}) end -local lab_ingredient_removal = { - ['metallurgic-science-pack'] = true, - ['agricultural-science-pack'] = true, - ['electromagnetic-science-pack'] = true, - ['cryogenic-science-pack'] = true, - ['promethium-science-pack'] = true, -} - -for _, tech in pairs(data.raw.technology) do - if tech.unit and tech.unit.ingredients then - for i = #tech.unit.ingredients, 1, -1 do - if lab_ingredient_removal[tech.unit.ingredients[i][1]] then - table.remove(tech.unit.ingredients, i) - end - end - end -end - -- GM-VP A 2 SPACE_AGE RESEARCH_EFFECT table.insert(data.raw.technology['fusion-reactor'].effects, {type = 'unlock-recipe', recipe = 'fluoroketone'}) table.insert(data.raw.technology['fusion-reactor'].effects, {type = 'unlock-recipe', recipe = 'fluoroketone-cooling'}) @@ -410,6 +392,16 @@ for _, v in pairs(items['technology']) do end end +for _, tech in pairs(data.raw.technology) do + if tech.unit and tech.unit.ingredients then + for i = #tech.unit.ingredients, 1, -1 do + if items['technology_ingredient_removal'][tech.unit.ingredients[i][1]] then + table.remove(tech.unit.ingredients, i) + end + end + end +end + -- GM-VP C 26 BASE RESEARCH -- GM-VP C 35 SPACE_AGE RESEARCH for k, v in pairs(items['technology_reform']) do