From 6cd2aea238f1ffb62feb3db23e13abce52606eba Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Mon, 1 Jan 2018 01:47:21 +0000
Subject: [PATCH] Fixed a few bugs in science info

---
 Addons/Guis/science.lua | 18 +++++++++++++-----
 Addons/playerRanks.lua  |  9 ++++++---
 locale/en/science.cfg   |  3 ++-
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Addons/Guis/science.lua b/Addons/Guis/science.lua
index abfa097d..1bca2004 100644
--- a/Addons/Guis/science.lua
+++ b/Addons/Guis/science.lua
@@ -20,7 +20,7 @@ local science_packs = {
 
 local function _global(reset)
     global.addons = not reset and global.addons or {}
-    global.addons.science = not reset and global.addons.science or {update=0,_update,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}}
+    global.addons.science = not reset and global.addons.science or {_base={update=0,_update=0,made={0,0,0,0,0,0,0},_made={0,0,0,0,0,0,0}}}
     return global.addons.science
 end
 
@@ -31,6 +31,10 @@ Gui.left.add{
     draw=function(frame)
         local data = _global()
         local player = Game.get_player(frame.player_index)
+        if not data[player.force.name] then 
+            data[player.force.name] = table.deepcopy(data._base)
+        end
+        data = data[player.force.name]
         frame.caption = {'science.name'}
         frame.add{
             type='label',
@@ -44,15 +48,15 @@ Gui.left.add{
         frame.add{
             type='label',
             caption={'science.time'},
-            style='caption_lable'
+            style='caption_label'
         }
         local times = frame.add{
             type='flow',
             direction='vertical'
         }
-        if data.update < game.time-100 then
+        if data.update < game.tick-100 then
             data._update = data.update
-            data._made = data.made
+            data._made = table.deepcopy(data.made)
             for i,name in pairs(science_packs) do
                 data.made[i] = player.force.item_production_statistics.get_input_count(name)
             end
@@ -72,7 +76,11 @@ Gui.left.add{
                 }
             end
         end
+    end,
+    can_open=function(player)
+        if player.force.item_production_statistics.get_input_count('science-pack-1') > 0 then return true
+        else return {'science.none'} end
     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)
\ No newline at end of file
diff --git a/Addons/playerRanks.lua b/Addons/playerRanks.lua
index 23693016..a0133765 100644
--- a/Addons/playerRanks.lua
+++ b/Addons/playerRanks.lua
@@ -42,17 +42,20 @@ local ranks = Ranking._ranks(true)
 groups['Root']:edit('allow',false,{
     ['player-list']=true,
     ['readme']=true,
-    ['rockets']=true
+    ['rockets']=true,
+    ['science']=true
 })
 groups['Admin']:edit('allow',false,{
     ['player-list']=true,
     ['readme']=true,
-    ['rockets']=true
+    ['rockets']=true,
+    ['science']=true
 })
 groups['User']:edit('allow',false,{
     ['player-list']=true,
     ['readme']=true,
-    ['rockets']=true
+    ['rockets']=true,
+    ['science']=true
 })
 groups['Jail']:edit('allow',false,{
     
diff --git a/locale/en/science.cfg b/locale/en/science.cfg
index 48a0b8ca..f42dbc94 100644
--- a/locale/en/science.cfg
+++ b/locale/en/science.cfg
@@ -10,4 +10,5 @@ science-pack-3=Blue
 military-science-pack=Military
 production-science-pack=Production
 high-tech-science-pack=High Tech
-space-science-pack=Space
\ No newline at end of file
+space-science-pack=Space
+none=No science packs have been made yet.
\ No newline at end of file