diff --git a/main.lua b/main.lua index 155ca912..a64883be 100644 --- a/main.lua +++ b/main.lua @@ -149,17 +149,15 @@ do--Z.setCursor {'dCirc',8,8,7}, {'fCirc',8,8,3}, } - local min,int,abs=math.min,math.floor,math.abs - local ms=love.mouse Z.setCursor(function(time,x,y) if not SETTING.sysCursor then - local R=int((time+1)/2)%7+1 + local R=math.floor((time+1)/2)%7+1 _=BLOCK_COLORS[SETTING.skin[R]] - GC.setColor(_[1],_[2],_[3],min(abs(1-time%2),.3)) + GC.setColor(_[1],_[2],_[3],math.min(math.abs(1-time%2),.3)) _=DSCP[R][0] - GC.draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1) + GC.draw(TEXTURE.miniBlock[R],x,y,time%math.pi*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1) GC.setColor(1,1,1) - GC.draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8) + GC.draw(love.mouse.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8) end end) end diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index f07b6d0f..3a18b368 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -199,7 +199,7 @@ return{ "多余操作/极简率:", }, aboutTexts={ - "这只是一个普通的方块游戏", + "这只是一个普通的*方块游戏*", "从C2/IO/JS/WWC/KOS等方块获得过灵感", "", "使用LÖVE引擎", @@ -1024,7 +1024,7 @@ return{ "viod main[]", "while(false)", - -- 其他游戏梗 + -- 其他乱七八糟梗 "啊哈哈哈哈哈,T块来咯", "不轻不重,手感真是好极了", "不要大力拍打或滑动哦", @@ -1032,6 +1032,7 @@ return{ "单手也能玩!", "感谢Orzmic为这个tip框提供修改意见", "感谢Phigros提供(确信)部分tip模板", + "科目三:(见词典\"新人练习路线\")", "你的双手是为了你的一生服务的,而不是Techmino", "你有一个好", "你这块是金子做的还是垃圾行是金子做的", @@ -1242,9 +1243,9 @@ return{ -- Z "Z哲[01]方块教会我们,合群了就会消失,……", - "Z哲[02]假如生活欺骗了你,不要悲伤,不要心急,还有块陪着你", - "Z哲[03]……,合群了就会消失,不合群世界毁灭(指game over", - "Z哲[04]……,合群了就会消失,但消失不代表没有意义", + "Z哲[02]……,合群了就会消失,不合群世界毁灭(指game over", + "Z哲[03]……,合群了就会消失,但消失不代表没有意义", + "Z哲[04]假如生活欺骗了你,不要悲伤,不要心急,还有块陪着你", "Z哲[05]没有量化就没有对比,……", "Z哲[06]……,没有对比就没有伤害", "Z哲[07]方块不是你生活的全部,适当走出去看看", @@ -1277,10 +1278,11 @@ return{ "Z推[10]Phigros好玩!", "Z推[11]VVVVVV好玩!", "Z推[12]Ballance好玩!", - "Z推[13]Zuma好玩!", - "Z推[14]魔方好玩!", - "Z推[15]15puzzle好玩!", - "Z推[16]扫雷好玩!", + "Z推[13]Bejeweled3好玩!", + "Z推[14]Zuma好玩!", + "Z推[15]魔方好玩!", + "Z推[16]15puzzle好玩!", + "Z推[17]扫雷好玩!", -- 可爱! {C.lP,"口〇口",C.Z," 可爱!"}, diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index 4d9c5b20..cf09aea3 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -199,7 +199,7 @@ return{ "Stat.FErr/FRate = ", }, aboutTexts={ - "/*这只是一个普通的方块游戏", + "/*这只是一个普通的*方块游戏*", "从C2/IO/JS/WWC/KOS等方块获得过灵感", "", "使用LÖVE引擎", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 19016f7b..85840c3f 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -199,7 +199,7 @@ return{ "多餘操作/finesse率:", }, aboutTexts={ - "這只是一個普通的方塊遊戲,請勿將此與某帶國家名的事物強行聯繫", + "這只是一個普通的*方塊遊戲*", "從C2/IO/JS/WWC/KOS等方塊獲得過靈感", "", "使用LÖVE引擎", diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index d5ae85e6..74e0bbc4 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -1,10 +1,3 @@ -local gc_translate=GC.translate -local gc_setColor,gc_setLineWidth=GC.setColor,GC.setLineWidth -local gc_draw,gc_line=GC.draw,GC.line -local gc_print=GC.print - -local int,sin=math.floor,math.sin - local scene={} local form--Form of clear & spins @@ -33,9 +26,9 @@ function scene.sceneInit() S.game, STRING.time(S.time), S.key.." "..S.rotate.." "..S.hold, - S.piece.." "..S.row.." "..int(S.atk), + S.piece.." "..S.row.." "..math.floor(S.atk), S.recv.." "..S.off.." "..S.pend, - S.dig.." "..int(S.digatk), + S.dig.." "..math.floor(S.digatk), ("%.2f %.2f"):format(S.atk/S.row,S.digatk/S.dig), S.b2b.." "..S.b3b, S.pc.." "..S.hpc, @@ -69,31 +62,31 @@ local spinChars={ function scene.draw() local t=TIME() - gc_draw(TEXTURE.title,260,615,.2+.04*sin(t*3),.4,nil,580,118) + GC.draw(TEXTURE.title,260,615,.2+.04*math.sin(t*3),.4,nil,580,118) - gc_setColor(COLOR.Z) + GC.setColor(COLOR.Z) setFont(20) for i=1,11 do - gc_print(item[i],760,40*i+10) + GC.print(item[i],760,40*i+10) end local A,B=form.A1,form.A2 - gc_translate(60,80) - gc_setLineWidth(2) + GC.translate(60,80) + GC.setLineWidth(2) GC.rectangle('line',0,0,560,160,5) GC.rectangle('line',0,240,560,160,5) for x=1,6 do x=80*x - gc_line(x,0,x,160) - gc_line(x,240,x,400) + GC.line(x,0,x,160) + GC.line(x,240,x,400) end for y=1,3 do - gc_line(0,40*y,560,40*y) - gc_line(0,240+40*y,560,240+40*y) + GC.line(0,40*y,560,40*y) + GC.line(0,240+40*y,560,240+40*y) end for x=1,7 do - gc_setColor(BLOCK_COLORS[SETTING.skin[x]]) + GC.setColor(BLOCK_COLORS[SETTING.skin[x]]) setFont(70) GC.mStr(BLOCK_CHARS[x],80*x-40,-70) GC.mStr(BLOCK_CHARS[x],80*x-40,170) @@ -108,14 +101,14 @@ function scene.draw() A,B=form.X1,form.X2 for y=1,4 do - gc_setColor(COLOR.Z) - gc_print(spinChars[y],-33,-37+40*y) - gc_print(y,-28,203+40*y) - gc_setColor(COLOR.H) + GC.setColor(COLOR.Z) + GC.print(spinChars[y],-33,-37+40*y) + GC.print(y,-28,203+40*y) + GC.setColor(COLOR.H) GC.mStr(A[y],612,-37+40*y) GC.mStr(B[y],612,203+40*y) end - gc_translate(-60,-80) + GC.translate(-60,-80) end scene.widgetList={