diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index ecbee0c..5cfb747 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -28,6 +28,38 @@ if items['entity_surface_conditions'] then end end +-- GM-VP H 1 QUALITY ITEM +-- GM-VP H 39 SPACE_AGE ITEM +for _, v in pairs(data.raw.item) do + v.auto_recycle = false + + if items['item'][v.name] then + v.hidden = true + v.hidden_in_factoriopedia = true + end +end + +-- GM-VP C 12 BASE RECIPE +-- GM-VP C 39 SPACE_AGE RECIPE +-- GM-VP H 1 QUALITY RECIPE +-- GM-VP H 76 SPACE_AGE RECIPE +for _, v in pairs(data.raw.recipe) do + v.surface_conditions = nil + v.maximum_productivity = nil + v.auto_recycle = false + + if items['recipe_reform'][v.name] then + v.category = (items['recipe_reform'][v.name].category and items['recipe_reform'][v.name].category) or v.category + v.ingredients = (items['recipe_reform'][v.name].ingredients and items['recipe_reform'][v.name].ingredients) or v.ingredients + v.results = (items['recipe_reform'][v.name].results and items['recipe_reform'][v.name].results) or v.results + v.energy_required = (items['recipe_reform'][v.name].energy_required and items['recipe_reform'][v.name].energy_required) or v.energy_required + + elseif items['recipe'][v.name] then + v.hidden = true + v.hidden_in_factoriopedia = true + end +end + -- GM-VP C 1 BASE UTILITY_CONSTANTS data.raw['utility-constants'].default.default_pipeline_extent = math.max(settings.startup['PHI-MI-PIPE-EXTENT'].value, 960) @@ -331,41 +363,6 @@ for _, v in pairs(data.raw['tile']) do end end --- GM-VP H 1 QUALITY ITEM --- GM-VP H 39 SPACE_AGE ITEM -for _, v in pairs(data.raw.item) do - v.auto_recycle = false - - if items['item'][v.name] then - v.hidden = true - v.hidden_in_factoriopedia = true - end -end - --- GM-VP H 1 QUALITY RECIPE --- GM-VP H 76 SPACE_AGE RECIPE -for _, v in pairs(data.raw.recipe) do - v.surface_conditions = nil - v.maximum_productivity = nil - v.auto_recycle = false - - if items['recipe'][v.name] then - v.hidden = true - v.hidden_in_factoriopedia = true - end -end - --- GM-VP C 12 BASE RECIPE --- GM-VP C 39 SPACE_AGE RECIPE -for k, v in pairs(items['recipe_reform']) do - if data.raw.recipe[k] then - data.raw.recipe[k].category = (v.category and v.category) or data.raw.recipe[k].category - data.raw.recipe[k].ingredients = (v.ingredients and v.ingredients) or data.raw.recipe[k].ingredients - data.raw.recipe[k].results = (v.results and v.results) or data.raw.recipe[k].results - data.raw.recipe[k].energy_required = (v.energy_required and v.energy_required) or data.raw.recipe[k].energy_required - end -end - -- GM-VP C 1 SPACE_AGE RECIPE if data.raw.recipe['ice-melting'] then data.raw.recipe['ice-melting'].enabled = true