aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to warp module

Browse Source 
* Variable name.
* Moved variable initialisation to outside a function.
This commit is contained in:
bbassie
2021-01-24 20:11:11 +01:00
parent 7e7660f1e1
commit e72f927d64
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/control/warps.lua
View File

@@ -37,6 +37,12 @@ Global.register(force_warps, function(tbl)
force_warps = tbl force_warps = tbl
end) end)
-- Create a array of entity names that will be added to the remove filter
local remove_warp_area_entity_names = {}
for _, entity in pairs(config.entities) do
table.insert(remove_warp_area_entity_names, entity[1])
end
-- When a warp is updated change its chat tag and resort the warp order -- When a warp is updated change its chat tag and resort the warp order
WrapData:on_update(function(warp_id, warp, old_warp) WrapData:on_update(function(warp_id, warp, old_warp)
if warp then if warp then
@@ -193,13 +199,13 @@ function Warps.remove_warp_area(warp_id)
local radius = config.standard_proximity_radius local radius = config.standard_proximity_radius
-- Check that a warp area was created previously -- Check that a warp area was created previously
local base_tile = warp.old_tile local old_tile = warp.old_tile
if not base_tile then return end if not old_tile then return end
-- Loop over warp tiles and set them to the old tile that was below -- Loop over warp tiles and set them to the old tile that was below
local tiles = {} local tiles = {}
for _, tile in pairs(config.tiles) do for _, tile in pairs(config.tiles) do
table.insert(tiles, {name=base_tile, position={tile[2]+position.x, tile[3]+position.y}}) table.insert(tiles, {name=old_tile, position={tile[2]+position.x, tile[3]+position.y}})
end end
surface.set_tiles(tiles) surface.set_tiles(tiles)
@@ -209,11 +215,7 @@ function Warps.remove_warp_area(warp_id)
} }
-- Remove warp structure entities -- Remove warp structure entities
local entity_names = {} local entities = surface.find_entities_filtered{ force='neutral', area=area, name = remove_warp_area_entity_names }
for _, entity in pairs(config.entities) do
table.insert(entity_names, entity[1])
end
local entities = surface.find_entities_filtered{ force='neutral', area=area, name = entity_names }
for _, entity in pairs(entities) do for _, entity in pairs(entities) do
-- Destroy them, this will leave corpses of the entities that it distroyed. -- Destroy them, this will leave corpses of the entities that it distroyed.
if entity and entity.valid and entity.destructible == false then if entity and entity.valid and entity.destructible == false then