Version bump for base game 1.1

Matched to mod portal description

.gitignore

@@ -0,0 +1 @@
+*.zip

README.md

@@ -1,10 +1,8 @@
-# Gun_Turret_Alerts
-![mod thumbnail](https://raw.githubusercontent.com/Wyrrrd/Gun_Turret_Alerts/master/thumbnail.png)
+# 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
-- Adds alerts when a gun turret is out of ammo or has low ammo. 
-
-Credit:
-- 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

@@ -0,0 +1,35 @@
+---------------------------------------------------------------------------------------------------
+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:
+    - Added changelog file
+    - Changed dependency to base 0.18
+  Bugfixes:
+    - Redesigned surface handling to ensure compatibility with other planets and Blueprint Lab
+---------------------------------------------------------------------------------------------------
+Version: 0.18.0
+Date: 2020-02-20
+  Changes:
+    - Ported to 0.18
+    - Renamed mod for upload in mod portal
+    - Matched versioning to Factorio versions
+
+  Graphics:
+    - Added thumbnail

control.lua

@@ -1,44 +1,39 @@
 --control.lua
 --This mod scans the map for gun-turrets and places alerts when turrets are low. 
 
+script.on_init(function (event)
+	-- turret index init
+	global.turret_entities = {}
+end)
 
-script.on_event({defines.events.on_tick}, function (event)
+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. 
-	if event.tick%3600 == 0 or global.turret_entities == nil then
-		local planet = game.surfaces
-		for index,value in pairs(planet) do
-			global.turret_entities = planet[index].find_entities_filtered{type = "ammo-turret"}
-		end
+	for index,surface in pairs(game.surfaces) do
+		global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"}
 	end
-	
-    if event.tick%600 == 0 then
+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
-			
-			GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
-			player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
-			if GTA_enabled then
-				for index2, turret_entity in pairs(global.turret_entities) do
-					if turret_entity.valid then
-						inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
-						if inv_var.is_empty() then
-							ammo_left = 0
-						else
-							ammo_left = inv_var[1].count
-						end
-						if turret_entity.force == player.force then
-							if ammo_left == 0 then
-								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
+	for _,player in pairs(game.connected_players) do
+		
+		GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
+		player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
+		turret_entities = global.turret_entities[player.surface.name]
+
+		if GTA_enabled and turret_entities then
+			for _,turret_entity in pairs(turret_entities) do
+				if turret_entity.valid and turret_entity.force == player.force then
+					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
 		end
-	end 
-end)
-
-
-
+	end
+end)

info.json

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