From 1f6fcd439e1b4aa7c9c0e371b538a9f24a6fbce3 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 26 Apr 2018 16:43:12 +0100 Subject: [PATCH] Added More To Sync --- Addons/Guis/rockets.lua | 20 +++++++++++++++++++- Addons/Guis/science.lua | 18 +++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/Addons/Guis/rockets.lua b/Addons/Guis/rockets.lua index 5ca8fb1f..62fa1074 100644 --- a/Addons/Guis/rockets.lua +++ b/Addons/Guis/rockets.lua @@ -83,4 +83,22 @@ Gui.left.add{ end } -Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) \ No newline at end of file +Event.register(defines.events.on_rocket_launched,function(event) Gui.left.update('rockets') end) +Sync.add_update('rockets',function() + local _return = {} + local data = _global() + local satellites = game.forces.player.get_item_launched('satellite') + local time = {'rockets.nan'} + if satellites == 1 then time = tick_to_display_format(game.tick) + elseif satellites > 1 then time = tick_to_display_format((game.tick-data.first)/satellites) end + _return.total = satellites + _return.first = Sync.tick_format(data.first) + _return.last = Sync.tick_format(data.last-data._last) + _return.time = Sync.tick_format(time) + _return.fastest = Sync.tick_format(data.fastest) + _return.milestones = {} + for milestone,time in pairs(data.milestones) do + _return.milestones[milestone] = Sync.tick_format(_time) + end + return _return +end) \ No newline at end of file diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua index 1bca2004..1cdf7887 100644 --- a/Addons/Guis/science.lua +++ b/Addons/Guis/science.lua @@ -83,4 +83,20 @@ Gui.left.add{ end } -Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) \ No newline at end of file +Event.register(defines.events.on_research_finished,function(event) Gui.left.update('science') end) +Sync.add_update('science',function() + local _return = {} + local _data = _global() + for force_name,data in pairs(_data) do + if force_name ~= '_base' then + _return[force_name] = {totals={},times={}} + for i,name in pairs(science_packs) do + local made = data.made[i] + _return[force_name].totals[name] = made + local _made = string.format('%.2f',(made-data._made[i])/((data.update-data._update)/(3600*game.speed))) + _return[force_name].times[name] = _made + end + end + end + return _return +end) \ No newline at end of file