From cfa1ceaff1731aa00a4e53c8b9ffe1c1fde15211 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Wed, 21 May 2025 18:24:35 +0900 Subject: [PATCH] . --- PHI-CL/changelog.txt | 1 + PHI-CL/data-updates.lua | 2 +- PHI-CL/data.lua | 4 ++-- PHI-CL/settings.lua | 23 +++++++---------------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index cf9b988..f027645 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -4,6 +4,7 @@ Date: 2025-05-24 Changes: - [SA] Some code clean up. + - [MI] Dropped support for the setting of the landfill, instead use min comparsion, comparing to 20. --------------------------------------------------------------------------------------------------- Version: 3.0.104 diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 88ce3bb..fe5897d 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -70,7 +70,7 @@ if mods['space-exploration'] and settings.startup['PHI-MB'].value and settings.s end if settings.startup['PHI-MB-EQUIPMENT'].value and settings.startup['PHI-MB-EQUIPMENT-SIZE'].value then - for _, e in pairs({'night-vision-equipment','energy-shield-equipment', 'battery-equipment', 'solar-panel-equipment', 'generator-equipment','active-defense-equipment', 'movement-bonus-equipment', 'roboport-equipment', 'belt-immunity-equipment'}) do + for _, e in pairs({'night-vision-equipment','energy-shield-equipment', 'battery-equipment', 'solar-panel-equipment', 'generator-equipment','active-defense-equipment', 'movement-bonus-equipment', 'roboport-equipment', 'belt-immunity-equipment', 'inventory-bonus-equipment'}) do if data.raw[e] then for _, v in pairs(data.raw[e]) do v.shape = {width = 1, height = 1, type = 'full', points = {{0, 0}}} diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 2b1820d..d9d2b04 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -215,7 +215,7 @@ if settings.startup['PHI-MI'].value then end end - data.raw.recipe['landfill'].ingredients = {{type = 'item', name = 'stone', amount = tonumber(settings.startup['PHI-MI-LANDFILL'].value) or 20}} + data.raw.recipe['landfill'].ingredients[1].amount = math.min(20, data.raw.recipe['landfill'].ingredients[1].amount) if settings.startup['PHI-MI-PIPE'].value then local s = settings.startup['PHI-MI-PIPE'].value / 10 @@ -914,7 +914,7 @@ if settings.startup['PHI-VP'].value then data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.tile.settings[v] = nil end - data.raw.recipe['landfill'].ingredients = {{type = 'item', name = 'stone', amount = math.min(20, tonumber(settings.startup['PHI-MI-LANDFILL'].value) or 20)}} + data.raw.recipe['landfill'].ingredients[1].amount = math.min(20, data.raw.recipe['landfill'].ingredients[1].amount) for k, v in pairs(items['space-age']['PHI-VP']['technology_reform']) do if v.prerequisites then diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index f58d83d..4b7a0e3 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -103,15 +103,6 @@ data:extend({ default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI'}, {'mod-setting-name.PHI-MI'}}, order = 'B00' -}, { - type = 'int-setting', - name = 'PHI-MI-LANDFILL', - setting_type = 'startup', - default_value = 20, - minimum_value = 1, - maximum_value = 1000, - localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-LANDFILL'}, {'mod-setting-name.PHI-MI-LANDFILL'}}, - order = 'B01' }, { type = 'int-setting', name = 'PHI-MI-EFFCY', @@ -120,7 +111,7 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-EFFCY'}, {'mod-setting-name.PHI-MI-EFFCY'}}, - order = 'B02' + order = 'B01' }, { type = 'int-setting', name = 'PHI-MI-PIPE', @@ -129,7 +120,7 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE'}, {'mod-setting-name.PHI-MI-PIPE'}}, - order = 'B03' + order = 'B02' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', @@ -138,14 +129,14 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT'}, {'mod-setting-name.PHI-MI-ROBOT'}}, - order = 'B04' + order = 'B03' }, { type = 'bool-setting', name = 'PHI-MI-ROBOT-ENERGY', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT-ENERGY'}, {'mod-setting-name.PHI-MI-ROBOT-ENERGY'}}, - order = 'B05' + order = 'B04' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', @@ -154,7 +145,7 @@ data:extend({ minimum_value = 1, maximum_value = 1000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-TRAIN'}, {'mod-setting-name.PHI-MI-TRAIN'}}, - order = 'B06' + order = 'B05' }, { type = 'int-setting', name = 'PHI-MI-PIPE-EXTENT', @@ -163,7 +154,7 @@ data:extend({ minimum_value = 80, maximum_value = 10240, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}}, - order = 'B07' + order = 'B06' }, { type = 'int-setting', name = 'PHI-MI-ROCKET-CAPACITY', @@ -172,7 +163,7 @@ data:extend({ minimum_value = 1, maximum_value = 10000, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-MI-ROCKET-CAPACITY'}}, - order = 'B08' + order = 'B07' }, { type = 'bool-setting', name = 'PHI-SA',