diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 61d7354..961d75a 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -382,7 +382,7 @@ local items = { ['electric-filter-furnace'] = { enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value, stage = 2, - type = 'furnace', + type = 'assembling-machine', name = 'electric-filter-furnace', ref_name = 'electric-filter-furnace', tech = 'advanced-material-processing-2', diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 19542c7..17fc88d 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -12,7 +12,7 @@ if settings.startup['PHI-RS'].value then item = table.deepcopy(data.raw.item['electric-furnace']) item.name = 'electric-filter-furnace' item.place_result = 'electric-filter-furnace' - item.order = item.order .. 'B' + item.order = item.order .. '2' data:extend({item}) data:extend({{ diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index a663911..36ace8c 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -376,24 +376,32 @@ function main.EL(source) data.raw[source.type][source.ref_name].fast_replaceable_group = source.ref_name end + local min = source.min + local max = source.max + + if (max - min) == 0 then + return + + elseif max > 2 then + min = 2 + end + local base_type = source.type - local base_name = source.ref_name + local base_name = source.ref_name .. '-' local new_type = source.type - local new_name = source.name + local new_name = source.name .. '-' - if (source.max - source.min) > 0 then - for j=source.min + 1, source.max do - if source.name == 'electric-filter-furnace' then - new_type = 'assembling-machine' + for j=min, max, 1 do + if (source.name == 'electric-filter-furnace') and (j == 2) then + if j == 2 then + base_type = 'furnace' + + else + base_type = source.type end - - if source.min > 2 then - new_name = source.name .. '-' .. j - base_name = source.name .. '-' .. (j - 1) - end - - data.raw[new_type][new_name].fast_replaceable_group = data.raw[base_type][base_name].fast_replaceable_group end + + data.raw[base_type][base_name .. (j - 1)].fast_replaceable_group = data.raw[new_type][new_name .. j].fast_replaceable_group end end