This commit is contained in:
2025-05-23 03:04:11 +09:00
parent 9dce3d99e4
commit 8ba8b40543
7 changed files with 13 additions and 36 deletions

View File

@@ -4,6 +4,7 @@ Date: 2025-05-24
Changes: Changes:
- [SA] Simplify some of the code logic in calculation. - [SA] Simplify some of the code logic in calculation.
- [SA] Support for adjusting efficiency module is dropped.
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 3.0.106 Version: 3.0.106

View File

@@ -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') v.scale_energy_usage = (v.fast_replaceable_group and v.fast_replaceable_group == 'reactor')
end 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) 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 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-2'].effect.consumption = -0.6
data.raw['module']['efficiency-module-3'].effect.consumption = -0.9 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.tile['space-platform-foundation'].max_health = data.raw.tile['space-platform-foundation'].max_health * 2
data.raw.item['space-platform-foundation'].stack_size = 100 data.raw.item['space-platform-foundation'].stack_size = 100

View File

@@ -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-MB-EQUIPMENT-SIZE=[color=54,228,255]MBQ3[/color]
PHI-MI=[color=255,254,42]MI[/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]MI1[/color]
PHI-MI-PIPE=[color=54,228,255]MI2[/color] PHI-MI-ROBOT=[color=54,228,255]MI2[/color]
PHI-MI-ROBOT=[color=54,228,255]MI3[/color] PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI3[/color]
PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI4[/color] PHI-MI-TRAIN=[color=54,228,255]MI4[/color]
PHI-MI-TRAIN=[color=54,228,255]MI5[/color] PHI-MI-PIPE-EXTENT=[color=54,228,255]MI5[/color]
PHI-MI-PIPE-EXTENT=[color=54,228,255]MI6[/color] PHI-MI-ROCKET-CAPACITY=[color=54,228,255]MI6[/color]
PHI-MI-ROCKET-CAPACITY=[color=54,228,255]MI7[/color]
PHI-SA=[color=255,254,42]SA[/color] PHI-SA=[color=255,254,42]SA[/color]
PHI-SA-SPOIL=[color=54,228,255]SA1[/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-MB-EQUIPMENT-SIZE=Small equipment
PHI-MI=[color=255,254,42]Miscellaneous change[/color] PHI-MI=[color=255,254,42]Miscellaneous change[/color]
PHI-MI-EFFCY=Efficiency module efficiency ratio
PHI-MI-PIPE=Pipe efficiency PHI-MI-PIPE=Pipe efficiency
PHI-MI-ROBOT=Robot efficiency PHI-MI-ROBOT=Robot efficiency
PHI-MI-ROBOT-ENERGY=Nuclear fussion robot PHI-MI-ROBOT-ENERGY=Nuclear fussion robot

View File

@@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=アーマーを有効にする
PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備 PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備
PHI-MI=[color=255,254,42]その他の変更[/color] PHI-MI=[color=255,254,42]その他の変更[/color]
PHI-MI-EFFCY=エネルギーモジュール効率マルチプライヤ
PHI-MI-PIPE=パイプ効率 PHI-MI-PIPE=パイプ効率
PHI-MI-ROBOT=ロボット効率 PHI-MI-ROBOT=ロボット効率
PHI-MI-ROBOT-ENERGY=核融合ロボット PHI-MI-ROBOT-ENERGY=核融合ロボット

View File

@@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=啟用護甲
PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
PHI-MI=[color=255,254,42]雜項小變化[/color] PHI-MI=[color=255,254,42]雜項小變化[/color]
PHI-MI-EFFCY=節能組件效率倍數
PHI-MI-PIPE=水管效率 PHI-MI-PIPE=水管效率
PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT=無人機效率
PHI-MI-ROBOT-ENERGY=核融合無人機 PHI-MI-ROBOT-ENERGY=核融合無人機

View File

@@ -105,7 +105,6 @@ PHI-MB-EQUIPMENT-ARMOR=啟用護甲
PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
PHI-MI=[color=255,254,42]雜項小變化[/color] PHI-MI=[color=255,254,42]雜項小變化[/color]
PHI-MI-EFFCY=節能組件效率倍數
PHI-MI-PIPE=水管效率 PHI-MI-PIPE=水管效率
PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT=無人機效率
PHI-MI-ROBOT-ENERGY=核融合無人機 PHI-MI-ROBOT-ENERGY=核融合無人機

View File

@@ -80,15 +80,6 @@ data:extend({
default_value = false, default_value = false,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI'}, {'mod-setting-name.PHI-MI'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI'}, {'mod-setting-name.PHI-MI'}},
order = 'B00' 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', type = 'int-setting',
name = 'PHI-MI-PIPE', name = 'PHI-MI-PIPE',
@@ -97,7 +88,7 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 1000, maximum_value = 1000,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE'}, {'mod-setting-name.PHI-MI-PIPE'}}, 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', type = 'int-setting',
name = 'PHI-MI-ROBOT', name = 'PHI-MI-ROBOT',
@@ -106,14 +97,14 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 1000, maximum_value = 1000,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT'}, {'mod-setting-name.PHI-MI-ROBOT'}}, 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', type = 'bool-setting',
name = 'PHI-MI-ROBOT-ENERGY', name = 'PHI-MI-ROBOT-ENERGY',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = false,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROBOT-ENERGY'}, {'mod-setting-name.PHI-MI-ROBOT-ENERGY'}}, 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', type = 'int-setting',
name = 'PHI-MI-TRAIN', name = 'PHI-MI-TRAIN',
@@ -122,7 +113,7 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 1000, maximum_value = 1000,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-TRAIN'}, {'mod-setting-name.PHI-MI-TRAIN'}}, 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', type = 'int-setting',
name = 'PHI-MI-PIPE-EXTENT', name = 'PHI-MI-PIPE-EXTENT',
@@ -131,7 +122,7 @@ data:extend({
minimum_value = 80, minimum_value = 80,
maximum_value = 10240, maximum_value = 10240,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}}, 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', type = 'int-setting',
name = 'PHI-MI-ROCKET-CAPACITY', name = 'PHI-MI-ROCKET-CAPACITY',
@@ -140,7 +131,7 @@ data:extend({
minimum_value = 1, minimum_value = 1,
maximum_value = 10000, maximum_value = 10000,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-MI-ROCKET-CAPACITY'}}, 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', type = 'bool-setting',
name = 'PHI-SA', name = 'PHI-SA',