diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua index 3ba6a07..69580a0 100644 --- a/PHI-CL/data/b/gm-vp-c.lua +++ b/PHI-CL/data/b/gm-vp-c.lua @@ -621,7 +621,7 @@ local items = { effect = {'concrete', 'concrete-from-molten-iron', 'refined-concrete', 'landfill'} }, ['automation'] = { - prerequisites = {'logistics-2'}, + prerequisites = {}, ingredients = {'metallurgic-science-pack', 'electromagnetic-science-pack'}, effect = {'pipe', 'casting-pipe', 'iron-gear-wheel', 'casting-iron-gear-wheel', 'barrel'} }, diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index 23ceb60..f4701df 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -387,30 +387,26 @@ if data.raw.technology and items['technology'] and items['technology_reform'] th for _, v in pairs(data.raw.technology) do if items['technology_reform'][v.name] then v.prerequisites = (items['technology_reform'][v.name].prerequisites and items['technology_reform'][v.name].prerequisites) or v.prerequisites - v.unit = (items['technology_reform'][v.name].unit and items['technology_reform'][v.name].unit) or v.unit v.effects = (items['technology_reform'][v.name].effects and items['technology_reform'][v.name].effects) or v.effects + v.max_level = (items['technology_reform'][v.name].max_level and items['technology_reform'][v.name].max_level) or v.max_level + + if items['technology_reform'][v.name].unit then + v.unit = items['technology_reform'][v.name].unit + end if v.unit then v.research_trigger = nil v.unit.ingredients = (items['technology_reform'][v.name].unit_ingredients and items['technology_reform'][v.name].unit_ingredients) or v.unit.ingredients v.unit.count = (items['technology_reform'][v.name].unit_count and items['technology_reform'][v.name].unit_count) or v.unit.count v.unit.count_formula = (items['technology_reform'][v.name].unit_count_formula and items['technology_reform'][v.name].unit_count_formula) or v.unit.count_formula - v.max_level = (items['technology_reform'][v.name].max_level and items['technology_reform'][v.name].max_level) or v.max_level end elseif items['technology'][v.name] then v.hidden = true v.hidden_in_factoriopedia = true v.effects = nil - - if v.research_trigger then - v.research_trigger = nil - v.unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}} - end - - if v.unit and v.unit.ingredients then - v.unit.ingredients = {{'space-science-pack', 1}} - end + v.research_trigger = nil + v.unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}} elseif v.unit and v.unit.ingredients then for i = #v.unit.ingredients, 1, -1 do