Merge branch 'main' into main

2021-04-19 18:02:37 +08:00
parent ce0a46dc2b 65da7fdfbd
commit 306154572e
93 changed files with 1401 additions and 1284 deletions
--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -39,7 +39,7 @@ return{
 	{"Applets",
 		"applets",
 		"help",
-		"[Entrance of applets has been moved to command line]",
+		"[Entrance of applets has been moved to console]",
 	},

 	--Games
@@ -202,26 +202,6 @@ return{
 		"term",
 		"Blocks per minute\n\tReflects playing speed of a player.\nAlso apparently MrZ forgot that it can be called PPM to avoid confusing with the music term.",
 	},
-	{"APM",
-		"apm attackperminute",
-		"term",
-		"Attack per minute\n\tReflects offensive power of a player.\nIn Techmino, the concept of \"attack\" sometimes includes the fractional lines of an attack. Since sending garbage rounds down before sending, this value can be higher than your actual attack power.",
-	},
-	{"SPM",
-		"spm linessentperminute",
-		"term",
-		"[lines] Sent per minute\n\tReflects *actual* offensive power of a player. (Seems like this does not count lines used for cancelling garbage in buffer.)",
-	},
-	{"ADPM",
-		"adpm attackdigperminute",
-		"term",
-		"Attack&Dig per minute\n\tUsed to compare skill differences between the two players within one match; slightly more accurate than APM.",
-	},
-	{"DPM",
-		"dpm digperminute defendperminute",
-		"term",
-		"Dig/Defend per minute\n\tSometimes can reflect how well a player can survive garbage.",
-	},
 	{"KPM",
 		"kpm keysperminute keypressesperminute",
 		"term",
@@ -232,47 +212,32 @@ return{
 		"term",
 		"Keypresses per piece\n\tReflects how efficient the player is with the controls. Reduce this number by learning to finesse.",
 	},
+	{"APM",
+		"apm attackperminute",
+		"term",
+		"Attack per minute\n\tReflects offensive power of a player.\nIn Techmino, the concept of \"attack\" sometimes includes the fractional lines of an attack. Since sending garbage rounds down before sending, this value can be higher than your actual attack power.",
+	},
+	{"SPM",
+		"spm linessentperminute",
+		"term",
+		"[lines] Sent per minute\n\tReflects *actual* offensive power of a player. (Seems like this does not count lines used for cancelling garbage in buffer.)",
+	},
+	{"DPM",
+		"dpm digperminute defendperminute",
+		"term",
+		"Dig/Defend per minute\n\tSometimes can reflect how well a player can survive garbage.",
+	},
+	{"ADPM",
+		"adpm attackdigperminute",
+		"term",
+		"Attack&Dig per minute\n\tUsed to compare skill differences between the two players within one match; slightly more accurate than APM.",
+	},
 	{"APL",
 		"apl attackperline efficiency",
 		"term",
 		"Attack per line [cleared]\n\tAlso known as \"efficiency\"; reflects the per-line efficiency of attacks. For example, Tetrises and T-spins have higher efficiency than doubles and triples.",
 	},

-	{"All Clear",
-		"pc perfectclear ac allclear",
-		"term",
-		"Formerly known as Perfect Clear (PC). That is also still the term preferred by the communities and used in Techmino.\nClear all minoes on the field.",
-	},
-	{"HPC",
-		"hpc hc clear halfperfectclear",
-		"term",
-		"*Techmino-exclusive*\nHalf Perfect Clear\nExtension of an All Clear. Should a line clear resemble an All Clear when ignoring lines below the clear, the clear is a Half Perfect Clear, and sends a small extra amount of attack.",
-	},
-	{"TSS",
-		"tss t1 tspinsingle",
-		"term",
-		"T-Spin Single\nClear 1 line with a T-Spin.",
-	},
-	{"TSD",
-		"tsd t2 tspindouble",
-		"term",
-		"T-Spin Double\nClear 2 lines with a T-Spin.",
-	},
-	{"TST",
-		"tst t3 tspintriple",
-		"term",
-		"T-Spin Triple\nClear 3 lines with a T-Spin.",
-	},
-	{"MTSS",
-		"mtss minitspinsingle tsms tspinminisingle",
-		"term",
-		"Mini T-Spin Single\nFormerly known as T-Spin Mini Single.\nClear 1 line with a Mini T-Spin.\nDifferent games apparently have different ways to determine whether a T-Spin is a Mini.",
-	},
-	{"MTSD",
-		"mtsd minitspindouble tsmd tspinminidouble",
-		"term",
-		"Mini T-Spin Double\nFormerly known as T-Spin Mini Double (TSMD).\nClear 2 lines with a Mini T-Spin.\nDifferent games apparently have different ways to determine whether a T-Spin is a Mini.\nIn addition, different games have different behavior when clearing a Mini T-Spin Double: some games credit this move correctly, and some games use a different displayed text because they never programmed this in.",
-	},
 	{"Single",
 		"single",
 		"term",
@@ -298,12 +263,27 @@ return{
 		"term",
 		"The name of the game (and its trademark). Also the name for clearing 4 lines.\nCoined from Tetra (greek for \"four\") and Tennis (favorite sport of Alexey Pajitnov, creator of Tetris).",
 	},
+	{"All Clear",
+		"pc perfectclear ac allclear",
+		"term",
+		"Formerly known as Perfect Clear (PC). That is also still the term preferred by the communities and used in Techmino.\nClear all minoes on the field.",
+	},
+	{"HPC",
+		"hpc hc clear halfperfectclear",
+		"term",
+		"*Techmino-exclusive*\nHalf Perfect Clear\nExtension of an All Clear. Should a line clear resemble an All Clear when ignoring lines below the clear, the clear is a Half Perfect Clear, and sends a small extra amount of attack.",
+	},

 	{"Spin",
 		"spin",
 		"term",
 		"Use rotation to move a piece into a position otherwise unreachable. In some games, this sends extra attack or awards extra score.",
 	},
+	{"Mini",
+		"mini",
+		"term",
+		"A modifier to Spins, applied to Spin actions that the game considers easy (thus the name \"EZ T-Spin\" in an old game). Score and attack bonuses are reduced for Mini Spins.\nDifferent games have different rules for what counts as a Mini, and many are not intuitive. You can just remember a few common shapes.",
+	},
 	{"All-Spin",
 		"allspin",
 		"term",
@@ -314,6 +294,31 @@ return{
 		"term",
 		"A spin using the T piece.\nIn modern official games, T-Spins are detected using the 3-corner rule, i.e. if at least three of the four cells diagonal to the rotation center, it is a T-Spin. Some games have extra rules to mark a T-Spin as a Mini T-Spin instead, which has reduced attack/score.",
 	},
+	{"TSS",
+		"tss t1 tspinsingle",
+		"term",
+		"T-Spin Single\nClear 1 line with a T-Spin.",
+	},
+	{"TSD",
+		"tsd t2 tspindouble",
+		"term",
+		"T-Spin Double\nClear 2 lines with a T-Spin.",
+	},
+	{"TST",
+		"tst t3 tspintriple",
+		"term",
+		"T-Spin Triple\nClear 3 lines with a T-Spin.",
+	},
+	{"MTSS",
+		"mtss minitspinsingle tsms tspinminisingle",
+		"term",
+		"Mini T-Spin Single\nFormerly known as T-Spin Mini Single.\nClear 1 line with a Mini T-Spin.\nDifferent games apparently have different ways to determine whether a T-Spin is a Mini.",
+	},
+	{"MTSD",
+		"mtsd minitspindouble tsmd tspinminidouble",
+		"term",
+		"Mini T-Spin Double\nFormerly known as T-Spin Mini Double (TSMD).\nClear 2 lines with a Mini T-Spin.\nDifferent games apparently have different ways to determine whether a T-Spin is a Mini.\nIn addition, different games have different behavior when clearing a Mini T-Spin Double: some games credit this move correctly, and some games use a different displayed text because they never programmed this in.",
+	},
 	{"O-Spin",
 		"ospin",
 		"term",
@@ -350,11 +355,6 @@ return{
 		"*Techmino-exclusive*\nTechmino Rotation System\nThe rotation system used in Techmino.\nIt is based on SRS, with fixes on common cases where S/Z are locked from rotating, and some extra useful kicks. Each pentomino also has a kick table roughly based on SRS logic.",
 	},

-	{"Mini",
-		"mini",
-		"term",
-		"A modifier to Spins, applied to Spin actions that the game considers easy (thus the name \"EZ T-Spin\" in an old game). Score and attack bonuses are reduced for Mini Spins.\nDifferent games have different rules for what counts as a Mini, and many are not intuitive. You can just remember a few common shapes.",
-	},
 	{"Back to Back",
 		"b2b btb backtoback",
 		"term",
@@ -903,17 +903,22 @@ return{
 		"Tetris Research community member.\nPersonal bests: Sprint 26.193 seconds\nOne of the prestigious players in the Chinese Tetris community. Author of T-ex and Tetr.js Farter's Dig Mod.",
 		"https://space.bilibili.com/132966",
 	},
+	{"Teatube",
+		"teatube ttb chaguan chanaiye sifangchaye 022",
+		"name",
+		"Administrator of the Tetris Research community, Operator of the Tetris Online Study private server, chief editor of the Huiji wiki.\nPersonal bests: Sprint 33 seconds, Tetris Online peak stats 50LPM, 70APM.",
+		"https://space.bilibili.com/834903",
+	},
 	{"Sniraite",
 		"sniraite",
 		"name",
 		"Tetris Research community member.\nPersonal bests: Sprint 23 seconds\nOne of the top players in China. Should be the fastest player in Mainland China.",
 		"https://space.bilibili.com/561589",
 	},
-	{"Teatube",
-		"teatube ttb chaguan chanaiye sifangchaye 022",
+	{"xb",
+		"xb",
 		"name",
-		"Administrator of the Tetris Research community, Operator of the Tetris Online Study private server, chief editor of the Huiji wiki.\nPersonal bests: Sprint 33 seconds, Tetris Online peak stats 50LPM, 70APM.",
-		"https://space.bilibili.com/834903",
+		"Tetris Research community member.\nMain organizer for competitions in the community.",
 	},
 	{"Flyz",
 		"flyz fxg",
@@ -927,11 +932,6 @@ return{
 		"Tetris Research community member.\nPersonal bests: Sprint 22.831 seconds (25.483 seconds on mobile), MPH Sprint 56 seconds, X rank on Tetr.io\nOne of the top players of 20G in China, achieved almost every achievement in TGM3.",
 		"https://space.bilibili.com/287769888",
 	},
-	{"xb",
-		"xb",
-		"name",
-		"Tetris Research community member.\nMain organizer for competitions in the community.",
-	},
 	{"蕴空之灵",
 		"ykzl yunkongzhiling niao bird",
 		"name",
@@ -1022,12 +1022,6 @@ return{
 		"Tetris Research community member, Virtual content creator.\nA top Tetris 99 players known for his strategies.",
 		"https://space.bilibili.com/147529",
 	},
-	{"ditoly",
-		"ditoly icrem kuimei jk",
-		"name",
-		"Tetris Research community member.",
-		"https://space.bilibili.com/13014410",
-	},
 	{"蓝绿",
 		"lanlv gompyn imple lee blari'o blariho",
 		"name",
@@ -1039,11 +1033,4 @@ return{
 		"Tetris Research community member, Virtual content creator.\nPractically the mascot of the community. Voice actress of Techmino.",
 		"https://space.bilibili.com/846180",
 	},
-
-	{"Windkey",
-		"wdk windkey fengyaoshi",
-		"name",
-		"Former community member.\nBad reputation due to excessive center 4-wides.",
-		"https://space.bilibili.com/25576872",
-	},
 }
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -28,13 +28,13 @@ return{
 	{"灰机wiki",
 		"灰机wiki huiji wiki",
 		"help",
-		"俄罗斯方块中文维基，由一群来自俄罗斯方块研究群及下属群的方块同好建立的关于俄罗斯方块的中文百科全书。\n当前大部分页面翻译和参考来自Harddrop wiki和Tetris Wiki",
+		"俄罗斯方块中文维基，由一群来自俄罗斯方块研究群及下属群的方块同好建立的关于俄罗斯方块的中文百科全书。\n目前其大部分页面翻译和参考来自Harddrop wiki和Tetris Wiki",
 		"https://tetris.huijiwiki.com",
 	},
 	{"小程序",
 		"小程序 applets",
 		"help",
-		"[小程序入口已移动至命令行]",
+		"[小程序入口已移动至控制台]",
 	},

 	--游戏(题库)
@@ -61,7 +61,7 @@ return{
 	{"King of Stackers",
 		"回合制 kos kingofstackers",
 		"game",
-		"King of Stackers\n网页版回合制对战方块点击即玩(可能很卡)",
+		"King of Stackers\n网页版回合制对战方块点击即玩(可能很卡)，主要规则为：以7块为一个回合，双方轮流在自己场地中放置方块，任何的攻击只在对方回合放一块不消行后生效，策略性很强。有不同的伤害表设置。",
 		"https://kingofstackers.com/games.php",
 	},
 	{"Tetr.js",
@@ -79,13 +79,13 @@ return{
 	{"Jstris",
 		"网页 手机 js jstris",
 		"game",
-		"全平台网页对战方块点击即玩(服务器在国外可能很卡)",
+		"全平台网页对战方块点击即玩(服务器在国外可能很卡)。有常用的科研向单机模式和自定义各种参数的功能，但没有很多强制速度向的挑战项目。都是纯色素材导致画面效果不怎么好。移动端的键位设置并不舒适。",
 		"https://jstris.jezevec10.com",
 	},
 	{"TETR.IO",
 		"网页 io tetrio",
 		"game",
-		"炫酷在线对战方块点击即玩(推荐使用电脑，移动设备需要外接键盘)(服务器在国外，可能超级慢甚至打不开)",
+		"炫酷在线对战方块点击即玩(推荐使用电脑，移动设备需要外接键盘)(服务器在国外，可能超级慢甚至打不开)有很科学的排位系统，自定义功能非常全面，同时也提供电脑客户端下载(可以去除广告)。缺点是单机模式非常非常少。",
 		"https://tetr.io",
 	},
 	{"World Wide Combo",
@@ -202,26 +202,6 @@ return{
 		"term",
 		"Block per Minute\n块每分，体现玩家下块速度\n别问为什么不是PPM，问就是不知道",
 	},
-	{"APM",
-		"apm attack gongji",
-		"term",
-		"Attack per Minute\n攻击每分，即玩家每分钟能打出的垃圾行数。\n一定程度体现玩家攻击力",
-	},
-	{"SPM",
-		"spm send gongji",
-		"term",
-		"Send per Minute\n送出每分，即玩家每分钟实际打出去给对手的垃圾行数。\n一定程度体现玩家给对手实际造成的攻击力",
-	},
-	{"ADPM",
-		"adpm attack defend",
-		"term",
-		"Atk+Dig per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比apm更准确一些",
-	},
-	{"DPM",
-		"dpm dig defend",
-		"term",
-		"Dig/Defend per Minute\n挖掘每分，即玩家每分钟向下挖掘的垃圾行数。\n某些时候可以体现玩家生存能力\n\n或:防御(抵消+挖掘)每分",
-	},
 	{"KPM",
 		"kpm sudu",
 		"term",
@@ -232,6 +212,26 @@ return{
 		"term",
 		"Key per Piece\n按键每块，体现玩家操作是否繁琐。\n学会极简提升操作效率以减少此数字",
 	},
+	{"APM",
+		"apm attack gongji",
+		"term",
+		"Attack per Minute\n攻击每分，即玩家每分钟能打出的垃圾行数。\n一定程度体现玩家攻击力",
+	},
+	{"SPM",
+		"spm send gongji",
+		"term",
+		"Send per Minute\n送出每分，即玩家每分钟实际打出去给对手的垃圾行数。\n一定程度体现玩家给对手实际造成的攻击力",
+	},
+	{"DPM",
+		"dpm dig defend",
+		"term",
+		"Dig/Defend per Minute\n挖掘每分，即玩家每分钟向下挖掘的垃圾行数。\n某些时候可以体现玩家生存能力\n\n或:防御(抵消+挖掘)每分",
+	},
+	{"ADPM",
+		"adpm attack defend",
+		"term",
+		"Atk+Dig per Minute\n攻击+挖掘每分，用于在同一局游戏内对比玩家间水平差距，比apm更准确一些。\n在TETR.IO中有一个叫vs的数据就是ADPM(调整了比例)",--TODO
+	},
 	{"APL",
 		"apl xiaolv",
 		"term",
@@ -239,6 +239,31 @@ return{
 	},

 	--术语(消除名)
+	{"Single",
+		"single xiaoyi",
+		"term",
+		"消一行",
+	},
+	{"Double",
+		"double xiaoer",
+		"term",
+		"消两行",
+	},
+	{"Triple",
+		"triple xiaosan",
+		"term",
+		"消三行",
+	},
+	{"Techrash",
+		"techrash xiaosi",
+		"term",
+		"消四行(Tech限定)",
+	},
+	{"Tetris",
+		"tetris xiaosi",
+		"term",
+		"商标，Tetris游戏名，同时也是别的方块游戏里消四行的名字。\n含义是Tetra(古希腊语 四)+Tennis(游戏原作者喜欢的运动)。",
+	},
 	{"PC",
 		"pc perfectclear ac allclear quanxiao quanqing",
 		"term",
@@ -247,7 +272,29 @@ return{
 	{"HPC",
 		"hpc hc clear banqing banquanqing banquanxiao",
 		"term",
-		"Half-PC\nPC(全消)的外延，如果去掉消除部分之下的场地后上面部分是一个PC，那么这个消除就是半PC，打出一些攻击(仅Tech中有)。",
+		"Half-PC\nPC(全消)的外延，\"下方有剩余方块\"的全消(特别地，如果只消1行则必须不剩余玩家放置的方块)，能打出一些攻击和防御(仅Tech中有)。",
+	},
+
+	--术语(旋转相关)
+	{"Spin",
+		"spin xuanzhuan zuandong",
+		"term",
+		"(部分游戏中)使用旋转将方块卡进不能直接移动进入的位置，具体判定规则不同游戏不一样，可能会有攻击加成。",
+	},
+	{"Mini",
+		"迷你 mini",
+		"term",
+		"spin附加mini后攻击会弱化，用于平衡不同难易度的tspin攻击，判定在不同游戏都不一样，而且大多数很不好理解，建议只记住常见形状即可。",
+	},
+	{"Allspin",
+		"allspin",
+		"term",
+		"一种规则，指所有方块的spin都有攻击力，而不止是Tspin才有攻击(Tspin only)。",
+	},
+	{"Tspin",
+		"tspin txuan",
+		"term",
+		"在官方规则中，当T方块在锁定前的最后一个操作是旋转，并且锁定后旋转中心对应的四个斜角位置有三个不是空气，那么这就是一个Tspin。PS:如果满足一些额外条件会被打上mini标签减少攻击力。",
 	},
 	{"TSS",
 		"tss t1 tspin",
@@ -274,55 +321,13 @@ return{
 		"term",
 		"mini T-spin double\n指T方块mini spin消2行(仅部分游戏内存在且判定不一样)。",
 	},
-	{"Single",
-		"single xiaoyi",
-		"term",
-		"消一行",
-	},
-	{"Double",
-		"double xiaoer",
-		"term",
-		"消两行",
-	},
-	{"Triple",
-		"triple xiaosan",
-		"term",
-		"消三行",
-	},
-	{"Techrash",
-		"techrash xiaosi",
-		"term",
-		"消四行(Tech限定)",
-	},
-	{"Tetris",
-		"tetris xiaosi",
-		"term",
-		"商标，Tetris游戏名，同时也是别的方块游戏里消四行的名字。\n含义是Tetra(古希腊语 四)+Tennis(作者喜欢的运动)。",
-	},
-
-	--术语(旋转相关)
-	{"Spin",
-		"spin xuanzhuan zuandong",
-		"term",
-		"(部分游戏中)使用旋转将方块卡进不能直接移动进入的位置，具体判定规则不同游戏不一样，可能会有攻击加成。",
-	},
-	{"Allspin",
-		"allspin",
-		"term",
-		"一种规则，指所有方块的spin都有攻击力，而不止是Tspin才有攻击(Tspin only)。",
-	},
-	{"Tspin",
-		"tspin txuan",
-		"term",
-		"在官方规则中，当T方块在锁定前的最后一个操作是旋转，并且锁定后旋转中心对应的四个斜角位置有三个不是空气，那么这就是一个Tspin。PS:如果满足一些额外条件会被打上mini标签减少攻击力。",
-	},
 	{"Ospin",
 		"ospin",
 		"term",
 		"由于O方块旋转后形状不变，只能左右移动，所以经常被卡住，于是方块圈就有了ospin的梗:\n有人做过T99/TF中的O变形的特效视频且广为流传;\nT-ex设计的旋转系统可以用spin使O传送进坑;\nTech设计的变形系统中可以旋转O来变形/传送进入一些特定形状的洞。",
 	},
-	{"踢墙",
-		"踢墙 wallkick tiqiang",
+	{"旋转系统(踢墙)",
+		"旋转系统 踢墙 xuanzhuanxitong wallkick tiqiang",
 		"term",
 		"(部分游戏中)方块旋转后可能和场地或者墙壁有碰撞，此时系统可能会给方块施加的偏移，让方块不会因此被卡住而不能操作。详见SRS词条",
 	},
@@ -353,11 +358,6 @@ return{
 	},

 	--术语(游戏内名词)
-	{"mini",
-		"迷你 mini",
-		"term",
-		"spin附加mini后攻击会弱化，用于平衡不同难易度的tspin攻击，判定在不同游戏都不一样，而且大多数很不好理解，建议只记住常见形状即可。",
-	},
 	{"B2B",
 		"大满贯 b2b btb backtoback",
 		"term",
@@ -433,7 +433,7 @@ return{
 	{"连击",
 		"连击 ren combo",
 		"term",
-		"从第二次消除起叫1ren/combo",
+		"从第二次消除起叫1ren/combo，打出的攻击根据游戏设计的不同也不同",
 	},
 	{"Side",
 		"连击 ·side",
@@ -538,7 +538,7 @@ return{
 	{"SDF",
 		"软降速度 sdf softdropfactor",
 		"term",
-		"Soft Drop Factor，软降速度因子(倍率)，部分游戏中的软降机制是让重力变为原来的若干倍，SDF就是这个倍数。\n基本所有官块和tetr.io使用这个机制，本游戏不使用。",
+		"Soft Drop Factor，软降速度因子(倍率)，部分游戏中的软降机制就是在按住软件键时方块受到的重力变为原来的若干倍，SDF就是这个变大的倍数。\n基本所有官块和tetr.io使用这个机制，但本游戏不使用。",
 	},
 	{"bag7出块",
 		"bag出块 bag7bag",
@@ -913,17 +913,23 @@ return{
 		"【研究群】「TTTT」\n40行26.193秒\nCN块圈元老之一，《T-ex》和《屁块》的作者",
 		"https://space.bilibili.com/132966",
 	},
+	{"Teatube",
+		"teatube ttb chaguan chanaiye sifangchaye t022",
+		"name",
+		"【研究群】「T022」\n40行33秒 top数据高峰约50L70A\n研究群管理，探索群群主，茶服服主，人形方块百科史书，现中文方块维基主催\n自2011年正式加入CN方块社区以来，以探索方块有趣的思想作为主动力，茶茶今天也在茶馆里当着茶房管理员——\n\n其他名称:TTB，永远旋转的炸弹，茶乃叶，四方茶叶\n明明茶管是蓝孩子却被群友叫茶娘…怎么想都很奇怪啊!嘛大家喜欢的话就随便啦——",
+		"https://space.bilibili.com/834903",
+	},
 	{"Sniraite",
 		"sniraite shege 11renpc t024",
 		"name",
 		"【研究群】「T024」\n40行sub23\n国内一流方块玩家，应该是大陆最速",
 		"https://space.bilibili.com/561589",
 	},
-	{"Teatube",
-		"teatube ttb chaguan chanaiye sifangchaye t022",
+	{"xb",
+		"xb t043",
 		"name",
-		"【研究群】「T022」\n40行33秒 top数据高峰约50L70A\n研究群管理，探索群群主，茶服服主，人形方块百科史书，现中文方块维基主催\n自2011年正式加入CN方块社区以来，以探索方块有趣的思想作为主动力，茶茶今天也在茶馆里当着茶房管理员——\n\n其他名称:TTB，永远旋转的炸弹，茶乃叶，四方茶叶\n明明茶管是蓝孩子却被群友叫茶娘…怎么想都很奇怪啊！嘛大家喜欢的话就随便啦——",
-		"https://space.bilibili.com/834903",
+		"【研究群】「T043」\n俄罗斯方块中文维基(灰机wiki)主要编者(之一",
+		"https://space.bilibili.com/226132",
 	},
 	{"Flyz",
 		"flyz fxg t114",
@@ -937,12 +943,6 @@ return{
 		"【研究群】「T127」\n40行22.831秒(手机25.483)，MPH40行56秒，tetr.io段位X，数据约60L95A\n20G规则国内一流玩家，拿到了TGM3几乎全部的最终成就(全世界都没几个)\n其他名称:小柒 kissne 127\n还是车车人，几个正作成绩:永EX NM 1B FS 风L NM",
 		"https://space.bilibili.com/287769888",
 	},
-	{"xb",
-		"xb t043",
-		"name",
-		"【研究群】「T043」\n研究群赛事主要主办人",
-		"https://space.bilibili.com/226132",
-	},
 	{"蕴空之灵",
 		"蕴空之灵 ykzl yunkongzhiling niao bird t196",
 		"name",
@@ -1033,12 +1033,6 @@ return{
 		"【研究群】「T1934」\nvup，T99国内一流战术型玩家",
 		"https://space.bilibili.com/147529",
 	},
-	{"ditoly",
-		"葵 ditoly icrem kuimei jk t3055",
-		"name",
-		"【研究群】「T3055」\n被清华劝退现于北大的打块天才jk\n(好像也被北大劝退了?不知道)",
-		"https://space.bilibili.com/13014410",
-	},
 	{"蓝绿",
 		"蓝绿 lanlv gompyn imple lee blari'o blariho t3182",
 		"name",
@@ -1050,11 +1044,4 @@ return{
 		"【研究群】「T7023」\nvup，喜欢打块的猫猫(Z酱单推)，techmino配音之一",
 		"https://space.bilibili.com/846180",
 	},
-
-	{"Windkey",
-		"wdk windkey fengyaoshi",
-		"name",
-		"曾经是群友，对战基本只用开局c4w导致风评很差，想学c4w可以看他",
-		"https://space.bilibili.com/25576872",
-	},
 }
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -95,6 +95,7 @@ return{

 	createRoomTooFast="You are creating a room too fast!",
 	createRoomSuccessed="Room successfully created!",
+  started="Playing",
 	joinRoom="has joined the room.",
 	leaveRoom="has left the room.",
 	notReady="Waiting",
@@ -253,7 +254,8 @@ return{
 			refreshing="Refreshing rooms",
 			noRoom="There aren't any rooms right now...",
 			refresh="Refresh",
-			new="New Room",
+			new="New Room(2)",
+			new2="New Room(5)",
 			join="Join",
 			up="↑",
 			down="↓",
@@ -503,8 +505,8 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="Open URL",
-			up="↑",
-			down="↓",
+			up="↑",down="↓",
+			pageup="↑↑",pagedown="↓↓",
 		},
 		stat={
 			path="Open Data Folder",
@@ -646,6 +648,7 @@ return{
 		},
 		app_dtw={
 			reset="Reset",
+			arcade="Arcade",
 			mode="Mode",
 		},
 		savedata={
@@ -665,7 +668,7 @@ return{
 			resetData="Reset Data",
 		},
 		error={
-			cmd="CMD",
+			cmd="Console",
 			quit="Quit",
 		},
 	},
@@ -867,7 +870,7 @@ return{
 		{c.fire,"Also try Tetr.js!"},
 		{c.fire,"Also try Tetra Legends!"},
 		{c.grape,"T-spin!"},
-		{c.grey,"REGRET!!"},
+		{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\""},
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -96,6 +96,7 @@ return{

 	createRoomTooFast="Vous avez créé un salon trop rapidement !",
 	createRoomSuccessed="Salon créé avec succès !",
+	-- started="Playing",
 	joinRoom="a rejoint le salon.",
 	leaveRoom="a quitté le salon.",
 	notReady="Attente",
@@ -460,8 +461,6 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="Ouvrir URL",
-			up="↑",
-			down="↓",
 		},
 		stat={
 			path="Ouvrir dossier des données",
@@ -556,6 +555,7 @@ return{
 		},
 		app_dtw={
 			reset="Réinitialiser",
+			-- arcade="Arcade",
 			-- mode="Mode",
 		},
 		about={
@@ -580,7 +580,7 @@ return{
 			resetData="Réinitialiser les données",
 		},
 		error={
-			cmd="CMD",
+			cmd="Console",
 			quit="Quit",
 		},
 	},
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -95,6 +95,7 @@ return{

 	-- createRoomTooFast="Create room too fast!",
 	-- createRoomSuccessed="Room successfully created!",
+	-- started="Playing",
 	joinRoom="Entrou a sala.",
 	leaveRoom="Saiu da sala.",
 	-- notReady="Waiting",
@@ -253,7 +254,8 @@ return{
 			-- refreshing="Refreshing Rooms",
 			noRoom="Nenhuma sala agora",
 			-- refresh="Refresh",
-			-- new="New room",
+			-- new="New Room(2)",
+			-- new2="New Room(5)",
 			-- join="Join",
 			up="↑",
 			down="↓",
@@ -503,8 +505,6 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="Abrir URL",
-			up="↑",
-			down="↓",
 		},
 		stat={
 			path="Abrir Pasta De Data",
@@ -644,6 +644,7 @@ return{
 		},
 		app_dtw={
 			reset="Resetar",
+			-- arcade="Arcade",
 			-- mode="Mode",
 		},
 		savedata={
@@ -663,7 +664,7 @@ return{
 			resetData="Reset data",
 		},
 		error={
-			cmd="CMD",
+			cmd="Console",
 			quit="Quit",
 		},
 	},
@@ -857,8 +858,8 @@ return{
 		{COLOR.fire,"Tente também Tetr.js"},
 		{COLOR.fire,"Tente também Tetralegends"},
 		{COLOR.grape,"T-spin!"},
-		{COLOR.grey,"暫定段位:9"},
-		{COLOR.grey,"REGRET!!"},
+		{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\""},
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -96,6 +96,7 @@ return{

 	createRoomTooFast="¡Creas salas muy rápido, párale we!",
 	createRoomSuccessed="¡Sala creada con éxito!",
+	-- started="Playing",
 	joinRoom="entró a la sala.",
 	leaveRoom="salió de la sala.",
 	notReady="En espera",
@@ -231,7 +232,8 @@ return{
 			-- refreshing="Refreshing Rooms",
 			noRoom="No Hay Salas Actualmente",
 			refresh="Refrescar",
-			new="Sala Nueva",
+			new="Sala Nueva(2)",
+			new2="Sala Nueva(5)",
 			join="Unirse",
 			up="↑",
 			down="↓",
@@ -464,8 +466,6 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="Abrir URL",
-			up="↑",
-			down="↓",
 		},
 		stat={
 			path="Abrir carpeta del juego",
@@ -559,6 +559,7 @@ return{
 		},
 		app_dtw={
 			reset="Reiniciar",
+			-- arcade="Arcade",
 			mode="Modo",
 		},
 		savedata={
@@ -578,7 +579,7 @@ return{
 			resetData="Reiniciar datos",
 		},
 		error={
-			cmd="CMD",
+			cmd="Console",
 			quit="Salir",
 		},
 	},
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -346,8 +346,6 @@ return{
 		dict={
 			title="TetroDictionary",
 			link="~~e>>",
-			up="↑",
-			down="↓",
 		},
 		stat={
 			path="%$%",
@@ -487,6 +485,7 @@ return{
 		},
 		app_dtw={
 			reset="R",
+			arcade="↓↓",
 			mode="?",
 		},
 	},
--- a/parts/language/lang_yygq.lua
+++ b/parts/language/lang_yygq.lua
@@ -43,9 +43,10 @@ return{

 	createRoomTooFast="手痒要开这么多房间?",
 	createRoomSuccessed="创好了",
+	started="开了",
 	notReady="没有准备好",
 	beReady="准备好了",
-	champion="爷爷是 $1",
+	champion="神仙是 $1",

 	stat={
 		"开了几次:",
@@ -182,7 +183,7 @@ return{
 			tapFX="动画",
 		},
 		error={
-			cmd="CMD",
+			cmd="Console",
 			quit="Quit",
 		},
 	},
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -95,6 +95,7 @@ return{

 	createRoomTooFast="创建房间太快啦,等等吧",
 	createRoomSuccessed="创建房间成功!",
+	started="游戏中",
 	joinRoom="进入房间",
 	leaveRoom="离开房间",
 	notReady="等待中",
@@ -253,7 +254,8 @@ return{
 			refreshing="刷新房间列表中",
 			noRoom="一个房间都没有哎...",
 			refresh="刷新",
-			new="创建房间",
+			new="创建房间(2)",
+			new2="创建房间(5)",
 			join="加入",
 			up="↑",
 			down="↓",
@@ -580,8 +582,8 @@ return{
 		dict={
 			title="小Z方块词典",
 			link="打开链接",
-			up="↑",
-			down="↓",
+			up="↑",down="↓",
+			pageup="↑↑",pagedown="↓↓",
 		},
 		stat={
 			path="打开存储目录",
@@ -647,6 +649,7 @@ return{
 		},
 		app_dtw={
 			reset="重置",
+			arcade="街机",
 			mode="模式",
 		},
 		savedata={
@@ -666,7 +669,7 @@ return{
 			resetData="重置统计",
 		},
 		error={
-			cmd="命令行",
+			cmd="控制台",
 			quit="退出",
 		},
 	},
@@ -800,8 +803,9 @@ return{
 		"本游戏的一部分内容是国际合作的!",
 		"本游戏的B2B是气槽机制,和传统的开关机制不一样哦",
 		"本游戏可不是休闲游戏。",
-		"本游戏内置了几个休(ying)闲(he)小游戏哦~去词典找找吧",
+		"本游戏内置了几个休(ying)闲(he)小游戏哦~入口就藏在这个菜单",
 		"必须要软降才能到达的位置都会判定为极简操作",
+		"别看攻击效率不高,其实消四还是很强的",
 		"别问游戏名怎么取的,问就是随便想的",
 		"不同人打40行最合适的方式不一样,s1w/63/散消/s2w...",
 		"不同游戏(甚至不同模式)中不同战术的能力都不一样,并没有绝对的强弱之分",
@@ -826,6 +830,7 @@ return{
 		"对战游戏不是单机游戏,所以timing在对战里也非常重要!",
 		"多年小游戏玩家表示痛恨假加载,启动动画主要是在加载资源",
 		"多hold现代块又回来了!",
+		"俄罗斯方块完全可以作为电竞游戏",
 		"发现有个\"隐形\"皮肤了吗",
 		"方块不能吃",
 		"方块教会我们,合群了就会消失,...",
@@ -943,6 +948,7 @@ return{
 		"这里的极简判定不松不严,放心软降,小心hold!",
 		"震惊,我只是一条凑数tip吗",
 		"中国的方块起步晚,所以世界级高手很少…下一个会是你吗?",
+		"众所周知俄罗斯方块是经典编程练手游戏(?",
 		"注意到方块\"旋转\"的时候到底发生了些什么吗?",
 		"自定义场地可以画图实现逐页演示",
 		"总共有300多条tip哦",
@@ -977,7 +983,7 @@ return{
 		"Farter:\"是民间UI动效艺术作品\"",
 		"Farter:\"是一滩散乱的代码组成的蜜汁结构\"",
 		"Farter:\"它是现在的techmino已发布版本\"",
-		"Farter:论方块的软工意义(就算这么小个范围内,各种取舍蒙混翻车现象都总会以很易懂的方式出现(",
+		"Farter:\"论方块的软工意义(就算这么小个范围内,各种取舍蒙混翻车现象都总会以很易懂的方式出现(\"",
 		"fin neo iso 是满足tspin条件的特殊t2的名字",
 		"if a==true",
 		"l-=-1",
@@ -987,14 +993,17 @@ return{
 		"sin²α-cos²β=-C(α+β)C(α-β)",
 		"sin²α-sin²β=S(α+β)S(α-β)",
 		"sin2α=2SαCα",
-		"Staff名单里飘过的是赞助榜单,喜欢本游戏的话可以给Z酱打赞助",
+		"Staff名单里飘过的是赞助榜单,喜欢本游戏的话可以给Z酱打赞助哦",
 		"SΔABC=√(h(h-a)(h-b)(h-c)), h=(a+b+c)/2",
 		"Tech生日不太清楚,那就定在2019.6.26吧",
 		"Tech也有节日主题了哦",
 		"Techmino = Technique + tetromino",
 		"Techmino n.铁壳米诺(游戏名)",
+		"Techmino console了解一下",
 		"Techmino安卓下载",
 		"Techmino好玩!",
+		"Techmino 好玩!",
+		"Techmino 濂界帺锛",
 		"Techmino有一个Nspire-CX版本!",
 		"Techmino在哪里下载",
 		"Techminohaowan",
@@ -1004,6 +1013,7 @@ return{
 		"Z酱累了,Z酱不想更新",
 		"Z酱只是个写代码的,懂什么方块",
 		"Z块等身抱枕来一个(x",
+		{c.aqua,"AQUA"},
 		{c.B,"BLUE"},
 		{c.C,"<PURE ",c.grape,"MEMORY>"},
 		{c.C,"15puzzle好玩!"},
@@ -1034,23 +1044,24 @@ return{
 		{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.grey,"感谢Phigros提供部分tip模板("},
-		{c.grey,"暂定段位:9"},
-		{c.grey,"REGRET!!"},
-		{c.lame,"LAME"},
+		{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.lGrey,"腱鞘炎警告"},
-		{c.lGrey,"看起来是个计算器,其实…"},
-		{c.lGrey,"没学过编曲,音乐都是自己瞎写的,觉得不好听就去设置关了吧"},
-		{c.lGrey,"秘密数字:626"},
-		{c.lGrey,"你有一个好"},
-		{c.lGrey,"STSD必死"},
-		{c.lGrey,"Techmino没有抽卡没有氪金,太良心了"},
+		{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!!"},
@@ -1076,16 +1087,14 @@ return{
 		{c.sky,"Lua",c.W,"天下第一"},
 		{c.sky,"SKY"},
 		{c.W,"1, 2, ",c.C,"⑨",c.W,"!!!!!"},
-		{c.W,"效率药水",c.grey," 效率提升 (8:00)"},
-		{c.W,"协调药水",c.grey," MD减少 II(1:30)"},
-		{c.water,"WATER"},
+		{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,"GREEN"},
 		{c.Y,"Miya",c.W," 可爱!"},
 		{c.Y,"O-spin Triple!"},
 		{c.Y,"YELLOW"},
--- a/parts/language/manual_en.lua
+++ b/parts/language/manual_en.lua
@@ -32,12 +32,12 @@ Attack system:

 		Special line clears will the increase B2B gauge, making later special line clears have either a B2B or B2B2B bonus (see below)

-		Half Perfect Clear (a P.C. "with blocks left below". If it's an I clearing 1 line, the remaining blocks must not be player-placed):
-				Attack +2, Extra Blocking +2
+		Hemi Perfect Clear (a P.C. "with blocks left below". If it's an I clearing 1 line, the remaining blocks must not be player-placed):
+				Attack +4, Extra Blocking +2

 		Perfect Clear (aka All Clear):
 				Sends 8 to 16 (increments within a game by 2 for every PC) OR every other damage above, whichever is higher,
-				and +2 extra blocking. (note: if lines cleared in this round >4, then B2B gauge will be completely filled)
+				and +2 extra blocking.

 		Combos: All damage above will be given a (combo x25%) bonus, or (combo x15% for Single clear) (capped at 12 combo),
 		+1 more attack for 3 Combo or more.
@@ -63,6 +63,8 @@ Back to Back (B2B) gauge:
 		A regular line clear -250
 		Spin Single/Double/Triple/Techrash/Techrash+ + 50/100/180/800/1000 (x50% if Mini)
 		Techrash/Techrash+ + 150/200/...
+		PC when lines cleared in this round >4, +800
+		Hemi-PC, +100
 		Spin (0 lines) +20. Do note that the B2B gauge cannot exceed 800 using this method.
 		When gauge is above 800, a drop without clearing lines decreases it by 40, but cannot drop below 800

--- a/parts/language/manual_zh.lua
+++ b/parts/language/manual_zh.lua
@@ -27,8 +27,8 @@ spin判定:
 						B2B攻击+1
 						B3B攻击+50%,+1额外抵挡
 		特殊消除会增加B2B点数,让之后的特殊消除获得B2B(B3B)增益(详细说明见下文)
-		半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):伤害+2,额外抵挡+2
-		全消:全消伤害为8~16(本局内递增2),和上述其他伤害取大,然后+2额外抵挡(注:本局消行数>4时会将B2B点数拉满)
+		半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):伤害+4,额外抵挡+2
+		全消:全消伤害为8~16(本局内递增2),和上述其他伤害取大,然后+2额外抵挡
 		连击:每次连击给予上述攻击[连击数*25%(上限12连)(如果只消一行就是15%)]的加成,>=3次时再额外加1攻击
 		根据上述规则计算后,向下取整,攻击打出

@@ -48,6 +48,8 @@ back to back(B2B)点数说明:
 		普通消除:-250
 		spin1~5:+[50/100/180/800/1000](mini变为原来50%)
 		消四/五/六:+[150/200/...]
+		本局内消行数>4时全消:+800
+		半全消:+100
 		空spin:+20,此法得到的点数不能超过800
 		当点数在800以上时空放一块-40(不低于800)