diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index b5c5f13..4bf4c27 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -42,10 +42,19 @@ local function gui_create(player) player.gui.relative.phi_cl_inserter_config.destroy() end + if player.gui.relative.phi_cl_combinator_config then + player.gui.relative.phi_cl_combinator_config.destroy() + end + do local frame = player.gui.relative.add({type = 'frame', name = 'phi_cl_inserter_config', anchor = {gui = defines.relative_gui_type.inserter_gui, position = defines.relative_gui_position.right}}) frame.add({type = 'drop-down', name = 'i_sub_direction', items = {'[virtual-signal=signal-0]', '[virtual-signal=signal-1]', '[virtual-signal=signal-2]', '[virtual-signal=signal-3]'}, selected_index = 1}) end + + do + local frame = player.gui.relative.add({type = 'frame', name = 'phi_cl_combinator_config', anchor = {gui = defines.relative_gui_type.constant_combinator_gui, position = defines.relative_gui_position.right}}) + -- frame.add({type = 'drop-down', name = 'i_sub_direction', items = {'[virtual-signal=signal-0]', '[virtual-signal=signal-1]', '[virtual-signal=signal-2]', '[virtual-signal=signal-3]'}, selected_index = 1}) + end end local function gui_update(player, entity) diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 6020b71..f2c0008 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -311,11 +311,28 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu name = item.name, energy_required = 2, enabled = true, - ingredients = {{type = 'item', name = 'electronic-circuit', amount = 5}, {type = 'item', name = 'copper-wire', amount = 5}}, + ingredients = {{type = 'item', name = 'electronic-circuit', amount = 5}, {type = 'item', name = 'copper-cable', amount = 5}}, results = {{type = 'item', name = item.name, amount = 1}}, main_product = item.name, localised_name = {'', {'name.super-entity'}, {'entity-name.constant-combinator'}} }}) + + local s = {} + + for _, v in pairs(data.raw['technology']) do + if v.max_level and v.max_level == 'infinite' then + table.insert(s, { + type = 'virtual-signal', + name = 'signal-' .. v.name, + icon = (v.icon and v.icon) or (v.icons and v.icons[1]), + subgroup = 'pictographs', + order = 'z[tech]-[' .. v.name .. ']', + localised_name = {'technology-name.' .. v.name} + }) + end + end + + data:extend(s) end for _, v in pairs(data.raw['inserter']) do