wyrrrd/Gun_Turret_Alerts
1
0
Fork 0
mirror of https://github.com/Wyrrrd/Gun_Turret_Alerts.git synced 2026-06-13 03:58:31 +02:00
Code Issues Releases Activity

Handle surface workaround on built, cleanup empty global tables

Browse Source
This commit is contained in:
Wyrrrd
2024-11-10 14:54:21 +01:00
parent 4c8b05b930
commit c837b99a01
1 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control.lua
+13 -16
View File
@@ -67,6 +67,13 @@ local function add_entity_to_list(event)
--Whenever an ammo-turret, vehicle or artillery type entity is built, add it to the global table. --Whenever an ammo-turret, vehicle or artillery type entity is built, add it to the global table.
local entity = event.created_entity or event.entity local entity = event.created_entity or event.entity
local index = entity.surface.name.."_"..entity.force.name local index = entity.surface.name.."_"..entity.force.name
-- Add table if it doesn't exist and a player of this force is connected
if entity.force.connected_players[1] and not storage.ammo_entities[index] then
storage.ammo_entities[index] = {}
end
-- Add entity to table
if storage.ammo_entities[index] then if storage.ammo_entities[index] then
table.insert(storage.ammo_entities[index], entity) table.insert(storage.ammo_entities[index], entity)
end end
@@ -134,20 +141,6 @@ local function remove_force_from_list(event)
end end
end end
local function add_surface_to_list(event)
--Whenever a surface is created, add an empty list to the global table for each force with a connected player.
local surface
if event.surface_index then
surface = game.surfaces[event.surface_index]
end
for _,force in pairs(game.forces) do
if surface and surface.valid and not storage.ammo_entities[surface.name.."_"..force.name] and force.connected_players[1] then
storage.ammo_entities[surface.name.."_"..force.name] = {}
end
end
end
local function remove_surface_from_list(event) local function remove_surface_from_list(event)
--Whenever a surface is renamed or deleted, move/remove all entities in/from the global table. --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
@@ -195,7 +188,8 @@ local function generate_alerts()
ammo_entities = storage.ammo_entities[surface.name.."_"..player.force.name] ammo_entities = storage.ammo_entities[surface.name.."_"..player.force.name]
end end
if ammo_entities and not table_is_empty(ammo_entities) then if ammo_entities then
if not table_is_empty(ammo_entities) then
for index,entity in pairs(ammo_entities) do for index,entity in pairs(ammo_entities) do
if entity.valid then if entity.valid then
if entity.force == player.force then if entity.force == player.force then
@@ -244,6 +238,10 @@ local function generate_alerts()
table.remove(ammo_entities, index) table.remove(ammo_entities, index)
end end
end end
else
-- Cleanup if table is empty
ammo_entites = nil
end
end end
end end
end end
@@ -262,7 +260,6 @@ script.on_event(defines.events.on_player_changed_force, remove_force_from_list)
script.on_event(defines.events.on_force_created, add_force_to_list) 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_forces_merged, remove_force_from_list)
script.on_event(defines.events.on_surface_created, add_surface_to_list)
script.on_event(defines.events.on_surface_renamed, remove_surface_from_list) script.on_event(defines.events.on_surface_renamed, remove_surface_from_list)
script.on_event(defines.events.on_pre_surface_deleted, remove_surface_from_list) script.on_event(defines.events.on_pre_surface_deleted, remove_surface_from_list)