From 75b82496a5ab00b695303bf116046bb1516d59ac Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 21 Sep 2020 09:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E8=A1=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/list.lua   |  4 ++--
 parts/player.lua | 38 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/parts/list.lua b/parts/list.lua
index b9b587bc..622eac34 100644
--- a/parts/list.lua
+++ b/parts/list.lua
@@ -165,6 +165,8 @@ end
 
 missionEnum={
 	_1=01,_2=02,_3=03,_4=04,
+	A1=05,A2=06,A3=07,A4=08,
+	PC=09,
 	Z1=11,Z2=12,Z3=13,
 	S1=21,S2=22,S3=23,
 	J1=31,J2=32,J3=33,
@@ -172,8 +174,6 @@ missionEnum={
 	T1=51,T2=52,T3=53,
 	O1=61,O2=62,O3=63,O4=64,
 	I1=71,I2=72,I3=73,I4=74,
-	A1=91,A2=92,A3=93,A4=94,
-	PC=99,
 }
 local _={}
 for k,v in next,missionEnum do _[v]=k end
diff --git a/parts/player.lua b/parts/player.lua
index 1f21471e..01b80781 100644
--- a/parts/player.lua
+++ b/parts/player.lua
@@ -914,7 +914,7 @@ do--function Pdraw_norm(P)
 			end
 
 			--Missions
-			if P.missionProgress then
+			if P.curMission then
 				local missionEnum=missionEnum
 				local L=ENV.mission
 
@@ -925,16 +925,16 @@ do--function Pdraw_norm(P)
 				else
 					gc.setColor(1,1,1)
 				end
-				gc.print(missionEnum[L[P.missionProgress+1]],85,180)
+				gc.print(missionEnum[L[P.curMission]],85,180)
 
 				--Draw next mission
 				gc.setColor(1,1,1)
 				setFont(17)
-				for i=2,4 do
-					local t=L[P.missionProgress+i]
+				for i=1,3 do
+					local t=L[P.curMission+i]
 					if t then
 						t=missionEnum[t]
-						gc.print(t,113-26*i,187)
+						gc.print(t,87-26*i,187)
 					else
 						break
 					end
@@ -1238,7 +1238,7 @@ local function applyGameEnv(P)--Finish gameEnv processing
 	end
 
 	if type(ENV.mission)=="table"then
-		P.missionProgress=0
+		P.curMission=1
 	end
 
 	ENV.das=max(ENV.das,ENV.mindas)
@@ -2447,32 +2447,32 @@ do--player.drop(P)--Place piece
 			end
 
 			--Check clearing task
-			if P.missionProgress then
-				local t=P.gameEnv.mission[P.missionProgress+1]
+			if P.curMission then
+				local t=P.gameEnv.mission[P.curMission]
 				local success
-				if t<10 then
+				if t<5 then
 					if C.row==t then
 						success=true
 					end
-				elseif t<90 then
-					if C.row==t%10 and C.name==int(t/10)then
+				elseif t<9 then
+					if C.row==t%10 and C.spin then
 						success=true
 					end
-				elseif t<99 then
-					if C.row==t%10 then
-						success=true
-					end
-				elseif t==99 then
+				elseif t==9 then
 					if C.pc then
 						success=true
 					end
+				elseif t<90 then
+					if C.row==t%10 and C.name==int(t/10)and C.spin then
+						success=true
+					end
 				end
 				if success then
-					P.missionProgress=P.missionProgress+1
+					P.curMission=P.curMission+1
 					SFX.play("reach")
-					if P.missionProgress==#P.gameEnv.mission then
+					if P.curMission>#P.gameEnv.mission then
+						P.curMission=nil
 						P:win()
-						P.missionProgress=nil
 					end
 				elseif P.gameEnv.missionKill then
 					P:showText(text.missionFailed,0,140,40,"flicker",.5)