Merge branch 'main' into main

2021-04-22 15:39:42 +08:00
parent 5d1e286645 2594d43a53
commit ae3c8e8548
157 changed files with 1241 additions and 1084 deletions
--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -47,19 +47,19 @@ return{
 		"ttt tetris trainer tres bien",
 		"game",
 		"*Web-based, no mobile support | Single player*\nTetris Trainer Tres-Bien. A hands-on tutorial of advanced techniques in modern Tetris.\nRecommended for players that can complete a 40-line Sprint with all Tetris line clears and no hold.\nCovered topics include T-Spin, finesse, SRS, and some battle setups.\nLinked is translated to Simplified Chinese; original in Japanese.",
-		"http://121.4.147.128/ttt",
+		"http://teatube.ltd/ttt",
 	},
 	{"TTPC",
 		"ttpc tetris perfect clear challenge",
 		"game",
 		"*Web-based, no mobile support | Single player*\nTetris Perfect Clear Challenge. The PC opener tutorial for SRS+bag7.\nRecommended for players that have completed TTT. You need to know SRS to play this.\nIncludes only the basic PC opener.\nLinked is translated to Simplified Chinese; original in Japanese.",
-		"http://121.4.147.128/ttpc",
+		"http://teatube.ltd/ttpc",
 	},
 	{"NAZO",
 		"nazo",
 		"game",
 		"*Web-based, no mobile support | Single player*\nAll sorts of SRS puzzles. Recommended for players that have completed TTT.\nHas T-Spin and all spin puzzles of all difficulties.\nLinked is translated to Simplified Chinese; original in Japanese.",
-		"http://121.4.147.128/nazo",
+		"http://teatube.ltd/nazo",
 	},

 	{"King of Stackers",
@@ -228,9 +228,9 @@ return{
 		"Dig/Defend per minute\n\tSometimes can reflect how well a player can survive garbage.",
 	},
 	{"ADPM",
-		"adpm attackdigperminute",
+		"adpm attackdigperminute vs",
 		"term",
-		"Attack&Dig per minute\n\tUsed to compare skill differences between the two players within one match; slightly more accurate than APM.",
+		"Attack&Dig per minute\n\tUsed to compare skill differences between the two players within one match; slightly more accurate than APM.\n\"vs\" in TETR.IO is Atk+Dig per 100s",
 	},
 	{"APL",
 		"apl attackperline efficiency",
@@ -772,7 +772,7 @@ return{
 		"tetrisonline servers",
 		"other",
 		"Google \"Tetris Online Poland\" for the Poland server.\nClick \"Open URL\" for information about the Tetris Online Study server.",
-		"http://121.4.147.128/tos",
+		"http://teatube.ltd/tos",
 	},
 	{"Github Repository",
 		"githubrepository sourcecode",
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -42,19 +42,19 @@ return{
 		"教程 ttt",
 		"game",
 		"现代方块特殊操作手把手教程(推荐使用电脑，移动设备需要外接键盘)\n\t推荐能无hold纯消四完成40行挑战的人学习\n\t内含T-spin、极简、SRS、部分对战定式介绍等教程\n\t完全吃透了话就可以成为教练啦!\n注:提供的链接是翻译后挂在茶服的版本",
-		"http://121.4.147.128/ttt",
+		"http://teatube.ltd/ttt",
 	},
 	{"TTPC",
 		"pc教程 ttpc",
 		"game",
 		"SRS+bag7方块游戏开局PC教程(推荐使用电脑，移动设备需要外接键盘)\n\t推荐完成了ttt的人学习(必须先学会SRS)\n\t(不包括六巧板等其它PC定式)\n\n注:提供的链接是翻译后挂在茶服的版本",
-		"http://121.4.147.128/ttpc",
+		"http://teatube.ltd/ttpc",
 	},
 	{"NAZO",
 		"题库 nazo",
 		"game",
 		"各类SRS试题(手机触屏玩不了)\n\t推荐能通过ttt的玩家尝试。\n\t内含各种t-spin/all-spin题目，简单到极难题目都有。\n\n注:提供的链接是翻译后挂在茶服的版本",
-		"http://121.4.147.128/nazo",
+		"http://teatube.ltd/nazo",
 	},

 	--游戏(网页)
@@ -106,7 +106,7 @@ return{
 		"俄罗斯方块大师 tgm tetrisgrandmaster",
 		"game",
 		"一个街机平台方块系列，S13/GM等称号出自该系列，可以在win平台运行\n\n其中TGM3目前玩得最普遍，部分模式说明:\nMaster:大师模式，有段位评价，拿到更高段位点的要求:非消一的连击和消四，字幕战中消除和通关，每100的前70小于【标准时间，上一个0~70秒数+2】中小的一个，每100总用时不能超过限定值(不然取消上一个方法的加分并反扣点数);到500若没有进标准时间会强制结束游戏(称为铁门);字幕战有两个难度，半隐和全隐，后者必须拿到几乎全部的段位点才能进，消除奖励的段位点也更多。\nShirase:死亡模式，类似于techmino中的20G-极限，开局就是高速20G，500和1000有铁门，500开始底下开始涨垃圾行，1000开始出现骨块，1300通关进入大方块字幕战;段位结算:每通100加1段从S1到S13，如果通关了字幕战就会有金色的S13\n\n更多内容详见链接",
-		"http://121.4.147.128/TGMGUIDE/",
+		"http://teatube.ltd/TGMGUIDE/",
 	},
 	{"DTET",
 		"dtet",
@@ -228,9 +228,9 @@ return{
 		"Dig/Defend per Minute\n挖掘每分，即玩家每分钟向下挖掘的垃圾行数。\n某些时候可以体现玩家生存能力\n\n或:防御(抵消+挖掘)每分",
 	},
 	{"ADPM",
-		"adpm attack defend",
+		"adpm attack defend vs",
 		"term",
-		"Atk+Dig per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比apm更准确一些。\n在TETR.IO中有一个叫vs的数据就是ADPM(调整了比例)",--TODO
+		"Atk+Dig per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比apm更准确一些。\n在TETR.IO中叫vs的数据就是ADPM(调整过比例，具体是Atk+Dig per 100s)",
 	},
 	{"APL",
 		"apl xiaolv",
@@ -262,7 +262,7 @@ return{
 	{"Tetris",
 		"tetris xiaosi",
 		"term",
-		"商标，Tetris游戏名，同时也是别的方块游戏里消四行的名字。\n含义是Tetra(古希腊语 四)+Tennis(游戏原作者喜欢的运动)。",
+		"商标，Tetris游戏名，同时也是别的方块游戏里消四行的名字。\n含义是Tetra(古希腊语 四)+Tennis(游戏原作者喜欢的运动)。\n现在版权在TTC(The Tetris Company)手上，任天堂和世嘉开发游戏是TTC授权的，本身并没有版权。",
 	},
 	{"PC",
 		"pc perfectclear ac allclear quanxiao quanqing",
@@ -523,12 +523,12 @@ return{
 	{"DAS & ARR",
 		"灵敏度 das arr",
 		"term",
-		"DAS(Delay-auto-shift，延迟自动移动)系统。\n\nDAS，自动移动延迟，指从<按下移动键时动了一格>到<开始自动移动>之间的时间\nARR(Auto-repeat-rate)，自动重复速率，指<每次自动移动>之间的时间\n\n单位都是f(帧，1帧=1/60秒)\n新人不会调的话推荐用das=8~10，arr=1~2\n对自己能力比较自信或者是已经有一定水平想提速推荐用das=4~6，arr=0\n(如果是别的游戏单位是ms(毫秒)，那么乘16.7就可算出对应的数值)\n\n最佳调整方法:das越小越好，小到玩家依然能精准区分单点/长按为止;arr能0就0，游戏不允许的话就能拉多小拉多小\n\n这套系统也被叫作DAS系统",
+		"DAS(Delay-auto-shift，自动加速延迟)系统。\n\nDAS，具体指从<按下移动键时动了一格>到<开始自动移动>之间的时间\nARR(Auto-repeat-rate)，自动重复速率，指<每次自动移动>之间的时间\n\n单位都是f(帧，1帧=1/60秒)\n新人不会调的话推荐用das=8~10，arr=1~2\n对自己能力比较自信或者是已经有一定水平想提速推荐用das=4~6，arr=0\n(如果是别的游戏单位是ms(毫秒)，那么乘16.7就可算出对应的数值)\n\n最佳调整方法:das越小越好，小到依然能准确区分单点/长按为止;arr能0就0，游戏不允许的话就能拉多小拉多小\n\n这套系统也被叫作DAS系统",
 	},
 	{"DAS通俗",
 		"das arr",
 		"term",
-		"打字时按住o，你会看到:Ooooooooooo\n在时间轴上:O-----------o-o-o-o-o-o-o-o-o-o\n-----------就是das长度，-就是arr长度",
+		"打字时按住o，你会看到:ooooooooooo\n在时间轴上:o-----------o-o-o-o-o-o-o-o-o-o\n-----------就是das长度，-就是arr长度",
 	},
 	{"DAS打断",
 		"dascut",
@@ -781,7 +781,7 @@ return{
 		"茶服 chafu study",
 		"other",
 		"TO-S的添加方法、说明等关于茶服的一切",
-		"http://121.4.147.128/tos",
+		"http://teatube.ltd/tos",
 	},
 	{"Github仓库",
 		"源代码 github sourcecode yuandaima",
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -1,4 +1,4 @@
-local c=COLOR
+local C=COLOR
 return{
 	back="Back",
 	anykey="Press a key!",
@@ -219,7 +219,6 @@ return{
 			music="Music & SE",
 			about="About",
 			dict="Zictionary",
-			lang="言/A",
 			manual="Manual",
 			quit="Exit",
 		},
@@ -852,30 +851,30 @@ return{
 		"You can perform a spin with 28 of the 29 minoes in this game; the exception being O1.",
 		"You can set the spawning orientation for each tetromino.",
 		"ZS JL T O I",
-		{c.C,"Also try 15puzzle!"},
-		{c.C,"Also try Minecraft!"},
-		{c.C,"Also try Minesweeper!"},
-		{c.C,"Also try osu!"},
-		{c.C,"Also try Phigros!"},
-		{c.C,"Also try Rubic's cube!"},
-		{c.C,"Also try Terraria!"},
-		{c.C,"Also try VVVVVV!"},
-		{c.fire,"Also try Cultris II!"},
-		{c.fire,"Also try Jstris"},
-		{c.fire,"Also try NullpoMino!"},
-		{c.fire,"Also try TETR.IO!"},
-		{c.fire,"Also try Tetr.js!"},
-		{c.fire,"Also try Tetra Legends!"},
-		{c.grape,"T-spin!"},
-		{c.gray,"REGRET!!"},
-		{c.lR,"Z ",c.lG,"S ",c.lSea,"J ",c.lOrange,"L ",c.lGrape,"T ",c.lY,"O ",c.lC,"I"},
-		{c.lY,"COOL!!"},
-		{c.R,"\"DMCA abusing\""},
-		{c.R,"\"Intellectual property law\""},
-		{c.R,"DT",c.W," Cannon=",c.grape,"TS",c.R,"D",c.W,"+",c.grape,"TS",c.R,"T",c.W," Cannon"},
-		{c.R,"LrL ",c.G,"RlR ",c.B,"LLr ",c.orange,"RRl ",c.grape,"RRR ",c.grape,"LLL ",c.C,"FFF ",c.Y,"RfR ",c.Y,"RRf ",c.Y,"rFF"},
-		{c.sky,"Lua",c.W," No.1"},
-		{c.W,"What is an ",c.lC,"X-Spin"?},
-		{c.Y,"O-Spin Triple!"},
+		{C.C,"Also try 15puzzle!"},
+		{C.C,"Also try Minecraft!"},
+		{C.C,"Also try Minesweeper!"},
+		{C.C,"Also try osu!"},
+		{C.C,"Also try Phigros!"},
+		{C.C,"Also try Rubic's cube!"},
+		{C.C,"Also try Terraria!"},
+		{C.C,"Also try VVVVVV!"},
+		{C.fire,"Also try Cultris II!"},
+		{C.fire,"Also try Jstris"},
+		{C.fire,"Also try NullpoMino!"},
+		{C.fire,"Also try TETR.IO!"},
+		{C.fire,"Also try Tetr.js!"},
+		{C.fire,"Also try Tetra Legends!"},
+		{C.purple,"T-spin!"},
+		{C.H,"REGRET!!"},
+		{C.lR,"Z ",C.lG,"S ",C.lS,"J ",C.lO,"L ",C.lP,"T ",C.lY,"O ",C.lC,"I"},
+		{C.lY,"COOL!!"},
+		{C.R,"\"DMCA abusing\""},
+		{C.R,"\"Intellectual property law\""},
+		{C.R,"DT",C.Z," Cannon=",C.purple,"TS",C.R,"D",C.Z,"+",C.purple,"TS",C.R,"T",C.Z," Cannon"},
+		{C.R,"LrL ",C.G,"RlR ",C.B,"LLr ",C.orange,"RRl ",C.purple,"RRR ",C.purple,"LLL ",C.C,"FFF ",C.Y,"RfR ",C.Y,"RRf ",C.Y,"rFF"},
+		{C.navy,"Lua",C.Z," No.1"},
+		{C.Z,"What is an ",c.lC,"X-Spin"?},
+		{C.Y,"O-Spin Triple!"},
 	}
 }
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -196,7 +196,6 @@ return{
 			-- music="Music & SE",
 			-- about="About",
 			dict="Zictionary",
-			lang="言/A",
 			manual="Manuel",
 			quit="Quitter",
 		},
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -1,3 +1,4 @@
+local C=COLOR
 return{
 	fallback=4,
 	back="Voltar",
@@ -219,7 +220,6 @@ return{
 			-- music="Music & SE",
 			-- about="About",
 			dict="Zictionary",
-			lang="言/A",
 			manual="Manual",
 			quit="Saída",
 		},
@@ -609,7 +609,7 @@ return{
 		},
 		app_15p={
 			reset="Embaralhar",
-			color="Cor",
+			C="Cor",
 			blind="Cego",
 			slide="Deslizar",
 			pathVis="Mostrar caminho",
@@ -843,37 +843,37 @@ return{
 		"Você pode abrir o diretório de save na pagina de Stats.",
 		"Você pode escolher uma orientação pra cada blococan.",
 		"ZS JL T O I",
-		{COLOR.cyan,"Tente também 15puzzle"},
-		{COLOR.cyan,"Tente também Minecraft"},
-		{COLOR.cyan,"Tente também Minesweeper"},
-		{COLOR.cyan,"Tente também osu!"},
-		{COLOR.cyan,"Tente também Phigros"},
-		{COLOR.cyan,"Tente também Rubic's cube"},
-		{COLOR.cyan,"Tente também Terraria"},
-		{COLOR.cyan,"Tente também VVVVVV"},
-		{COLOR.fire,"Tente também Cultris II"},
-		{COLOR.fire,"Tente também Jstris"},
-		{COLOR.fire,"Tente também Nullpomino"},
-		{COLOR.fire,"Tente também Tetr.io"},
-		{COLOR.fire,"Tente também Tetr.js"},
-		{COLOR.fire,"Tente também Tetralegends"},
-		{COLOR.grape,"T-spin!"},
-		{COLOR.gray,"暫定段位:9"},
-		{COLOR.gray,"REGRET!!"},
-		{COLOR.lR,"Z ",COLOR.lG,"S ",COLOR.lSea,"J ",COLOR.lOrange,"L ",COLOR.lGrape,"T ",COLOR.lY,"O ",COLOR.lC,"I"},
-		{COLOR.lY,"LEGAL!!"},
-		{COLOR.R,"\"DMCA abusing\""},
-		{COLOR.R,"\"Intellectual property law\""},
-		{COLOR.R,"DT",COLOR.W," Cannon=",COLOR.grape,"TS",COLOR.R,"D",COLOR.W,"+",COLOR.grape,"TS",COLOR.R,"T",COLOR.W," Cannon"},
-		{COLOR.R,"LrL ",COLOR.G,"RlR ",COLOR.B,"LLr ",COLOR.orange,"RRl ",COLOR.grape,"RRR ",COLOR.grape,"LLL ",COLOR.C,"FFF ",COLOR.Y,"RfR ",COLOR.Y,"RRf ",COLOR.Y,"rFF"},
-		{COLOR.sky,"Lua",COLOR.W," No.1"},
-		{COLOR.W,"What is ",COLOR.lC,"Xspin"},
-		{COLOR.Y,"暫定段位:GM"},
-		{COLOR.Y,"暫定段位:M"},
-		{COLOR.Y,"暫定段位:MK"},
-		{COLOR.Y,"暫定段位:MM"},
-		{COLOR.Y,"暫定段位:MO"},
-		{COLOR.Y,"暫定段位:MV"},
-		{COLOR.Y,"O-spin Triple!"},
+		{C.C,"Tente também 15puzzle"},
+		{C.C,"Tente também Minecraft"},
+		{C.C,"Tente também Minesweeper"},
+		{C.C,"Tente também osu!"},
+		{C.C,"Tente também Phigros"},
+		{C.C,"Tente também Rubic's cube"},
+		{C.C,"Tente também Terraria"},
+		{C.C,"Tente também VVVVVV"},
+		{C.F,"Tente também Cultris II"},
+		{C.F,"Tente também Jstris"},
+		{C.F,"Tente também Nullpomino"},
+		{C.F,"Tente também Tetr.io"},
+		{C.F,"Tente também Tetr.js"},
+		{C.F,"Tente também Tetralegends"},
+		{C.H,"暫定段位:9"},
+		{C.H,"REGRET!!"},
+		{C.lR,"Z ",C.lG,"S ",C.lS,"J ",C.lO,"L ",C.lP,"T ",C.lY,"O ",C.lC,"I"},
+		{C.lY,"LEGAL!!"},
+		{C.N,"Lua",C.Z," No.1"},
+		{C.P,"T-spin!"},
+		{C.R,"\"DMCA abusing\""},
+		{C.R,"\"Intellectual property law\""},
+		{C.R,"DT",C.Z," Cannon=",C.P,"TS",C.R,"D",C.Z,"+",C.P,"TS",C.R,"T",C.Z," Cannon"},
+		{C.R,"LrL ",C.G,"RlR ",C.B,"LLr ",C.O,"RRl ",C.P,"RRR ",C.P,"LLL ",C.C,"FFF ",C.Y,"RfR ",C.Y,"RRf ",C.Y,"rFF"},
+		{C.Z,"What is ",C.lC,"Xspin"},
+		{C.Y,"暫定段位:GM"},
+		{C.Y,"暫定段位:M"},
+		{C.Y,"暫定段位:MK"},
+		{C.Y,"暫定段位:MM"},
+		{C.Y,"暫定段位:MO"},
+		{C.Y,"暫定段位:MV"},
+		{C.Y,"O-spin Triple!"},
 	}
 }
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -197,7 +197,6 @@ return{
 			music="Música y SFX",
 			about="Acerca del Juego",
 			dict="Zictionary",
-			lang="言/A",
 			manual="Manual",
 			quit="Salir",
 		},
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -101,7 +101,6 @@ return{
 			music="~~~ & =><=",
 			about="?",
 			dict="z",
-			lang="言/A",
 			manual="???",
 			quit="X",
 		},
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -1,4 +1,4 @@
-local c=COLOR
+local C=COLOR
 return{
 	back="返回",
 	anykey="按任意键继续",
@@ -219,7 +219,6 @@ return{
 			music="音乐&音效",
 			about="关于",
 			dict="小Z词典",
-			lang="言/A",
 			manual="说明书",
 			quit="退出",
 		},
@@ -1013,91 +1012,91 @@ return{
 		"Z酱累了,Z酱不想更新",
 		"Z酱只是个写代码的,懂什么方块",
 		"Z块等身抱枕来一个(x",
-		{c.aqua,"AQUA"},
-		{c.B,"BLUE"},
-		{c.C,"<PURE ",c.grape,"MEMORY>"},
-		{c.C,"15puzzle好玩!"},
-		{c.C,"魔方好玩!"},
-		{c.C,"扫雷好玩!"},
-		{c.C,"泰拉瑞亚好玩!"},
-		{c.C,"我的世界好玩!"},
-		{c.C,"CYAN"},
-		{c.C,"Orzmic好玩!"},
-		{c.C,"Osu!好玩!"},
-		{c.C,"Phigros好玩!"},
-		{c.C,"VVVVVV好玩!"},
-		{c.fire,"Cultris II也很好玩!"},
-		{c.fire,"FIRE"},
-		{c.fire,"Jstris也很好玩!"},
-		{c.fire,"Nullpomino也很好玩!"},
-		{c.fire,"Tetr.io也很好玩!"},
-		{c.fire,"Tetr.js也很好玩!"},
-		{c.fire,"Tetralegends也很好玩!"},
-		{c.G,"快捷键: Alt+F4=关闭当前窗口"},
-		{c.G,"快捷键: Alt+Tab=切换窗口"},
-		{c.G,"快捷键: backspace=返回上一个文件目录"},
-		{c.G,"快捷键: Ctrl+鼠标滚轮=缩放"},
-		{c.G,"快捷键: Ctrl+A=全选"},
-		{c.G,"快捷键: Ctrl+Alt+Z=查看所有qq消息"},
-		{c.G,"快捷键: Ctrl+D=复制一份"},
-		{c.G,"快捷键: Ctrl+F=查找"},
-		{c.G,"快捷键: Ctrl+Tab=切换标签页"},
-		{c.G,"快捷键: Ctrl+W=关闭当前标签页"},
-		{c.G,"快捷键: shift+del=永久删除文件 (技术人员别杠)"},
-		{c.G,"GREEN"},
-		{c.grape,"GRAPE"},
-		{c.grape,"T-spin!"},
-		{c.grass,"GRASS"},
-		{c.gray,"感谢Phigros提供部分tip模板("},
-		{c.gray,"暂定段位:9"},
-		{c.gray,"REGRET!!"},
-		{c.lime,"LIME"},
-		{c.lC,"26连T2来一个?"},
-		{c.lC,"Xspin",c.W,"是啥"},
-		{c.lGrape,"Naki",c.W," 可爱!"},
-		{c.lGray,"腱鞘炎警告"},
-		{c.lGray,"看起来是个计算器,其实…"},
-		{c.lGray,"没学过编曲,音乐都是自己瞎写的,觉得不好听就去设置关了吧"},
-		{c.lGray,"秘密数字:626"},
-		{c.lGray,"你有一个好"},
-		{c.lGray,"STSD必死"},
-		{c.lGray,"Techmino没有抽卡没有氪金,太良心了"},
-		{c.lR,"Z ",c.lG,"S ",c.lSea,"J ",c.lOrange,"L ",c.lGrape,"T ",c.lY,"O ",c.lC,"I"},
-		{c.lSea,"茶娘",c.W," 可爱!"},
-		{c.lY,"COOL!!"},
-		{c.magenta,"MAGENTA"},
-		{c.orange,"ORANGE"},
-		{c.pink,"PINK"},
-		{c.pink,"uid:225238922"},
-		{c.purple,"PURPLE"},
-		{c.R,"《滥用DMCA》"},
-		{c.R,"《知识产权法》"},
-		{c.R,"本游戏难度上限很高,做好心理准备。"},
-		{c.R,"不要向不感兴趣的路人推荐!!!!!!!!"},
-		{c.R,"不要在上课时玩游戏!"},
-		{c.R,"光敏性癫痫警告"},
-		{c.R,"请在有一定游戏基础之后再学Tspin!不然副作用非常大!"},
-		{c.R,"新人请千万记住,打好基础,不要太早学那些花里胡哨的。"},
-		{c.R,"长时间游戏状态会越来越差!玩久了记得放松一下~"},
-		{c.R,"DD",c.W,"炮=",c.grape,"TS",c.R,"D",c.W,"+",c.grape,"TS",c.R,"D",c.W,"炮"},
-		{c.R,"DT",c.W,"炮=",c.grape,"TS",c.R,"D",c.W,"+",c.grape,"TS",c.R,"T",c.W,"炮"},
-		{c.R,"LrL ",c.G,"RlR ",c.B,"LLr ",c.orange,"RRl ",c.grape,"RRR LLL ",c.C,"FFF ",c.Y,"RfR RRf rFF"},
-		{c.R,"RED"},
-		{c.sea,"SEA"},
-		{c.sky,"Lua",c.W,"天下第一"},
-		{c.sky,"SKY"},
-		{c.W,"1, 2, ",c.C,"⑨",c.W,"!!!!!"},
-		{c.W,"效率药水",c.gray," 效率提升 (8:00)"},
-		{c.W,"协调药水",c.gray," MD减少 II(1:30)"},
-		{c.Y,"暂定段位:GM"},
-		{c.Y,"暂定段位:M"},
-		{c.Y,"暂定段位:MK"},
-		{c.Y,"暂定段位:MM"},
-		{c.Y,"暂定段位:MO"},
-		{c.Y,"暂定段位:MV"},
-		{c.Y,"Miya",c.W," 可爱!"},
-		{c.Y,"O-spin Triple!"},
-		{c.Y,"YELLOW"},
+		{C.A,"AQUA"},
+		{C.B,"BLUE"},
+		{C.C,"<PURE ",C.purple,"MEMORY>"},
+		{C.C,"15puzzle好玩!"},
+		{C.C,"魔方好玩!"},
+		{C.C,"扫雷好玩!"},
+		{C.C,"泰拉瑞亚好玩!"},
+		{C.C,"我的世界好玩!"},
+		{C.C,"CYAN"},
+		{C.C,"Orzmic好玩!"},
+		{C.C,"Osu!好玩!"},
+		{C.C,"Phigros好玩!"},
+		{C.C,"VVVVVV好玩!"},
+		{C.F,"Cultris II也很好玩!"},
+		{C.F,"FIRE"},
+		{C.F,"Jstris也很好玩!"},
+		{C.F,"Nullpomino也很好玩!"},
+		{C.F,"Tetr.io也很好玩!"},
+		{C.F,"Tetr.js也很好玩!"},
+		{C.F,"Tetralegends也很好玩!"},
+		{C.G,"快捷键: Alt+F4=关闭当前窗口"},
+		{C.G,"快捷键: Alt+Tab=切换窗口"},
+		{C.G,"快捷键: backspace=返回上一个文件目录"},
+		{C.G,"快捷键: Ctrl+鼠标滚轮=缩放"},
+		{C.G,"快捷键: Ctrl+A=全选"},
+		{C.G,"快捷键: Ctrl+Alt+Z=查看所有qq消息"},
+		{C.G,"快捷键: Ctrl+D=复制一份"},
+		{C.G,"快捷键: Ctrl+F=查找"},
+		{C.G,"快捷键: Ctrl+Tab=切换标签页"},
+		{C.G,"快捷键: Ctrl+W=关闭当前标签页"},
+		{C.G,"快捷键: shift+del=永久删除文件 (技术人员别杠)"},
+		{C.G,"GREEN"},
+		{C.H,"感谢Phigros提供部分tip模板("},
+		{C.H,"暂定段位:9"},
+		{C.H,"REGRET!!"},
+		{C.jade,"JADE"},
+		{C.lC,"26连T2来一个?"},
+		{C.lC,"Xspin",C.Z,"是啥"},
+		{C.lH,"腱鞘炎警告"},
+		{C.lH,"看起来是个计算器,其实…"},
+		{C.lH,"没学过编曲,音乐都是自己瞎写的,觉得不好听就去设置关了吧"},
+		{C.lH,"秘密数字:626"},
+		{C.lH,"你有一个好"},
+		{C.lH,"STSD必死"},
+		{C.lH,"Techmino没有抽卡没有氪金,太良心了"},
+		{C.L,"LIME"},
+		{C.lP,"Naki",C.Z," 可爱!"},
+		{C.lR,"Z ",C.lG,"S ",C.lS,"J ",C.lO,"L ",C.lP,"T ",C.lY,"O ",C.lC,"I"},
+		{C.lS,"茶娘",C.Z," 可爱!"},
+		{C.lY,"COOL!!"},
+		{C.M,"MAGENTA"},
+		{C.N,"Lua",C.Z,"天下第一"},
+		{C.N,"NAVY"},
+		{C.O,"ORANGE"},
+		{C.P,"PURPLE"},
+		{C.P,"T-spin!"},
+		{C.R,"《滥用DMCA》"},
+		{C.R,"《知识产权法》"},
+		{C.R,"本游戏难度上限很高,做好心理准备。"},
+		{C.R,"不要向不感兴趣的路人推荐!!!!!!!!"},
+		{C.R,"不要在上课时玩游戏!"},
+		{C.R,"光敏性癫痫警告"},
+		{C.R,"请在有一定游戏基础之后再学Tspin!不然副作用非常大!"},
+		{C.R,"新人请千万记住,打好基础,不要太早学那些花里胡哨的。"},
+		{C.R,"长时间游戏状态会越来越差!玩久了记得放松一下~"},
+		{C.R,"DD",C.Z,"炮=",C.purple,"TS",C.R,"D",C.Z,"+",C.purple,"TS",C.R,"D",C.Z,"炮"},
+		{C.R,"DT",C.Z,"炮=",C.purple,"TS",C.R,"D",C.Z,"+",C.purple,"TS",C.R,"T",C.Z,"炮"},
+		{C.R,"LrL ",C.G,"RlR ",C.B,"LLr ",C.orange,"RRl ",C.purple,"RRR LLL ",C.C,"FFF ",C.Y,"RfR RRf rFF"},
+		{C.R,"RED"},
+		{C.S,"SEA"},
+		{C.V,"VIOLET"},
+		{C.W,"uid:225238922"},
+		{C.W,"WINE"},
+		{C.Y,"暂定段位:GM"},
+		{C.Y,"暂定段位:M"},
+		{C.Y,"暂定段位:MK"},
+		{C.Y,"暂定段位:MM"},
+		{C.Y,"暂定段位:MO"},
+		{C.Y,"暂定段位:MV"},
+		{C.Y,"Miya",C.Z," 可爱!"},
+		{C.Y,"O-spin Triple!"},
+		{C.Y,"YELLOW"},
+		{C.Z,"1, 2, ",C.C,"⑨",C.Z,"!!!!!"},
+		{C.Z,"效率药水",C.H," 效率提升 (8:00)"},
+		{C.Z,"协调药水",C.H," MD减少 II(1:30)"},
 		-- "Z酱 可爱!",
 	}
 }
--- a/parts/language/manual_en.lua
+++ b/parts/language/manual_en.lua
@@ -1,4 +1,4 @@
-return SPLITSTR([=[
+return STRING.split([=[
 Gameplay:
 		The system will provide you with tetrominoes (4-block pieces),
 		with a total of 7 types, and the player needs to control them
--- a/parts/language/manual_zh.lua
+++ b/parts/language/manual_zh.lua
@@ -1,4 +1,4 @@
-return SPLITSTR([=[
+return STRING.split([=[
 游戏方法:
 		系统会提供的一个个四连骨牌("方块",总共7种)
 		玩家需要控制(左右移动和旋转90,180,270度)这些骨牌直到下落到场地底部,锁定