diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 24e2fc0..15ebb2d 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -111,7 +111,7 @@ if settings.startup['PHI-MB-EQUIPMENT'].value and settings.startup['PHI-MB-EQUIP end end -if settings.startup['PHI-MI'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then +if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].value) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then data.raw.recipe['landfill'].ingredients[1].amount = math.min(20, data.raw.recipe['landfill'].ingredients[1].amount) for _, t in pairs({'arithmetic-combinator', 'decider-combinator', 'programmable-speaker', 'selector-combinator'}) do diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index dd52c82..43a9cf3 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -58,11 +58,12 @@ PHI-MB-EQUIPMENT-ARMOR=MBQ2 PHI-MB-EQUIPMENT-SIZE=MBQ3 PHI-MI=MI -PHI-MI-PIPE=MI1 -PHI-MI-ROBOT=MI2 -PHI-MI-ROBOT-ENERGY=MI3 -PHI-MI-TRAIN=MI4 -PHI-MI-PIPE-EXTENT=MI5 +PHI-MI-GENERIC=MI1 +PHI-MI-PIPE=MI2 +PHI-MI-ROBOT=MI3 +PHI-MI-ROBOT-ENERGY=MI4 +PHI-MI-TRAIN=MI5 +PHI-MI-PIPE-EXTENT=MI6 PHI-SA=SA PHI-SA-SPOIL=SA1 @@ -91,6 +92,7 @@ PHI-MB-EQUIPMENT-ARMOR=Extra armor tier PHI-MB-EQUIPMENT-SIZE=Small equipment PHI-MI=Miscellaneous Item +PHI-MI-GENERIC=Generic 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 86a3786..d1c7567 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -53,6 +53,7 @@ PHI-MB-EQUIPMENT-ARMOR=追加アーマーの最高等級 PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備 PHI-MI=その他の変更 +PHI-MI-GENERIC=ジェネリック 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 64ccbda..48772f4 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -53,6 +53,7 @@ PHI-MB-EQUIPMENT-ARMOR=額外的護甲等級 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MI=雜項小變化 +PHI-MI-GENERIC=通用優化 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 64ccbda..48772f4 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -53,6 +53,7 @@ PHI-MB-EQUIPMENT-ARMOR=額外的護甲等級 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備 PHI-MI=雜項小變化 +PHI-MI-GENERIC=通用優化 PHI-MI-PIPE=水管效率 PHI-MI-ROBOT=無人機效率 PHI-MI-ROBOT-ENERGY=核融合無人機 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 522ef67..2eb24a4 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -80,6 +80,13 @@ data:extend({ default_value = false, localised_name = {'phi-cl.setting-category-color', {'mod-setting-name-prefix.PHI-MI'}, {'phi-cl.enable', {'mod-setting-name.PHI-MI'}}}, order = 'B00' +}, { + type = 'bool-setting', + name = 'PHI-MI-GENERIC', + setting_type = 'startup', + default_value = false, + localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-GENERIC'}, {'phi-cl.enable', {'mod-setting-name.PHI-MI-GENERIC'}}}, + order = 'B01' }, { type = 'int-setting', name = 'PHI-MI-PIPE', @@ -88,7 +95,7 @@ data:extend({ minimum_value = 1, maximum_value = 160, localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-PIPE'}, {'phi-cl.proportion', {'mod-setting-name.PHI-MI-PIPE'}}}, - order = 'B01' + order = 'B02' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', @@ -97,14 +104,14 @@ data:extend({ minimum_value = 1, maximum_value = 160, localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-ROBOT'}, {'phi-cl.proportion', {'mod-setting-name.PHI-MI-ROBOT'}}}, - order = 'B02' + order = 'B03' }, { type = 'bool-setting', name = 'PHI-MI-ROBOT-ENERGY', setting_type = 'startup', default_value = false, localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-ROBOT-ENERGY'}, {'phi-cl.enable', {'mod-setting-name.PHI-MI-ROBOT-ENERGY'}}}, - order = 'B03' + order = 'B04' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', @@ -113,7 +120,7 @@ data:extend({ minimum_value = 1, maximum_value = 160, localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-TRAIN'}, {'phi-cl.proportion', {'mod-setting-name.PHI-MI-TRAIN'}}}, - order = 'B04' + order = 'B05' }, { type = 'int-setting', name = 'PHI-MI-PIPE-EXTENT', @@ -122,7 +129,7 @@ data:extend({ minimum_value = 80, maximum_value = 10240, localised_name = {'phi-cl.setting-class-color', {'mod-setting-name-prefix.PHI-MI-PIPE-EXTENT'}, {'mod-setting-name.PHI-MI-PIPE-EXTENT'}}, - order = 'B05' + order = 'B06' }, { type = 'bool-setting', name = 'PHI-SA',