diff --git a/parts/player/draw.lua b/parts/player/draw.lua index cac0ad75..6aedf64c 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -228,27 +228,6 @@ local drawGhost={ end end end end, - colorLine=function(P,clr,alpha) - clr=minoColor[clr] - gc_setColor(clr[1],clr[2],clr[3],alpha) - gc_setLineWidth(4) - local CB=P.cur.bk - for i=1,#CB do for j=1,#CB[1]do - if CB[i][j]then - gc_rectangle('line',30*(j+P.curX-1)-30+2,-30*(i+P.ghoY-1)+2,26,26) - end - end end - end, - grayLine=function(P,_,alpha) - gc_setColor(1,1,1,alpha) - gc_setLineWidth(4) - local CB=P.cur.bk - for i=1,#CB do for j=1,#CB[1]do - if CB[i][j]then - gc_rectangle('line',30*(j+P.curX-1)-30+2,-30*(i+P.ghoY-1)+2,26,26) - end - end end - end, colorCell=function(P,clr,alpha) clr=minoColor[clr] gc_setColor(clr[1],clr[2],clr[3],alpha) @@ -268,6 +247,27 @@ local drawGhost={ end end end end, + colorLine=function(P,clr,alpha) + clr=minoColor[clr] + gc_setColor(clr[1],clr[2],clr[3],alpha) + gc_setLineWidth(4) + local CB=P.cur.bk + for i=1,#CB do for j=1,#CB[1]do + if CB[i][j]then + gc_rectangle('line',30*(j+P.curX-1)-30+4,-30*(i+P.ghoY-1)+4,22,22) + end + end end + end, + grayLine=function(P,_,alpha) + gc_setColor(1,1,1,alpha) + gc_setLineWidth(4) + local CB=P.cur.bk + for i=1,#CB do for j=1,#CB[1]do + if CB[i][j]then + gc_rectangle('line',30*(j+P.curX-1)-30+4,-30*(i+P.ghoY-1)+4,22,22) + end + end end + end, } local function drawBlockOutline(P,texture,trans) shader_alpha:send('a',trans) diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index c30db8ac..a1d5a330 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -45,7 +45,7 @@ scene.widgetList={ WIDGET.newSwitch{name="upEdge", x=380,y=320,disp=SETval("upEdge"),code=SETrev("upEdge")}, 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','colorLine','grayLine','colorCell','greyCell'},disp=SETval("ghostType"),code=SETsto("ghostType")}, + WIDGET.newSelector{name="ghostType",x=915,y=180,w=350,list={'color','gray','colorCell','greyCell','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")},