aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 12:31:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Renamed global to force_data

Browse Source
This commit is contained in:
Cooldude2606
2018-10-14 17:34:40 +01:00
parent a120a17996
commit 6f8fea9a11
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/ExpGamingInfo/Science/control.lua
View File

@@ -34,8 +34,7 @@ local global = global{
_update=0, _update=0,
made={0,0,0,0,0,0,0}, made={0,0,0,0,0,0,0},
_made={0,0,0,0,0,0,0} _made={0,0,0,0,0,0,0}
}, }
data={}
} }
-- Function Define -- Function Define
@@ -46,14 +45,14 @@ ThisModule.Gui = Gui.left{
draw=function(frame) draw=function(frame)
local player = Game.get_player(frame.player_index) local player = Game.get_player(frame.player_index)
log(serpent.line(global)) log(serpent.line(global))
log(serpent.line(global.data[player.force.name])) log(serpent.line(global[player.force.name]))
if not global.data[player.force.name] then if not global[player.force.name] then
verbose('Added Science Global for: '..player.force.name) verbose('Added Science Global for: '..player.force.name)
global.data[player.force.name] = table.deepcopy(global._base) global[player.force.name] = table.deepcopy(global._base)
end end
log(serpent.line(global)) log(serpent.line(global))
log(serpent.line(global.data[player.force.name])) log(serpent.line(global[player.force.name]))
global = global.data[player.force.name] force_data = global[player.force.name]
frame.caption = {'ExpGamingInfo-Science.name'} frame.caption = {'ExpGamingInfo-Science.name'}
frame.add{ frame.add{
type='label', type='label',
@@ -73,22 +72,22 @@ ThisModule.Gui = Gui.left{
type='flow', type='flow',
direction='vertical' direction='vertical'
} }
if global.update < game.tick-100 then if force_data.update < game.tick-100 then
global._update = global.update force_data._update = force_data.update
global._made = table.deepcopy(global.made) force_data._made = table.deepcopy(force_data.made)
for i,name in pairs(science_packs) do for i,name in pairs(science_packs) do
global.made[i] = player.force.item_production_statistics.get_input_count(name) force_data.made[i] = player.force.item_production_statistics.get_input_count(name)
end end
global.update = game.tick force_data.update = game.tick
end end
for i,name in pairs(science_packs) do for i,name in pairs(science_packs) do
local made = global.made[i] local made = force_data.made[i]
if made > 0 then if made > 0 then
totals.add{ totals.add{
type='label', type='label',
caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},made} caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},made}
} }
local _made = string.format('%.2f',(made-global._made[i])/((global.update-global._update)/(3600*game.speed))) local _made = string.format('%.2f',(made-force_data._made[i])/((force_data.update-force_data._update)/(3600*game.speed)))
times.add{ times.add{
type='label', type='label',
caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},_made} caption={'ExpGamingInfo-Science.format',{'ExpGamingInfo-Science.'..name},_made}