Version bump for base game 1.1

Matched to mod portal description

README.md

@@ -1,10 +1,8 @@
 # Gun Turret Alerts
 <img src=https://raw.githubusercontent.com/Wyrrrd/Gun_Turret_Alerts/master/thumbnail.png width="128" height="128">
 
-(Please note: This is a quick and dirty port to 0.18. As soon as the original is ported to 0.18, this will be removed.)
+### Description
+Adds alerts when a gun turret is out of ammo or has low ammo. 
 
-Description
+### Credit
-- Adds alerts when a gun turret is out of ammo or has low ammo. 
+Thanks to [unhott](https://mods.factorio.com/user/unhott) for the [original mod](https://mods.factorio.com/mod/GunTurretAlerts).
-
-Credit:
-- Thanks to [unhott](https://mods.factorio.com/user/unhott) for the [original mod](https://mods.factorio.com/mod/GunTurretAlerts).

changelog.txt

@@ -1,4 +1,21 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.0
+Date: 2020-12-02
+  Changes:
+    - Version bump for base game 1.1
+---------------------------------------------------------------------------------------------------
+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
-	--Every 10 seconds recheck and give alerts to players for ammo-turret entities on the same force as them. 
+	global.turret_entities = {}
-		for index,player in pairs(game.connected_players) do
+end)
 
-			GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
+script.on_nth_tick(3600, function (event)
-			player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
+	--Every minute the surface is rescanned for ammo-turret type entities. This is stored in the global table. 
-			turret_entities = player.surface.find_entities_filtered{type = "ammo-turret"}
+	for index,surface in pairs(game.surfaces) do
-			if GTA_enabled then
+		global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"}
-				for index2, turret_entity in pairs(turret_entities) do
+	end
-					if turret_entity.valid then
+end)
-						inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
+
-						if inv_var.is_empty() then
+script.on_nth_tick(600, function (event)
-							ammo_left = 0
+	--Every 10 seconds recheck and give alerts to players for ammo-turret entities on the same force as them. 
-						else
+	for _,player in pairs(game.connected_players) do
-							ammo_left = inv_var[1].count
+		
-						end
+		GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
-						if turret_entity.force == player.force then
+		player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
-							if ammo_left == 0 then
+		turret_entities = global.turret_entities[player.surface.name]
-								player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
+
-							elseif ammo_left < player_threshold then
+		if GTA_enabled and turret_entities then
-								player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
+			for _,turret_entity in pairs(turret_entities) do
-							end
+				if turret_entity.valid and turret_entity.force == player.force then
-						end
+					inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
+					if inv_var.is_empty() then
+						-- no ammo alert
+						player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
+					elseif inv_var[1].count < player_threshold then
+						-- low ammo alert
+						player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
 					end
 				end
 			end

info.json

@@ -1,9 +1,9 @@
 {
     "name": "Gun_Turret_Alerts",
-    "version": "0.18.1",
+    "version": "1.1.0",
     "title": "Gun_Turret_Alerts",
     "author": "Wyrrrd",
-    "factorio_version": "0.18",
+    "factorio_version": "1.1",
-    "dependencies": ["base >= 0.18"],
+    "dependencies": ["base >= 1.1.0"],
     "description": "Adds map alerts for players when a turret is either out of ammo or has low ammo"
 }