diff --git a/conf.lua b/conf.lua index 1e29a6ed..e0b720f2 100644 --- a/conf.lua +++ b/conf.lua @@ -1,4 +1,4 @@ -gameVersion="Alpha V0.8.23" +gameVersion="Alpha V0.8.24" function love.conf(t) t.identity="Techmino"--folder name t.version="11.1" diff --git a/image/skin/brick(notypey).png b/image/skin/brick(notypey).png new file mode 100644 index 00000000..eece912f Binary files /dev/null and b/image/skin/brick(notypey).png differ diff --git a/image/skin/classic(_).png b/image/skin/classic(_).png new file mode 100644 index 00000000..3e73810c Binary files /dev/null and b/image/skin/classic(_).png differ diff --git a/image/skin/paper(mrz).png b/image/skin/paper(mrz).png new file mode 100644 index 00000000..727d7942 Binary files /dev/null and b/image/skin/paper(mrz).png differ diff --git a/main.lua b/main.lua index 2ad2e964..0be8cadb 100644 --- a/main.lua +++ b/main.lua @@ -82,4 +82,86 @@ if setting.fullscreen then love.window.setFullscreen(true)end if fs.getInfo("unlock.dat")then FILE.loadUnlock()end if fs.getInfo("data.dat")then FILE.loadData()end if fs.getInfo("key.dat")then FILE.loadKeyMap()end -if fs.getInfo("virtualkey.dat")then FILE.loadVK()end \ No newline at end of file +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 + for i=1,7 do + S.clear[i][5]=0 + S.spin[i][5]=0 + end + 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 + S.off=S.recv-S.pend +end +while #modeRanks>73 do + table.remove(modeRanks) +end +if modeRanks[73]==6 then modeRanks[73]=0 end +if setting.skin[10]==5 then + setting.skin[10],setting.skin[11]=1,5 +end +if S.version~=gameVersion then + S.version=gameVersion + TEXT.show(text.newVersion,640,200,30,"fly",.3) +end +S=nil \ No newline at end of file diff --git a/modes/sprintPenta.lua b/modes/sprintPenta.lua index 3e1328ad..603609a7 100644 --- a/modes/sprintPenta.lua +++ b/modes/sprintPenta.lua @@ -25,7 +25,7 @@ return{ end, score=function(P)return{P.stat.time,P.stat.piece}end, scoreDisp=function(D)return toTime(D[1]).." "..D[2].." Pieces"end, - comp=function(a,b)return a[1]b[2]or a[2]==b[2]and a[1]