Version: 1.18.2

Date: 2023-01-05
  Bugfixes:
    - skip over not existing position signals with error message instead of crashing

Author: Optera

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.18.2
+Date: 2023-01-05
+  Bugfixes:
+    - skip over not existing position signals with error message instead of crashing outright
+---------------------------------------------------------------------------------------------------
 Version: 1.18.1
 Date: 2022-12-13
   Bugfixes:

data-final-fixes.lua

@@ -8,64 +8,41 @@ local flib = require('__flib__.data-util')
 
 local icon_encoded_position = { { icon = "__LogisticTrainNetwork__/graphics/icons/encoded-position.png", icon_size = 64, tint = {r=1, g=1, b=1, a=1} } }
 
-local lococount = 0
-for _, loco in pairs(data.raw["locomotive"]) do
-  lococount=lococount+1
+local function create_signal(prototype, order)
   local signal = {
     type = "virtual-signal",
-    name = "ltn-position-"..loco.name,
-    icons = flib.create_icons(loco, icon_encoded_position) or icon_encoded_position,
+    name = "ltn-position-"..prototype.name,
+    icons = flib.create_icons(prototype, icon_encoded_position) or icon_encoded_position,
     icon_size = nil,
     subgroup = "ltn-position-signal",
-    order = "a"..string.format("%02d", lococount),
-    localised_name = {"virtual-signal-name.ltn-position", loco.localised_name or {"entity-name." .. loco.name}}
+    order = order,
+    localised_name = {"virtual-signal-name.ltn-position", prototype.localised_name or {"entity-name." .. prototype.name}}
   }
   data:extend({signal})
 end
 
+local lococount = 0
+for _, loco in pairs(data.raw["locomotive"]) do
+  lococount=lococount+1
+  create_signal(loco, "a"..string.format("%02d", lococount))
+end
+
 local wagoncount = 0
 for _, wagon in pairs(data.raw["cargo-wagon"]) do
   wagoncount=wagoncount+1
-  local signal = {
-    type = "virtual-signal",
-    name = "ltn-position-"..wagon.name,
-    icons = flib.create_icons(wagon, icon_encoded_position) or icon_encoded_position,
-    icon_size = nil,
-    subgroup = "ltn-position-signal",
-    order = "b"..string.format("%02d", wagoncount),
-    localised_name = {"virtual-signal-name.ltn-position", wagon.localised_name or {"entity-name." .. wagon.name}}
-  }
-  data:extend({signal})
+  create_signal(wagon, "b"..string.format("%02d", wagoncount))
 end
 
 local wagoncount_fluid = 0
 for _, wagon in pairs(data.raw["fluid-wagon"]) do
   wagoncount_fluid=wagoncount_fluid+1
-  local signal = {
-    type = "virtual-signal",
-    name = "ltn-position-"..wagon.name,
-    icons = flib.create_icons(wagon, icon_encoded_position) or icon_encoded_position,
-    icon_size = nil,
-    subgroup = "ltn-position-signal",
-    order = "c"..string.format("%02d", wagoncount_fluid),
-    localised_name = {"virtual-signal-name.ltn-position", wagon.localised_name or {"entity-name." .. wagon.name}}
-  }
-  data:extend({signal})
+  create_signal(wagon, "c"..string.format("%02d", wagoncount_fluid))
 end
 
 local wagoncount_artillery = 0
 for _, wagon in pairs(data.raw["artillery-wagon"]) do
   wagoncount_artillery=wagoncount_artillery+1
-  local signal = {
-    type = "virtual-signal",
-    name = "ltn-position-"..wagon.name,
-    icons = flib.create_icons(wagon, icon_encoded_position) or icon_encoded_position,
-    icon_size = nil,
-    subgroup = "ltn-position-signal",
-    order = "d"..string.format("%02d", wagoncount_artillery),
-    localised_name = {"virtual-signal-name.ltn-position", wagon.localised_name or {"entity-name." .. wagon.name}}
-  }
-  data:extend({signal})
+  create_signal(wagon, "d"..string.format("%02d", wagoncount_artillery))
 end
 
 -- sum items, fluids and train composition signals for number of slots required in stop output
@@ -85,5 +62,4 @@ for type, type_data in pairs(data.raw) do
 end
 
 data.raw["constant-combinator"]["logistic-train-stop-output"].item_slot_count = 4 + lococount + wagoncount + wagoncount_fluid + wagoncount_artillery + itemcount + fluidcount
-log("[LTN] found "..tostring(itemcount).." items, "..tostring(fluidcount).." fluids, "..tostring(lococount).." locomotives, "..tostring(wagoncount + wagoncount_fluid + wagoncount_artillery).." wagons")
-
+log(string.format("[LTN] found %d items, %d fluids, %d locomotives, %d cargo wagons, %d fluid wagons, %d artillery wagons.", itemcount, fluidcount, lococount, wagoncount, wagoncount_fluid, wagoncount_artillery))

info.json

