1.6.2

- read artillery turret and artillery wagon inventories

Author: 0ptera

changelog.txt

@@ -1,3 +1,6 @@
+1.6.2
+- read artillery turret and artillery wagon inventories
+
 1.6.1
 - updated graphics to match current constant combinator
 - added hr graphics

control.lua

@@ -6,10 +6,12 @@ local FURNACE = "furnace"
 local REACTOR = "reactor"
 local ROBOPORT = "roboport"
 local SILO = "rocket-silo"
+local ARTILLERY = "artillery-turret"
 local CHEST = "logistic-container" -- requester: type = "logistic-container" && logistic_mode = "requester"
 local LOCO = "locomotive"
 local WAGON = "cargo-wagon"
 local WAGONFLUID = "fluid-wagon"
+local WAGONARTILLERY = "artillery-wagon"
 local CAR = "car"
 local TANK = "tank"
 
@@ -20,11 +22,13 @@ local SupportedTypes = {
 	[REACTOR] = true,
 	[ROBOPORT] = true,
 	[SILO] = true,
+  [ARTILLERY] = true,
 	[CHEST] = true,
 	[CAR] = false,
 	[LOCO] = false,
 	[WAGON] = false,
-	[WAGONFLUID] = false
+	[WAGONFLUID] = false,
+  [WAGONARTILLERY] = false,
 }
 
 local floor = math.floor
@@ -256,7 +260,7 @@ function UpdateSensor(itemSensor)
 			return
 		end
 
-	elseif connectedEntity.type == WAGON or connectedEntity.type == WAGONFLUID then
+	elseif connectedEntity.type == WAGON or connectedEntity.type == WAGONFLUID or connectedEntity.type == WAGONARTILLERY then
 		if connectedEntity.train.state == defines.train_state.wait_station
 		or connectedEntity.train.state == defines.train_state.wait_signal
 		or connectedEntity.train.state == defines.train_state.manual_control then --keeps showing inventory for ScanInterval ticks after movement start > neglect able
@@ -319,7 +323,7 @@ function UpdateSensor(itemSensor)
 			-- log("temp: "..tostring(temp))
 			signals[signalIndex] = {index = signalIndex, signal = {type = "virtual",name = "inv-sensor-temperature"},count = floor(temp+0.5)}
 			signalIndex = signalIndex+1
-		end
+		end      
 	end
 
 	-- get all fluids

info.json

@@ -1,11 +1,11 @@
 {
   "name": "Inventory Sensor",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "title": "Inventory Sensor",
   "author": "Optera",
   "contact": "https://forums.factorio.com/memberlist.php?mode=viewprofile&u=21729",
   "homepage": "https://forums.factorio.com/viewtopic.php?f=97&t=30454",
   "description": "Adds a combinator that reads inventories of locomotives, wagons, cars, furnaces, assemblers, roboports, rocket silos and reactors.",
   "factorio_version": "0.16",
-	"dependencies": ["base >= 0.16.3"]
+	"dependencies": ["base >= 0.16.6"]
 }

prototypes/entity.lua

@@ -3,46 +3,45 @@ inv_sensor.name = "item-sensor"
 inv_sensor.icon = "__Inventory Sensor__/graphics/icons/inventory-sensor.png"
 inv_sensor.icon_size = 32
 inv_sensor.minable.result = "item-sensor"
-
-inv_sensor.sprites =
-    make_4way_animation_from_spritesheet({ layers =
+inv_sensor.sprites = make_4way_animation_from_spritesheet(
+  { layers =
+    {
       {
+        filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
+        width = 58,
+        height = 52,
+        frame_count = 1,
+        shift = util.by_pixel(0, 5),
+        hr_version =
         {
-          filename = "__Inventory Sensor__/graphics/entity/inventory-sensor.png",
-          width = 58,
-          height = 52,
+          scale = 0.5,
+          filename = "__Inventory Sensor__/graphics/entity/hr-inventory-sensor.png",
+          width = 114,
+          height = 102,
           frame_count = 1,
           shift = util.by_pixel(0, 5),
-          hr_version =
-          {
-            scale = 0.5,
-            filename = "__Inventory Sensor__/graphics/entity/hr-inventory-sensor.png",
-            width = 114,
-            height = 102,
-            frame_count = 1,
-            shift = util.by_pixel(0, 5),
-          },
         },
+      },
+      {
+        filename = "__base__/graphics/entity/combinator/constant-combinator-shadow.png",
+        width = 50,
+        height = 34,
+        frame_count = 1,
+        shift = util.by_pixel(9, 6),
+        draw_as_shadow = true,
+        hr_version =
         {
-          filename = "__base__/graphics/entity/combinator/constant-combinator-shadow.png",
-          width = 50,
-          height = 34,
+          scale = 0.5,
+          filename = "__base__/graphics/entity/combinator/hr-constant-combinator-shadow.png",
+          width = 98,
+          height = 66,
           frame_count = 1,
-          shift = util.by_pixel(9, 6),
+          shift = util.by_pixel(8.5, 5.5),
           draw_as_shadow = true,
-          hr_version =
-          {
-            scale = 0.5,
-            filename = "__base__/graphics/entity/combinator/hr-constant-combinator-shadow.png",
-            width = 98,
-            height = 66,
-            frame_count = 1,
-            shift = util.by_pixel(8.5, 5.5),
-            draw_as_shadow = true,
-          },
         },
       },
-    })
+    },
+  })
 
 inv_sensor.item_slot_count = 1000