Fix surface handling fuckup for real

changelog.txt

@@ -1,4 +1,26 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.0.5
+Date: 2024-11-09
+  Bugfixes:
+    - Really fix the crash on surface deletion
+---------------------------------------------------------------------------------------------------
+Version: 2.0.4
+Date: 2024-11-09
+  Bugfixes:
+    - Fix another crash on surface deletion
+---------------------------------------------------------------------------------------------------
+Version: 2.0.3
+Date: 2024-11-08
+  Bugfixes:
+    - Fixed crash on invalid entity
+---------------------------------------------------------------------------------------------------
+Version: 2.0.2
+Date: 2024-11-08
+  Changes:
+    - Cleanup tracking table on surface rename/deletion
+  Bugfixes:
+    - Quick fix setting for manual turret fill
+---------------------------------------------------------------------------------------------------
 Version: 2.0.1
 Date: 2024-11-06
   Locale:

control.lua

@@ -90,15 +90,17 @@ local function add_force_to_list(event)
 	local player, force
 	if event.player_index then
 		player = game.get_player(event.player_index)
+		if player and player.valid then
 			force = player.force
+		end
 	elseif event.force then
 		force = event.force
-		if force.connected_players then
+		if force.valid and force.connected_players then
 			player = force.connected_players[1]
 		end
 	end
 
-	if player and force and not storage.ammo_entities[player.surface.name.."_"..force.name] then
+	if player and player.valid and force and force.valid and not storage.ammo_entities[player.surface.name.."_"..force.name] then
 		for _,surface in pairs(game.surfaces) do
 			storage.ammo_entities[surface.name.."_"..force.name] = surface.find_entities_filtered{type = {"ammo-turret","car","artillery-turret","artillery-wagon","spider-vehicle"}, force = force, to_be_deconstructed = false}
 		end
@@ -132,13 +134,13 @@ end
 
 local function remove_surface_from_list(event)
 	--Whenever a surface is renamed or deleted, move/remove all entities in/from the global table.
-	for force,_ in pairs(game.forces) do
+	for _,force in pairs(game.forces) do
 		local index
 		if event.new_name then
-			storage.ammo_entities[new_name.."_"..force.name] = table.deepcopy(storage.ammo_entities[old_name.."_"..force.name])
-			index = old_name.."_"..force.name
+			storage.ammo_entities[event.new_name.."_"..force.name] = table.deepcopy(storage.ammo_entities[event.old_name.."_"..force.name])
+			index = event.old_name.."_"..force.name
 		elseif event.surface_index then
-			index = game.surfaces[surface_index].name.."_"..force.name
+			index = game.surfaces[event.surface_index].name.."_"..force.name
 		end
 
 		if index then
@@ -166,10 +168,11 @@ local function generate_alerts()
 		local artillery_enabled = player.mod_settings["gun-turret-alerts-artillery-enabled"].value
 		local mode = player.mod_settings["gun-turret-alerts-mode"].value
 		local player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
+		local autofull = player.mod_settings["gun-turret-alerts-z-automated-full"].value
 		local ammo_entities = storage.ammo_entities[player.surface.name.."_"..player.force.name]
 
 		if ammo_entities then
-			for _,entity in pairs(ammo_entities) do
+			for index,entity in pairs(ammo_entities) do
 				if entity.valid then
 					if entity.force == player.force then
 
@@ -192,7 +195,7 @@ local function generate_alerts()
 						if inventory and get_ammo_flag[mode] then
 							if entity.type == "ammo-turret" or entity.type == "artillery-turret" or entity.type == "artillery-wagon" then
 								ammo_flag = get_ammo_flag[mode](inventory, player_threshold)
-								if entity.prototype.automated_ammo_count then
+								if autofull and entity.prototype.automated_ammo_count then
 									if entity.prototype.automated_ammo_count < player_threshold then
 										ammo_flag = get_ammo_flag[mode](inventory, entity.prototype.automated_ammo_count)
 									end
@@ -212,9 +215,7 @@ local function generate_alerts()
 						end
 					end
 				else
