Merge pull request #911 from TWLTriston/fix_autodeconstruct

Fix autodeconstruct

features/autodeconstruct.lua

@@ -3,18 +3,85 @@
 local Event = require 'utils.event'
 local Token = require 'utils.token'
 local Task = require 'utils.task'
+local Global = require 'utils.global'
+local table = require 'utils.table'
+
+local drill_radius_map = {}
+local max_radius = 0
+local require_fluid_ores = {}
+local pumpjack_resources_map = {}
+local drill_names = {}
+
+Global.register_init(
+    {
+        drill_radius_map = drill_radius_map,
+        require_fluid_ores = require_fluid_ores,
+        pumpjack_resources_map = pumpjack_resources_map
+    },
+    function(tbl)
+        local map = tbl.drill_radius_map
+        local max = 0
+        local fluid_ores = tbl.require_fluid_ores
+        local pumpjack_map = tbl.pumpjack_resources_map
+
+        for name, entity in pairs(game.entity_prototypes) do
+            if entity.type == 'mining-drill' and entity.resource_categories['basic-solid'] then
+                local radius = entity.mining_drill_radius
+
+                map[name] = radius
+
+                if radius > max then
+                    max = radius
+                end
+            elseif entity.type == 'resource' then
+                local props = entity.mineable_properties
+
+                if props.required_fluid then
+                    fluid_ores[name] = true
+                end
+
+                local products = props.products
+                for i = 1, #products do
+                    local product = products[i]
+                    if product.type == 'fluid' then
+                        pumpjack_map[name] = true
+                        break
+                    end
+                end
+            end
+        end
+
+        tbl.max_radius = max
+    end,
+    function(tbl)
+        drill_radius_map = tbl.drill_radius_map
+        max_radius = tbl.max_radius
+        require_fluid_ores = tbl.require_fluid_ores
+        pumpjack_resources_map = tbl.pumpjack_resources_map
+
+        drill_names = table.keys(drill_radius_map)
+    end
+)
 
 local function is_depleted(drill, entity)
-    local position = drill.position
-    local area
-    if drill.name == 'electric-mining-drill' then
-        area = {{position.x - 2.5, position.y - 2.5}, {position.x + 2.5, position.y + 2.5}}
-    else
-        area = {{position.x - 1, position.y - 1}, {position.x + 1, position.y + 1}}
+    local radius = drill_radius_map[drill.name]
+
+    if radius == nil then
+        return false
     end
 
-    for _, resource in pairs(drill.surface.find_entities_filtered {type = 'resource', area = area}) do
-        if resource ~= entity and resource.name ~= 'crude-oil' then
+    local pos = drill.position
+    local x, y = pos.x, pos.y
+
+    local area = {
+        {x - radius, y - radius},
+        {x + radius, y + radius}
+    }
+
+    local resources = drill.surface.find_entities_filtered {type = 'resource', area = area}
+    for i = 1, #resources do
+        local resource = resources[i]
+        if resource ~= entity and not pumpjack_resources_map[resource.name] then
             return false
         end
     end
@@ -32,15 +99,28 @@ local callback =
 
 local function on_resource_depleted(event)
     local entity = event.entity
-    if entity.name == 'uranium-ore' then
-        return nil
+
+    if not entity or not entity.valid then
+        return
     end
 
-    local position = entity.position
-    local area = {{position.x - 1, position.y - 1}, {position.x + 1, position.y + 1}}
-    local drills = event.entity.surface.find_entities_filtered {area = area, type = 'mining-drill'}
-    for _, drill in ipairs(drills) do
-        if drill.name ~= 'pumpjack' and is_depleted(drill, entity) then
+    if require_fluid_ores[entity.name] then
+        return
+    end
+
+    local pos = entity.position
+    local x, y = pos.x, pos.y
+    local radius = max_radius
+
+    local area = {
+        {x - radius, y - radius},
+        {x + radius, y + radius}
+    }
+
+    local drills = event.entity.surface.find_entities_filtered {area = area, name = drill_names}
+    for i = 1, #drills do
+        local drill = drills[i]
+        if is_depleted(drill, entity) then
             Task.set_timeout_in_ticks(5, callback, drill)
         end
     end

utils/table.lua

@@ -106,6 +106,20 @@ function table.set(t, index, element)
     error('Index out of bounds', 2)
 end
 
+--- Returns an array of keys for a table.
+--@param tbl <table>
+function table.keys(tbl)
+    local n = 1
+    local keys = {}
+
+    for k in pairs(tbl) do
+        keys[n] = k
+        n = n + 1
+    end
+
+    return keys
+end
+
 --- Chooses a random entry from a table
 -- because this uses math.random, it cannot be used outside of events
 -- @param t <table>