From 8bbfa7ea29b663ef5440ddfeaa0a863dc9caa811 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Mon, 17 Jun 2024 20:27:17 +0900 Subject: [PATCH] . --- PHI-CL/config.lua | 2 +- PHI-CL/data.lua | 1 - PHI-CL/main.lua | 25 ++++++++++++++++++------- PHI-CL/settings.lua | 10 +++++----- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index ee5dfaf..1c31226 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -381,7 +381,7 @@ local items = { }, ['electric-filter-furnace'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value, - stage = 1, + stage = 2, type = 'furnace', name = 'electric-filter-furnace', ref_name = 'electric-filter-furnace', diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index e964db9..19542c7 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -231,7 +231,6 @@ if settings.startup['PHI-RS'].value then end end - for k, v in pairs(items['setting']) do for k2=1, #v.effect do if items[v.effect[k2]] ~= nil then diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index 8b5a801..19e7b21 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -373,16 +373,27 @@ end -- fast replace group function main.EL(source) if not data.raw[source.type][source.ref_name].fast_replaceable_group then - data.raw[source.type][source.ref_name].fast_replaceable_group = source.type + data.raw[source.type][source.ref_name].fast_replaceable_group = source.ref_name end - if source.max > 2 then - data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group - end + if (source.max - source.min) > 0 then + for j=source.min, source.max - 1 do + if source.min == 2 then + if source.name == 'electric-filter-furnace' then + data.raw['assembling-machine'][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group - if source.max > source.min then - for j=source.min + 1, source.max do - data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j - 1)].fast_replaceable_group + else + data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group + end + + else + if source.name == 'electric-filter-furnace' then + data.raw['assembling-machine'][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j + 1)].fast_replaceable_group + + else + data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j + 1)].fast_replaceable_group + end + end end end end diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 15585d6..0b6f78b 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -9,31 +9,31 @@ data:extend({ type = 'bool-setting', name = 'PHI-MB', setting_type = 'startup', - default_value = false, + default_value = true, order = 'A2' }, { type = 'bool-setting', name = 'PHI-WE', setting_type = 'startup', - default_value = false, + default_value = true, order = 'A3' }, { type = 'bool-setting', name = 'PHI-EQ', setting_type = 'startup', - default_value = false, + default_value = true, order = 'A4' }, { type = 'bool-setting', name = 'PHI-MI', setting_type = 'startup', - default_value = false, + default_value = true, order = 'A5' }, { type = 'bool-setting', name = 'PHI-RS', setting_type = 'startup', - default_value = false, + default_value = true, order = 'A6' }, { type = 'int-setting',