Performance

- moved turret index init to on_init
- migrated on_event to on_nth_tick
- typo in changelog

changelog.txt

@@ -1,4 +1,16 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.18.3
+Date: 2020-03-21
+  Changes:
+    - Migrated on_event to on_nth_tick for performance
+  Bugfixes:
+    - Added missing initialization of turret index
+---------------------------------------------------------------------------------------------------
+Version: 0.18.2
+Date: 2020-03-20
+  Changes:
+    - Redesigned surface handling again to be more performant
+---------------------------------------------------------------------------------------------------
 Version: 0.18.1
 Date: 2020-03-19
   Changes:

control.lua

@@ -1,30 +1,36 @@
 --control.lua
 --This mod scans the map for gun-turrets and places alerts when turrets are low. 
 
-script.on_event({defines.events.on_tick}, function (event)
+script.on_init(function (event)
-	if event.tick%600 == 0 then
+	-- turret index init
+	global.turret_entities = {}
+end)
+
+script.on_nth_tick(3600, function (event)
+	--Every minute the surface is rescanned for ammo-turret type entities. This is stored in the global table. 
+	for index,surface in pairs(game.surfaces) do
+		global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"}
+	end
+end)
+
+script.on_nth_tick(600, function (event)
 	--Every 10 seconds recheck and give alerts to players for ammo-turret entities on the same force as them. 
-		for index,player in pairs(game.connected_players) do
+	for _,player in pairs(game.connected_players) do
-			
+		
-			GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
+		GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
-			player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
+		player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
-			turret_entities = player.surface.find_entities_filtered{type = "ammo-turret"}
+		turret_entities = global.turret_entities[player.surface.name]
-			if GTA_enabled then
+
-				for index2, turret_entity in pairs(turret_entities) do
+		if GTA_enabled and turret_entities then
-					if turret_entity.valid then
+			for _,turret_entity in pairs(turret_entities) do
-						inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
+				if turret_entity.valid and turret_entity.force == player.force then
-						if inv_var.is_empty() then
+					inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
-							ammo_left = 0
+					if inv_var.is_empty() then
-						else
+						-- no ammo alert
-							ammo_left = inv_var[1].count
+						player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
-						end
+					elseif inv_var[1].count < player_threshold then
-						if turret_entity.force == player.force then
+						-- low ammo alert
-							if ammo_left == 0 then
+						player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
-								player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
-							elseif ammo_left < player_threshold then
-								player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
-							end
-						end
 					end
 				end
 			end

info.json

@@ -1,6 +1,6 @@
 {
     "name": "Gun_Turret_Alerts",
-    "version": "0.18.1",
+    "version": "0.18.3",
     "title": "Gun_Turret_Alerts",
     "author": "Wyrrrd",
     "factorio_version": "0.18",