diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index 49273112..d3bfadb5 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -714,7 +714,7 @@ do--function resetGameData(args) local gameSetting={ --Tuning 'das','arr','dascut','dropcut','sddas','sdarr', - 'ihs','irs','ims','RS','FTLock', + 'ihs','irs','ims','RS', --System 'skin','face', @@ -943,7 +943,7 @@ do--CUS/SETXXX(k) local warnList={ 'das','arr','dascut','dropcut','sddas','sdarr', 'ihs','irs','ims','RS', - 'FTLock','frameMul','highCam', + 'frameMul','highCam', 'VKSwitch','VKIcon','VKTrack','VKDodge', 'simpMode', } diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 7dd51770..028ce1fa 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -536,7 +536,6 @@ do--Game data tables ROOMENV={ --Room config capacity=10, - FTLock=true, --Basic drop=30,lock=60, @@ -591,7 +590,6 @@ do--Userdata tables ihs=true,irs=true,ims=true, holdMode='hold', RS='TRS', - FTLock=true, --System reTime=2, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 6ed43a03..c2e1ddc2 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -459,7 +459,6 @@ return{ atkFX="Atk FX", frame="Render Frame Rate (%)", - FTlock="Frame skip", text="Line Clear Pop-Ups", score="Score Pop-Ups", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index db01ea86..4f394ade 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -330,7 +330,6 @@ return{ atkFX="FX Vis. de Ataque", frame="Ratio de FPSs(%)", - FTlock="Bloqueo por frames", text="Texto de Acciones", score="Puntaje en Pantalla", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d7d51fad..2c4e3f11 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -423,7 +423,6 @@ return{ atkFX="Effets d'attaque", frame="Montrer les FPS(%)", - -- FTlock="Frame-Time Lock", text="Texte d'action", score="Pop-up de score", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 4ab09184..c9986d90 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -461,7 +461,6 @@ return{ atkFX="Efek Serang", frame="Kecepatan Bingkai (%)", - FTlock="Lewat Bingkai", text="Teks Baris", score="Teks Nilai", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index e064703b..87fbac7a 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -461,7 +461,6 @@ return{ atkFX="攻撃演出", frame="レンダリングフレームレート(%)", - FTlock="フレームスキップ", text="ライン消去ポップ", score="スコアポップ", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index b17ed129..70c6b73a 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -448,7 +448,6 @@ return{ atkFX="Nível FX Atk.", frame="Render Frame Rate(%)", - -- FTlock="Frame-Time Lock", text="Texto de ação", score="Pop-up de pontos", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index a85c8080..5f55c4a8 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -269,7 +269,6 @@ return{ atkFX="→→~", frame="|=|%", - FTlock="||=|→→|=||", text="ABC", score="+123", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4ab56347..25574d94 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -460,7 +460,6 @@ return{ atkFX="攻击特效:", frame="绘制帧率(%):", - FTlock="逻辑追帧", text="消行文本", score="分数动画", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 3955e942..64364185 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -458,7 +458,6 @@ return{ atkFX="攻击外汇", frame="渲染帧率(%)", - FTlock="逻辑追帧", text="行清除弹出窗口", score="分数弹出", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 709991d8..804d3a59 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -460,7 +460,6 @@ return{ atkFX="攻擊特效", frame="渲染幀率(%)", - FTlock="跳幀", text="清除文本", score="分數動畫", diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 4084e979..90ae7db0 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -70,5 +70,4 @@ return{ bg='none',bgm='race', allowMod=true, - FTLock=true, } diff --git a/parts/player/init.lua b/parts/player/init.lua index 0d70002f..d1de8d70 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -377,7 +377,6 @@ local DemoEnv={ life=1e99, allowMod=false, fine=false, - FTLock=false, } function PLY.newDemoPlayer(id) local P=_newEmptyPlayer(id) diff --git a/parts/player/player.lua b/parts/player/player.lua index e7421661..cff6a3e6 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -2671,7 +2671,7 @@ function Player:_die() end end function Player:update(dt) - self.trigFrame=self.trigFrame+(self.gameEnv.FTLock and dt*60 or 1) + self.trigFrame=self.trigFrame+dt*60 if self.alive then local S=self.stat if self.type=='computer'then self.bot:update(dt)end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index d16d5df9..0bf9d95c 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -69,7 +69,6 @@ scene.widgetList={ WIDGET.newSlider{name='atkFX', x=330,y=820,lim=280,w=540,axis={0,5,1},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=function(v)SETTING.frameMul=v;Z.setFrameMul(SETTING.frameMul)end}, - 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')},