Fixes: validate min/max in logistic sections, better error messages, restrict non-combinator section editing to items, and allow negative numbers for constant combinators

Author: ahicks92

locale/en/ui-menu.cfg

@@ -132,6 +132,9 @@ logistics-deleted=Request deleted
 logistics-add-request=Add Request
 logistics-request-added=Request added: __1__
 logistics-invalid-number=Invalid number
+logistics-value-cannot-be-negative=Value cannot be negative
+logistics-max-must-be-at-least-min=Max must be at least __1__
+logistics-min-must-be-at-most-max=Min must be at most __1__
 infinity=Infinity
 
 # Logistics overview

scripts/circuit-network.lua

@@ -510,7 +510,7 @@ function mod.constant_combinator_signals_info(entity, pindex)
    for _, signal_info in ipairs(all_signals) do
       msg:list_item()
       msg:fragment(mod.localise_signal(signal_info.signal))
-      if signal_info.count > 0 then
+      if signal_info.count ~= 0 then
          msg:fragment("x")
          msg:fragment(tostring(signal_info.count))
       end

scripts/ui/constant-combinator.lua

@@ -58,7 +58,7 @@ local function render_overview(ctx)
          for _, signal_info in ipairs(all_signals) do
             ctx.message:list_item()
             ctx.message:fragment(CircuitNetwork.localise_signal(signal_info.signal))
-            if signal_info.count > 0 then
+            if signal_info.count ~= 0 then
                ctx.message:fragment("x")
                ctx.message:fragment(tostring(signal_info.count))
             end

scripts/ui/tabs/logistics-section-editor.lua

@@ -43,6 +43,10 @@ local function render_section(ctx, point_index, section_index)
 
    local menu = Menu.MenuBuilder.new()
 
+   -- Detect if this is a constant combinator to determine signal mode
+   local is_combinator = entity.type == "constant-combinator"
+   local signal_mode = is_combinator and "all" or "item"
+
    -- Add rows for each existing filter/request
    for i = 1, section.filters_count do
       local slot = section.get_slot(i)
@@ -70,7 +74,7 @@ local function render_section(ctx, point_index, section_index)
             on_click = function(ctx)
                ctx.controller:open_child_ui(
                   Router.UI_NAMES.SIGNAL_CHOOSER,
-                  {},
+                  { mode = signal_mode },
                   { node = row_key .. "_overview", slot_index = i }
                )
             end,
@@ -110,18 +114,26 @@ local function render_section(ctx, point_index, section_index)
             end,
             on_child_result = function(ctx, result)
                local num = tonumber(result)
-               if num and num >= 0 then
+               if not num then
+                  UiSounds.play_ui_edge(ctx.pindex)
+                  ctx.controller.message:fragment({ "fa.logistics-invalid-number" })
+               elseif not is_combinator and num < 0 then
+                  UiSounds.play_ui_edge(ctx.pindex)
+                  ctx.controller.message:fragment({ "fa.logistics-value-cannot-be-negative" })
+               else
                   local section = provider.get_section(section_index)
                   if not section then return end
 
                   local slot = section.get_slot(i)
-                  slot.min = math.floor(num)
-                  section.set_slot(i, slot)
+                  if slot.max and num > slot.max then
+                     UiSounds.play_ui_edge(ctx.pindex)
+                     ctx.controller.message:fragment({ "fa.logistics-min-must-be-at-most-max", tostring(slot.max) })
+                  else
+                     slot.min = math.floor(num)
+                     section.set_slot(i, slot)
 
-                  ctx.controller.message:fragment(tostring(math.floor(num)))
-               else
-                  UiSounds.play_ui_edge(ctx.pindex)
-                  ctx.controller.message:fragment({ "fa.logistics-invalid-number" })
+                     ctx.controller.message:fragment(tostring(math.floor(num)))
+                  end
                end
             end,
             on_clear = function(ctx)
@@ -167,18 +179,27 @@ local function render_section(ctx, point_index, section_index)
                   ctx.controller.message:fragment({ "fa.infinity" })
                else
                   local num = tonumber(result)
-                  if num and num >= 0 then
+                  if not num then
+                     UiSounds.play_ui_edge(ctx.pindex)
+                     ctx.controller.message:fragment({ "fa.logistics-invalid-number" })
+                  elseif num < 0 then
+                     UiSounds.play_ui_edge(ctx.pindex)
+                     ctx.controller.message:fragment({ "fa.logistics-value-cannot-be-negative" })
+                  else
                      local section = provider.get_section(section_index)
                      if not section then return end
 
                      local slot = section.get_slot(i)
-                     slot.max = math.floor(num)
-                     section.set_slot(i, slot)
-
-                     ctx.controller.message:fragment(tostring(math.floor(num)))
-                  else
-                     UiSounds.play_ui_edge(ctx.pindex)
-                     ctx.controller.message:fragment({ "fa.logistics-invalid-number" })
+                     local min_val = slot.min or 0
+                     if num < min_val then
+                        UiSounds.play_ui_edge(ctx.pindex)
+                        ctx.controller.message:fragment({ "fa.logistics-max-must-be-at-least-min", tostring(min_val) })
+                     else
+                        slot.max = math.floor(num)
+                        section.set_slot(i, slot)
+
+                        ctx.controller.message:fragment(tostring(math.floor(num)))
+                     end
                   end
                end
             end,
@@ -220,7 +241,7 @@ local function render_section(ctx, point_index, section_index)
          ctx.message:fragment({ "fa.logistics-add-request" })
       end,
       on_click = function(ctx)
-         ctx.controller:open_child_ui(Router.UI_NAMES.SIGNAL_CHOOSER, {}, { node = "add_filter" })
+         ctx.controller:open_child_ui(Router.UI_NAMES.SIGNAL_CHOOSER, { mode = signal_mode }, { node = "add_filter" })
       end,
       on_child_result = function(ctx, result)
          if result then

scripts/ui/tabs/signal-chooser.lua

@@ -9,7 +9,18 @@ local mod = {}
 ---@param ctx fa.ui.graph.Ctx
 local function build_signal_tree(ctx)
    local builder = TreeChooser.TreeChooserBuilder.new()
+   local mode = ctx.global_parameters and ctx.global_parameters.mode
 
+   -- If mode is "item" or "fluid", add signals directly to root without category wrapper
+   if mode == "item" then
+      SignalHelpers.add_item_signals(builder, TreeChooser.ROOT, false, nil)
+      return builder:build()
+   elseif mode == "fluid" then
+      SignalHelpers.add_fluid_signals(builder, TreeChooser.ROOT)
+      return builder:build()
+   end
+
+   -- Default mode: show all signal types with categories
    -- Top-level signal type categories
    local signal_types = {
       {