diff --git a/BGM/far.ogg b/BGM/far.ogg new file mode 100644 index 00000000..7ffd4087 Binary files /dev/null and b/BGM/far.ogg differ diff --git a/BGM/shining terminal.ogg b/BGM/shining terminal.ogg index 5c2fe32a..8bfaa6ab 100644 Binary files a/BGM/shining terminal.ogg and b/BGM/shining terminal.ogg differ diff --git a/main.lua b/main.lua index e9be8b72..37e081c4 100644 --- a/main.lua +++ b/main.lua @@ -64,8 +64,9 @@ require("callback") --load files & settings local fs=love.filesystem if fs.getInfo("keymap.dat")then fs.remove("keymap.dat")end +if fs.getInfo("setting.dat")then fs.remove("setting.dat")end -if fs.getInfo("setting.dat")then FILE.loadSetting() +if fs.getInfo("settings.dat")then FILE.loadSetting() else -- firstRun=true if system=="Android"or system=="iOS" then diff --git a/modes/GM.lua b/modes/GM.lua index 3c5726d0..31f48e50 100644 --- a/modes/GM.lua +++ b/modes/GM.lua @@ -30,7 +30,7 @@ return{ P:win("finish") end end, - bg="game3",bgm="shining terminal", + bg="game3",bgm="far", }, slowMark=true, load=function() diff --git a/parts/bgm.lua b/parts/bgm.lua index 323677bf..8281656d 100644 --- a/parts/bgm.lua +++ b/parts/bgm.lua @@ -5,9 +5,9 @@ local BGM={} -- BGM.suspend=[str:pausing ID] -- BGM.playing=[src:playing SRC] BGM.list={ - "blank","way","race","newera","push", - "reason","infinite","secret7th","secret8th", - "shining terminal","oxygen","distortion", + "blank","way","race","newera","push","reason","infinite", + "secret7th","secret8th", + "shining terminal","oxygen","distortion","far", "rockblock","cruelty","final","8-bit happiness","end", } BGM.len=#BGM.list diff --git a/parts/file.lua b/parts/file.lua index de14e20e..a88c185a 100644 --- a/parts/file.lua +++ b/parts/file.lua @@ -68,7 +68,7 @@ end local files={ data= fs.newFile("data.dat"), - setting=fs.newFile("setting.dat"), + setting=fs.newFile("settings.dat"), VK= fs.newFile("virtualkey.dat"), keyMap= fs.newFile("key.dat"), unlock= fs.newFile("unlock.dat"), @@ -194,9 +194,6 @@ function File.loadData() S.spin_S[5]=0 S.clear_S[5]=0 end - if S.version=="Alpha V0.8.16"or S.version=="Alpha V0.8.17"or S.version=="Alpha V0.8.18"then - setting.skin[3],setting.skin[4]=setting.skin[4],setting.skin[3] - 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] diff --git a/parts/kickList.lua b/parts/kickList.lua index 4b587352..01d70138 100644 --- a/parts/kickList.lua +++ b/parts/kickList.lua @@ -4,7 +4,7 @@ local ZERO={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zer local map={} for x=-3,3 do map[x]={}for y=-3,3 do map[x][y]={x,y}end end -local function collect(T) +local function collect(T)--make all vec point to the same vec if type(T)=="table"then for _,T in next,T do for k,vec in next,T do @@ -14,11 +14,11 @@ local function collect(T) end end -local function sym(L) +local function C_sym(L)--use this if the block is centrosymmetry, *PTR!!! L[23]=L[01]L[32]=L[10] L[21]=L[03]L[12]=L[30] end -local function flipList(O) +local function flipList(O)--use this to copy a symmetry list if not O then return end local L={} for i=1,#O do @@ -41,9 +41,7 @@ local function reflect(a,b) b[13]=flipList(a[31]) end local function pushZero(T) - local L - for i=1,#T do - L=T[i] + for _,L in next,T do if type(L)=="table"then for _,v in next,L do table.insert(v,1,zero) @@ -163,8 +161,8 @@ local TRS={ [10]={{ 1, 0},{ 0,-1},{-1,-1},{ 0,-2},{ 0,-3},{ 0, 3},{ 1,-2}}, [03]={{ 1, 0},{ 0,-3},{ 0, 1},{ 0, 2},{ 0, 3},{ 1, 2}}, [30]={{-1, 0},{ 0, 1},{ 0,-2},{ 0,-3},{ 0, 3},{-1,-2}}, - },--5Z - {},--5S + },--Z5 + {},--S5 { [01]={{-1, 0},{-1, 1},{ 0,-2},{-1,-2},{-1,-1},{ 0, 1}}, [10]={{ 1, 0},{ 1,-1},{ 0, 2},{ 1, 2},{ 0,-1},{ 1, 1}}, @@ -208,7 +206,7 @@ local TRS={ [20]={{ 0,-1},{ 0, 1},{ 0,-2}}, [13]={{ 1, 0},{-1, 1},{-2, 0}}, [31]={{-1, 0},{ 1, 1},{ 2, 0}}, - },--5T + },--T5 { [01]={{-1, 0},{-1, 1},{ 0,-2},{-1,-1},{-1,-2}}, [10]={{ 1, 0},{ 1,-1}}, @@ -267,8 +265,8 @@ local TRS={ [20]={{ 0, 1},{-1, 1},{ 1, 0},{-2, 1},{ 0,-1}}, [13]={{-1, 0},{-1,-1},{ 0, 1},{-1,-2}}, [31]={{ 1, 0},{ 1, 1},{ 0,-1},{ 1, 2}}, - },--5J - {},--5L + },--J5 + {},--L5 { [01]={{-1, 0},{-1, 1},{ 1, 0},{-1, 2},{-1,-1},{ 0,-3},{ 0, 1}}, [10]={{-1, 0},{ 1,-1},{-1, 0},{ 1,-2},{ 1, 1},{ 0, 3},{ 0, 1}}, @@ -276,8 +274,8 @@ local TRS={ [30]={{ 0, 1},{-1, 1},{ 1, 0},{-1,-1},{ 0, 2},{-1, 2},{ 0, 3},{-1, 3},{ 1,-1}}, [12]={{ 1, 0},{ 1,-1},{ 0,-1},{ 1,-2},{ 0,-2},{ 1, 1},{-1, 0},{ 0, 2},{ 1, 2}}, [21]={{-1, 0},{-1, 1},{ 0, 1},{-1, 2},{ 0, 2},{-1,-1},{ 1, 0},{ 0,-2},{-1,-2}}, - [32]={{-1, 0},{-1, 1},{-1,-1},{ 0, 2},{-1, 2},{ 0,-2}}, - [23]={{ 1, 0},{ 1,-1},{ 1, 1},{ 0,-2},{ 1,-2},{ 0, 2}}, + [32]={{-1, 0},{-1, 1},{-1,-1},{ 1, 0},{ 0, 2},{-1, 2},{ 0,-2}}, + [23]={{ 1, 0},{ 1,-1},{ 1, 1},{-1, 0},{ 0,-2},{ 1,-2},{ 0, 2}}, [02]={{ 0,-1},{ 1,-1},{-1, 0},{ 2,-1},{ 0, 1}}, [20]={{ 0, 1},{-1, 1},{ 1, 0},{-2, 1},{ 0,-1}}, [13]={{-1, 0},{-1,-1},{ 0, 1},{-1,-2}}, @@ -302,22 +300,25 @@ local TRS={ { [01]={{ 1,-1},{ 1, 0},{ 1, 1},{ 0, 1},{-1, 1},{-1, 0},{-1,-1},{ 0,-1},{ 0,-2},{-2,-1},{-2,-2},{ 2, 0},{ 2,-1},{ 2,-2},{ 1, 2},{ 2, 2},{-1, 2},{-2, 2}}, [10]={{-1, 0},{-1,-1},{ 0,-1},{ 1,-1},{-2,-2},{-2,-1},{-2, 0},{-1,-2},{ 0,-2},{ 1,-2},{ 2,-2},{-1, 1},{-2, 1},{-2, 2},{ 1, 0},{ 2, 0},{ 2,-1},{ 0, 1},{ 1,-1},{ 2,-2}}, - },--5I + [03]={{-1,-1},{-1, 0},{-1, 1},{-0, 1},{ 1, 1},{ 1, 0},{ 1,-1},{-0,-1},{-0,-2},{ 2,-1},{ 2,-2},{-2, 0},{-2,-1},{-2,-2},{-1, 2},{-2, 2},{ 1, 2},{ 2, 2}}, + [30]={{ 1, 0},{ 1,-1},{-0,-1},{-1,-1},{ 2,-2},{ 2,-1},{ 2, 0},{ 1,-2},{-0,-2},{-1,-2},{-2,-2},{ 1, 1},{ 2, 1},{ 2, 2},{-1, 0},{-2, 0},{-2,-1},{ 0, 1},{-1,-1},{-2,-2}}, + },--I5 } -TRS[25][03]=flipList(TRS[25][01]) -TRS[25][30]=flipList(TRS[25][10]) -sym(TRS[8])sym(TRS[9])sym(TRS[25]) reflect(TRS[1],TRS[2])--SZ reflect(TRS[3],TRS[4])--LJ -reflect(TRS[8],TRS[9])--5S5Z +reflect(TRS[8],TRS[9])--S5Z5 reflect(TRS[10],TRS[11])--PQ reflect(TRS[12],TRS[13])--FE -reflect(TRS[19],TRS[20])--5L5J +reflect(TRS[19],TRS[20])--L5J5 reflect(TRS[21],TRS[22])--RY reflect(TRS[23],TRS[24])--HN -for i=1,25 do collect(TRS[i])end pushZero(TRS) +C_sym(TRS[8]) +C_sym(TRS[9]) +C_sym(TRS[25]) +for i=1,25 do collect(TRS[i])end + local AIRS={ { [01]={{-1,0},{-1, 1},{ 0,-2},{-1,-2}}, @@ -332,8 +333,8 @@ local AIRS={ false, false, false, - function()end, false, + function()end, { [01]={{-2, 0},{ 1, 0},{-2,-1},{ 1, 2}}, [10]={{ 2, 0},{-1, 0},{ 2, 1},{-1,-2}}, @@ -346,9 +347,9 @@ local AIRS={ } } collect(AIRS[1])collect(AIRS[7]) +pushZero(AIRS) for i=2,5 do AIRS[i]=AIRS[1]end for i=8,25 do AIRS[i]=AIRS[1]end -pushZero(AIRS) local NONE={} for i=1,25 do NONE[i]=ZERO end diff --git a/parts/languages.lua b/parts/languages.lua index 30fc7575..ae38085e 100644 --- a/parts/languages.lua +++ b/parts/languages.lua @@ -1,7 +1,7 @@ local langList={ { anykey="按任意键继续", - newVersion="检测到更新!存档格式可能更新", + newVersion="检测到更新!存档格式可能更新,设置已重置", marking="游戏作者:MrZ_26\n出现此水印则为非法录屏上传", lang="中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -413,7 +413,7 @@ local langList={ }, { anykey="按任意键继续", - newVersion="检测到更新!存档格式可能更新", + newVersion="检测到更新!存档格式可能更新,设置已重置", marking="游戏作者:MrZ_26\n出现此水印则为非法录屏上传", lang="全中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -823,7 +823,7 @@ local langList={ }, { anykey="Press any button", - newVersion="Updating detected! Save format may have been updated.", + newVersion="Updating detected! Save format may have been updated, settings reseted", marking="Author:MrZ_26\nIllegal recording if u see this", lang="English", atkModeName={"Random","Badges","K.O.s","Attackers"}, @@ -1222,7 +1222,7 @@ local langList={ }, { anykey="↓□↓", - newVersion="!!!!!!!!!!!!!!!!!!!", + newVersion="&!!! ___/_?_ R", marking="Author:MrZ_26\nIllegal recording if u see this", lang="?????", atkModeName={"?","( )","!","←→"}, diff --git a/updateLog.lua b/updateLog.lua index 8e0a580d..35b05f77 100644 --- a/updateLog.lua +++ b/updateLog.lua @@ -78,8 +78,11 @@ Future outlook: field flip(LR/UD) no fail(∞ lives) 简易防沉迷系统 + better drop FX + 60+ fps supporting in-game document lang setting page + dragging control warning FX(Graphic) game recording new widgets (joystick etc.) @@ -93,6 +96,7 @@ Future outlook: 0.8.22: Details Updated changed: won't show "open saving folder" button on mobile devices + reset all settings 0.8.21: Bug Fixed changed: