把方便改的blind都换成invis，防止冒犯到盲人

模式名里的blind没有改，会影响存档数据不方便，不会在游戏里直接显示 close #291 （好奇真的有盲人玩吗）
2021-09-11 20:32:12 +08:00
parent 27f2d05c56
commit b8b85b569c
11 changed files with 52 additions and 52 deletions
--- a/parts/scenes/app_15p.lua
+++ b/parts/scenes/app_15p.lua
@@ -9,7 +9,7 @@ local board,cx,cy
 local startTime,time
 local move,push,state

-local color,blind='color1'
+local color,invis='color1'
 local slide,pathVis,revKB

 local function ifGaming()return state==1 end
@@ -26,7 +26,7 @@ function scene.sceneInit()
    state=2

    color='color1'
-    blind=false
+    invis=false
    slide=true
    pathVis=true
    revKB=false
@@ -160,7 +160,7 @@ function scene.keyDown(key,isRep)
        end
    elseif key=="w"then
        if state==0 then
-            blind=not blind
+            invis=not invis
        end
    elseif key=="e"then
        if state==0 then
@@ -292,7 +292,7 @@ function scene.draw()
    gc.rectangle('line',313,33,654,654,18)

    gc.setLineWidth(4)
-    local mono=blind and state==1
+    local mono=invis and state==1
    setFont(80)
    for i=1,4 do
        for j=1,4 do
