diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index 82af0d3..00b79cb 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -110,7 +110,27 @@ local function gui_update(player, entity) end local function gui_press(event, player) - if event.element.anchor then + if event.element.anchor and event.element.entity and event.element.entity.name == 'decider-combinator' then + if event.element.entity.parameters and event.element.entity.parameters.conditions then + + end + + if event.element.name == 'label_decider_action_button_zoom_in' then + + end + + if event.element.entity.parameters.conditions.first_signal then + event.element.parent.parent['table_decider_signal_start']['label_decider_signal_start_first'].caption = '[' .. event.element.entity.parameters.conditions.first_signal.type .. '=' .. event.element.entity.parameters.conditions.first_signal.name .. ']' + end + + if event.element.entity.parameters.conditions.comparator then + event.element.parent.parent['table_decider_signal_start']['label_decider_signal_start_comparator'].caption = event.element.entity.parameters.conditions.comparator + end + + if event.element.entity.parameters.conditions.second_signal then + event.element.parent.parent['table_decider_signal_start']['label_decider_signal_start_second'].caption = '[' .. event.element.entity.parameters.conditions.second_signal.type .. '=' .. event.element.entity.parameters.conditions.second_signal.name .. ']' + end + --[[ label_decider_action_button_zoom_in label_decider_action_button_zoom_out diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 911851f..52a027f 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -115,10 +115,7 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu data.raw.recipe['landfill'].ingredients[1].amount = math.min(20, data.raw.recipe['landfill'].ingredients[1].amount) data.raw['inserter']['burner-inserter'].allow_burner_leech = true data.raw['character']['character']['mining_categories'] = {'basic-solid', 'hard-solid'} - - for _, t in pairs({'arithmetic-combinator', 'decider-combinator', 'programmable-speaker', 'selector-combinator'}) do - data.raw[t][t].energy_source.usage_priority = 'primary-input' - end + data.raw['programmable-speaker']['programmable-speaker'].energy_source.usage_priority = 'primary-input' for _, v in pairs(data.raw['container']) do v.inventory_type = 'with_filters_and_bar'