diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 9396693c..d6d050f7 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -180,13 +180,14 @@ do--drawableText } end BLOCKNAMES={ - "Z","S","J","L","T","O","I", - "Z5","S5","P","Q","F","E", - "T5","U","V","W","X", - "J5","L5","R","Y","N","H","I5", - "I3","C","I2","O1" + 'Z','S','J','L','T','O','I', + 'Z5','S5','P','Q','F','E', + 'T5','U','V','W','X', + 'J5','L5','R','Y','N','H','I5', + 'I3','C','I2','O1' } BLOCKCHARS={}for i=1,#BLOCKNAMES do BLOCKCHARS[i]=CHAR.mino[BLOCKNAMES[i]]end +RANKCHARS={'B','A','S','U','X'}for i=1,#RANKCHARS do RANKCHARS[i]=CHAR.icon['rank'..RANKCHARS[i]]end do--BLOCKS local O,_=true,false BLOCKS={ diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index a99a1ca6..6d15fb61 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -62,7 +62,6 @@ return{ ai_prebag="AI is incompatible with custom sequences which have non-tetromino", ai_mission="AI is incompatible with custom missions", switchSpawnSFX="Please turn on the block spawn SFX!", - ranks={"B","A","S","U","X"}, needRestart="Restart to apply all changes", saveDone="Data saved", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index f0ab54ad..136f3e56 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -49,8 +49,6 @@ return{ noPassword="注册会不会?", diffPassword="字不认识?", - ranks={"菜","可","好","强","您"}, - createRoomSuccessed="创好了", started="开了", spectating="看戏中", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index e8889d3b..1b40385b 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -62,7 +62,6 @@ return{ ai_prebag="不能同时开启AI和含有非四连块的自定义序列", ai_mission="不能同时开启AI和自定义任务", switchSpawnSFX="请开启方块出生音效", - ranks={"B","A","S","U","X"}, needRestart="重新开始以生效", saveDone="保存成功!", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 9ab9424d..10834d7e 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -26,8 +26,6 @@ return{ ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列", ai_mission="不能同时开启电脑玩家和自定义任务", - ranks={"可","中","良","优","极"}, - modInstruction="选择你要使用的模组!\n不同的模组会用不同的方式改变游戏规则,来开发新玩法挑战自我吧!\n提醒:开启一些模组会让成绩无效 你可以用键盘开关模组,按tab重置", modInfo={ next="预览数量:\n强制使用预览的个数", diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index 66c3f149..a6df9787 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -63,7 +63,6 @@ return{ ai_prebag="AI与具有非四格拼板的自定义序列不兼容", ai_mission="AI与自定义使命不兼容", switchSpawnSFX="请打开繁殖特技效果", - ranks={"B","A","S","U","X"}, needRestart="请重试以使更改生效", saveDone="保存的数据", diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index cb6ab29b..fedbe86a 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -180,7 +180,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=20,y=5,font=70,align='L'}, + WIDGET.newText{name="book", x=20,y=15,font=70,align='L',fText=CHAR.icon.zBook}, + WIDGET.newText{name="title", x=100,y=15,font=70,align='L'}, inputBox, WIDGET.newKey{name="link", x=1150,y=655,w=200,h=80,font=35,code=pressKey"link",hideF=function()return not url end}, WIDGET.newKey{name="up", x=1130,y=460,w=60,h=90,font=35,fText="↑",code=pressKey"up",hide=not MOBILE}, diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index db651ce3..877217ad 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -380,13 +380,13 @@ function scene.draw() drawWarning() end scene.widgetList={ - WIDGET.newKey{name="rep0", x=40,y=50,w=60, code=_rep0, fText=TEXTURE.rep.rep0}, - WIDGET.newKey{name="repP8", x=105,y=50,w=60,code=_repP8, fText=TEXTURE.rep.repP8}, - WIDGET.newKey{name="repP2", x=170,y=50,w=60,code=_repP2, fText=TEXTURE.rep.repP2}, - WIDGET.newKey{name="rep1", x=235,y=50,w=60,code=_rep1, fText=TEXTURE.rep.rep1}, - WIDGET.newKey{name="rep2", x=300,y=50,w=60,code=_rep2, fText=TEXTURE.rep.rep2}, - WIDGET.newKey{name="rep5", x=365,y=50,w=60,code=_rep5, fText=TEXTURE.rep.rep5}, - WIDGET.newKey{name="step", x=430,y=50,w=60,code=_step, font=35,fText=CHAR.icon.nextFrame}, + WIDGET.newKey{name="rep0", x=40,y=50,w=60, code=_rep0, font=40,fText=CHAR.icon.pause}, + WIDGET.newKey{name="repP8", x=105,y=50,w=60,code=_repP8, font=40,fText=CHAR.icon.speedOneEights}, + WIDGET.newKey{name="repP2", x=170,y=50,w=60,code=_repP2, font=40,fText=CHAR.icon.speedOneHalf}, + WIDGET.newKey{name="rep1", x=235,y=50,w=60,code=_rep1, font=40,fText=CHAR.icon.speedOne}, + WIDGET.newKey{name="rep2", x=300,y=50,w=60,code=_rep2, font=40,fText=CHAR.icon.speedTwo}, + WIDGET.newKey{name="rep5", x=365,y=50,w=60,code=_rep5, font=40,fText=CHAR.icon.speedFive}, + WIDGET.newKey{name="step", x=430,y=50,w=60,code=_step, font=40,fText=CHAR.icon.nextFrame}, WIDGET.newKey{name="restart",x=0,y=45,w=60, code=_restart, font=40,fText=CHAR.icon.retry_spin}, WIDGET.newKey{name="pause", x=0,y=45,w=60, code=pauseGame,font=40,fText=CHAR.icon.pause}, } diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index 24937359..0ea31244 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -22,7 +22,7 @@ scene.widgetList={ WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end}, WIDGET.newButton{name="setting", x=1000,y=400,w=120,font=90,fText=CHAR.icon.settings,code=goScene'setting_game'}, WIDGET.newButton{name="lang", x=1000,y=560,w=120,font=90,fText=CHAR.icon.language,code=goScene'lang'}, - WIDGET.newButton{name="manual", x=1160,y=400,w=120,font=90,fText=CHAR.key.winMenu,code=goScene'dict'}, + WIDGET.newButton{name="dict", x=1160,y=400,w=120,font=90,fText=CHAR.icon.zBook,code=goScene'dict'}, WIDGET.newButton{name="quit", x=1160,y=560,w=120,font=80,fText=CHAR.key.macEsc,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, } diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 896c80b8..05b42c95 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -269,7 +269,7 @@ function scene.draw() --Rank if unlocked==1 then - name=text.ranks[rank] + name=RANKCHARS[rank] if name then gc_setColor(0,0,0,.8) mStr(name,M.x+M.size*.7,M.y-50-M.size*.7) diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 55637cf5..1f59dcfb 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -217,7 +217,7 @@ function scene.draw() if GAME.rank>0 then gc.push('transform') gc.translate(1050,5) - local str=text.ranks[GAME.rank] + local str=RANKCHARS[GAME.rank] setFont(80) gc.setColor(0,0,0,timer1*.7) gc.print(str,-5,-4,nil,1.5) diff --git a/parts/texture.lua b/parts/texture.lua index d1690145..0ba65a01 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -154,15 +154,6 @@ TEXTURE.dial={ } } -TEXTURE.rep={--Replay speed buttons - rep0=GC.DO{50,50,{'fRect',11,8,8,34},{'fRect',31,8,8,34}}, - repP8=GC.DO{50,50,{'setFT',15},{'mText',"0.125x",25,15}}, - repP2=GC.DO{50,50,{'setFT',25},{'mText',"0.5x",25,8}}, - rep1=GC.DO{50,50,{'setFT',30},{'mText',"1x",25,3}}, - rep2=GC.DO{50,50,{'setFT',30},{'mText',"2x",25,3}}, - rep5=GC.DO{50,50,{'setFT',30},{'mText',"5x",25,3}}, -} - gc.setCanvas() setmetatable(TEXTURE,{__index=function(_,i)error(i)end}) return TEXTURE