From 8dc718d876d012d717cf02b2c8ff3a232fb82ce5 Mon Sep 17 00:00:00 2001 From: David Skrundz Date: Wed, 18 Sep 2024 20:31:42 -0600 Subject: [PATCH] Don't save max_mining_drill_radius in global table --- changelog.txt | 7 ++++++- control.lua | 8 ++++++-- info.json | 2 +- teardown/mining_drill.lua | 6 +++--- teardown/on_resource_depleted.lua | 4 ++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/changelog.txt b/changelog.txt index e7546c9..5d55155 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,10 @@ --------------------------------------------------------------------------------------------------- -Version: 0.0.1 +Version: 1.0.1 +Date: 18.09.2024 + Bugfixes: + - Recompute max_mining_drill_radius every time instead of storing it in the global table +--------------------------------------------------------------------------------------------------- +Version: 1.0.0 Date: 15.09.2024 Features: - Initial release diff --git a/control.lua b/control.lua index 68331a5..77d8bf7 100644 --- a/control.lua +++ b/control.lua @@ -1,5 +1,7 @@ fmsl = require("__fmsl__.fmsl") +teardown = {} + local next = next active_tick = 1 @@ -14,8 +16,6 @@ script.on_init(function() global.active.mining_drills = {} -- [Tick:Entity] global.passive = {} global.passive.mining_drills = {} -- [Entity:true] - - recompute_max_mining_drill_radius() end) script.on_load(function() @@ -27,4 +27,8 @@ script.on_load(function() end end) +script.on_configuration_changed(function(data) + teardown.max_mining_drill_radius = compute_max_mining_drill_radius() +end) + script.on_event(defines.events.on_resource_depleted, on_resource_depleted) diff --git a/info.json b/info.json index 2a0a715..2fc1a2e 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "Teardown", - "version": "1.0.0", + "version": "1.0.1", "title": "Teardown", "description": "Automate the removal of depleted miners", "author": "David Skrundz", diff --git a/teardown/mining_drill.lua b/teardown/mining_drill.lua index b010809..5d2a9f9 100644 --- a/teardown/mining_drill.lua +++ b/teardown/mining_drill.lua @@ -1,5 +1,5 @@ --- Populate global.max_mining_drill_radius with [Category:double] -function recompute_max_mining_drill_radius() +-- @return [Category:double] +function compute_max_mining_drill_radius() local max_radius = {} local prototypes = game.get_filtered_entity_prototypes({{filter = "type", type = "mining-drill"}}) @@ -10,5 +10,5 @@ function recompute_max_mining_drill_radius() end end - global.max_mining_drill_radius = max_radius + return max_radius end diff --git a/teardown/on_resource_depleted.lua b/teardown/on_resource_depleted.lua index f9ff965..516c16c 100644 --- a/teardown/on_resource_depleted.lua +++ b/teardown/on_resource_depleted.lua @@ -10,10 +10,10 @@ function on_resource_depleted(event) local position = entity.position local category = entity.prototype.resource_category - local radius = global.max_mining_drill_radius[category] + local radius = teardown.max_mining_drill_radius[category] if radius == nil then - log("max_mining_drill_radius: " .. serpent.block(global.max_mining_drill_radius)) + log("max_mining_drill_radius: " .. serpent.block(teardown.max_mining_drill_radius)) error("max_mining_drill_radius is not set for category: " .. category) return end