新tips，修复手机旋屏bug，各种调平，统计数据简化

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

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

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={'!','@','#','$','%','^','&','*','(',')','-','=','_','+','[',']','{','}','\\','|',';',':','\'','"',',','<','.','>','/','?'}

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
 

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 w<h then
+			love.resize(w,h)
+		end
+		return true
+	end
+end
 return Tick

parts/updateLog.lua

@@ -1,23 +1,22 @@
 local S=[=[
 "Patron"(time ordered,may not accurate):
 		[rmb100+]:
-			那没事了(T6300)	加油啊,钉钉动了的大哥哥(T3228)
-			弥佑瑶			Alan
-			幽灵3383		靏鸖龘龘
-			込余			saki
+			那没事了(T6300)		加油啊,钉钉动了的大哥哥(T3228)
+			弥佑瑶				Alan			幽灵3383
+			靏鸖龘龘			込余			saki
 	[rmb10+]:
-		八零哥  蕴空之灵  gggf127  dtg
-		ThTsOd  Fireboos  金巧  10元
-		立斐  Deep_Sea  时雪  yyangdid
-		sfqr  心痕  Sasoric  夏小亚
-		仁参  乐↗乐↘  喜欢c4w的ztcjoin  面包
-		蠢熏  潘一栗  Lied  星街书婉
-		祝西  829  e m*12  我永远爱白银诺艾尔(鹏
-		PCX  kagura77  呆喂  GlowingEmbers
-		轩辕辚  HimuroAki  TCV100  tech有养成系统了@7065
-		HAGE KANOBU  闪电和拐棍  葡萄味的曼妥思  世界沃德
-		蓝绿  天生的魔法师  琳雨空  T8779.易缄  吃水榴莲
-
+		八零哥    蕴空之灵    gggf127    dtg
+		ThTsOd    Fireboos    金巧    10元
+		立斐    Deep_Sea    时雪    yyangdid
+		sfqr    心痕    Sasoric    夏小亚    仁参
+		乐↗乐↘    喜欢c4w的ztcjoin    面包    蠢熏
+		潘一栗    Lied    星街书婉    祝西    829
+		e m*12    我永远爱白银诺艾尔(鹏    PCX
+		kagura77    呆喂    GlowingEmbers    轩辕辚
+		HimuroAki    TCV100    tech有养成系统了@7065
+		HAGE KANOBU    闪电和拐棍    葡萄味的曼妥思
+		世界沃德    蓝绿    天生的魔法师    琳雨空
+		T8779.易缄    吃水榴莲    诗情画意    星姐阿夸双推Man暗炎
 	Thanks!!!
 
 Future outlook:
@@ -72,6 +71,12 @@ Future outlook:
 		network game
 		new AI: task-Z
 
+0.9.1: Bug fixed
+	code:
+		render background to canvas first, not redering each frame
+	fixed:
+		error when moving [nothing] when arr>0
+		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: