Compare commits

..

No commits in common. "dcd1d54f1304068080d814e530da3da82ad9f212" and "16469f086386e9e220fd0a5335596fa4ae63370a" have entirely different histories.

3 changed files with 23 additions and 11 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
.DS_Store .DS_Store
.vscode/settings.json

22
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,22 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#65c89b",
"activityBar.background": "#65c89b",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#945bc4",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#15202b99",
"sash.hoverBorder": "#65c89b",
"statusBar.background": "#42b883",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#359268",
"statusBarItem.remoteBackground": "#42b883",
"statusBarItem.remoteForeground": "#15202b",
"titleBar.activeBackground": "#42b883",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#42b88399",
"titleBar.inactiveForeground": "#15202b99"
},
"peacock.color": "#42b883"
}

View File

@ -411,11 +411,6 @@ function newtitle()
end end
}, },
bg.new{c=1}, bg.new{c=1},
bg.new{
y=28,
h=72,
c=5,
},
box, box,
toyphin.new(), toyphin.new(),
{ {
@ -620,9 +615,7 @@ function toyphin:update()
-- maybe boost -- maybe boost
if dy > -4.125 then if dy > -4.125 then
new_y = 64 + ((dy + y - 64)/dy * -4.125) new_y = 64 + ((dy + y - 64)/dy * -4.125)
dy = -4.125 dy = 4.125
else
dy = (dy - 4.125) / 2
end end
else else
-- brake -- brake
@ -643,8 +636,6 @@ function toyphin:update()
if dy < 4.125 then if dy < 4.125 then
new_y = 64 - ((dy - y + 64)/dy * 4.125) new_y = 64 - ((dy - y + 64)/dy * 4.125)
dy = 4.125 dy = 4.125
else
dy = (4.125 + dy) / 2
end end
else else
--brake --brake