1
0
mirror of https://github.com/Wyrrrd/Gun_Turret_Alerts.git synced 2026-07-01 20:51:08 +02:00

Compare commits

..

4 Commits

Author SHA1 Message Date
Wyrrrd d7f853f1a5 Added french locale (by d0ob) 2021-08-07 00:08:34 +02:00
Wyrrrd 9ee6474408 Merge pull request #3 from snouz/master
Adaptive threshold based on automated ammo count
2021-06-22 15:59:46 +00:00
snouz 33c9bbe783 Fixed missing signal names 2021-06-22 17:13:30 +02:00
snouz ad4ae53c97 Adaptive threshold based on automated ammo count
-Threshold for alert comes is never higher than then number of ammo loaded by an inserter.
-This fixes annoying alerts in Space Exploration's meteor defence, where the default ammo loaded is 4, and fixes the problem for any other mod.
2021-06-21 15:06:34 +02:00
7 changed files with 52 additions and 4 deletions
+2 -1
View File
@@ -9,4 +9,5 @@ If you want to contribute by translating this mod, you can view the existing tra
### Credit ### Credit
Thanks to [unhott](https://mods.factorio.com/user/unhott) for the [original mod](https://mods.factorio.com/mod/GunTurretAlerts). Thanks to [unhott](https://mods.factorio.com/user/unhott) for the [original mod](https://mods.factorio.com/mod/GunTurretAlerts).
Thanks to [snouz](https://mods.factorio.com/user/snouz) for the new icons and thumbnail. Thanks to [snouz](https://mods.factorio.com/user/snouz) for the new icons and thumbnail.
Thanks to [d0ob](https://github.com/d0ob) for the french locale.
+10
View File
@@ -1,4 +1,14 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 1.1.8
Date: 2021-08-06
Locale:
- Addedd french locale (thanks to d0ob)
---------------------------------------------------------------------------------------------------
Version: 1.1.7
Date: 2021-06-21
Compatibility:
- Added compatibility to Space Exploration's Meteor defence and other mods (no longer displays alert when ammo is dynamically loaded) (by snouz)
---------------------------------------------------------------------------------------------------
Version: 1.1.6 Version: 1.1.6
Date: 2021-04-22 Date: 2021-04-22
Bugfixes: Bugfixes:
+5
View File
@@ -166,6 +166,11 @@ local function generate_alerts()
if inventory and get_ammo_flag[mode] then if inventory and get_ammo_flag[mode] then
if entity.type == "ammo-turret" then if entity.type == "ammo-turret" then
ammo_flag = get_ammo_flag[mode](inventory, player_threshold) ammo_flag = get_ammo_flag[mode](inventory, player_threshold)
if 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
end
elseif entity.type == "car" then elseif entity.type == "car" then
ammo_flag = get_ammo_flag[mode](inventory, player_threshold, entity.selected_gun_index) ammo_flag = get_ammo_flag[mode](inventory, player_threshold, entity.selected_gun_index)
end end
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "Gun_Turret_Alerts", "name": "Gun_Turret_Alerts",
"version": "1.1.6", "version": "1.1.8",
"title": "Ammo Alerts", "title": "Ammo Alerts",
"author": "Wyrrrd", "author": "Wyrrrd",
"factorio_version": "1.1", "factorio_version": "1.1",
+5 -1
View File
@@ -17,4 +17,8 @@ autofilter_mode-selected=Auswahl
[gun-turret-alerts] [gun-turret-alerts]
message-empty=__1__ hat keine Munition message-empty=__1__ hat keine Munition
message-low=__1__ hat wenig Munition message-low=__1__ hat wenig Munition
[virtual-signal-name]
ammo-icon-red=Hat keine Munition
ammo-icon-yellow=Hat wenig Munition
+5 -1
View File
@@ -17,4 +17,8 @@ autofilter_mode-selected=Selected
[gun-turret-alerts] [gun-turret-alerts]
message-empty=__1__ out of ammo message-empty=__1__ out of ammo
message-low=__1__ ammo low message-low=__1__ low ammo
[virtual-signal-name]
ammo-icon-red=Out of ammo signal
ammo-icon-yellow=Low ammo signal
+24
View File
@@ -0,0 +1,24 @@
[mod-setting-name]
gun-turret-alerts-enabled=Activer les alertes de manque de munitions dans les tourelles.
gun-turret-alerts-car-enabled=Activer les alertes de manque de munitions dans les véhicules.
gun-turret-alerts-mode=Prendre en considération plusieurs compartiments de munitions.
gun-turret-alerts-threshold=Nombre de munitions restantes avant d'être alerté.
[mod-setting-description]
gun-turret-alerts-enabled=Le manque de munitions dans une tourelle enverra une alerte au joueur.
gun-turret-alerts-car-enabled=Le manque de munitions dans un véhicule enverra une alerte au joueur.
gun-turret-alerts-mode=Surveiller tous les compartiments de l'unité, un seul, ou une sélection.\n(Certaines unités, principalement des véhicules, peuvent posséder plusieurs compartiments. À laisser décoché s'il n'y en a qu'un seul.)
gun-turret-alerts-threshold=Le nombre de munitions, dans une tourelle ou un véhicule, qui déclenchera un alerte une fois atteint.
[string-mod-setting]
autofilter_mode-added=Tous
autofilter_mode-individually=Unique
autofilter_mode-selected=Sélection
[gun-turret-alerts]
message-empty=__1__ plus de munition
message-low=__1__ peu de munitions
[virtual-signal-name]
ammo-icon-red=Signal d'absence de munition
ammo-icon-yellow=Signal de manque de munitions