diff --git a/media/image/skin/shiny_cho.png b/media/image/skin/shiny_cho.png index 829476a9..824f5027 100644 Binary files a/media/image/skin/shiny_cho.png and b/media/image/skin/shiny_cho.png differ diff --git a/parts/player/player.lua b/parts/player/player.lua index 92df7aa5..fd2889d0 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -1816,7 +1816,7 @@ local function _updateFX(P,dt) end end end -local function update_alive(P,dt) +local function update_alive(P) local ENV=P.gameEnv local S=P.stat @@ -1845,7 +1845,7 @@ local function update_alive(P,dt) end if P.timing then - S.time=S.time+dt + S.time=S.time+1/60 S.frame=S.frame+1 end @@ -1868,10 +1868,6 @@ local function update_alive(P,dt) end end - if P.type=='computer'then - P.bot:update(dt) - end - --Fresh visible time if not P.keepVisible then local V=P.visTime @@ -2165,7 +2161,14 @@ function Player:update(dt) else self.trigFrame=self.trigFrame+(self.gameEnv.FTLock and dt*60 or 1) while self.trigFrame>=1 do - (self.alive and update_alive or update_dead)(self,dt) + if self.alive then + update_alive(self) + if self.type=='computer'then + self.bot:update(dt) + end + else + update_dead(self) + end self.trigFrame=self.trigFrame-1 end end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 8f046326..25053588 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -58,7 +58,7 @@ scene.widgetList={ WIDGET.newSlider{name="atkFX", x=330,y=820,lim=280,w=540,unit=5,disp=SETval('atkFX'), code=SETsto('atkFX')}, WIDGET.newSelector{name="frame", x=400,y=890,lim=280,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval('frameMul'),code=SETsto('frameMul')}, - WIDGET.newSwitch{name="FTlock", x=950,y=890,lim=290,disp=SETval('FTLock'), code=SETsto('FTLock')}, + WIDGET.newSwitch{name="FTlock", x=950,y=890,lim=290,disp=SETval('FTLock'), code=SETrev('FTLock')}, WIDGET.newSwitch{name="text", x=450,y=980,lim=360,disp=SETval('text'), code=SETrev('text')}, WIDGET.newSwitch{name="score", x=450,y=1030,lim=360,disp=SETval('score'), code=SETrev('score')},