diff --git a/Zframework/vibrate.lua b/Zframework/vibrate.lua index 116264f3..d5a5b057 100644 --- a/Zframework/vibrate.lua +++ b/Zframework/vibrate.lua @@ -1,8 +1,6 @@ local level={0,0,.01,.016,.023,.03,.04,.05,.06,.07,.08,.09,.12,.15} local vib=love.system.vibrate return function(t) - local L=SETTING.vib - if L>0 then - vib(level[L+t]) - end + t=level[t] + if t then vib(t)end end diff --git a/parts/player/player.lua b/parts/player/player.lua index 4edeab04..4f8561bc 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -13,6 +13,7 @@ local SFX,BGM,VOC,VIB,SYSFX=SFX,BGM,VOC,VIB,SYSFX local FREEROW,TABLE,TEXT,TASK=FREEROW,TABLE,TEXT,TASK local PLAYERS,PLY_ALIVE,GAME=PLAYERS,PLY_ALIVE,GAME +local SETTING=SETTING ---------------------------------------------------- function Player:_showText(text,dx,dy,font,style,spd,stop) ins(self.bonus,TEXT.getText(text,150+dx,300+dy,font,style,spd,stop)) @@ -1520,7 +1521,7 @@ do--Player.drop(self)--Place piece if cmb>14 then SFX.play('ren_mega',(cmb-10)*.1) end - VIB(cc+1) + if SETTING.vib>0 then VIB(SETTING.vib+cc+1)end end else--No lines clear cmb=0 @@ -2479,7 +2480,7 @@ function Player:act_hardDrop() self.spinLast=false if self.sound then SFX.play('drop',nil,self:getCenterX()*.15) - VIB(1) + if SETTING.vib>0 then VIB(SETTING.vib+1)end end end if ENV.shakeFX then diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index e36d04d5..d5144c28 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -77,7 +77,7 @@ scene.widgetList={ WIDGET.newSlider{name="stereo", x=300, y=380,w=420,lim=220,color='lC',change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval('stereo'),code=SETsto('stereo'),hideF=function()return SETTING.sfx==0 end}, WIDGET.newSlider{name="spawn", x=300, y=450,w=420,lim=220,color='lC',change=function()SFX.fplay('spawn_'..math.random(7),SETTING.sfx_spawn)end,disp=SETval('sfx_spawn'),code=SETsto('sfx_spawn')}, WIDGET.newSlider{name="warn", x=300, y=520,w=420,lim=220,color='lC',change=function()SFX.fplay('warning',SETTING.sfx_warn)end,disp=SETval('sfx_warn'),code=SETsto('sfx_warn')}, - WIDGET.newSlider{name="vib", x=300, y=590,w=420,lim=220,color='lN',unit=10,change=function()VIB(2)end,disp=SETval('vib'),code=SETsto('vib')}, + WIDGET.newSlider{name="vib", x=300, y=590,w=420,lim=220,color='lN',unit=10,change=function()if SETTING.vib>0 then VIB(SETTING.vib+2)end end,disp=SETval('vib'),code=SETsto('vib')}, WIDGET.newSlider{name="voc", x=300, y=660,w=420,lim=220,color='lN',change=function()VOC.play('test')end,disp=SETval('voc'),code=SETsto('voc')}, WIDGET.newSwitch{name="autoMute", x=1150,y=180,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 6ebb96a7..be42d1a5 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -47,7 +47,7 @@ scene.widgetList={ WIDGET.newSwitch{name="hide", x=1150, y=200, lim=400, font=40,disp=SETval('VKSwitch'),code=SETrev('VKSwitch')}, WIDGET.newSwitch{name="icon", x=1150, y=300, lim=400, font=40,disp=SETval('VKIcon'),code=SETrev('VKIcon'),hideF=_notShow}, WIDGET.newSlider{name="sfx", x=830, y=380, lim=160,w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval('VKSFX'),code=SETsto('VKSFX'),hideF=_notShow}, - WIDGET.newSlider{name="vib", x=830, y=450, lim=160,w=400,unit=6, font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, + WIDGET.newSlider{name="vib", x=830, y=450, lim=160,w=400,unit=6, font=35,change=function()if SETTING.vib>0 then VIB(SETTING.vib+SETTING.VKVIB)end end,disp=SETval('VKVIB'),code=SETsto('VKVIB'),hideF=_notShow}, WIDGET.newSlider{name="alpha", x=830, y=520, lim=160,w=400, font=40,disp=SETval('VKAlpha'),code=SETsto('VKAlpha'),hideF=_notShow}, WIDGET.newSwitch{name="track", x=360, y=720, lim=250, font=35,disp=SETval('VKTrack'),code=SETrev('VKTrack'),hideF=_notShow}, diff --git a/parts/virtualKey.lua b/parts/virtualKey.lua index da4e3611..d1e09d41 100644 --- a/parts/virtualKey.lua +++ b/parts/virtualKey.lua @@ -139,6 +139,8 @@ function VK.touch(id,x,y) local B=keys[id] B.isDown=true B.pressTime=10 + SFX.play('virtualKey',SETTING.VKSFX) + if SETTING.vib>0 then VIB(SETTING.vib+SETTING.VKVIB)end if SETTING.VKTrack then --Auto follow @@ -160,8 +162,6 @@ function VK.touch(id,x,y) end end end - SFX.play('virtualKey',SETTING.VKSFX) - VIB(SETTING.VKVIB) end function VK.press(id)