This commit is contained in:
2024-06-17 20:27:17 +09:00
parent e3697c56b1
commit 8bbfa7ea29
4 changed files with 24 additions and 14 deletions

View File

@@ -381,7 +381,7 @@ local items = {
}, },
['electric-filter-furnace'] = { ['electric-filter-furnace'] = {
enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value, enabled = settings.startup['PHI-MB'].value and settings.startup['PHI-RS'].value,
stage = 1, stage = 2,
type = 'furnace', type = 'furnace',
name = 'electric-filter-furnace', name = 'electric-filter-furnace',
ref_name = 'electric-filter-furnace', ref_name = 'electric-filter-furnace',

View File

@@ -231,7 +231,6 @@ if settings.startup['PHI-RS'].value then
end end
end end
for k, v in pairs(items['setting']) do for k, v in pairs(items['setting']) do
for k2=1, #v.effect do for k2=1, #v.effect do
if items[v.effect[k2]] ~= nil then if items[v.effect[k2]] ~= nil then

View File

@@ -373,16 +373,27 @@ end
-- fast replace group -- fast replace group
function main.EL(source) function main.EL(source)
if not data.raw[source.type][source.ref_name].fast_replaceable_group then 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 end
if source.max > 2 then if (source.max - source.min) > 0 then
data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group for j=source.min, source.max - 1 do
end 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 else
for j=source.min + 1, source.max do data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group
data.raw[source.type][source.name .. '-' .. j].fast_replaceable_group = data.raw[source.type][source.name .. '-' .. (j - 1)].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 end
end end

View File

@@ -9,31 +9,31 @@ data:extend({
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-MB', name = 'PHI-MB',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'A2' order = 'A2'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-WE', name = 'PHI-WE',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'A3' order = 'A3'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-EQ', name = 'PHI-EQ',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'A4' order = 'A4'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-MI', name = 'PHI-MI',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'A5' order = 'A5'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-RS', name = 'PHI-RS',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = true,
order = 'A6' order = 'A6'
}, { }, {
type = 'int-setting', type = 'int-setting',