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

Added car ammo alerts

This commit is contained in:
Wyrrrd
2021-03-28 15:36:13 +02:00
parent 52e8d69938
commit f42afe756a
6 changed files with 57 additions and 11 deletions
+8
View File
@@ -1,4 +1,12 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 1.1.1
Date: 2021-03-28
Changes:
- Added car ammo alerts, if car has guns (this should apply to modded cars and tanks)
- Added config options to display/hide car and/or turret ammo alerts
- Added german locale
- Mod display name is now less focused on turrets
---------------------------------------------------------------------------------------------------
Version: 1.1.0 Version: 1.1.0
Date: 2020-12-02 Date: 2020-12-02
Changes: Changes:
+26 -5
View File
@@ -1,27 +1,31 @@
--control.lua --control.lua
--This mod scans the map for gun-turrets and places alerts when turrets are low. --This mod scans the map for cars and gun-turrets and places alerts when they are low.
script.on_init(function (event) script.on_init(function (event)
-- turret index init -- turret index init
global.turret_entities = {} global.turret_entities = {}
global.car_entities = {}
end) end)
script.on_nth_tick(3600, function (event) script.on_nth_tick(3600, function (event)
--Every minute the surface is rescanned for ammo-turret type entities. This is stored in the global table. --Every minute the surface is rescanned for car and ammo-turret type entities. This is stored in two global tables.
for index,surface in pairs(game.surfaces) do for index,surface in pairs(game.surfaces) do
global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"} global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"}
global.car_entities[index] = surface.find_entities_filtered{type = "car"}
end end
end) end)
script.on_nth_tick(600, function (event) script.on_nth_tick(600, function (event)
--Every 10 seconds recheck and give alerts to players for ammo-turret entities on the same force as them. --Every 10 seconds recheck and give alerts to players for car and ammo-turret entities on the same force as them.
for _,player in pairs(game.connected_players) do for _,player in pairs(game.connected_players) do
GTA_enabled = player.mod_settings["gun-turret-alerts-enabled"].value GTA_turret_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
GTA_car_enabled = player.mod_settings["gun-turret-alerts-car-enabled"].value
player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
turret_entities = global.turret_entities[player.surface.name] turret_entities = global.turret_entities[player.surface.name]
car_entities = global.car_entities[player.surface.name]
if GTA_enabled and turret_entities then if GTA_turret_enabled and turret_entities then
for _,turret_entity in pairs(turret_entities) do for _,turret_entity in pairs(turret_entities) do
if turret_entity.valid and turret_entity.force == player.force then if turret_entity.valid and turret_entity.force == player.force then
inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo) inv_var = turret_entity.get_inventory(defines.inventory.turret_ammo)
@@ -35,5 +39,22 @@ script.on_nth_tick(600, function (event)
end end
end end
end end
if GTA_car_enabled and car_entities then
for _,car_entity in pairs(car_entities) do
-- extra check if car has gun
if car_entity.valid and car_entity.force == player.force and car_entity.selected_gun_index then
inv_var = car_entity.get_inventory(defines.inventory.car_ammo)
if inv_var.is_empty() then
-- no ammo alert
player.add_custom_alert(car_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
elseif inv_var[1].count < player_threshold then
-- low ammo alert
player.add_custom_alert(car_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
end
end
end
end
end end
end) end)
+3 -3
View File
@@ -1,9 +1,9 @@
{ {
"name": "Gun_Turret_Alerts", "name": "Gun_Turret_Alerts",
"version": "1.1.0", "version": "1.1.1",
"title": "Gun_Turret_Alerts", "title": "Ammo Alerts",
"author": "Wyrrrd", "author": "Wyrrrd",
"factorio_version": "1.1", "factorio_version": "1.1",
"dependencies": ["base >= 1.1.0"], "dependencies": ["base >= 1.1.0"],
"description": "Adds map alerts for players when a turret is either out of ammo or has low ammo" "description": "Adds map alerts for players when a turret or car is either out of ammo or has low ammo"
} }
+9
View File
@@ -0,0 +1,9 @@
[mod-setting-name]
gun-turret-alerts-enabled=Alarme für Geschützturmmunition aktiviert
gun-turret-alerts-car-enabled=Alarme für Fahrzeugmunition aktiviert
gun-turret-alerts-threshold=Grenze für wenig Munition
[mod-setting-description]
gun-turret-alerts-enabled=Aktiviert Alarme für Geschützturmmunition für deinen Spieler
gun-turret-alerts-car-enabled=Aktiviert Alarme für Fahrzeugmunition für deinen Spieler
gun-turret-alerts-threshold=Wenn ein Fahrzeug oder Geschützturm weniger als diese Anzahl Munition hat, wird ein Alarm zu deinem Spieler hinzugefügt
+5 -3
View File
@@ -1,7 +1,9 @@
[mod-setting-name] [mod-setting-name]
gun-turret-alerts-enabled=Gun turret alerts enabled gun-turret-alerts-enabled=Turret ammo alerts enabled
gun-turret-alerts-car-enabled=Car ammo alerts enabled
gun-turret-alerts-threshold=Low ammo threshold gun-turret-alerts-threshold=Low ammo threshold
[mod-setting-description] [mod-setting-description]
gun-turret-alerts-enabled=Enables alerts to be added to your player gun-turret-alerts-enabled=Enables turret ammo alerts to be added to your player
gun-turret-alerts-threshold=If a turret has less than this much ammo an alert will be added to your player gun-turret-alerts-car-enabled=Enables car ammo alerts to be added to your player
gun-turret-alerts-threshold=If a car or turret has less than this much ammo an alert will be added to your player
+6
View File
@@ -7,6 +7,12 @@ data:extend({
name = "gun-turret-alerts-enabled", name = "gun-turret-alerts-enabled",
setting_type = "runtime-per-user", setting_type = "runtime-per-user",
default_value = true default_value = true
},
{
type = "bool-setting",
name = "gun-turret-alerts-car-enabled",
setting_type = "runtime-per-user",
default_value = true
}, },
{ {
type = "int-setting", type = "int-setting",