@@ -1,6 +1,6 @@
 {
   "name": "LogisticTrainNetwork",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "title": "LTN - Logistic Train Network",
   "author": "Optera",
   "contact": "https://forums.factorio.com/memberlist.php?mode=viewprofile&u=21729",

locale/de/base.cfg

@@ -60,6 +60,7 @@ error-stop-output-truncated=[LTN] Fehler: Inventar von Zug __1__ in Haltestelle
 error-invalid-delivery=[LTN] Fehler: Entferne ungültige Lieferung von Haltestelle __1__
 error-invalid-stop-index=[LTN] Fehler: Haltestelle mit ungültiger unit_number __1__ in global.LogisticTrainStops.
 error-invalid-request-index=[LTN] Fehler: Ungültiger Index __1__ in global.Dispatcher.Requests.
+error-invalid-position-signal=[LTN] Error: Positionssignal __1__ existiert nicht.
 
 warning-dispatcher-disabled=[LTN] Warnung: Disponent deaktiviert. Es werden keine Lieferungen erstellt.
 

locale/en/base.cfg

@@ -60,6 +60,7 @@ error-stop-output-truncated=[LTN] Error: Inventory of train __2__ at stop __1__
 error-invalid-delivery=[LTN] Error: Removing invalid delivery from stop __1__
 error-invalid-stop-index=[LTN] Error: Invalid stop unit_number __1__ in global.LogisticTrainStops.
 error-invalid-request-index=[LTN] Error: Invalid index __1__ in global.Dispatcher.Requests.
+error-invalid-position-signal=[LTN] Error: position signal __1__ does not exist.
 
 warning-dispatcher-disabled=[LTN] Warning: Dispatcher disabled. No deliveries will be created.
 

script/stop-update.lua

@@ -381,45 +381,65 @@ function UpdateStopOutput(trainStop, ignore_existing_cargo)
     if #carriages < 32 then --prevent circuit network integer overflow error
       if trainStop.parked_train_faces_stop then --train faces forwards >> iterate normal
         for i=1, #carriages do
-          local type = carriages[i].type
-          if encoded_positions_by_type[type] then
-            encoded_positions_by_type[type] = encoded_positions_by_type[type] + 2^(i-1)
+          local signal_type = format("ltn-position-any-%s", carriages[i].type)
+          if game.virtual_signal_prototypes[signal_type] then
+            if encoded_positions_by_type[signal_type] then
+              encoded_positions_by_type[signal_type] = encoded_positions_by_type[signal_type] + 2^(i-1)
+            else
+              encoded_positions_by_type[signal_type] = 2^(i-1)
+            end
           else
-            encoded_positions_by_type[type] = 2^(i-1)
+            if message_level >= 1 then printmsg({"ltn-message.error-invalid-position-signal", signal_type}) end
+            log(format("Error: signal \"%s\" not found!", signal_type))
           end
-          local name = carriages[i].name
-          if encoded_positions_by_name[name] then
-            encoded_positions_by_name[name] = encoded_positions_by_name[name] + 2^(i-1)
+          local signal_name = format("ltn-position-%s", carriages[i].name)
+          if game.virtual_signal_prototypes[signal_name] then
+            if encoded_positions_by_name[signal_name] then
+              encoded_positions_by_name[signal_name] = encoded_positions_by_name[signal_name] + 2^(i-1)
+            else
+              encoded_positions_by_name[signal_name] = 2^(i-1)
+            end
           else
-            encoded_positions_by_name[name] = 2^(i-1)
+            if message_level >= 1 then printmsg({"ltn-message.error-invalid-position-signal", signal_name}) end
+            log(format("Error: signal \"%s\" not found!", signal_name))
           end
         end
       else --train faces backwards >> iterate backwards
         n = 0
         for i=#carriages, 1, -1 do
-          local type = carriages[i].type
-          if encoded_positions_by_type[type] then
-            encoded_positions_by_type[type] = encoded_positions_by_type[type] + 2^n
+          local signal_type = format("ltn-position-any-%s", carriages[i].type)
+          if game.virtual_signal_prototypes[signal_type] then
+            if encoded_positions_by_type[signal_type] then
+              encoded_positions_by_type[signal_type] = encoded_positions_by_type[signal_type] + 2^n
+            else
+              encoded_positions_by_type[signal_type] = 2^n
+            end
           else
-            encoded_positions_by_type[type] = 2^n
+            if message_level >= 1 then printmsg({"ltn-message.error-invalid-position-signal", signal_type}) end
+            log(format("Error: signal \"%s\" not found!", signal_type))
           end
-          local name = carriages[i].name
-          if encoded_positions_by_name[name] then
-            encoded_positions_by_name[name] = encoded_positions_by_name[name] + 2^n
+          local signal_name = format("ltn-position-%s", carriages[i].name)
+          if game.virtual_signal_prototypes[signal_name] then
+            if encoded_positions_by_name[signal_name] then
+              encoded_positions_by_name[signal_name] = encoded_positions_by_name[signal_name] + 2^n
+            else
+              encoded_positions_by_name[signal_name] = 2^n
+            end
           else
-            encoded_positions_by_name[name] = 2^n
+            if message_level >= 1 then printmsg({"ltn-message.error-invalid-position-signal", signal_name}) end
+            log(format("Error: signal \"%s\" not found!", signal_name))
           end
           n=n+1
         end
       end
 
       for k ,v in pairs (encoded_positions_by_type) do
         index = index+1
-        table.insert(signals, {index = index, signal = {type="virtual",name="ltn-position-any-"..k}, count = v })
+        table.insert(signals, {index = index, signal = {type="virtual",name=k}, count = v })
       end
       for k ,v in pairs (encoded_positions_by_name) do
         index = index+1
-        table.insert(signals, {index = index, signal = {type="virtual",name="ltn-position-"..k}, count = v })
+        table.insert(signals, {index = index, signal = {type="virtual",name=k}, count = v })
       end
     end