diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 972fef99..8d68c567 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -265,7 +265,7 @@ SETTING={--Settings --Graphic ghostType='gray', block=true,ghost=.3,center=1, - smooth=true,grid=.16, + smooth=true,grid=.16,lineNum=.5, upEdge=true, bagLine=false, lockFX=2, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 86fe548b..4993e2ad 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -332,8 +332,9 @@ return{ ghostType="Ghost Type", ghost="Ghost", - grid="Grid", center="Center", + grid="Grid", + lineNum="line No.", lockFX="Lock FX", dropFX="Drop FX", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 98364ad7..04c2fcc9 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -298,8 +298,9 @@ return{ -- ghostType="Ghost Type", ghost="Fantasma", - grid="Grilla", center="Centrar", + grid="Grilla", + -- lineNum="line No.", lockFX="FX Vis. de Bloqueo", dropFX="FX Vis. de Caída", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 45aa48e5..ea772962 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -296,8 +296,9 @@ return{ -- ghostType="Ghost Type", ghost="Pièce fantôme", - grid="Grille", center="Centre", + grid="Grille", + -- lineNum="line No.", lockFX="Effets de verrouillage", dropFX="Effets de chute", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index c1f2e108..784fe62f 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -322,8 +322,9 @@ return{ -- ghostType="Ghost Type", ghost="Fantasma", - grid="Rede", center="Centro", + grid="Rede", + -- lineNum="line No.", lockFX="Nível FX Trava", dropFX="Nível FX Queda", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 4d561dbe..2677ce5b 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -156,8 +156,9 @@ return{ ghostType="__↓?__", ghost="__↓__", - grid="#", center="+", + grid="#", + lineNum="--No.", lockFX="↓_~", dropFX="↓~", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 0d17f0d5..63ded132 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -87,6 +87,7 @@ return{ block="方块可见", ghost="阴影", center="中心", + lineNum="行号", text="招式名", score="跳分", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 581922a0..4b39c0fc 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -332,8 +332,9 @@ return{ ghostType="阴影样式", ghost="阴影不透明度", - grid="网格不透明度", center="旋转中心不透明度", + grid="网格不透明度", + lineNum="行号透明度", lockFX="锁定特效", dropFX="下落特效", diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 75f2be83..23054a08 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -686,6 +686,15 @@ function draw.norm(P) --Draw field drawField(P,replaying) + if ENV.fieldH>20 and ENV.lineNum then + gc_setColor(1,1,1,ENV.lineNum) + setFont(20) + local dy=camDY<900 and 0 or camDY-camDY%300-900 + for i=1,3 do + gc.print(10+10*i+dy/30,2,-325-300*i-dy) + end + end + --Draw spawn line gc_setLineWidth(4) gc_setColor(1,sin(t)*.4+.5,0,.5) diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 62cdc345..7a32ef72 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -7,7 +7,7 @@ return{ ghostType='gray', block=true,ghost=.3,center=1, - smooth=false,grid=.16, + smooth=false,grid=.16,lineNum=.5, upEdge=true, bagLine=true, text=true, diff --git a/parts/player/init.lua b/parts/player/init.lua index 10cf8606..bdb8194f 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -348,6 +348,7 @@ local function applyGameEnv(P)--Finish gameEnv processing if ENV.ghost==0 then ENV.ghost=false end if ENV.grid==0 then ENV.grid=false end if ENV.center==0 then ENV.center=false end + if ENV.lineNum==0 then ENV.lineNum=false end end ---------------------------------------------------- diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 242f2aad..c829f062 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -46,9 +46,10 @@ scene.widgetList={ WIDGET.newSwitch{name="bagLine", x=380,y=390,disp=SETval("bagLine"),code=SETrev("bagLine")}, WIDGET.newSelector{name="ghostType",x=915,y=180,w=350,list={'color','gray','colorCell','grayCell','colorLine','grayLine'},disp=SETval("ghostType"),code=SETsto("ghostType")}, - WIDGET.newSlider{name="ghost", x=740,y=240,w=350,unit=1,disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, - WIDGET.newSlider{name="grid", x=740,y=320,w=350,unit=.4,disp=SETval("grid"),show="percent",code=SETsto("grid")}, - WIDGET.newSlider{name="center", x=740,y=400,w=350,unit=1,disp=SETval("center"), code=SETsto("center")}, + WIDGET.newSlider{name="ghost", x=740,y=240,w=350,unit=1,disp=SETval("ghost"), show="percent",code=SETsto("ghost")}, + WIDGET.newSlider{name="center", x=740,y=300,w=350,unit=1,disp=SETval("center"), show="percent",code=SETsto("center")}, + WIDGET.newSlider{name="grid", x=740,y=360,w=350,unit=.4,disp=SETval("grid"), show="percent",code=SETsto("grid")}, + WIDGET.newSlider{name="lineNum", x=740,y=420,w=350,unit=1,disp=SETval("lineNum"), show="percent",code=SETsto("lineNum")}, WIDGET.newSlider{name="lockFX", x=330,y=460,w=540,unit=5,disp=SETval("lockFX"), code=SETsto("lockFX")}, WIDGET.newSlider{name="dropFX", x=330,y=520,w=540,unit=5,disp=SETval("dropFX"), code=SETsto("dropFX")},