@@ -322,7 +322,7 @@ end
 scene.widgetList={
    WIDGET.newButton{name="reset",  x=160, y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"},
    colorSelector,
-    WIDGET.newSwitch{name="blind",  x=240, y=330,w=60,font=40,disp=function()return blind end,  code=pressKey"w",hideF=ifGaming},
+    WIDGET.newSwitch{name="invis",  x=240, y=330,w=60,font=40,disp=function()return invis end,  code=pressKey"w",hideF=ifGaming},
    WIDGET.newSwitch{name="slide",  x=240, y=420,w=60,font=40,disp=function()return slide end,  code=pressKey"e",hideF=ifGaming},
    WIDGET.newSwitch{name="pathVis",x=240, y=510,w=60,font=40,disp=function()return pathVis end,code=pressKey"r",hideF=function()return state==1 or not slide end},
    WIDGET.newSwitch{name="revKB",  x=240, y=600,w=60,font=40,disp=function()return revKB end,  code=pressKey"t",hideF=ifGaming},
--- a/parts/scenes/app_2048.lua
+++ b/parts/scenes/app_2048.lua
@@ -9,7 +9,7 @@ local mStr=mStr

 local scene={}

-local blind,tapControl
+local invis,tapControl

 local board
 local startTime,time
@@ -231,7 +231,7 @@ function scene.sceneInit()
    BGM.play('truth')
    board={}

-    blind=false
+    invis=false
    tapControl=false
    startTime=0
    reset()
@@ -320,7 +320,7 @@ function scene.keyDown(key,isRep)
        end
    elseif key=="space"then skip()
    elseif key=="r"then reset()
-    elseif key=="q"then if state==0 then blind=not blind end
+    elseif key=="q"then if state==0 then invis=not invis end
    elseif key=="w"then if state==0 then tapControl=not tapControl end
    elseif key=="1"or key=="2"then(kb.isDown("lshift","lctrl","lalt")and playRep or setFocus)(key=="1"and 1 or 2)
    elseif key=="c1"then playRep(1)
@@ -405,7 +405,7 @@ function scene.draw()
            local x,y=1+(i-1)%4,int((i+3)/4)
            local N=board[i]
            if i~=prevPos or prevSpawnTime==1 then
-                if not blind or i==prevPos then
+                if not invis or i==prevPos then
                    setColor(tileColor[N]or COLOR.D)
                    rectangle('fill',x*160+163,y*160-117,154,154,15)
                    if N>=0 then
@@ -482,7 +482,7 @@ end

 scene.widgetList={
    WIDGET.newButton{name="reset",     x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"},
-    WIDGET.newSwitch{name="blind",     x=240,y=300,w=60,font=40,disp=function()return blind end,code=pressKey"q",hideF=function()return state==1 end},
+    WIDGET.newSwitch{name="invis",     x=240,y=300,w=60,font=40,disp=function()return invis end,code=pressKey"q",hideF=function()return state==1 end},
    WIDGET.newSwitch{name="tapControl",x=240,y=370,w=60,font=40,disp=function()return tapControl end,code=pressKey"w",hideF=function()return state==1 end},

    WIDGET.newKey{name="up",           x=155,y=460,w=100,fText="↑",font=50, color='Y',code=pressKey"up",   hideF=function()return tapControl end},
--- a/parts/scenes/app_schulteG.lua
+++ b/parts/scenes/app_schulteG.lua
@@ -9,7 +9,7 @@ local mStr=mStr
 local scene={}

 local board,rank
-local blind,disappear
+local invis,disappear
 local startTime,time
 local state,progress
 local tapFX,mistake
@@ -19,7 +19,7 @@ function scene.sceneInit()
    BGM.play('way')
    board={}
    rank=3
-    blind=false
+    invis=false
    disappear=false
    tapFX=true

@@ -94,7 +94,7 @@ function scene.keyDown(key,isRep)
        end
    elseif key=="q"then
        if state==0 then
-            blind=not blind
+            invis=not invis
        end
    elseif key=="w"then
        if state==0 then
@@ -143,7 +143,7 @@ function scene.draw()
    gc.rectangle('line',310,30,660,660)

    local width=640/rank
-    local mono=state==0 or blind and state==1 and progress>0
+    local mono=state==0 or invis and state==1 and progress>0
    gc.setLineWidth(4)
    local f=180-rank*20
    setFont(f)
@@ -171,7 +171,7 @@ end
 scene.widgetList={
    WIDGET.newButton{name="reset",    x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space",hideF=function()return state==0 end},
    WIDGET.newSlider{name="rank",     x=130,y=250,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hideF=function()return state>0 end},
-    WIDGET.newSwitch{name="blind",    x=240,y=330,w=60,        font=40,disp=function()return blind end,    code=pressKey"q",hideF=function()return state==1 end},
+    WIDGET.newSwitch{name="invis",    x=240,y=330,w=60,        font=40,disp=function()return invis end,    code=pressKey"q",hideF=function()return state==1 end},
    WIDGET.newSwitch{name="disappear",x=240,y=420,w=60,        font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end},
    WIDGET.newSwitch{name="tapFX",    x=240,y=510,w=60,        font=40,disp=function()return tapFX end,    code=pressKey"e",hideF=function()return state==1 end},
    WIDGET.newButton{name="back",     x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
--- a/parts/scenes/app_ten.lua
+++ b/parts/scenes/app_ten.lua
@@ -33,7 +33,7 @@ local fallingTimer
 local score

 local nexts
-local blind
+local invis
 local fast

 local function reset()
@@ -60,7 +60,7 @@ function scene.sceneInit()
    board={{},{},{},{},{}}
    cx,cy=3,3
    startTime=0
-    blind=false
+    invis=false
    nexts=true
    reset()
 end
@@ -149,7 +149,7 @@ function scene.keyDown(key,isRep)
        end
    elseif key=="w"then
        if state==0 then
-            blind=not blind
+            invis=not invis
        end
    elseif key=="e"then
        if state==0 then
@@ -265,7 +265,7 @@ function scene.draw()

    gc.setLineWidth(4)
    setFont(70)
-    local hide=blind and state==1
+    local hide=invis and state==1
    for i=1,5 do
        for j=1,5 do
            local N=board[i][j]
@@ -303,7 +303,7 @@ end
 scene.widgetList={
    WIDGET.newButton{name="reset",x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"},
    WIDGET.newSwitch{name="next", x=240,y=235,font=40,disp=function()return nexts end,code=pressKey"q",hideF=function()return state==1 end},
-    WIDGET.newSwitch{name="blind",x=240,y=305,font=40,disp=function()return blind end,code=pressKey"w",hideF=function()return state==1 end},
+    WIDGET.newSwitch{name="invis",x=240,y=305,font=40,disp=function()return invis end,code=pressKey"w",hideF=function()return state==1 end},
    WIDGET.newSwitch{name="fast", x=240,y=375,font=30,disp=function()return fast end,code=pressKey"e",hideF=function()return state==1 end},
    WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }