From 60cbc83313dac154a5e73fea444d8d83adf325de Mon Sep 17 00:00:00 2001 From: MrZ_26 Date: Sun, 19 Jul 2020 21:33:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0tips=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E6=97=8B=E5=B1=8Fbug=EF=BC=8C=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E8=B0=83=E5=B9=B3=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/init.lua | 10 ++++-- Zframework/languages.lua | 8 ++--- Zframework/scene.lua | 18 ++++++++--- conf.lua | 2 +- font.ttf | Bin 969248 -> 970080 bytes main.lua | 65 ++++++-------------------------------- modes/GM.lua | 2 +- modes/blind_easy.lua | 2 +- modes/blind_hard.lua | 2 +- modes/blind_lunatic.lua | 2 +- modes/blind_normal.lua | 2 +- modes/blind_ultimate.lua | 2 +- modes/drought_lunatic.lua | 26 +++++++++------ modes/master_adavnce.lua | 2 +- modes/master_beginner.lua | 2 +- parts/default_data.lua | 5 +-- parts/gametoolfunc.lua | 8 +++-- parts/getTip.lua | 21 +++++++++--- parts/player.lua | 19 +++++------ parts/tick.lua | 11 +++++++ parts/updateLog.lua | 40 +++++++++++++---------- 21 files changed, 127 insertions(+), 122 deletions(-) diff --git a/Zframework/init.lua b/Zframework/init.lua index bee7fefb..cd9389b2 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -369,7 +369,7 @@ function keyDown.sequence(key) elseif key=="delete"then if sceneTemp.sure>20 then preBag={} - sceneTemp.cur=7 + sceneTemp.cur=0 sceneTemp.sure=0 else sceneTemp.sure=50 @@ -720,7 +720,7 @@ function keyDown.staff(key,RESET) if key=="escape"then SCN.back() elseif key=="\122"then - if kb.isDown("\109")and kb.isDown("\114")or RESET then + if RESET or kb.isDown("\109")and kb.isDown("\114")then sceneTemp.ct=sceneTemp.ct+1 if sceneTemp.ct==5 then TEXT.show("What are you up to?",640,200,40,"appear",.5) @@ -1021,7 +1021,11 @@ function love.resize(w,h) SHADER.warning:send("h",h*scr.dpi) end function love.focus(f) - if SCN.cur=="play"and not f and setting.autoPause then pauseGame()end + if f then + TASK.new(TICK.autoResize,{0}) + elseif SCN.cur=="play"and setting.autoPause then + pauseGame() + end end local scs={1,2,1,2,1,2,1,2,1,2,1.5,1.5,.5,2.5} local devColor={ diff --git a/Zframework/languages.lua b/Zframework/languages.lua index b6685d0b..c3a30ed2 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -1,7 +1,7 @@ local langList={ { anykey="按任意键继续", - newVersion="检测到更新!存档格式可能更新,设置已重置", + newVersion="检测到更新!存档格式已修改", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", lang="中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -442,7 +442,7 @@ local langList={ }, { anykey="按任意键继续", - newVersion="检测到更新!存档格式可能更新,设置已重置", + newVersion="检测到更新!存档格式已修改", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", lang="全中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -880,7 +880,7 @@ local langList={ }, { anykey="Press any button", - newVersion="Updating detected! Save format may have been updated, settings reseted", + newVersion="Updating detected! Saving format updated", marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid", lang="English", atkModeName={"Random","Badges","K.O.s","Attackers"}, @@ -1307,7 +1307,7 @@ local langList={ }, { anykey="↓□↓", - newVersion="&!!! ___/_?_ R", + newVersion="&!!! ___!", marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid", lang="?????", atkModeName={"?","( )","!","←→"}, diff --git a/Zframework/scene.lua b/Zframework/scene.lua index f2e4b4db..be9d8fb2 100644 --- a/Zframework/scene.lua +++ b/Zframework/scene.lua @@ -118,8 +118,8 @@ function sceneInit.pause(org) format("%d(%d) %.2fLPM",S.row,S.dig,S.row/S.time*60), format("%d(%d)",S.atk,S.digatk), format("%d(%d-%d)",S.pend,S.recv,S.recv-S.pend), - format("%d/%d/%d/%d",S.clear_S[1],S.clear_S[2],S.clear_S[3],S.clear_S[4]), - format("(%d)/%d/%d/%d",S.spin_S[1],S.spin_S[2],S.spin_S[3],S.spin_S[4]), + format("%d/%d/%d/%d",S.clears[1],S.clears[2],S.clears[3],S.clears[4]), + format("(%d)/%d/%d/%d",S.spins[1],S.spins[2],S.spins[3],S.spins[4]), format("%d(+%d)/%d(%d)",S.b2b,S.b3b,S.pc,S.hpc), format("%d[%.2f%%]",S.extraPiece,100*max(1-S.extraRate/S.piece,0)), }, @@ -223,12 +223,22 @@ function sceneInit.staff() end function sceneInit.stat() local S=stat + local X1,X2,Y1,Y2={0,0,0,0},{0,0,0,0},{},{} + for i=1,7 do + local S,C=S.spin[i],S.clear[i] + Y1[i]=S[1]+S[2]+S[3]+S[4] + Y2[i]=C[1]+C[2]+C[3]+C[4] + for j=1,4 do + X1[j]=X1[j]+S[j] + X2[j]=X2[j]+C[j] + end + end sceneTemp={ count=0, chart={ A1=S.spin,A2=S.clear, - X1=S.spin_S,X2=S.clear_S, - Y1=S.spin_B,Y2=S.clear_B, + X1=X1,X2=X2, + Y1=Y1,Y2=Y2, }, item={ S.run, diff --git a/conf.lua b/conf.lua index 4917676b..c9d509d3 100644 --- a/conf.lua +++ b/conf.lua @@ -1,4 +1,4 @@ -gameVersion="Alpha V0.9.0" +gameVersion="Alpha V0.9.1" function love.conf(t) t.identity="Techmino"--saving folder t.version="11.1" diff --git a/font.ttf b/font.ttf index 22b1a683a8a8b26b95d18b94f53d0d8b47ba1f23..f12b1d6840a3608ea5a19031b112a160a30dc14f 100644 GIT binary patch delta 17412 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 delta 16672 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 diff --git a/main.lua b/main.lua index 11f2139b..94462891 100644 --- a/main.lua +++ b/main.lua @@ -81,51 +81,8 @@ if fs.getInfo("virtualkey.dat")then FILE.loadVK()end --update data file S=stat -if not S.version or S.version=="Alpha V0.8.15"then - S.clear_S={S.clear_1,S.clear_2,S.clear_3,S.clear_4} - S.clear={{},{},{},{},{},{},{}} - local A,B,C,D=int(S.clear_1/7),int(S.clear_2/7),int(S.clear_3/7),S.clear_4 - for i=1,7 do - S.clear[i][1]=A - S.clear[i][2]=B - S.clear[i][3]=C - S.clear[i][4]=0 - end - S.clear[7][4]=D - for i=1,S.clear_1%7 do S.clear[i][1]=S.clear[i][1]+1 end - for i=1,S.clear_2%7 do S.clear[i][2]=S.clear[i][2]+1 end - for i=1,S.clear_3%7 do S.clear[i][3]=S.clear[i][3]+1 end - S.clear_B={} - for i=1,7 do - S.clear_B[i]=S.clear[i][1]+S.clear[i][2]+S.clear[i][3]+S.clear[i][4] - end - - S.spin_S={S.spin_0,S.spin_1,S.spin_2,S.spin_3} - S.spin={{},{},{},{},{},{},{}} - A,B,C,D=int(S.spin_0/7),int(S.spin_1/7),int(S.spin_2/7),int(S.spin_3/7) - for i=1,7 do - S.spin[i][1]=A - S.spin[i][2]=B - S.spin[i][3]=C - S.spin[i][4]=D - end - for i=1,S.spin_0%7 do S.spin[i][1]=S.spin[i][1]+1 end - for i=1,S.spin_1%7 do S.spin[i][2]=S.spin[i][2]+1 end - for i=1,S.spin_2%7 do S.spin[i][3]=S.spin[i][3]+1 end - for i=1,S.spin_3%7 do S.spin[i][4]=S.spin[i][4]+1 end - S.spin_B={} - for i=1,7 do - S.spin_B[i]=S.spin[i][1]+S.spin[i][2]+S.spin[i][3]+S.spin[i][4] - end - - S.hpc=S.c -elseif S.version=="Alpha V0.8.16"then - for i=1,6 do - S.clear[7][4]=S.clear[7][4]+S.clear[i][4] - S.clear[i][4]=0 - end -end -if not S.clear_B[8]then +S.clear_B,S.clear_S=nil +if not S.clear[1][5]then for i=1,7 do S.clear[i][5]=0 S.spin[i][5]=0 @@ -133,21 +90,17 @@ if not S.clear_B[8]then for i=8,25 do S.clear[i]={0,0,0,0,0} S.spin[i]={0,0,0,0,0} - S.spin_B[i]=0 - S.clear_B[i]=0 end - S.spin_S[5]=0 - S.clear_S[5]=0 end -if S.version=="Alpha V0.8.18"or S.version=="Alpha V0.8.19"then - S.clear[3],S.clear[4]=S.clear[4],S.clear[3] - S.spin[3],S.spin[4]=S.spin[4],S.spin[3] - S.clear_B[3],S.clear_B[4]=S.clear_B[4],S.clear_B[3] - S.spin_B[3],S.spin_B[4]=S.spin_B[4],S.spin_B[3] -end -if S.version=="Alpha V0.8.22"then +if not S.off then S.off=S.recv-S.pend end +if S.clear[1][4]>0 then + for i=1,6 do + S.clear[7][4]=S.clear[7][4]+S.clear[i][4] + S.clear[i][4]=0 + end +end while #modeRanks>73 do table.remove(modeRanks) end diff --git a/modes/GM.lua b/modes/GM.lua index 14166cc7..11665a9c 100644 --- a/modes/GM.lua +++ b/modes/GM.lua @@ -45,7 +45,7 @@ return{ mStr(P.modeData.event,-81,110) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) end, score=function(P)return{P.modeData.point,P.stat.score}end, scoreDisp=function(D)return sectionName[int(D[1]*.1)+1].." "..D[2]end, diff --git a/modes/blind_easy.lua b/modes/blind_easy.lua index 37628398..7500c719 100644 --- a/modes/blind_easy.lua +++ b/modes/blind_easy.lua @@ -18,7 +18,7 @@ return{ mText(drawableText.techrash,-81,420) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) end, score=function(P)return{min(P.stat.row or 200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end, diff --git a/modes/blind_hard.lua b/modes/blind_hard.lua index 79f0a131..04b4e9b3 100644 --- a/modes/blind_hard.lua +++ b/modes/blind_hard.lua @@ -21,7 +21,7 @@ return{ mText(drawableText.techrash,-81,420) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) gc.setColor(1,1,1,.2) gc.draw(IMG.electric,-26,120,0,2.6) end, diff --git a/modes/blind_lunatic.lua b/modes/blind_lunatic.lua index f51adeae..c284f254 100644 --- a/modes/blind_lunatic.lua +++ b/modes/blind_lunatic.lua @@ -22,7 +22,7 @@ return{ mText(drawableText.techrash,-81,420) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) gc.setColor(1,1,1,.2) gc.draw(IMG.electric,-26,120,0,2.6) end, diff --git a/modes/blind_normal.lua b/modes/blind_normal.lua index 5006f3ca..e4d893a8 100644 --- a/modes/blind_normal.lua +++ b/modes/blind_normal.lua @@ -20,7 +20,7 @@ return{ mText(drawableText.techrash,-81,420) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) gc.setColor(1,1,1,.2) gc.draw(IMG.electric,-26,120,0,2.6) end, diff --git a/modes/blind_ultimate.lua b/modes/blind_ultimate.lua index 2ffcad12..b6ef7a0a 100644 --- a/modes/blind_ultimate.lua +++ b/modes/blind_ultimate.lua @@ -23,7 +23,7 @@ return{ mText(drawableText.techrash,-81,420) setFont(75) mStr(P.stat.row,-81,220) - mStr(P.stat.clear_S[4],-81,340) + mStr(P.stat.clears[4],-81,340) gc.setColor(1,1,1,.2) gc.draw(IMG.electric,-26,120,0,2.6) end, diff --git a/modes/drought_lunatic.lua b/modes/drought_lunatic.lua index a095b9a0..d78d7218 100644 --- a/modes/drought_lunatic.lua +++ b/modes/drought_lunatic.lua @@ -10,13 +10,19 @@ return{ if not P.next[1] then local height=freeRow.get(0) local max=#P.field - for x=1,10 do - local h=max - while P.field[h][x]==0 and h>1 do - h=h-1 + if max>0 then + for x=1,10 do + local h=max + while P.field[h][x]==0 and h>1 do + h=h-1 + end + height[x]=h + end--get heights + else + for x=1,10 do + height[x]=0 end - height[x]=h - end--get heights + end height[11]=999 local res={1,1,2,2,3,4} @@ -27,9 +33,11 @@ return{ end if d<40 or P.stat.row>2*42 then A=#res+1 - for i=A,A+5 do - res[i]=1 - res[i+6]=2 + for i=1,4 do + res[A]=1 + res[A+1]=2 + res[A+2]=6 + A=A+3 end goto END end diff --git a/modes/master_adavnce.lua b/modes/master_adavnce.lua index e7520f73..107bdbec 100644 --- a/modes/master_adavnce.lua +++ b/modes/master_adavnce.lua @@ -63,7 +63,7 @@ return{ getRank=function(P) local S=P.modeData.point if S==500 then - local T=P.modeData.time + local T=P.stat.time return T<=118 and 5 or T<=148 and 4 or diff --git a/modes/master_beginner.lua b/modes/master_beginner.lua index 77e5d897..c89c338b 100644 --- a/modes/master_beginner.lua +++ b/modes/master_beginner.lua @@ -67,7 +67,7 @@ return{ getRank=function(P) local S=P.modeData.point if S==500 then - local L=P.stat.clear_S[4] + local L=P.stat.clears[4] return L>=30 and 5 or L>=25 and 4 or diff --git a/parts/default_data.lua b/parts/default_data.lua index 0e1fca2a..72b827c2 100644 --- a/parts/default_data.lua +++ b/parts/default_data.lua @@ -60,14 +60,11 @@ s={ piece=0,row=0,dig=0, atk=0,digatk=0, send=0,recv=0,pend=0,off=0, - clear={},clear_B={},clear_S={0,0,0,0,0}, - spin={},spin_B={},spin_S={0,0,0,0,0}, + clear={},spin={}, pc=0,hpc=0,b2b=0,b3b=0,score=0, lastPlay="sprint_10",--last played mode ID } for i=1,25 do - s.clear_B[i]=0 - s.spin_B[i]=0 s.clear[i]={0,0,0,0,0} s.spin[i]={0,0,0,0,0} end diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index ebac0569..45239025 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -109,9 +109,13 @@ end function mergeStat(stat,delta) for k,v in next,delta do if type(v)=="table"then - mergeStat(stat[k],v) + if type(stat[k])=="table"then + mergeStat(stat[k],v) + end else - stat[k]=stat[k]+v + if stat[k]then + stat[k]=stat[k]+v + end end end end diff --git a/parts/getTip.lua b/parts/getTip.lua index 689914c6..47fb0942 100644 --- a/parts/getTip.lua +++ b/parts/getTip.lua @@ -2,6 +2,7 @@ local L if setting.lang==1 or setting.lang==2 then L={ "ZS JL T O I", + "uid:225238922", "tetr.js 也很好玩!", "tetr.io 也很好玩!", "Techminohaowan", @@ -11,7 +12,9 @@ if setting.lang==1 or setting.lang==2 then "osu好玩!", "O spin Triple!", "nullpomino 也很好玩!", + "Naki 可爱!", "Miya:喵!", + "Miya 可爱!", "LrL RlR LLr RRl RRR LLL FFF RfR RRf rFF", "Let-The-Bass-Kick!", "l-=-1", @@ -31,6 +34,7 @@ if setting.lang==1 or setting.lang==2 then "有建议的话可以把信息反馈给作者~", "学会使用两个旋转键, 三个更好", "享受特色旋转系统!", + "无聊翻翻设置是好习惯", "我的世界好玩!", "提前旋转等设置可以用来救命", "泰拉瑞亚好玩!", @@ -38,20 +42,23 @@ if setting.lang==1 or setting.lang==2 then "使用love2d引擎制作", "少女祈祷中", "扫雷好玩!", + "哦,我的上帝", "你可以从统计页面打开游戏存档目录", "你好 世界!", "魔方好玩!", "秘密数字:626", "每个虚拟按键都可以隐藏/显示", + "每个块的出现方向可以自定义", "联网还没做呢, 别急", "键位是可以自定义的", "合群了就会消失, 但是消失不代表没有意义", "更小的DAS和ARR拥有更高的操作上限(如果你还能控制得了的话)", - "俄罗斯方块环游记也不错！", + "俄罗斯方块环游记也不错!", "调到特殊的日期也不会发生什么的", "低帧率会降低游戏体验", "戴上耳机以获得最佳体验", "大满贯10连击消四全清!", + "车车人在此", "草(日本语)", "不要在上课时玩游戏!", "不要盯着bug不放", @@ -59,9 +66,9 @@ if setting.lang==1 or setting.lang==2 then "不是动画,真的在加载!", "本游戏难度上限很高, 做好心理准备", "本游戏可不是休闲游戏", + "啊这,不会吧不会吧", "3.1415926535897932384", "26连T2来一个?", - "225238922 哔哩哔哩 干杯~", "20G本质是一套全新的游戏规则", "20连PC来一个?", "2+2=Miya", @@ -70,13 +77,15 @@ if setting.lang==1 or setting.lang==2 then "11renPC!", "<方块研究所>有一个Nspire-CX版本!", "↑↑↓↓←→←→BABA", - "\"免费吃鸡方块\"", + '"免费吃鸡方块"', "(RUR'U')R'FR2U'R'U'(RUR'F')", } elseif setting.lang==3 then L={ "ZS JL T O I", + "You can set orientation for each block", "You can open saving directory from stat. page", + "You are Grand Master", "wwwwww", "Who is diao", "What about 26 TSDs?", @@ -101,7 +110,9 @@ elseif setting.lang==3 then "O spin triple!", "Nothing will happen when some special day come", "Not animation,real loading!", + "Naki so cute!", "Miya:Nya!", + "Miya so cute!", "Minesweeper is fun!", "Minecraft is fun!", "LrL RlR LLr RRl RRR LLL FFF RfR RRf rFF", @@ -121,7 +132,6 @@ elseif setting.lang==3 then "DO NOT PRESS F10", "Do not play game in class!", "Disappearing doesn't mean useless", - "diaoyoumei so bully", "diao so bully", "COOL!!", "CLASSIC SEXY RUSSIAN BLOCKS", @@ -145,7 +155,10 @@ elseif setting.lang==3 then "11renPC!", "↑↑↓↓←→←→BABA", "\"Free block game with royale mode\"", + "/osk/", + "/jezevec/", "(RUR'U')R'FR2U'R'U'(RUR'F')", + ":pog:", } elseif setting.lang==4 then L={'!','@','#','$','%','^','&','*','(',')','-','=','_','+','[',']','{','}','\\','|',';',':','\'','"',',','<','.','>','/','?'} diff --git a/parts/player.lua b/parts/player.lua index acc8d2cd..42569711 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -309,7 +309,7 @@ local function Pupdate_alive(P,dt) if P.keyPressing[2]then if arr>0 then if mov==das+arr or mov==das then - if P:ifoverlap(P.cur.bk,P.curX+1,P.curY)then + if not P.cur or P:ifoverlap(P.cur.bk,P.curX+1,P.curY)then mov=das+arr-1 else P.act.moveRight(P,true) @@ -334,7 +334,7 @@ local function Pupdate_alive(P,dt) if P.keyPressing[1]then if arr>0 then if mov==das+arr or mov==das then - if P:ifoverlap(P.cur.bk,P.curX-1,P.curY)then + if not P.cur or P:ifoverlap(P.cur.bk,P.curX-1,P.curY)then mov=das+arr-1 else P.act.moveLeft(P,true) @@ -728,7 +728,7 @@ local function Pdraw_norm(P) if P.gameEnv.bagLine then local L=P.gameEnv.bagLen local C=-P.pieceCount%L--phase - gc.setColor(.5,.5,.5) + gc.setColor(.8,.5,.5) for i=C,N-1,L do local y=72*i+36 gc.line(321+P.fieldOff.x,y,441,y) @@ -1018,15 +1018,14 @@ local function getNewStatTable() piece=0,row=0,dig=0, atk=0,digatk=0, send=0,recv=0,pend=0,off=0, - clear={},clear_B={},clear_S={0,0,0,0,0}, - spin={},spin_B={},spin_S={0,0,0,0,0}, + clear={},clears={},spin={},spins={}, pc=0,hpc=0,b2b=0,b3b=0, } for i=1,25 do T.clear[i]={0,0,0,0,0} T.spin[i]={0,0,0,0,0} - T.clear_B[i]=0 - T.spin_B[i]=0 + T.clears[i]=0 + T.spins[i]=0 end return T end @@ -1811,12 +1810,10 @@ function player.drop(P)--Place piece local n=P.cur.name if dospin then _=STAT.spin[n] _[cc+1]=_[cc+1]+1--spin[1~25][0~4] - _=STAT.spin_S _[cc+1]=_[cc+1]+1--spin[0~4] - _=STAT.spin_B _[n]=_[n]+1--spin[1~25] + _=STAT.spins _[cc+1]=_[cc+1]+1--spin[0~4] elseif cc>0 then _=STAT.clear[n] _[cc]=_[cc]+1--clear[1~25][1~5] - _=STAT.clear_S _[cc]=_[cc]+1--clear[1~5] - _=STAT.clear_B _[n]=_[n]+1--clear[1~25] + _=STAT.clears _[cc]=_[cc]+1--clear[1~5] end --Update stat diff --git a/parts/tick.lua b/parts/tick.lua index 205014ea..f2ce8543 100644 --- a/parts/tick.lua +++ b/parts/tick.lua @@ -1,3 +1,4 @@ +local gc=love.graphics local Tick={} function Tick.finish(P) P.endCounter=P.endCounter+1 @@ -69,4 +70,14 @@ function Tick.autoPause(data) return true end end +function Tick.autoResize(data) + data[1]=data[1]+1 + if data[1]==62 then + local w,h=gc.getWidth(),gc.getHeight() + if w0 + error when complete master-advanced 0.9.0: Custom Sequence Update new: custom sequence @@ -88,14 +93,17 @@ Future outlook: easier to get S in infinite mode, c4w, PC harder to unlock sprint-400/1000 harder to get high rank of sprint-1000 + harder drought-lunatic code: file sorted task system rewrited, now perfect (maybe) remove scissors/blendMode setting in drawing players fixed: + screen orientation sometimes error after wake up the phone hard move won't deactive "spin" do not clear dead enemies' field show ghost's center when ghost is off + error when get a PC in drought-lunatic 0.8.24: Bug Fixed new: