Added support for generators and fluid is in the ouput now

Also fixed that big entities would not be found sometimes.

Author: theRustyKnife

changelog.txt

@@ -1,3 +1,7 @@
+##0.2.0##
++ Added fluid content to output
++ Added support for generators
+
 ##0.1.3##
 + Added a toggle for 'precise mode' - on: output is multiplied by 100; off: output remains as-is
 

control.lua

@@ -5,12 +5,13 @@ local types = {
 	["storage-tank"] = true,
 	["boiler"] = true,
 	["pipe"] = true,
-	["pipe-to-ground"] = true
+	["pipe-to-ground"] = true,
+	["generator"] = true,
 }
 
 local look_offset = 0.5
 local look_distance = 1
-local tank_surroundings_check_distance = 2
+local tank_surroundings_check_distance = 5
 local function get_tank(entity)
 	local position = entity.position
 	local direction = entity.direction
@@ -68,25 +69,37 @@ local function on_built(event)
 end
 
 local function on_tick(event)
+	-- entity update
 	for _, combinator in pairs(global.combinators[event.tick % refresh_rate]) do
 		local count = 0
+		local fluid
 		if combinator.tank and combinator.tank.valid and combinator.tank.fluidbox[1] then
+			local fluidbox = combinator.tank.fluidbox[1]
 			local precision = 1
 			if combinator.precise then precision = 100 end
-			count = combinator.tank.fluidbox[1].temperature * precision
+			count = fluidbox.temperature * precision
+			
+			fluid = {
+				signal = {type = "fluid", name = fluidbox.type},
+				count = math.floor(fluidbox.amount),
+				index = 2
+			}
 		end
+		
 		combinator.entity.get_or_create_control_behavior().parameters = {
 			enabled = true,
 			parameters = {
 				{
 					signal = {type = "virtual", name = "fluid-temperature"},
 					count = math.floor(count),
 					index = 1
-				}
+				},
+				fluid
 			}
 		}
 	end
 
+	-- GUI update
 	for i = event.tick % gui_refresh_rate + 1, #game.players, gui_refresh_rate do
 		local player = game.players[i]
 		if player.opened and player.opened.name == "fluid-temperature-combinator" then

data-updates.lua

@@ -3,7 +3,7 @@ local name = "fluid-temperature-combinator"
 local entity = util.table.deepcopy(data.raw["constant-combinator"]["constant-combinator"])
 entity.name = name
 entity.minable.result = name
-entity.item_slot_count = 1
+entity.item_slot_count = 2
 
 local item = util.table.deepcopy(data.raw["item"]["constant-combinator"])
 item.name = name

info.json

@@ -1,11 +1,11 @@
 {
 	"name": "fluid-temperature-combinator",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"factorio_version": "0.14",
 	"title": "Fluid Temperature Combinator",
 	"author": "theRustyKnife",
-	"description": "A combinator that can read the temperature of fluid in an adjacent tank, boiler or pipe.",
+	"description": "A combinator that can read the temperature of fluid in an adjacent tank, boiler, generator or pipe.",
 	"homepage": "https://mods.factorio.com/mods/theRustyKnife/fluid-temperature-combinator",
-	"date": "02.11.2016",
+	"date": "10.11.2016",
 	"dependencies": ["base"]
 }