From 759a7f0006322b13a9c0a3f79bc2390f9c7bd4f5 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 30 Oct 2020 21:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8E=A9=E5=AE=B6=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=89=8D5=E6=AC=A1commit?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9C=A8=E9=87=8D=E6=9E=84=E5=90=8E=E9=83=BD?=
 =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BDai=E7=8E=A9=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/player.lua | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/parts/player.lua b/parts/player.lua
index 6e94df3f..529a19f0 100644
--- a/parts/player.lua
+++ b/parts/player.lua
@@ -1328,8 +1328,6 @@ local function loadAI(P,AIdata)--Load AI params
 		for i=1,AIdata.next do
 			CC.addNext(P.AI_bot,CCblockID[P.next[i].id])
 		end
-	elseif P.AI_mode=="9S"then
-		P.RS=kickList.TRS
 	end
 end
 local function newEmptyPlayer(id,x,y,size)
@@ -1418,6 +1416,7 @@ local function newEmptyPlayer(id,x,y,size)
 	P.pieceCount=0--Count pieces from next, for drawing bagline
 
 	P.human=false
+	P.sound=false
 	P.RS=kickList.TRS
 
 	-- P.newNext=nil--Call prepareSequence()to get a function to get new next
@@ -3081,6 +3080,7 @@ end
 --------------------------<Generator>--------------------------
 function PLY.newDemoPlayer(id,x,y,size)
 	local P=newEmptyPlayer(id,x,y,size)
+	P.sound=true
 
 	-- rewrite some args
 	P.small=false
@@ -3129,9 +3129,6 @@ function PLY.newDemoPlayer(id,x,y,size)
 	}
 	applyGameEnv(P)
 	prepareSequence(P)
-
-	P.human=false
-	P.sound=true
 	loadAI(P,{
 		type="CC",
 		next=5,
@@ -3146,9 +3143,6 @@ function PLY.newDemoPlayer(id,x,y,size)
 end
 function PLY.newRemotePlayer(id,x,y,size)
 	local P=newEmptyPlayer(id,x,y,size)
-
-	P.human=false
-	P.sound=false
 	P.remote=true
 
 	-- P.updateAction=buildActionFunctionFromActions(P, actions)
@@ -3159,8 +3153,11 @@ function PLY.newRemotePlayer(id,x,y,size)
 end
 function PLY.newAIPlayer(id,x,y,size,AIdata)
 	local P=newEmptyPlayer(id,x,y,size)
-	local ENV=P.gameEnv
 
+	loadGameEnv(P)
+	local ENV=P.gameEnv
+	ENV.face={0,0,0,0,0,0,0}
+	ENV.skin={1,5,8,2,10,3,7}
 	if P.small then
 		ENV.text=false
 		ENV.lockFX=nil
@@ -3168,28 +3165,19 @@ function PLY.newAIPlayer(id,x,y,size,AIdata)
 		ENV.moveFX=nil
 		ENV.shakeFX=nil
 	end
-
-	loadGameEnv(P)
 	applyGameEnv(P)
-
-	ENV.face={0,0,0,0,0,0,0}
-	ENV.skin={1,5,8,2,10,3,7}
 	prepareSequence(P)
-
-	P.human=false
-	P.sound=false
 	loadAI(P,AIdata)
 end
 function PLY.newPlayer(id,x,y,size)
 	local P=newEmptyPlayer(id,x,y,size)
+	P.human=true
+	P.sound=true
 
 	loadGameEnv(P)
 	applyGameEnv(P)
 	prepareSequence(P)
 
-	P.human=true
-	P.sound=true
-	P.RS=kickList.TRS
 end
 --------------------------</Generator>--------------------------
 return PLY
\ No newline at end of file