pull changes from upstream #4

Merged
kistaro merged 5 commits from pyrex/chameleonic:main into main 2022-12-18 01:39:00 +00:00
Showing only changes of commit 8a88131d1e - Show all commits

View File

@ -609,8 +609,9 @@ function player:_vanish_if_requested()
if self.vanishing then if self.vanishing then
self.vanish_frame+=1 self.vanish_frame+=1
if (self.fall_frame>10 or self.vanish_frame>20) then if (self.fall_frame>0 or self.vanish_frame>20) then
level:restart() level:restart()
self.vanish_frame=20
self.vanishing=false self.vanishing=false
end end
else else