-					local param = {}
-					param.entity = entity
-					remove_entity_from_list(param)
+					ammo_entities[index] = nil
 				end
 			end
 		end
@@ -235,7 +236,7 @@ script.on_event(defines.events.on_force_created, add_force_to_list)
 script.on_event(defines.events.on_forces_merged, remove_force_from_list)
 
 script.on_event(defines.events.on_surface_renamed, remove_surface_from_list)
-script.on_event(defines.events.on_surface_deleted, remove_surface_from_list)
+script.on_event(defines.events.on_pre_surface_deleted, remove_surface_from_list)
 
 script.on_event(defines.events.on_built_entity, add_entity_to_list, {{filter="type", type = "ammo-turret"},{filter="type", type = "car"},{filter="type", type = "spider-vehicle"},{filter="type", type = "artillery-turret"},{filter="type", type = "artillery-wagon"}})
 script.on_event(defines.events.on_robot_built_entity, add_entity_to_list, {{filter="type", type = "ammo-turret"},{filter="type", type = "car"},{filter="type", type = "spider-vehicle"},{filter="type", type = "artillery-turret"},{filter="type", type = "artillery-wagon"}})

info.json

@@ -1,6 +1,6 @@
 {
     "name": "Gun_Turret_Alerts",
-    "version": "2.0.1",
+    "version": "2.0.5",
     "title": "Ammo Alerts",
     "author": "Wyrrrd",
     "factorio_version": "2.0",

locale/de/config.cfg

@@ -24,3 +24,8 @@ message-low=__1__ hat wenig Munition
 [virtual-signal-name]
 ammo-icon-red=Hat keine Munition
 ammo-icon-yellow=Hat wenig Munition
+
+[mod-name]
+
+[mod-description]
+

locale/en/config.cfg

@@ -4,6 +4,7 @@ gun-turret-alerts-car-enabled=Vehicle ammo alerts enabled
 gun-turret-alerts-artillery-enabled=Artillery ammo alerts enabled
 gun-turret-alerts-mode=Multi slot mode
 gun-turret-alerts-threshold=Low ammo threshold
+gun-turret-alerts-z-automated-full=Automated amount equals full
 
 [mod-setting-description]
 gun-turret-alerts-enabled=Enables turret ammo alerts to be added to your player.
@@ -11,6 +12,7 @@ gun-turret-alerts-car-enabled=Enables vehicle ammo alerts to be added to your pl
 gun-turret-alerts-artillery-enabled=Enables artillery ammo alerts to be added to your player.
 gun-turret-alerts-mode=Controls, if the ammo slots are added up, every slot is counted individually, or just the selected slot is counted.\n(Only applies for more than one ammo slot, for example in vehicles.)
 gun-turret-alerts-threshold=If a turret, vehicle or artillery has less than this much ammo, an alert will be added to your player.
+gun-turret-alerts-z-automated-full=Send no alerts when a turret or artillery has an amount of ammo equal or higher than what inserters would automatically insert into them. 
 
 [string-mod-setting]
 gun-turret-alerts-mode-added=Added up

locale/fr/config.cfg

@@ -24,3 +24,8 @@ message-low=__1__ peu de munitions
 [virtual-signal-name]
 ammo-icon-red=Signal d'absence de munition
 ammo-icon-yellow=Signal de manque de munitions
+
+[mod-name]
+
+[mod-description]
+

locale/uk/config.cfg

@@ -24,3 +24,8 @@ message-low=__1__ мало боєприпасів
 [virtual-signal-name]
 ammo-icon-red=Сигнал про закінчення набоїв
 ammo-icon-yellow=Сигнал про низький рівень набоїв
+
+[mod-name]
+
+[mod-description]
+

settings.lua

@@ -34,4 +34,10 @@ data:extend({
         default_value = 8,
 		minimum_value = 0
     },
+    {
+        type = "bool-setting",
+        name = "gun-turret-alerts-z-automated-full",
+        setting_type = "runtime-per-user",
+        default_value = true
+    },
 })