diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt index e9870a1..b24f038 100644 --- a/PHI-CL/changelog.txt +++ b/PHI-CL/changelog.txt @@ -4,6 +4,7 @@ Date: 2025-05-24 Changes: - [SA] Simplify some of the code logic in calculation. + - [SA] Support for adjusting efficiency module is dropped. --------------------------------------------------------------------------------------------------- Version: 3.0.106 diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 9179df2..9c6f0f7 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -214,12 +214,6 @@ if settings.startup['PHI-MI'].value then v.scale_energy_usage = (v.fast_replaceable_group and v.fast_replaceable_group == 'reactor') end - for _, v in pairs({data.raw['module']['efficiency-module'], data.raw['module']['efficiency-module-2'], data.raw['module']['efficiency-module-3']}) do - for _, v2 in pairs(v.effect) do - v2 = v2 * settings.startup['PHI-MI-EFFCY'].value / 10 - end - end - 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 @@ -573,10 +567,6 @@ if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup data.raw['module']['efficiency-module-2'].effect.consumption = -0.6 data.raw['module']['efficiency-module-3'].effect.consumption = -0.9 - for _, v in pairs({data.raw['module']['efficiency-module'], data.raw['module']['efficiency-module-2'], data.raw['module']['efficiency-module-3']}) do - v.effect.consumption = v.effect.consumption * settings.startup['PHI-MI-EFFCY'].value / 10 - end - data.raw.tile['space-platform-foundation'].max_health = data.raw.tile['space-platform-foundation'].max_health * 2 data.raw.item['space-platform-foundation'].stack_size = 100 diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index e066259..1196590 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -105,13 +105,12 @@ PHI-MB-EQUIPMENT-ARMOR=[color=54,228,255]MBQ2[/color] PHI-MB-EQUIPMENT-SIZE=[color=54,228,255]MBQ3[/color] PHI-MI=[color=255,254,42]MI[/color] -PHI-MI-EFFCY=[color=54,228,255]MI1[/color] -PHI-MI-PIPE=[color=54,228,255]MI2[/color] -PHI-MI-ROBOT=[color=54,228,255]MI3[/color] -PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI4[/color] -PHI-MI-TRAIN=[color=54,228,255]MI5[/color] -PHI-MI-PIPE-EXTENT=[color=54,228,255]MI6[/color] -PHI-MI-ROCKET-CAPACITY=[color=54,228,255]MI7[/color] +PHI-MI-PIPE=[color=54,228,255]MI1[/color] +PHI-MI-ROBOT=[color=54,228,255]MI2[/color] +PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI3[/color] +PHI-MI-TRAIN=[color=54,228,255]MI4[/color] +PHI-MI-PIPE-EXTENT=[color=54,228,255]MI5[/color] +PHI-MI-ROCKET-CAPACITY=[color=54,228,255]MI6[/color] PHI-SA=[color=255,254,42]SA[/color] PHI-SA-SPOIL=[color=54,228,255]SA1[/color] @@ -140,7 +139,6 @@ PHI-MB-EQUIPMENT-ARMOR=Enable armor PHI-MB-EQUIPMENT-SIZE=Small equipment PHI-MI=[color=255,254,42]Miscellaneous change[/color] -PHI-MI-EFFCY=Efficiency module efficiency ratio PHI-MI-PIPE=Pipe efficiency PHI-MI-ROBOT=Robot efficiency PHI-MI-ROBOT-ENERGY=Nuclear fussion robot diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index e06dbcd..514731a 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=アーマーを有効にする PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備 PHI-MI=[color=255,254,42]その他の変更[/color] -PHI-MI-EFFCY=エネルギーモジュール効率マルチプライヤ PHI-MI-PIPE=パイプ効率 PHI-MI-ROBOT=ロボット効率 PHI-MI-ROBOT-ENERGY=核融合ロボット diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 9b5e008..e75deb1 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=啟用護甲 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MI=[color=255,254,42]雜項小變化[/color] -PHI-MI-EFFCY=節能組件效率倍數 PHI-MI-PIPE=水管效率 PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT-ENERGY=核融合無人機 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 9b5e008..e75deb1 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=啟用護甲 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MI=[color=255,254,42]雜項小變化[/color] -PHI-MI-EFFCY=節能組件效率倍數 PHI-MI-PIPE=水管效率 PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT-ENERGY=核融合無人機 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index b360040..20b489d 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -80,15 +80,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-EFFCY', - setting_type = 'startup', - default_value = 10, - 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 = 'B01' }, { type = 'int-setting', name = 'PHI-MI-PIPE', @@ -97,7 +88,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 = 'B02' + order = 'B01' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', @@ -106,14 +97,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 = 'B03' + order = 'B02' }, { 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 = 'B04' + order = 'B03' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', @@ -122,7 +113,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 = 'B05' + order = 'B04' }, { type = 'int-setting', name = 'PHI-MI-PIPE-EXTENT', @@ -131,7 +122,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 = 'B06' + order = 'B05' }, { type = 'int-setting', name = 'PHI-MI-ROCKET-CAPACITY', @@ -140,7 +131,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 = 'B07' + order = 'B06' }, { type = 'bool-setting', name = 'PHI-SA',