diff --git a/Zframework/languages.lua b/Zframework/languages.lua index b6db84fa..46246ada 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -288,9 +288,10 @@ local langList={ setting_video={ sound="←声音设置", game="游戏设置→", - ghost="阴影", + block="方块透明度", + ghost="阴影透明度", + center="旋转中心透明度", smooth="平滑下落", - center="旋转中心", grid="网格", bagLine="包分界线", lockFX="锁定特效等级", @@ -787,9 +788,10 @@ local langList={ setting_video={ sound="←声音设置", game="游戏设置→", - ghost="阴影", + block="方块透明度", + ghost="阴影透明度", + center="旋转中心透明度", smooth="平滑下落", - center="旋转中心", grid="网格", bagLine="包分界线", lockFX="锁定特效等级", @@ -1276,9 +1278,10 @@ local langList={ setting_video={ sound="←Sound", game="Game→", + block="Block", ghost="Ghost", - smooth="Smooth drop", center="Center", + smooth="Smooth drop", grid="Grid", bagLine="Bag Line", lockFX="Lock FX Level", @@ -1763,9 +1766,10 @@ local langList={ setting_video={ sound="←Sound", game="Game→", + block="==↓==", ghost="__↓__", - smooth="~~↓~~", center="+", + smooth="~~↓~~", grid="#", bagLine="123|123", lockFX="↓_~", diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 214dfc44..c3006420 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -243,6 +243,7 @@ local Widgets={ setting_game={ newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_video","swipeR")end}), newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_sound","swipeL")end}), + newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=goScene("setting_control")}), newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=goScene("setting_key")}), newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=goScene("setting_touch")}), @@ -260,41 +261,46 @@ local Widgets={ setting_video={ newButton({name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_sound","swipeR")end}), newButton({name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=function()SCN.swapTo("setting_game","swipeL")end}), - newSlider({name="ghost", x=250, y=180,w=200,unit=.6,font=35,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}), - newSlider({name="center", x=620, y=180,w=200,unit=1, font=35,disp=SETval("center"), code=SETsto("center")}), - newSwitch({name="smooth", x=260, y=260, font=25,disp=SETval("smooth"), code=SETrev("smooth")}), - newSwitch({name="grid", x=480, y=260, font=35,disp=SETval("grid"), code=SETrev("grid")}), - newSwitch({name="bagLine", x=700, y=260, font=30,disp=SETval("bagLine"), code=SETrev("bagLine")}), - newSlider({name="lockFX", x=350, y=340,w=373,unit=5, font=32,disp=SETval("lockFX"), code=SETsto("lockFX")}), - newSlider({name="dropFX", x=350, y=390,w=373,unit=5, font=32,disp=SETval("dropFX"), code=SETsto("dropFX")}), - newSlider({name="moveFX", x=350, y=440,w=373,unit=5, font=32,disp=SETval("moveFX"), code=SETsto("moveFX")}), - newSlider({name="clearFX", x=350, y=490,w=373,unit=5, font=32,disp=SETval("clearFX"), code=SETsto("clearFX")}), - newSlider({name="shakeFX", x=350, y=540,w=373,unit=5, font=32,disp=SETval("shakeFX"), code=SETsto("shakeFX")}), - newSlider({name="atkFX", x=350, y=590,w=373,unit=5, font=32,disp=SETval("atkFX"), code=SETsto("atkFX")}), - newSlider({name="frame", x=350, y=640,w=373,unit=10,font=30, + + newSlider({name="block", x=260, y=180,w=200,unit=1, font=30,disp=SETval("block"),show="percent",code=SETsto("block")}), + newSlider({name="ghost", x=260, y=240,w=200,unit=.6,font=30,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}), + newSlider({name="center", x=260, y=300,w=200,unit=1, font=30,disp=SETval("center"),show="percent",code=SETsto("center")}), + + newSwitch({name="smooth", x=700, y=180, font=30,disp=SETval("smooth"), code=SETrev("smooth")}), + newSwitch({name="grid", x=700, y=240, font=30,disp=SETval("grid"), code=SETrev("grid")}), + newSwitch({name="bagLine", x=700, y=300, font=30,disp=SETval("bagLine"), code=SETrev("bagLine")}), + + newSlider({name="lockFX", x=350, y=350,w=373,unit=5, font=32,disp=SETval("lockFX"), code=SETsto("lockFX")}), + newSlider({name="dropFX", x=350, y=400,w=373,unit=5, font=32,disp=SETval("dropFX"), code=SETsto("dropFX")}), + newSlider({name="moveFX", x=350, y=450,w=373,unit=5, font=32,disp=SETval("moveFX"), code=SETsto("moveFX")}), + newSlider({name="clearFX", x=350, y=500,w=373,unit=5, font=32,disp=SETval("clearFX"), code=SETsto("clearFX")}), + newSlider({name="shakeFX", x=350, y=550,w=373,unit=5, font=32,disp=SETval("shakeFX"), code=SETsto("shakeFX")}), + newSlider({name="atkFX", x=350, y=600,w=373,unit=5, font=32,disp=SETval("atkFX"), code=SETsto("atkFX")}), + newSlider({name="frame", x=350, y=650,w=373,unit=10,font=30, disp=function() return setting.frameMul>35 and setting.frameMul/10 or setting.frameMul/5-4 end, code=function(i) setting.frameMul=i<5 and 5*i+20 or 10*i end}), - newSwitch({name="text", x=1050, y=180,font=35,disp=SETval("text"),code=SETrev("text")}), - newSwitch({name="warn", x=1050, y=240,font=35,disp=SETval("warn"),code=SETrev("warn")}), - newSwitch({name="highCam", x=1050, y=300,font=35,disp=SETval("highCam"),code=SETrev("highCam")}), - newSwitch({name="nextPos", x=1050, y=360,font=35,disp=SETval("nextPos"),code=SETrev("nextPos")}), - newSwitch({name="fullscreen",x=1050,y=420,font=35,disp=SETval("fullscreen"), + + newSwitch({name="text", x=1100, y=180,font=35,disp=SETval("text"),code=SETrev("text")}), + newSwitch({name="warn", x=1100, y=240,font=35,disp=SETval("warn"),code=SETrev("warn")}), + newSwitch({name="highCam", x=1100, y=300,font=35,disp=SETval("highCam"),code=SETrev("highCam")}), + newSwitch({name="nextPos", x=1100, y=360,font=35,disp=SETval("nextPos"),code=SETrev("nextPos")}), + newSwitch({name="fullscreen",x=1100,y=420,font=35,disp=SETval("fullscreen"), code=function() setting.fullscreen=not setting.fullscreen love.window.setFullscreen(setting.fullscreen) love.resize(love.graphics.getWidth(),love.graphics.getHeight()) end}), - newSwitch({name="bg", x=1050, y=480,font=35,disp=SETval("bg"), + newSwitch({name="bg", x=1100, y=480,font=35,disp=SETval("bg"), code=function() BG.set("none") setting.bg=not setting.bg BG.set("space") end}), - newSwitch({name="power", x=1050, y=540,font=35,disp=SETval("powerInfo"), + newSwitch({name="power", x=1100, y=540,font=35,disp=SETval("powerInfo"), code=function() setting.powerInfo=not setting.powerInfo end}), @@ -303,6 +309,7 @@ local Widgets={ setting_sound={ newButton({name="game", x=200, y=80,w=240,h=80,color="lCyan", font=35,code=function()SCN.swapTo("setting_game","swipeR")end}), newButton({name="graphic", x=1080, y=80,w=240,h=80,color="lCyan", font=35,code=function()SCN.swapTo("setting_video","swipeL")end}), + newSlider({name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end, disp=SETval("sfx"), code=SETsto("sfx")}), newSlider({name="stereo", x=180, y=500,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return setting.sfx==0 end}), newSlider({name="spawn", x=180, y=300,w=400, font=30,change=function()SFX.fplay("spawn_"..rnd(7),setting.spawn)end,disp=SETval("spawn"), code=SETsto("spawn")}), diff --git a/modes/blind_ultimate.lua b/modes/blind_ultimate.lua index a2925735..bd380ed1 100644 --- a/modes/blind_ultimate.lua +++ b/modes/blind_ultimate.lua @@ -4,8 +4,7 @@ return{ color=color.red, env={ drop=30,lock=60, - block=false, - center=0,ghost=0, + block=0,center=0,ghost=0, dropFX=0,lockFX=0, visible="none", dropPiece=PLY.check_lineReach, diff --git a/modes/blind_wtf.lua b/modes/blind_wtf.lua index d526b493..acaeb28b 100644 --- a/modes/blind_wtf.lua +++ b/modes/blind_wtf.lua @@ -6,8 +6,7 @@ return{ env={ drop=30,lock=60, next=1, - block=false, - center=0,ghost=0, + block=0,center=0,ghost=0, dropFX=0,lockFX=0, visible="none", dropPiece=PLY.check_lineReach, diff --git a/parts/player.lua b/parts/player.lua index 431c4c97..49239efd 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -730,8 +730,8 @@ do--function Pdraw_norm(P) --Draw rotate center local x=30*(P.curX+P.sc[2])-15 - if ENV.center then - gc.setColor(1,1,1,trans*ENV.center) + if ENV.center and ENV.block then + gc.setColor(1,1,1,ENV.block*ENV.center) gc.draw(IMG.spinCenter,x,-30*(P.curY+P.sc[1])+15,nil,nil,nil,4,4) end gc.translate(0,dy) @@ -1216,6 +1216,7 @@ local function applyGameEnv(P)--Finish gameEnv processing if ENV.clearFX==0 then ENV.clearFX=nil end if ENV.shakeFX==0 then ENV.shakeFX=nil end + if ENV.block==0 then ENV.block=nil end if ENV.ghost==0 then ENV.ghost=nil end if ENV.center==0 then ENV.center=nil end end