From 1b176ed5adc02ce96a87ddc6f9911502459e6f76 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 17 Aug 2021 02:12:03 +0800 Subject: [PATCH] =?UTF-8?q?tas=E5=BD=95=E5=83=8F=E5=9C=A8=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E5=88=97=E8=A1=A8=E4=BC=9A=E6=9C=89=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/data.lua | 2 ++ parts/gametoolfunc.lua | 2 +- parts/scenes/replays.lua | 11 ++++++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/parts/data.lua b/parts/data.lua index 770014d9..d7a78b32 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -366,6 +366,7 @@ do--function DATA.saveReplay() seed=GAME.seed, setting=GAME.setting, mod=getModList(), + tasUsed=GAME.tasUsed, }.."\n".. DATA.dumpRecording(GAME.rep) ) @@ -414,6 +415,7 @@ function DATA.parseReplayData(fileName,fileData,ifFull) seed=metaData.seed, setting=metaData.setting, mod=metaData.mod, + tasUsed=metaData.tasUsed, } if ifFull then rep.data=fileData end do return rep end diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 446223d6..2dad7a4a 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -480,7 +480,6 @@ do--function resetGameData(args) if not args then args=""end trySave() - GAME.tasUsed=false GAME.result=false GAME.rank=0 GAME.warnLVL0=0 @@ -496,6 +495,7 @@ do--function resetGameData(args) GAME.pauseCount=0 GAME.saved=false GAME.setting=copyGameSetting() + GAME.tasUsed=false GAME.rep={} GAME.recording=true GAME.statSaved=false diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index 34734ee4..c4bba5c9 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -15,6 +15,10 @@ local listBox=WIDGET.newListBox{name="list",x=50,y=50,w=1200,h=520,lineH=40,draw setFont(30) gc_setColor(.8,.8,.8) gc_print(id,10,-2) + if rep.tasUsed then + gc_setColor(COLOR.R) + gc_print("TAS",680,-2) + end if rep.available then gc_setColor(.9,.9,1) @@ -25,7 +29,7 @@ local listBox=WIDGET.newListBox{name="list",x=50,y=50,w=1200,h=520,lineH=40,draw gc_print(rep.date,80,6) gc_setColor(1,.4,.4,.6) gc_printf(rep.version,0,6,1190,'right') - gc_setColor(1,1,1) + gc_setColor(COLOR.Z) gc_printf(rep.player,0,6,960,'right') else gc_setColor(.6,.6,.6) @@ -37,7 +41,7 @@ local scene={} local sure -local function replay(fileName) +local function playRep(fileName) local rep=DATA.parseReplay(fileName,true) if not rep.available then MES.new('error',text.replayBroken) @@ -59,6 +63,7 @@ local function replay(fileName) GAME.init=false GAME.saved=true GAME.fromRepMenu=true + GAME.tasUsed=rep.tasUsed else MES.new('error',("No mode id: [%s]"):format(rep.mode)) end @@ -77,7 +82,7 @@ function scene.keyDown(key) if key=="return"then local rep=listBox:getSel() if rep then - replay(rep.fileName) + playRep(rep.fileName) end elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then local rep=listBox:getSel()