diff --git a/changelog.txt b/changelog.txt index 6c46a59..04f7192 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +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: diff --git a/control.lua b/control.lua index 4f339c6..496baee 100644 --- a/control.lua +++ b/control.lua @@ -166,6 +166,7 @@ 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 @@ -192,7 +193,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 diff --git a/info.json b/info.json index 9a525c0..afefb54 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "Gun_Turret_Alerts", - "version": "2.0.1", + "version": "2.0.2", "title": "Ammo Alerts", "author": "Wyrrrd", "factorio_version": "2.0", diff --git a/locale/en/config.cfg b/locale/en/config.cfg index ecec6ff..877dda5 100644 --- a/locale/en/config.cfg +++ b/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 diff --git a/settings.lua b/settings.lua index 7bec18b..22cb5a0 100644 --- a/settings.lua +++ b/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 + }, }) \ No newline at end of file