0.7.30α

2020-02-04 19:37:25 +08:00
parent f261906f1a
commit c14124d00c
32 changed files with 1420 additions and 996 deletions
--- a/language/chi.lua
+++ b/language/chi.lua
@@ -1,4 +1,13 @@
 local BK="返回"
+local actName={
+	"左移:","右移:",
+	"顺时针旋转:","逆时针旋转:","180°旋转:",
+	"硬降:","软降:",
+	"暂存:","功能键:",
+	"重新开始:",
+	"左瞬移:","右瞬移:","软降到底:","软降一格:","软降四格:","软降十格:",
+	"落在最左:","落在最右:","列在最左:","列在最右:",
+}
 return{
 	atkModeName={"随机","徽章","击杀","反击"},
 	royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -67,8 +76,11 @@ return{
 	setting_sound="声音设置",
 	musicRoom="音乐室",
 	nowPlaying="正在播放:",
+	VKTchW="触摸点权重",
+	VKOrgW="原始点权重",
+	VKCurW="当前点权重",

-	actName={"左移:","右移:","顺时针旋转:","逆时针旋转:","180°旋转","硬降:","软降:","暂存:","功能键:","重新开始:","左瞬移:","右瞬移:","软降到底:"},
+	actName=actName,
 	modeName={
 		[0]="自定义",
 		"竞速","马拉松","大师","经典","禅","无尽","单挑","回合制","仅TSD","隐形",
@@ -128,6 +140,8 @@ return{
 		"使用love2d引擎制作",
 		"有疑问?先看设置有没有你想要的",
 		"有建议的话可以把信息反馈给作者~",
+		"不要按F8",
+		"秘密代码:626",
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"LrL,RlR  LLr,RRl  RRR/LLL  F!!",--ZSLJTTI
 	},
@@ -149,7 +163,8 @@ return{
 		"B2B数:",
 		"PC数:",
 		"效率:",
-		"多余操作:"
+		"多余操作:",
+		"最简操作率:",
 	},
 	help={
 		"好像也没啥好帮助的吧?就当是关于了",
@@ -210,11 +225,11 @@ return{
 			start1="消除开始",
 			start2="拼图开始",
 			draw="画图(D)",
-			set1="40行",
-			set2="1v1",
-			set3="无尽",
-			set4="隐形",
-			set5="极限",
+			set1="40行(1)",
+			set2="1v1(2)",
+			set3="无尽(3)",
+			set4="隐形(4)",
+			set5="极限(5)",
 			back=BK,
 		},
 		draw={
@@ -283,16 +298,32 @@ return{
 			voc="语音",
 			back=BK,
 		},
-		setting_control={
+		setting_key={
 			back=BK,
 		},
 		setting_touch={
-			hide=function()return setting.virtualkeySwitch and"隐藏虚拟按键"or"显示虚拟按键"end,
+			hide="显示虚拟按键",
+			track="按键自动跟踪",
+			tkset="跟踪设置",
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.virtualkeyAlpha.."0%"end,
+			alpha=function()return setting.VKAlpha.."0%"end,
 			icon="图标",
 			size="大小",
+			toggle="开关",
+			back=BK,
+		},
+		setting_touchSwitch={
+			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
+			b5=	actName[5],b6=actName[6],b7=actName[7],b8=actName[8],
+			b9=	actName[9],b10=actName[10],b11=actName[11],b12=actName[12],
+			b13=actName[13],b14=actName[14],b15=actName[15],b16=actName[16],
+			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
+			norm="标准",
+			pro="专业",
+			back=BK,
+		},
+		setting_trackSetting={
 			back=BK,
 		},
 		help={
--- a/language/chi_full.lua
+++ b/language/chi_full.lua
@@ -1,4 +1,13 @@
 local BK="返回"
+local actName={
+	"左移:","右移:",
+	"顺时针旋转:","逆时针旋转:","180°旋转:",
+	"硬降:","软降:",
+	"暂存:","功能键:",
+	"重新开始:",
+	"左瞬移:","右瞬移:","软降到底:","软降一格:","软降四格:","软降十格:",
+	"落在最左:","落在最右:","列在最左:","列在最右:",
+}
 return{
 	atkModeName={"随机","徽章","击杀","反击"},
 	royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -67,8 +76,11 @@ return{
 	setting_sound="声音设置",
 	musicRoom="音乐室",
 	nowPlaying="正在播放:",
+	VKTchW="触摸点权重",
+	VKOrgW="原始点权重",
+	VKCurW="当前点权重",

-	actName={"左移:","右移:","顺时针旋转:","逆时针旋转:","180°旋转","硬降:","软降:","暂存:","功能键:","重新开始:","左瞬移:","右瞬移:","软降到底:"},
+	actName=actName,
 	modeName={
 		[0]="自定义",
 		"竞速","马拉松","大师","经典","禅","无尽","单挑","回合制","仅TSD","隐形",
@@ -128,6 +140,8 @@ return{
 		"使用love2d引擎制作",
 		"有疑问?先看设置有没有你想要的",
 		"有建议的话可以把信息反馈给作者~",
+		"不要按F8",
+		"秘密代码:626",
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"LrL,RlR  LLr,RRl  RRR/LLL  F!!",--ZSLJTTI
 	},
@@ -149,7 +163,8 @@ return{
 		"满贯数:",
 		"全清数:",
 		"效率:",
-		"多余操作:"
+		"多余操作:",
+		"最简操作率:",
 	},
 	help={
 		"好像也没啥好帮助的吧?就当是关于了",
@@ -210,11 +225,11 @@ return{
 			start1="消除开始",
 			start2="拼图开始",
 			draw="画图(D)",
-			set1="40行",
-			set2="1v1",
-			set3="无尽",
-			set4="隐形",
-			set5="极限",
+			set1="40行(1)",
+			set2="1v1(2)",
+			set3="无尽(3)",
+			set4="隐形(4)",
+			set5="极限(5)",
 			back=BK,
 		},
 		draw={
@@ -284,16 +299,32 @@ return{
 			voc="语音",
 			back=BK,
 		},
-		setting_control={
+		setting_key={
 			back=BK,
 		},
 		setting_touch={
-			hide=function()return setting.virtualkeySwitch and"隐藏虚拟按键"or"显示虚拟按键"end,
+			hide="显示虚拟按键",
+			track="按键自动跟踪",
+			tkset="跟踪设置",
 			default="默认组合",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.virtualkeyAlpha.."0%"end,
+			alpha=function()return setting.VKAlpha.."0%"end,
 			icon="图标",
 			size="大小",
+			toggle="开关",
+			back=BK,
+		},
+		setting_touchSwitch={
+			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
+			b5=	actName[5],b6=actName[6],b7=actName[7],b8=actName[8],
+			b9=	actName[9],b10=actName[10],b11=actName[11],b12=actName[12],
+			b13=actName[13],b14=actName[14],b15=actName[15],b16=actName[16],
+			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
+			norm="标准",
+			pro="专业",
+			back=BK,
+		},
+		setting_trackSetting={
 			back=BK,
 		},
 		help={
--- a/language/eng.lua
+++ b/language/eng.lua
@@ -1,4 +1,11 @@
 local BK="Back"
+local actName={
+	"Move Left:","Move Right:",
+	"Rotate Right:","Rotate Left:","Rotate Flip:",
+	"Hard Drop:","Soft Drop:","Hold:","Function:","Restart:",
+	"Instant Left:","Instant Right:","Ins Down:","Down 1:","Down 4:","Down 10:",
+	"Left Drop:","Right Drop:","Left INS:","Right INS:",
+}
 return{
 	atkModeName={"Random","Badges","K.O.s","Counters"},
 	royale_remain=function(n)return n.." Players Remain"end,
@@ -67,8 +74,11 @@ return{
 	setting_sound="Sound setting",
 	musicRoom="Music Room",
 	nowPlaying="Now Playing:",
+	VKTchW="Touch weight",
+	VKOrgW="Origion weight",
+	VKCurW="CurPos weight",

-	actName={"Move Left:","Move Right:","Rotate Right:","Rotate Left:","Rotate Flip:","Hard Drop:","Soft Drop:","Hold:","Function:","Restart:","Instant Left:","Instant Right:","Ins Down:"},
+	actName=actName,
 	modeName={
 		[0]="Custom",
 		"Sprint","Marathon","Master","Classic","Zen","Infinite","1v1","Round","TSD-only","Blind",
@@ -128,6 +138,8 @@ return{
 		"Powered by love2d",
 		"Find out what's in the setting!",
 		"Any suggestions to author!",
+		"DO NOT PRESS F8",
+		"Secret code:626",
 		"Techmino=Technique+Tetromino",
 		"CLASSIC SEXY RUSSIAN BLOCKS",
 		"LrL,RlR  LLr,RRl  RRR/LLL  F!!",--ZSLJTTI
@@ -150,7 +162,8 @@ return{
 		"B2B:",
 		"PC:",
 		"Efficiency:",
-		"Fineese:"
+		"Finesse error:",
+		"Finesse rate:",
 	},
 	help={
 		"I don't think you need \"help\".",
@@ -211,11 +224,11 @@ Lib used:
 			start1="Clear Start",
 			start2="Puzzle Start",
 			draw="Draw(D)",
-			set1="40L",
-			set2="1v1",
-			set3="infinite",
-			set4="blind",
-			set5="master",
+			set1="40L(1)",
+			set2="1v1(2)",
+			set3="infinite(3)",
+			set4="blind(4)",
+			set5="master(5)",
 			back=BK,
 		},
 		draw={
@@ -253,7 +266,7 @@ Lib used:
 			sdarrD="-",sdarrU="+",
 			quickR="Quick restart",
 			swap="Combo key to change ATK mode",
-			fine="Fineese error SFX",
+			fine="Finesse error SFX",
 			ctrl="Key Setting",
 			touch="Touch Setting",
 			back=BK,
@@ -284,16 +297,32 @@ Lib used:
 			voc="VOC",
 			back=BK,
 		},
-		setting_control={
+		setting_key={
 			back=BK,
 		},
 		setting_touch={
-			hide=function()return setting.virtualkeySwitch and"Hide Virtual Key"or"Show Virtual Key"end,
+			hide="Show Virtual Key",
+			track="Auto track",
+			tkset="Track setting",
 			default="Defaults",
 			snap=function()return text.snapLevelName[snapLevel]end,
-			alpha=function()return setting.virtualkeyAlpha.."0%"end,
+			alpha=function()return setting.VKAlpha.."0%"end,
 			icon="Icon",
 			size="Size",
+			toggle="Toggle",
+			back=BK,
+		},
+		setting_touchSwitch={
+			b1=	actName[1],b2=actName[2],b3=actName[3],b4=actName[4],
+			b5=	actName[5],b6=actName[6],b7=actName[7],b8=actName[8],
+			b9=	actName[9],b10=actName[10],b11=actName[11],b12=actName[12],
+			b13=actName[13],b14=actName[14],b15=actName[15],b16=actName[16],
+			b17=actName[17],b18=actName[18],b19=actName[19],b20=actName[20],
+			norm="Normal",
+			pro="Professioanl",
+			back=BK,
+		},
+		setting_trackSetting={
 			back=BK,
 		},
 		help={