diff --git a/Zframework/file.lua b/Zframework/file.lua index 823f3a9a..1759dcb8 100644 --- a/Zframework/file.lua +++ b/Zframework/file.lua @@ -3,6 +3,7 @@ local fs=love.filesystem local files={ data= fs.newFile("data.dat"), setting=fs.newFile("settings.dat"), + network=fs.newFile("network.dat"), VK= fs.newFile("virtualkey.dat"), keyMap= fs.newFile("key.dat"), unlock= fs.newFile("unlock.dat"), @@ -109,6 +110,28 @@ function FILE.saveSetting() end end +function FILE.loadNetwork() + local F=files.setting + if F:open("r")then + local s=F:read() + if s:sub(1,6)~="return"then + s="return{"..s:gsub("\n",",").."}" + end + s=loadstring(s) + F:close() + if s then + setfenv(s,{}) + addToTable(s(),NETWORK) + end + end +end +function FILE.saveNetwork() + local F=files.setting + F:open("w") + F:write(dumpTable(NETWORK)) + F:flush()F:close() +end + function FILE.loadKeyMap() local F=files.keyMap if F:open("r")then diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 1f35a409..53da90bd 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -299,6 +299,15 @@ for i=1,25 do STAT.spin[i]={0,0,0,0,0,0,0} end +NETWORK={ + id=nil, + username=nil, + motto=nil, + avatar=nil, + auth_token=nil, + access_token=nil +} + keyMap={ {"left","right","x","z","c","up","down","space","tab","r"},{}, --Keyboard diff --git a/parts/tick.lua b/parts/tick.lua index fd0a8c03..fe043971 100644 --- a/parts/tick.lua +++ b/parts/tick.lua @@ -156,8 +156,10 @@ function Tick.httpREQ_login(data) local success,content=json.decode(response.body) if success then LOG.print(text.loginSuccessed..": "..content.message) - -- TODO: save {content.token} to storage and a global variable - -- TODO: save {content.id} to a global variable + NETWORK.id=content.id + NETWORK.username=content.username + NETWORK.auth_token=content.auth_token + FILE.saveNetwork() else LOG.print(text.jsonError,"warn") end