虚拟按键的重开键取消，换成2号功能键

document/mode.txt

@@ -62,7 +62,8 @@
 			freshLimit:锁延刷新次数限制
 			easyFresh:是否使用简单锁延刷新规则
 
-			Fkey:按下功能键后执行的函数
+			fkey1:按下功能键1后执行的函数
+			fkey2:按下功能键2后执行的函数
 			keyCancel:包含禁止使用的按键的id们的table
 			fineKill:是否开启非极简即死
 			b2bKill:是否开启断b2b即死

parts/gametoolfunc.lua

@@ -446,7 +446,6 @@ function restoreVirtualKey()
 end
 function pauseGame()
 	if not SCN.swapping then
-		GAME.restartCount=0--Avoid strange darkness
 		if not GAME.replaying then
 			for i=1,#PLAYERS do
 				local l=PLAYERS[i].keyPressing

parts/globalTables.lua

@@ -208,7 +208,6 @@ CUSTOMENV={--gameEnv for cutsom game
 }
 GAME={--Global game data
 	init=false,			--If need initializing game when enter scene-play
-	restartCount=0,		--Keep +=1 if player hold restart button after game start
 
 	frame=0,			--Frame count
 	result=false,		--Game result (string)
@@ -334,7 +333,7 @@ else
 	}for i=1,29 do STAT.clear[i]={0,0,0,0,0,0}STAT.spin[i]={0,0,0,0,0,0,0}end
 end
 keyMap=FILE.load("conf/key")or{--Key setting
-	{"left","right","x","z","c","up","down","space","tab","r"},{},
+	{"left","right","x","z","c","up","down","space","a","s"},{},
 	--Keyboard
 	{"dpleft","dpright","a","b","y","dpup","dpdown","rightshoulder","x","leftshoulder"},{},
 	--Joystick

parts/language/lang_en.lua

@@ -6,7 +6,6 @@ return{
 	newVersion="Thanks for updating! Check out the updates below.",
 	httpTimeout="Network connection timed out",
 	marking="Game Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid",
-	holdR="Keep holding to retry",
 	newDay="[Anti-addiction] New day, new beginning!",
 	playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
@@ -134,7 +133,7 @@ return{
 	acts={
 		"Move Left:","Move Right:",
 		"Rotate Right:","Rotate Left:","Rotate 180°:",
-		"Hard Drop:","Soft Drop:","Hold:","Function:","Restart:",
+		"Hard Drop:","Soft Drop:","Hold:","Function1:","Function2:",
 		"Instant Left:","Instant Right:","Sonic Drop:","Down 1:","Down 4:","Down 10:",
 		"Left Drop:","Right Drop:","Left Zangi:","Right Zangi:",
 	},
@@ -235,9 +234,6 @@ return{
 			reset="Reset (tab)",
 			unranked="Unranked",
 		},
-		play={
-			pause="Pause",
-		},
 		pause={
 			setting="Settings (S)",
 			replay="Replay (P)",
@@ -354,7 +350,7 @@ return{
 		setting_touchSwitch={
 			b1=	"Move Left:",	b2="Move Right:",	b3="Rotate Right:",	b4="Rotate Left:",
 			b5=	"Rotate 180°:",	b6="Hard Drop:",	b7="Soft Drop:",	b8="Hold:",
-			b9=	"Function:",	b10="Restart Game:",		b11="Instant Left:",b12="Instant Right:",
+			b9=	"Function1:",	b10="Function2:",	b11="Instant Left:",b12="Instant Right:",
 			b13="Sonic Drop:",	b14="Down 1:",		b15="Down 4:",		b16="Down 10:",
 			b17="Left Drop:",	b18="Right Drop:",	b19="Left Zangi:",	b20="Right Zangi:",
 			norm="Normal",

parts/language/lang_fr.lua

@@ -6,7 +6,6 @@ return{
 	newVersion="Merci d'avoir mis le jeu à jour ! Les nouvelles fonctionnalités sont listées ci-dessous.",
 	httpTimeout="La connexion au réseau ne s'est pas faite à temps.",
 	marking="Créateur du jeu: MrZ_26\nSi vous pouvez voir ceci, cet enregistrement est illégal\nToute explication est fausse et invalide.",
-	holdR="Hold to restart",
 	-- newDay="[Anti-addiction] New day, new beginning!",
 	-- playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	-- playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
@@ -113,7 +112,7 @@ return{
 	acts={
 		"Déplacement vers la gauche :","Déplacement vers la droite :",
 		"Rotation vers la droite:","Rotation vers la gauche :","180° :",
-		"Chute instantanée :","Chute rapide :","Réserve :","Fonction :","Réessayer:",
+		"Chute instantanée :","Chute rapide :","Réserve :","Fonction1 :","Fonction2 :",
 		"Déplacement instantané vers la gauche :","Déplacement instantané vers la droite : ","Chute sonique :","Descendre de 1 :","Descendre de 4 :","Descendre de 10 :",
 		"Chute à gauche :","Chute à droite :","Zangi gauche :","Zangi droite :",
 	},
@@ -213,9 +212,6 @@ return{
 			-- reset="Reset (tab)",
 			-- unranked="Unranked",
 		},
-		play={
-			pause="Pause",
-		},
 		pause={
 			setting="Paramètres (S)",
 			replay="Replay (P)",
@@ -333,7 +329,7 @@ return{
 			b1=	"Déplacement vers la gauche :",b2="Déplacement vers la droite:",
 			b3="Rotation vers la droite :",b4="Rotation vers la gauche :",
 			b5=	"180° :",b6="Chute instantanée :",b7="Chute rapide :",b8="Réserve :",
-			b9=	"Fonction :",b10="Redémarrer :",
+			b9=	"Fonction1 :",b10="Fonction2 :",
 			b11="Déplacement instantané vers la gauche :",b12="Déplacement instantané vers la droite :",
 			b13="Chute sonique :",b14="Descendre de 1 :",b15="Descendre de 4 :",b16="Descendre de 10:",
 			b17="Chute à gauche :",b18="Chute à droite :",b19="Zangi Gauche :",b20="Zangi Droite :",

parts/language/lang_pt.lua

@@ -5,7 +5,6 @@ return{
 	newVersion="Obrigado por atualizar! Veja as mudanças abaixo.",
 	httpTimeout="Conexão de rede expirou",
 	marking="Autor do jogo: MrZ_26\nSe puder ver isso a gravação e illegal\nQualquer explicação é invalida",
-	holdR="Segure pra tentar novamente",
 	newDay="[Anti-vício] Novo dia, um começo novo!",
 	playedLong="[Anti-vício] Você andou jogando bastante hoje. Certifique-se de fazer pausas.",
 	playedTooMuch="[Anti-vício] Você esteve jogando demais hoje! Você não pode jogar mais.",
@@ -133,7 +132,7 @@ return{
 	acts={
 		"Esquerda:","Direita:",
 		"Gira direita:","Gira esquerda:","Gire 180°:",
-		"Queda dura:","Queda leve:","Segurar:","Função:","Reiniciar:",
+		"Queda dura:","Queda leve:","Segurar:","Função1:","Função2:",
 		"Esquerda imediata:","Direita imediata:","Queda sonic:","Queda 1:","Queda 4:","Queda 10:",
 		"Queda esquerda:","Queda direita:"," Zangi esquerda:","Zangi direita:",
 	},
@@ -234,9 +233,6 @@ return{
 			reset="Reset (tab)",
 			unranked="Unranked",
 		},
-		play={
-			pause="Pausa",
-		},
 		pause={
 			setting="Config. (S)",
 			replay="Replay (P)",

parts/language/lang_sp.lua

@@ -6,7 +6,6 @@ return{
 	newVersion="¡Gracias por actualizar! Detalles a continuación:",
 	httpTimeout="¡Tiempo de espera de conexión agotado!",
 	marking="Autor:MrZ_26\nEsta grabación es ilegal si ves esto\nNo se aceptan excusas",
-	holdR="Mantén presionado para reiniciar",
 	-- newDay="[Anti-addiction] New day, new beginning!",
 	-- playedLong="[Anti-addiction] You've been playing quite a bit today. Make sure to take breaks.",
 	-- playedTooMuch="[Anti-addiction] You've been playing too much today! You can't play any more.",
@@ -115,8 +114,7 @@ return{
 		"Mover a Izq.:","Mover a Der.:",
 		"Rotar Der.:","Rotar Izq.:","Rotar 180°:",
 		"Caída Instantánea:","Caída Rápida:",
-		"Reserva:","Función (para Tech99/49):",
+		"Reserva:","Función1:","Función2:",
-		"Reiniciar:",
 		"Izq. Instant.:","Der. Instant.:","Sonic Drop:","Abajo 1:","Abajo 4:","Abajo 10:",
 		"Caída a Izq.:","Caída a Der.:","Zangi a Izq.:","Zangi a Der.:",
 	},
@@ -217,9 +215,6 @@ return{
 			-- reset="Reset (tab)",
 			-- unranked="Unranked",
 		},
-		play={
-			pause="Pausa",
-		},
 		pause={
 			setting="Opciones (S)",
 			replay=	"Grabación (P)",
@@ -332,7 +327,7 @@ return{
 		setting_touchSwitch={
 			b1=	"Mover Izq.:",b2="Mover Der.:",b3="Rotar Der.:",b4="Rotar Izq.:",
 			b5=	"Rotar 180°:",b6="Caída Inst.:",b7="Caída Ráp.:",b8="Reserva:",
-			b9=	"Función:",b10="Reiniciar:",b11="Izq. Instant.:",b12="Der. Instant.:",
+			b9=	"Función1:",b10="Función2:",b11="Izq. Instant.:",b12="Der. Instant.:",
 			b13="Sonic Drop:",b14="Abajo 1:",b15="Abajo 4:",b16="Abajo 10:",
 			b17="Soltar a Izq.:",b18="Soltar a Der.:",b19="Zangi a Izq.:",b20="Zangi a Der.:",
 			norm="Normal",

parts/language/lang_symbol.lua

@@ -4,7 +4,6 @@ return{
 	anykey="↓□↓",
 	newVersion="&!!!???↓↓",
 	httpTimeout="e??????x",
-	holdR="→→→→R",
 
 	atkModeName={"?","(  )","!","←→"},
 	royale_remain="$1 ~",
@@ -57,7 +56,7 @@ return{
 	acts={
 		"←:","→:",
 		"R→:","←R:","R↑↓:",
-		"↓↓:","↓:","□←:","F:","R:",
+		"↓↓:","↓:","□←:","F1:","F2:",
 		"|←:","→|:","↓_:","↓1:","↓4:","↓10:",
 		"←↓→↓:","→↓↓:","←↓→↓:","→↓←↓:",
 	},
@@ -120,9 +119,6 @@ return{
 			reset="R",
 			unranked="X!!!",
 		},
-		play={
-			pause="||",
-		},
 		pause={
 			setting="_?_ (S)",
 			replay="## (P)",
@@ -223,7 +219,7 @@ return{
 		setting_touchSwitch={
 			b1=	"←:",    b2="→:",   b3="R→:",   b4="←R:",
 			b5=	"R↑↓:",   b6="↓↓:",   b7="↓:",     b8="□←:",
-			b9=	"F:",    b10="R:",  b11="←←:",  b12="→→:",
+			b9=	"F1:",    b10="F2:",  b11="←←:",  b12="→→:",
 			b13="↓_:",   b14="↓1:",  b15="↓4:",   b16="↓10:",
 			b17="←↓→↓:", b18="→↓↓:", b19="←↓→↓:",b20="→↓←↓:",
 			norm="-",

parts/language/lang_yygq.lua

@@ -2,7 +2,6 @@ return{
 	anykey="您开始了",
 	newVersion="感谢更新,请看看更新了些啥",
 	httpTimeout="没网或者网不好?",
-	holdR="长按重开",
 	playedLong="今天已经玩很久了,你小心点",
 	playedTooMuch="你他妈再玩小心眼睛瞎掉,爬",
 

parts/language/lang_zh.lua

@@ -6,7 +6,6 @@ return{
 	newVersion="感谢更新!更新内容如下",
 	httpTimeout="网络连接超时!",
 	marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
-	holdR="长按以重新开始",
 	newDay="新的一天,新的开始~",
 	playedLong="已经玩很久了!注意休息!",
 	playedTooMuch="今天玩太久啦!打块好玩但也要适可而止哦~",
@@ -136,8 +135,7 @@ return{
 		"左移:","右移:",
 		"顺时针旋转:","逆时针旋转:","180°旋转:",
 		"硬降:","软降:",
-		"暂存:","功能键:",
+		"暂存:","功能键1:","功能键2:",
-		"重新开始:",
 		"左瞬移:","右瞬移:","软降到底:","软降一格:","软降四格:","软降十格:",
 		"落在最左:","落在最右:","列在最左:","列在最右:",
 	},
@@ -238,9 +236,6 @@ return{
 			reset="重置(tab)",
 			unranked="成绩无效",
 		},
-		play={
-			pause="暂停",
-		},
 		pause={
 			setting="设置(S)",
 			replay=	"回放(P)",
@@ -356,7 +351,7 @@ return{
 		setting_touchSwitch={
 			b1=	"左移:",	b2="右移:",		b3="顺时针旋转:",	b4="逆时针旋转:",
 			b5=	"180°旋转:",b6="硬降:",		b7="软降:",			b8="暂存:",
-			b9=	"功能键:",	b10="重新开始:",b11="左瞬移:",		b12="右瞬移:",
+			b9=	"功能键1:",	b10="功能键2:",b11="左瞬移:",		b12="右瞬移:",
 			b13="软降到底:",b14="软降一格:",b15="软降四格:",	b16="软降十格:",
 			b17="落在最左:",b18="落在最右:",b19="列在最左:",	b20="列在最右:",
 			norm="标准",

parts/modes/custom_puzzle.lua

@@ -34,7 +34,7 @@ end
 return{
 	color=COLOR.white,
 	env={
-		Fkey=function(P)P.modeData.event=1-P.modeData.event end,
+		fkey1=function(P)P.modeData.event=1-P.modeData.event end,
 		dropPiece=puzzleCheck,
 	},
 	load=function()

parts/modes/techmino49_e.lua

@@ -21,7 +21,7 @@ return{
 		drop=60,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/modes/techmino49_h.lua

@@ -21,7 +21,7 @@ return{
 		drop=60,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/modes/techmino49_u.lua

@@ -21,7 +21,7 @@ return{
 		drop=15,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/modes/techmino99_e.lua

@@ -21,7 +21,7 @@ return{
 		drop=60,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/modes/techmino99_h.lua

@@ -21,7 +21,7 @@ return{
 		drop=60,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/modes/techmino99_u.lua

@@ -21,7 +21,7 @@ return{
 		drop=15,lock=60,
 		fall=20,
 		royaleMode=true,
-		Fkey=selectTarget,
+		fkey1=selectTarget,
 		garbageSpeed=.3,
 		pushSpeed=2,
 		freshLimit=15,

parts/player/gameEnv0.lua

@@ -48,7 +48,7 @@ return{
 	visible="show",
 	freshLimit=1e99,easyFresh=true,
 
-	Fkey=false,
+	fkey1=false,
 	keyCancel={},
 	fine=false,fineKill=false,
 	b2bKill=false,

parts/player/init.lua

@@ -232,9 +232,8 @@ local function applyGameEnv(P)--Finish gameEnv processing
 			end
 		end
 	end
-	if not ENV.Fkey then
+	if not ENV.fkey1 then P.keyAvailable[9]=false end
-		P.keyAvailable[9]=false
+	if not ENV.fkey2 then P.keyAvailable[10]=false end
-	end
 	for _,v in next,ENV.keyCancel do
 		P.keyAvailable[v]=false
 	end

parts/player/player.lua

@@ -1853,17 +1853,11 @@ function Player.act_hold(P)
 		P:hold()
 	end
 end
-function Player.act_func(P)
+function Player.act_func1(P)
-	P.gameEnv.Fkey(P)
+	P.gameEnv.fkey1(P)
 end
-function Player.act_restart()
+function Player.act_func2(P)
-	if GAME.frame<240 then
+	P.gameEnv.fkey2(P)
-		resetGameData("q")
-	elseif GAME.result then
-		resetGameData()
-	else
-		LOG.print(text.holdR,20,COLOR.orange)
-	end
 end
 
 function Player.act_insLeft(P,auto)
@@ -1993,8 +1987,8 @@ Player.actList={
 	Player.act_hardDrop,	--6
 	Player.act_softDrop,	--7
 	Player.act_hold,		--8
-	Player.act_func,		--9
+	Player.act_func1,		--9
-	Player.act_restart,		--10
+	Player.act_func2,		--10
 	Player.act_insLeft,		--11
 	Player.act_insRight,	--12
 	Player.act_insDown,		--13

parts/scenes/play.lua

@@ -29,7 +29,6 @@ local scene={}
 
 function scene.sceneInit()
 	love.keyboard.setKeyRepeat(false)
-	GAME.restartCount=0
 	if GAME.init then
 		resetGameData()
 		GAME.init=false
@@ -209,16 +208,7 @@ function scene.update(dt)
 				P.moving=0
 			end
 		end
-		if GAME.restartCount>0 then GAME.restartCount=GAME.restartCount-1 end
 		return
-	elseif P1.keyPressing[10]then
-		GAME.restartCount=GAME.restartCount+1
-		if GAME.restartCount>20 then
-			resetGameData()
-			return
-		end
-	elseif GAME.restartCount>0 then
-		GAME.restartCount=GAME.restartCount>2 and GAME.restartCount-2 or 0
 	end
 
 	--Update players
@@ -365,14 +355,11 @@ function scene.draw()
 		gc.rectangle("fill",0,0,SCR.w,SCR.h)
 		gc.setShader()
 	end
-	if GAME.restartCount>0 then
-		gc_setColor(0,0,0,GAME.restartCount*.05)
-		gc.rectangle("fill",0,0,SCR.w,SCR.h)
-	end
 	gc.pop()
 end
 scene.widgetList={
-	WIDGET.newKey{name="pause",x=1235,y=45,w=60,font=20,code=function()pauseGame()end},
+	WIDGET.newKey{name="restart",fText="R",x=45,y=45,w=60,font=40,code=function()resetGameData(GAME.frame<240 and"q")end},
+	WIDGET.newKey{name="pause",fText="II",x=1235,y=45,w=60,font=40,code=function()pauseGame()end},
 }
 
 return scene