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

Compare commits

...

3 Commits

Author SHA1 Message Date
Wyrrrd ff7c5aab24 Performance
- moved turret index init to on_init
- migrated on_event to on_nth_tick
- typo in changelog
2020-03-21 14:20:23 +01:00
Wyrrrd 8a707a0c8b Bugfix & style
- added initialization of turret index
- removed unnecessary variable
2020-03-21 14:00:26 +01:00
Wyrrrd 7c1e998c86 Fixed surface handling (again)
This time keeping performance of original design
2020-03-20 12:25:04 +01:00
3 changed files with 42 additions and 24 deletions
+12
View File
@@ -1,4 +1,16 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 0.18.3
Date: 2020-03-21
Changes:
- Migrated on_event to on_nth_tick for performance
Bugfixes:
- Added missing initialization of turret index
---------------------------------------------------------------------------------------------------
Version: 0.18.2
Date: 2020-03-20
Changes:
- Redesigned surface handling again to be more performant
---------------------------------------------------------------------------------------------------
Version: 0.18.1 Version: 0.18.1
Date: 2020-03-19 Date: 2020-03-19
Changes: Changes:
+22 -16
View File
@@ -1,33 +1,39 @@
--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 gun-turrets and places alerts when turrets are low.
script.on_event({defines.events.on_tick}, function (event) script.on_init(function (event)
if event.tick%600 == 0 then -- turret index init
global.turret_entities = {}
end)
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.
for index,surface in pairs(game.surfaces) do
global.turret_entities[index] = surface.find_entities_filtered{type = "ammo-turret"}
end
end)
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 ammo-turret entities on the same force as them.
for index,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_enabled = player.mod_settings["gun-turret-alerts-enabled"].value
player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value player_threshold = player.mod_settings["gun-turret-alerts-threshold"].value
turret_entities = player.surface.find_entities_filtered{type = "ammo-turret"} turret_entities = global.turret_entities[player.surface.name]
if GTA_enabled then
for index2, turret_entity in pairs(turret_entities) do if GTA_enabled and turret_entities then
if turret_entity.valid then for _,turret_entity in pairs(turret_entities) do
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)
if inv_var.is_empty() then if inv_var.is_empty() then
ammo_left = 0 -- no ammo alert
else
ammo_left = inv_var[1].count
end
if turret_entity.force == player.force then
if ammo_left == 0 then
player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true) player.add_custom_alert(turret_entity, {type = "item", name = "piercing-rounds-magazine"}, "Out of ammo", true)
elseif ammo_left < player_threshold then elseif inv_var[1].count < player_threshold then
-- low ammo alert
player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true) player.add_custom_alert(turret_entity, {type = "item", name = "firearm-magazine"}, "Ammo low", true)
end end
end end
end end
end end
end end
end
end
end) end)
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "Gun_Turret_Alerts", "name": "Gun_Turret_Alerts",
"version": "0.18.1", "version": "0.18.3",
"title": "Gun_Turret_Alerts", "title": "Gun_Turret_Alerts",
"author": "Wyrrrd", "author": "Wyrrrd",
"factorio_version": "0.18", "factorio_version": "0.18",