Added "quick" argument

This commit is contained in:
LDDestroier 2018-11-27 17:28:31 -05:00 committed by GitHub
parent 908f184b3a
commit fb68ed9007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 33 deletions

View File

@ -72,6 +72,7 @@ local resetPlayers = function()
end end
local tArg = {...} local tArg = {...}
local useSkynet = (tArg[1] or ""):lower() == "skynet" local useSkynet = (tArg[1] or ""):lower() == "skynet"
local useOnce = (tArg[2] or tArg[1] or ""):lower() == "quick"
local skynetPath = "skynet" local skynetPath = "skynet"
local skynetURL = "https://raw.githubusercontent.com/osmarks/skynet/master/client.lua" local skynetURL = "https://raw.githubusercontent.com/osmarks/skynet/master/client.lua"
@ -1015,6 +1016,38 @@ local helpScreen = function()
waitForKey(0.25) waitForKey(0.25)
end end
local startGame = function()
-- reset all info between games
trail = {}
deadGuys = {}
lastDirectionPressed = nil
netLastDirectionPressed = nil
gameDelay = gameDelayInit
grid = deepCopy(initGrid)
player = resetPlayers()
you, nou = 1, 2
gamename = ""
for i = 1, 32 do
gamename = gamename .. string.char(mathrandom(1,126))
end
waitingForGame = true
transmit(port, {
player = player,
gameID = gamename,
new = os.time(),
gameDelay = gameDelayInit,
grid = initGrid
})
rVal = parallel.waitForAny( pleaseWait, networking )
-- give time for skynet
sleep(0.1)
if rVal == 2 then
startCountdown()
parallel.waitForAny( getInput, game, networking )
end
end
local decision local decision
local main = function() local main = function()
@ -1023,35 +1056,7 @@ local main = function()
decision = titleScreen() decision = titleScreen()
lockInput = false lockInput = false
if decision == "start" then if decision == "start" then
-- reset all info between games startGame()
trail = {}
deadGuys = {}
lastDirectionPressed = nil
netLastDirectionPressed = nil
gameDelay = gameDelayInit
grid = deepCopy(initGrid)
player = resetPlayers()
you, nou = 1, 2
gamename = ""
for i = 1, 32 do
gamename = gamename .. string.char(mathrandom(1,126))
end
waitingForGame = true
transmit(port, {
player = player,
gameID = gamename,
new = os.time(),
gameDelay = gameDelayInit,
grid = initGrid
})
rVal = parallel.waitForAny( pleaseWait, networking )
-- give time for skynet
sleep(0.1)
if rVal == 2 then
startCountdown()
parallel.waitForAny( getInput, game, networking )
end
elseif decision == "help" then elseif decision == "help" then
helpScreen() helpScreen()
elseif decision == "demo" then elseif decision == "demo" then
@ -1062,9 +1067,18 @@ local main = function()
end end
end end
if useSkynet then if useOnce then
parallel.waitForAny(main, skynet.listen) if useSkynet then
skynet.socket.close() parallel.waitForAny(startGame, skynet.listen)
skynet.socket.close()
else
startGame()
end
else else
main() if useSkynet then
parallel.waitForAny(main, skynet.listen)
skynet.socket.close()
else
main()
end
end end