mirrors/ldd-CC
1
0
Fork 0
mirror of https://github.com/LDDestroier/CC/ synced 2025-06-26 07:02:52 +00:00
Code Issues Releases Wiki Activity

Added menu animation when going to options

Browse Source 
neato
This commit is contained in:
LDDestroier 2019-04-17 01:31:12 -04:00 committed by GitHub
parent 396130487d
commit 9518e30243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tron.lua
View File

@ -1029,8 +1029,9 @@ local startCountdown = function()
end end
end end
local makeMenu = function(x, y, options, doAnimate, scrollInfo, _cpos) local makeMenu = function(x, fromX, y, options, doAnimate, scrollInfo, _cpos)
local cpos = _cpos or 1 local cpos = _cpos or 1
local xmod = 0
local cursor = "> " local cursor = "> "
local gsX, gsY = (scrollInfo or {})[2] or 0, (scrollInfo or {})[3] or 0 local gsX, gsY = (scrollInfo or {})[2] or 0, (scrollInfo or {})[3] or 0
local step = (scrollInfo or {})[1] or 0 local step = (scrollInfo or {})[1] or 0
@ -1062,16 +1063,16 @@ local makeMenu = function(x, y, options, doAnimate, scrollInfo, _cpos)
end end
for i = 1, #options do for i = 1, #options do
if i == cpos then if i == cpos then
termsetCursorPos(x, y + (i - 1)) termsetCursorPos(fromX + xmod, y + (i - 1))
termsetTextColor(colors.white) termsetTextColor(colors.white)
termwrite(cursor .. options[i]) termwrite(cursor .. options[i])
else else
if i == lastPos then if i == lastPos then
termsetCursorPos(x, y + (i - 1)) termsetCursorPos(fromX + xmod, y + (i - 1))
termwrite((" "):rep(#cursor)) termwrite((" "):rep(#cursor))
lastPos = nil lastPos = nil
else else
termsetCursorPos(x + #cursor, y + (i - 1)) termsetCursorPos(fromX + xmod + #cursor, y + (i - 1))
end end
termsetTextColor(colors.gray) termsetTextColor(colors.gray)
termwrite(options[i]) termwrite(options[i])
@ -1083,6 +1084,7 @@ local makeMenu = function(x, y, options, doAnimate, scrollInfo, _cpos)
os.queueEvent("timer", gstID) os.queueEvent("timer", gstID)
end end
rend() rend()
local tID = os.startTimer(0.05)
while true do while true do
evt = {os.pullEvent()} evt = {os.pullEvent()}
if evt[1] == "key" then if evt[1] == "key" then
@ -1107,22 +1109,34 @@ local makeMenu = function(x, y, options, doAnimate, scrollInfo, _cpos)
return cpos, {step, gsX, gsY} return cpos, {step, gsX, gsY}
else else
cpos = evt[4] - (y - 1) cpos = evt[4] - (y - 1)
rend() doRend = true
end end
end end
elseif evt[1] == "timer" and evt[2] == gstID then elseif evt[1] == "timer" then
gstID = os.startTimer(gameDelayInit) if evt[2] == gstID then
drawGrid(gsX, gsY, true) gstID = os.startTimer(gameDelayInit)
step = step + 1 drawGrid(gsX, gsY, true)
if mathceil(step / 100) % 2 == 1 then step = step + 1
gsX = gsX + 1 if mathceil(step / 100) % 2 == 1 then
else gsX = gsX + 1
gsY = gsY - 1 else
gsY = gsY - 1
end
doRend = true
elseif evt[2] == tID then
doRend = true
if x > fromX then
xmod = math.min(xmod + 1, x - fromX)
tID = os.startTimer(0.05)
else
xmod = math.max(xmod - 1, x - fromX)
tID = os.startTimer(0.05)
end
end end
rend()
end end
if lastPos ~= cpos then if lastPos ~= cpos or doRend then
rend() rend()
doRend = false
end end
end end
end end
@ -1261,8 +1275,10 @@ local titleScreen = function()
"Exit" "Exit"
} }
end end
local currentX = 2
while true do while true do
choice, scrollInfo = makeMenu(2, scr_y - #menuOptions, menuOptions, true, scrollInfo) choice, scrollInfo = makeMenu(2, currentX, scr_y - #menuOptions, menuOptions, true, scrollInfo)
currentX = 2
if choice == 1 then if choice == 1 then
return "start" return "start"
elseif choice == 2 then elseif choice == 2 then
@ -1277,7 +1293,8 @@ local titleScreen = function()
(useSkynet and "Disable" or "Enable") .. " Skynet", (useSkynet and "Disable" or "Enable") .. " Skynet",
"Back..." "Back..."
} }
choice, scrollInfo = makeMenu(14, scr_y - #options, options, true, scrollInfo, _cpos) choice, scrollInfo = makeMenu(6, currentX, scr_y - #options, options, true, scrollInfo, _cpos)
currentX = 6
_cpos = choice _cpos = choice
if choice == 1 then if choice == 1 then
return "demo" return "demo"