From 230123f528c79d6fe708ed51df7744575557b5f3 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Wed, 1 Jul 2026 18:07:09 +0900 Subject: [PATCH] . --- PHI-CL/data/b/gm-vp-c.lua | 11 +++++ PHI-CL/data/b/gm-vp.lua | 99 ++++++++++++++++++--------------------- PHI-CL/settings.lua | 2 +- 3 files changed, 58 insertions(+), 54 deletions(-) diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua index 3e351fd..4d380f1 100644 --- a/PHI-CL/data/b/gm-vp-c.lua +++ b/PHI-CL/data/b/gm-vp-c.lua @@ -329,6 +329,7 @@ local items = { ['scrap-recycling'] = { energy_required = 5, allow_productivity = true, + allow_decomposition = false, ingredients = {{type = 'item', name = 'scrap', amount = 10}}, results = {{type = 'item', name = 'iron-plate', amount = 3}, {type = 'item', name = 'copper-plate', amount = 3}, {type = 'item', name = 'solid-fuel', amount = 2}, {type = 'item', name = 'ice', amount = 1}, {type = 'item', name = 'holmium-ore', amount = 1}} }, @@ -896,6 +897,9 @@ local items = { prerequisites = {'mining-productivity-2', 'space-science-pack'}, unit_ingredients = {{'automation-science-pack', 1}, {'logistic-science-pack', 1}, {'chemical-science-pack', 1}, {'production-science-pack', 1}, {'utility-science-pack', 1}, {'space-science-pack', 1}} }, + ['rocket-silo'] = { + effects = {{type = 'unlock-recipe', recipe = 'rocket-silo'}, {type = 'unlock-recipe', recipe = 'rocket-part'}, {type = 'unlock-recipe', recipe = 'cargo-landing-pad'}, {type = 'unlock-recipe', recipe = 'cargo-bay'}} + }, -- SPACE_AGE 0 ['processing-unit-productivity'] = { prerequisites = {'electromagnetic-science-pack'}, @@ -1134,6 +1138,13 @@ local items = { ['lithium-processing'] = true, ['stellar-discovery-solar-system-edge'] = true, -- SPACE_AGE 30 + -- QUALITY 0 + ['epic-quality'] = true, + ['legendary-quality'] = true, + ['quality-module'] = true, + ['quality-module-2'] = true, + ['quality-module-3'] = true + -- QUALITY 5 }, } diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index c79699b..b936338 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -18,6 +18,12 @@ for c, _ in pairs(defines.prototypes.entity) do end end +for _, v in pairs(data.raw.recipe) do + v.surface_conditions = nil + v.maximum_productivity = nil + v.auto_recycle = false +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) @@ -31,11 +37,6 @@ for _, v in pairs(data.raw['inserter']) do v.enter_drop_mode_if_held_stack_spoiled = true end --- GM-VP C 1 BASE RESEARCH_EFFECT -if data.raw.technology['rocket-silo'] then - data.raw.technology['rocket-silo'].effects = {{type = 'unlock-recipe', recipe = 'rocket-silo'}, {type = 'unlock-recipe', recipe = 'rocket-part'}, {type = 'unlock-recipe', recipe = 'cargo-landing-pad'}, {type = 'unlock-recipe', recipe = 'cargo-bay'}} -end - -- GM-VP C 1 BASE TOOL if data.raw.item['space-science-pack'] then data.raw.item['space-science-pack'].rocket_launch_products = {{type = 'item', name = 'raw-fish', amount = 1}} @@ -401,9 +402,22 @@ if data.raw['lab'] then end end --- GM-VP C 26 BASE RESEARCH +-- GM-VP H 30 SPACE_AGE RESEARCH +-- GM-VP H 5 QUALITY RESEARCH +if items['technology'] then + for t, _ in pairs(items['technology']) do + if data.raw.technology[t] then + data.raw.technology[t].hidden = true + data.raw.technology[t].hidden_in_factoriopedia = true + data.raw.technology[t].effects = nil + data.raw.technology[t].research_trigger = nil + data.raw.technology[t].unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}} + end + end +end + +-- GM-VP C 27 BASE RESEARCH -- GM-VP C 39 SPACE_AGE RESEARCH --- GM-VP H 29 SPACE_AGE RESEARCH if data.raw.technology and items['technology'] and items['technology_reform'] then for _, v in pairs(data.raw.technology) do if items['technology_reform'][v.name] then @@ -422,13 +436,6 @@ if data.raw.technology and items['technology'] and items['technology_reform'] th 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 end - elseif items['technology'][v.name] then - v.hidden = true - v.hidden_in_factoriopedia = true - v.effects = nil - 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 if data.raw.item[v.unit.ingredients[i][1]].hidden then @@ -450,55 +457,49 @@ if settings.startup['PHI-MB-MACHINE'].value and settings.startup['PHI-MB-MACHINE end -- GM-VP H 1 QUALITY ITEM --- GM-VP H 24 SPACE_AGE ITEM for c, _ in pairs(defines.prototypes.item) do if data.raw[c] then for _, v in pairs(data.raw[c]) do v.auto_recycle = false + end + end +end - if items['item'][v.name] then - v.hidden = true - v.hidden_in_factoriopedia = true - end +-- GM-VP H 24 SPACE_AGE ITEM +if items['item'] then + for i, _ in pairs(items['item']) do + if data.raw.item[i] then + data.raw.item[i].hidden = true + data.raw.item[i].hidden_in_factoriopedia = true end end end -- GM-VP C 17 BASE RECIPE -- GM-VP C 61 SPACE_AGE RECIPE --- GM-VP H 1 QUALITY RECIPE --- GM-VP H 54 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 - for k, _ in pairs(items['recipe_reform'][v.name]) do - v[k] = (items['recipe_reform'][v.name][k] and items['recipe_reform'][v.name][k]) or v[k] +if items['recipe_reform'] then + for r, t in pairs(items['recipe_reform']) do + if data.raw.recipe[r] then + for k, v in pairs(t) do + data.raw.recipe[r][k] = v + end end - - elseif items['recipe'][v.name] then - v.hidden = true - v.hidden_in_factoriopedia = true end end -if data.raw.recipe['scrap-recycling'] then - data.raw.recipe['scrap-recycling'].allow_decomposition = false +-- GM-VP H 54 SPACE_AGE RECIPE +-- GM-VP H 1 QUALITY RECIPE +if items['recipe'] then + for r, _ in pairs(items['recipe']) do + if data.raw.recipe[r] then + data.raw.recipe[r].hidden = true + data.raw.recipe[r].hidden_in_factoriopedia = true + end + end end -- GM-VP C 3 QUALITY MODULE,RECIPE --- GM-VP C 5 QUALITY RESEARCH --- GM-VP H 4 QUALITY QUALITY for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do - if data.raw.technology[v] then - data.raw.technology[v].hidden = true - data.raw.technology[v].hidden_in_factoriopedia = true - data.raw.technology[v].unit.ingredients = {{'space-science-pack', 1}} - data.raw.technology[v].effects = {} - end - if data.raw.module[v] then data.raw.module[v].hidden = true data.raw.module[v].hidden_in_factoriopedia = true @@ -510,15 +511,7 @@ for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do end end -for _, v in pairs({'epic-quality', 'legendary-quality'}) do - if data.raw.technology[v] then - data.raw.technology[v].hidden = true - data.raw.technology[v].hidden_in_factoriopedia = true - data.raw.technology[v].unit = {count = 1000, time = 30, ingredients = {{'automation-science-pack', 1}}} - data.raw.technology[v].effects = {} - end -end - +-- GM-VP H 4 QUALITY QUALITY for _, v in pairs({'uncommon', 'rare', 'epic', 'legendary'}) do if data.raw.quality[v] then data.raw.quality[v].next = nil diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 48da5b2..5f4f995 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -146,7 +146,7 @@ data:extend({ default_value = '', allowed_values = {'', 'SAP', 'VP'}, localised_name = {'phi-cl.setting-category-color', 'GM', {'phi-cl.enable'}, {'mod-setting-name.PHI-GM'}}, - localised_description = {'', {'phi-cl.setting-change-color', '[GM] [50] A20 C23 H7\n[SAP] [31] A3 C28\n[VP] [626] A15 C244 H367'}}, + localised_description = {'', {'phi-cl.setting-change-color', '[GM] [50] A20 C23 H7\n[SAP] [31] A3 C28\n[VP] [626] A16 C238 H372'}}, order = 'D00' }, { type = 'bool-setting',