把方便改的blind都换成invis,防止冒犯到盲人
模式名里的blind没有改,会影响存档数据不方便,不会在游戏里直接显示 close #291 (好奇真的有盲人玩吗)
This commit is contained in:
@@ -671,7 +671,7 @@ return{
|
||||
app_15p={
|
||||
reset="Shuffle",
|
||||
color="Color",
|
||||
blind="Blind",
|
||||
invis="Invis",
|
||||
slide="Slide",
|
||||
pathVis="Show Path",
|
||||
revKB="Reverse",
|
||||
@@ -679,7 +679,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="Reset",
|
||||
rank="Size",
|
||||
blind="Blind",
|
||||
invis="Invis",
|
||||
disappear="Hide",
|
||||
tapFX="Tap FX",
|
||||
},
|
||||
@@ -693,7 +693,7 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="Reset",
|
||||
blind="Blind",
|
||||
invis="Invis",
|
||||
tapControl="Tap controls",
|
||||
|
||||
skip="Skip Round",
|
||||
@@ -701,7 +701,7 @@ return{
|
||||
app_ten={
|
||||
reset="Reset",
|
||||
next="Next",
|
||||
blind="Blind",
|
||||
invis="Invis",
|
||||
fast="Fast",
|
||||
},
|
||||
app_dtw={
|
||||
@@ -775,12 +775,12 @@ return{
|
||||
['rhythm_e']= {"Rhythm", "EASY", "200-line low-BPM rhythm marathon."},
|
||||
['rhythm_h']= {"Rhythm", "HARD", "200-line medium BPM rhythm marathon"},
|
||||
['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-BPM rhythm marathon."},
|
||||
['blind_e']= {"Blind", "HALF", "For novices."},
|
||||
['blind_n']= {"Blind", "ALL", "For intermediates."},
|
||||
['blind_h']= {"Blind", "SUDDEN", "For the experienced."},
|
||||
['blind_l']= {"Blind", "SUDDEN+", "For professionals."},
|
||||
['blind_u']= {"Blind", "?", "Are you ready?"},
|
||||
['blind_wtf']= {"Blind", "WTF", "You're not ready."},
|
||||
['blind_e']= {"Invis", "HALF", "For novices."},
|
||||
['blind_n']= {"Invis", "ALL", "For intermediates."},
|
||||
['blind_h']= {"Invis", "SUDDEN", "For the experienced."},
|
||||
['blind_l']= {"Invis", "SUDDEN+", "For professionals."},
|
||||
['blind_u']= {"Invis", "?", "Are you ready?"},
|
||||
['blind_wtf']= {"Invis", "WTF", "You're not ready."},
|
||||
['classic_h']= {"Classic", "HARD", "A medium speed recreation from the 80s."},
|
||||
['classic_l']= {"Classic", "LUNATIC", "A high-speed recreation from the 80s."},
|
||||
['classic_u']= {"Classic", "ULTIMATE", "A very high-speed recreation from the 80s."},
|
||||
|
||||
@@ -577,7 +577,7 @@ return{
|
||||
app_15p={
|
||||
reset="Mezclar",
|
||||
color="Color",
|
||||
blind="A ciegas",
|
||||
invis="A ciegas",
|
||||
slide="Mover",
|
||||
pathVis="Mostrar Movs.",
|
||||
revKB="Deshacer",
|
||||
@@ -585,7 +585,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="Reiniciar",
|
||||
rank="Tamaño",
|
||||
blind="A ciegas",
|
||||
invis="A ciegas",
|
||||
disappear="No mostrar",
|
||||
tapFX="Sonido al pulsar",
|
||||
},
|
||||
@@ -599,14 +599,14 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="Reiniciar",
|
||||
blind="A ciegas",
|
||||
invis="A ciegas",
|
||||
tapControl="Control táctil",
|
||||
skip="Saltar ronda",
|
||||
},
|
||||
app_ten={
|
||||
reset="Reiniciar",
|
||||
next="Siguiente",
|
||||
blind="A ciegas",
|
||||
invis="A ciegas",
|
||||
fast="Rápido",
|
||||
},
|
||||
app_dtw={
|
||||
|
||||
@@ -574,7 +574,7 @@ return{
|
||||
app_15p={
|
||||
reset="Réinitialiser",
|
||||
color="Couleur",
|
||||
blind="Aveugler",
|
||||
invis="Aveugler",
|
||||
slide="Glisser",
|
||||
pathVis="Montrer le tracé",
|
||||
revKB="Inverser",
|
||||
@@ -582,7 +582,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="Réinitialiser",
|
||||
rank="Taille",
|
||||
blind="Aveugler",
|
||||
invis="Aveugler",
|
||||
disappear="Cacher",
|
||||
tapFX="Effet quand tapé",
|
||||
},
|
||||
@@ -596,14 +596,14 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="Réinitialiser",
|
||||
blind="Aveugler",
|
||||
invis="Aveugler",
|
||||
tapControl="Contrôle par toucher",
|
||||
skip="Passer Round",
|
||||
},
|
||||
app_ten={
|
||||
reset="Réinitialiser",
|
||||
next="Prévisualisations",
|
||||
blind="Aveugler",
|
||||
invis="Aveugler",
|
||||
-- fast="Fast",
|
||||
},
|
||||
app_dtw={
|
||||
|
||||
@@ -661,7 +661,7 @@ return{
|
||||
app_15p={
|
||||
reset="Embaralhar",
|
||||
C="Cor",
|
||||
blind="Cego",
|
||||
invis="Cego",
|
||||
slide="Deslizar",
|
||||
pathVis="Mostrar caminho",
|
||||
revKB="Reverso",
|
||||
@@ -669,7 +669,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="Resetar",
|
||||
rank="Tamanho",
|
||||
blind="Cego",
|
||||
invis="Cego",
|
||||
disappear="Escond.",
|
||||
tapFX="FX De Toque",
|
||||
},
|
||||
@@ -683,14 +683,14 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="Resetar",
|
||||
blind="Cego",
|
||||
invis="Cego",
|
||||
-- tapControl="Tap control",
|
||||
-- skip="Skip Round",
|
||||
},
|
||||
app_ten={
|
||||
reset="Resetar",
|
||||
next="Próxima",
|
||||
blind="Cego",
|
||||
invis="Cego",
|
||||
-- fast="Fast",
|
||||
},
|
||||
app_dtw={
|
||||
|
||||
@@ -538,7 +538,7 @@ return{
|
||||
app_15p={
|
||||
reset="!@#$%",
|
||||
color="~~~",
|
||||
blind="???",
|
||||
invis="???",
|
||||
slide="~_~",
|
||||
pathVis="--==>",
|
||||
revKB="Reverse",
|
||||
@@ -546,7 +546,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="!@#$%",
|
||||
rank="←?→",
|
||||
blind="???",
|
||||
invis="???",
|
||||
disappear="=X=",
|
||||
tapFX="↓ !",
|
||||
},
|
||||
@@ -560,14 +560,14 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="R",
|
||||
blind="???",
|
||||
invis="???",
|
||||
tapControl="_↓",
|
||||
skip=">>",
|
||||
},
|
||||
app_ten={
|
||||
reset="R",
|
||||
next="→",
|
||||
blind="???",
|
||||
invis="???",
|
||||
fast="~~→",
|
||||
},
|
||||
app_dtw={
|
||||
|
||||
@@ -181,7 +181,7 @@ return{
|
||||
app_15p={
|
||||
reset="打乱",
|
||||
color="彩",
|
||||
blind="盲",
|
||||
invis="盲",
|
||||
slide="滑动",
|
||||
pathVis="路径显示",
|
||||
revKB="键盘反向",
|
||||
@@ -189,7 +189,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="重开",
|
||||
rank="尺寸",
|
||||
blind="盲",
|
||||
invis="盲",
|
||||
disappear="消失",
|
||||
tapFX="动画",
|
||||
},
|
||||
|
||||
@@ -669,7 +669,7 @@ return{
|
||||
app_15p={
|
||||
reset="打乱",
|
||||
color="颜色",
|
||||
blind="盲打",
|
||||
invis="盲打",
|
||||
slide="滑动操作",
|
||||
pathVis="路径显示",
|
||||
revKB="键盘反向",
|
||||
@@ -677,7 +677,7 @@ return{
|
||||
app_schulteG={
|
||||
reset="重来",
|
||||
rank="尺寸",
|
||||
blind="盲打",
|
||||
invis="盲打",
|
||||
disappear="消失",
|
||||
tapFX="点击动画",
|
||||
},
|
||||
@@ -694,7 +694,7 @@ return{
|
||||
},
|
||||
app_2048={
|
||||
reset="重置",
|
||||
blind="盲打",
|
||||
invis="盲打",
|
||||
tapControl="点击操作",
|
||||
|
||||
skip="跳过回合",
|
||||
@@ -702,7 +702,7 @@ return{
|
||||
app_ten={
|
||||
reset="重置",
|
||||
next="预览",
|
||||
blind="盲打",
|
||||
invis="盲打",
|
||||
fast="速打",
|
||||
},
|
||||
app_dtw={
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -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},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user