新增玩家排版函数，不再需要生成玩家同时指定坐标，添加动画位移方法；玩家task升级为同task模块

document/mode.txt

@@ -118,7 +118,7 @@ return{--返回一个table，你也可以在之前定义一些常量或者函数
 		bg="bg2",bgm="race",
 	},
 	load=function()--生成玩家
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)--1是玩家编号，默认用户控制1号玩家
 	end,
 	mesDisp=function(P)--40行模式需要显示的信息
 		setFont(55)

parts/gametoolfunc.lua

@@ -462,6 +462,33 @@ function loadGame(M,ifQuickPlay)
 		SFX.play("enter")
 	end
 end
+function resetPlayerPosition()
+	local l=#PLAYERS
+	PLAYERS[1]:setPosition(340,15)
+	if l==2 then
+		PLAYERS[2]:setPosition(965,360,.5)
+	elseif l==49 then
+		local n=2
+		for i=1,4 do for j=1,6 do
+			PLAYERS[n]:setPosition(78*i-54,115*j-98,.09)
+			n=n+1
+		end end
+		for i=9,12 do for j=1,6 do
+			PLAYERS[n]:setPosition(78*i+267,115*j-98,.09)
+			n=n+1
+		end end
+	elseif l==99 then
+		local n=2
+		for i=1,7 do for j=1,7 do
+			PLAYERS[n]:setPosition(46*i-36,97*j-72,.068)
+			n=n+1
+		end end
+		for i=15,21 do for j=1,7 do
+			PLAYERS[n]:setPosition(46*i+264,97*j-72,.068)
+			n=n+1
+		end end
+	end
+end
 local function tick_showMods()
 	local time=0
 	while true do
@@ -506,6 +533,7 @@ function resetGameData(replaying)
 
 	destroyPlayers()
 	GAME.curMode.load()
+	resetPlayerPosition()
 	restoreVirtualKey()
 	if GAME.modeEnv.task then
 		for i=1,#PLAYERS do

parts/modes/GM.lua

@@ -37,7 +37,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		PLAYERS[1].modeData.event="M7"
 	end,
 	mesDisp=function(P)

parts/modes/attacker_hard.lua

@@ -39,7 +39,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/attacker_ultimate.lua

@@ -46,7 +46,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/bigbang.lua

@@ -10,7 +10,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	score=function(P)return{P.modeData.event,P.stat.finesseRate*25/P.stat.piece}end,
 	scoreDisp=function(D)return D[1].."Stage "..format("%.2f",D[2]).."%"end,

parts/modes/blind_easy.lua

@@ -11,7 +11,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		mText(drawableText.line,69,370)

parts/modes/blind_hard.lua

@@ -15,7 +15,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		mText(drawableText.line,69,370)

parts/modes/blind_lunatic.lua

@@ -16,7 +16,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		mText(drawableText.line,69,370)

parts/modes/blind_normal.lua

@@ -12,7 +12,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		mText(drawableText.line,69,370)

parts/modes/blind_ultimate.lua

@@ -15,7 +15,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		mText(drawableText.line,69,370)

parts/modes/blind_wtf.lua

@@ -16,7 +16,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		if SETTING.spawn==0 then
 			LOG.print(text.switchSpawnSFX,COLOR.yellow)
 		end

parts/modes/c4wtrain_lunatic.lua

@@ -27,7 +27,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		local F=P.field
 		for i=1,24 do

parts/modes/c4wtrain_normal.lua

@@ -25,7 +25,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		local F=P.field
 		for i=1,24 do

parts/modes/classic_fast.lua

@@ -34,7 +34,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(75)

parts/modes/custom_clear.lua

@@ -70,14 +70,14 @@ return{
 				break
 			end
 		end
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L=GAME.modeEnv.opponent
 		if L~=0 then
 			GAME.modeEnv.target=nil
 			if L<6 then
-				PLY.newAIPlayer(2,965,360,.5,AIBUILDER("9S",2*L))
+				PLY.newAIPlayer(2,AIBUILDER("9S",2*L))
 			else
-				PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",2*L-11,int(L*.5-1.5),true,4000*L))
+				PLY.newAIPlayer(2,AIBUILDER("CC",2*L-11,int(L*.5-1.5),true,4000*L))
 			end
 		end
 		for _,P in next,PLAYERS.alive do

parts/modes/custom_puzzle.lua

@@ -51,14 +51,14 @@ return{
 		else
 			GAME.modeEnv.mission=nil
 		end
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L=GAME.modeEnv.opponent
 		if L~=0 then
 			GAME.modeEnv.target=nil
 			if L<6 then
-				PLY.newAIPlayer(2,965,360,.5,AIBUILDER("9S",2*L))
+				PLY.newAIPlayer(2,AIBUILDER("9S",2*L))
 			else
-				PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",2*L-11,int(L*.5-1.5),true,4000*L))
+				PLY.newAIPlayer(2,AIBUILDER("CC",2*L-11,int(L*.5-1.5),true,4000*L))
 			end
 		end
 		GAME.modeEnv.bg=CUSTOMENV.bg

parts/modes/defender_lunatic.lua

@@ -45,7 +45,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/defender_normal.lua

@@ -45,7 +45,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/dig_10.lua

@@ -12,7 +12,7 @@ return{
 		bg="bg1",bgm="way",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		for _=1,10 do
 			P:garbageRise(21,1,P:getHolePos())

parts/modes/dig_100.lua

@@ -15,7 +15,7 @@ return{
 		bg="bg2",bgm="way",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		for _=1,10 do
 			P:garbageRise(21,1,P:getHolePos())

parts/modes/dig_40.lua

@@ -15,7 +15,7 @@ return{
 		bg="bg1",bgm="way",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		for _=1,10 do
 			P:garbageRise(21,1,P:getHolePos())

parts/modes/dig_400.lua

@@ -15,7 +15,7 @@ return{
 		bg="bg2",bgm="way",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		for _=1,10 do
 			P:garbageRise(21,1,P:getHolePos())

parts/modes/dig_hard.lua

@@ -23,7 +23,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/dig_ultimate.lua

@@ -22,7 +22,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/drought_lunatic.lua

@@ -99,7 +99,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(70)

parts/modes/drought_normal.lua

@@ -13,7 +13,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(70)

parts/modes/infinite.lua

@@ -7,7 +7,7 @@ return{
 		bg="glow",bgm="infinite",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/infinite_dig.lua

@@ -36,7 +36,7 @@ return{
 		bg="wing",bgm="infinite",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local P=PLAYERS[1]
 		for _=1,8 do
 			P:garbageRise(13,1,P:RND(10))

parts/modes/marathon_hard.lua

@@ -28,7 +28,7 @@ return{
 	pauseLimit=true,
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/marathon_normal.lua

@@ -25,7 +25,7 @@ return{
 	pauseLimit=true,
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/marathon_ultimate.lua

@@ -32,7 +32,7 @@ return{
 	pauseLimit=true,
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/master_advance.lua

@@ -54,7 +54,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/master_beginner.lua

@@ -56,7 +56,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/master_final.lua

@@ -53,7 +53,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/master_phantasm.lua

@@ -146,7 +146,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/pcchallenge_hard.lua

@@ -10,7 +10,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/pcchallenge_lunatic.lua

@@ -10,7 +10,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/pcchallenge_normal.lua

@@ -8,7 +8,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/pctrain_lunatic.lua

@@ -65,7 +65,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		check(PLAYERS[1])
 	end,
 	mesDisp=function(P)

parts/modes/pctrain_normal.lua

@@ -57,7 +57,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		check(PLAYERS[1])
 	end,
 	mesDisp=function(P)

parts/modes/round_1.lua

@@ -19,8 +19,8 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",10,1,true,10000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",10,1,true,10000))
 		GAME.garbageSpeed=1e99
 	end,
 	score=function(P)return{P.stat.piece,P.stat.frame/60}end,

parts/modes/round_2.lua

@@ -19,8 +19,8 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",10,1,true,13000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",10,1,true,13000))
 		GAME.garbageSpeed=1e99
 	end,
 	score=function(P)return{P.stat.piece,P.stat.frame/60}end,

parts/modes/round_3.lua

@@ -19,8 +19,8 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",10,2,true,16000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",10,2,true,16000))
 		GAME.garbageSpeed=1e99
 	end,
 	score=function(P)return{P.stat.piece,P.stat.frame/60}end,

parts/modes/round_4.lua

@@ -19,8 +19,8 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",10,3,true,26000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",10,3,true,26000))
 		GAME.garbageSpeed=1e99
 	end,
 	score=function(P)return{P.stat.piece,P.stat.frame/60}end,

parts/modes/round_5.lua

@@ -19,8 +19,8 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",10,3,true,40000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",10,3,true,40000))
 		GAME.garbageSpeed=1e99
 	end,
 	score=function(P)return{P.stat.piece,P.stat.frame/60}end,

parts/modes/solo_1.lua

@@ -8,8 +8,8 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("9S",4))
+		PLY.newAIPlayer(2,AIBUILDER("9S",4))
 	end,
 	score=function(P)return{P.stat.frame/60}end,
 	scoreDisp=function(D)return toTime(D[1])end,

parts/modes/solo_2.lua

@@ -8,8 +8,8 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("9S",5))
+		PLY.newAIPlayer(2,AIBUILDER("9S",5))
 	end,
 	score=function(P)return{P.stat.frame/60}end,
 	scoreDisp=function(D)return toTime(D[1])end,

parts/modes/solo_3.lua

@@ -8,8 +8,8 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("9S",6))
+		PLY.newAIPlayer(2,AIBUILDER("9S",6))
 	end,
 	score=function(P)return{P.stat.frame/60}end,
 	scoreDisp=function(D)return toTime(D[1])end,

parts/modes/solo_4.lua

@@ -8,8 +8,8 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",6,2,true,30000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",6,2,true,30000))
 	end,
 	score=function(P)return{P.stat.frame/60}end,
 	scoreDisp=function(D)return toTime(D[1])end,

parts/modes/solo_5.lua

@@ -8,8 +8,8 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
-		PLY.newAIPlayer(2,965,360,.5,AIBUILDER("CC",7,3,true,50000))
+		PLY.newAIPlayer(2,AIBUILDER("CC",7,3,true,50000))
 	end,
 	score=function(P)return{P.stat.frame/60}end,
 	scoreDisp=function(D)return toTime(D[1])end,

parts/modes/sprintFix.lua

@@ -8,7 +8,7 @@ return{
 		bg="aura",bgm="waterfall",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprintLock.lua

@@ -7,7 +7,7 @@ return{
 		bg="aura",bgm="waterfall",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprintMPH.lua

@@ -8,7 +8,7 @@ return{
 		bg="aura",bgm="waterfall",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprintPenta.lua

@@ -7,7 +7,7 @@ return{
 		bg="aura",bgm="waterfall",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_10.lua

@@ -6,7 +6,7 @@ return{
 		bg="bg2",bgm="race",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_100.lua

@@ -6,7 +6,7 @@ return{
 		bg="bg2",bgm="race",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_1000.lua

@@ -6,7 +6,7 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_20.lua

@@ -6,7 +6,7 @@ return{
 		bg="bg2",bgm="race",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_40.lua

@@ -6,7 +6,7 @@ return{
 		bg="bg2",bgm="race",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/sprint_400.lua

@@ -6,7 +6,7 @@ return{
 		bg="rainbow",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(55)

parts/modes/survivor_easy.lua

@@ -23,7 +23,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/survivor_hard.lua

@@ -29,7 +29,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/survivor_lunatic.lua

@@ -24,7 +24,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/survivor_normal.lua

@@ -28,7 +28,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/survivor_ultimate.lua

@@ -30,7 +30,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/tech_finesse.lua

@@ -13,7 +13,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_finesse2.lua

@@ -25,7 +25,7 @@ return{
 	},
 	slowMark=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_hard.lua

@@ -12,7 +12,7 @@ return{
 		bg="matrix",bgm="down",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_hard2.lua

@@ -22,7 +22,7 @@ return{
 		bg="matrix",bgm="down",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_lunatic.lua

@@ -12,7 +12,7 @@ return{
 		bg="matrix",bgm="down",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_lunatic2.lua

@@ -22,7 +22,7 @@ return{
 		bg="matrix",bgm="down",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_normal.lua

@@ -12,7 +12,7 @@ return{
 		bg="matrix",bgm="new era",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/tech_normal2.lua

@@ -22,7 +22,7 @@ return{
 		bg="matrix",bgm="new era",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(45)

parts/modes/techmino49_easy.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,5,10,20},
 			stage={30,20,15,10,5},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,49 do L[i]=true end
 		local t=CC and 2 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,4 do for j=1,6 do
+		for _=1,4 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("9S",rnd(4,6)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,6)),true)
 			else
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("CC",rnd(2,4),2,true,20000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(2,4),2,true,20000),true)
 			end
 			n=n+1
 		end end
-		for i=9,12 do for j=1,6 do
+		for _=9,12 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("9S",rnd(4,5)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,5)),true)
 			else
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("CC",rnd(3,5),2,true,20000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,5),2,true,20000),true)
 			end
 			n=n+1
 		end end

parts/modes/techmino49_hard.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,5,10,20},
 			stage={30,20,15,10,5},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,49 do L[i]=true end
 		local t=CC and 4 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,4 do for j=1,6 do
+		for _=1,4 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("9S",rnd(4,8)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,8)),true)
 			else
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("CC",rnd(3,6),3,true,30000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,6),3,true,30000),true)
 			end
 			n=n+1
 		end end
-		for i=9,12 do for j=1,6 do
+		for _=9,12 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("9S",rnd(4,7)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,7)),true)
 			else
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("CC",rnd(4,6),3,true,30000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,6),3,true,30000),true)
 			end
 			n=n+1
 		end end

parts/modes/techmino49_ultimate.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,5,10,20},
 			stage={30,20,15,10,5},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,49 do L[i]=true end
 		local t=CC and 6 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,4 do for j=1,6 do
+		for _=1,4 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("9S",rnd(8,10)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,10)),true)
 			else
-				PLY.newAIPlayer(n,78*i-54,115*j-98,.09,AIBUILDER("CC",rnd(4,7),3,true,40000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,7),3,true,40000),true)
 			end
 			n=n+1
 		end end
-		for i=9,12 do for j=1,6 do
+		for _=9,12 do for _=1,6 do
 			if L[n]then
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("9S",rnd(8,9)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,9)),true)
 			else
-				PLY.newAIPlayer(n,78*i+267,115*j-98,.09,AIBUILDER("CC",rnd(5,8),3,true,40000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(5,8),3,true,40000),true)
 			end
 			n=n+1
 		end end

parts/modes/techmino99_easy.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,6,14,30},
 			stage={75,50,35,20,10},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,100 do L[i]=true end
 		local t=CC and 4 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,7 do for j=1,7 do
+		for _=1,7 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("9S",rnd(4,6)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,6)),true)
 			else
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("CC",rnd(2,4),2,true,20000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(2,4),2,true,20000),true)
 			end
 			n=n+1
 		end end
-		for i=15,21 do for j=1,7 do
+		for _=15,21 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("9S",rnd(4,5)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,5)),true)
 			else
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("CC",rnd(3,5),2,true,20000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,5),2,true,20000),true)
 			end
 			n=n+1
 		end end

parts/modes/techmino99_hard.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,6,14,30},
 			stage={75,50,35,20,10},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,100 do L[i]=true end
 		local t=CC and 4 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,7 do for j=1,7 do
+		for _=1,7 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("9S",rnd(4,8)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,8)),true)
 			else
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("CC",rnd(3,6),3,true,30000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,6),3,true,30000),true)
 			end
 			n=n+1
 		end end
-		for i=15,21 do for j=1,7 do
+		for _=15,21 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("9S",rnd(4,7)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,7)),true)
 			else
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("CC",rnd(4,6),3,true,30000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,6),3,true,30000),true)
 			end
 			n=n+1
 		end end

parts/modes/techmino99_ultimate.lua

@@ -31,7 +31,7 @@ return{
 			powerUp={2,6,14,30},
 			stage={75,50,35,20,10},
 		}
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 		local L={}for i=1,100 do L[i]=true end
 		local t=CC and 4 or 0
 		while t>0 do
@@ -39,19 +39,19 @@ return{
 			if L[r]then L[r],t=false,t-1 end
 		end
 		local n=2
-		for i=1,7 do for j=1,7 do
+		for _=1,7 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("9S",rnd(8,10)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,10)),true)
 			else
-				PLY.newAIPlayer(n,46*i-36,97*j-72,.068,AIBUILDER("CC",rnd(4,7),3,true,40000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,7),3,true,40000),true)
 			end
 			n=n+1
 		end end
-		for i=15,21 do for j=1,7 do
+		for _=15,21 do for _=1,7 do
 			if L[n]then
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("9S",rnd(8,9)))
+				PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,9)),true)
 			else
-				PLY.newAIPlayer(n,46*i+264,97*j-72,.068,AIBUILDER("CC",rnd(5,8),3,true,40000))
+				PLY.newAIPlayer(n,AIBUILDER("CC",rnd(5,8),3,true,40000),true)
 			end
 			n=n+1
 		end end

parts/modes/tsd_easy.lua

@@ -19,7 +19,7 @@ return{
 		bg="matrix",bgm="push",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/tsd_hard.lua

@@ -20,7 +20,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/tsd_ultimate.lua

@@ -20,7 +20,7 @@ return{
 	},
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(65)

parts/modes/ultra.lua

@@ -28,7 +28,7 @@ return{
 	slowMark=true,
 	pauseLimit=true,
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		gc.setLineWidth(2)

parts/modes/zen.lua

@@ -7,7 +7,7 @@ return{
 		bg="bg2",bgm="infinite",
 	},
 	load=function()
-		PLY.newPlayer(1,340,15)
+		PLY.newPlayer(1)
 	end,
 	mesDisp=function(P)
 		setFont(70)

parts/player/init.lua

@@ -72,7 +72,7 @@ local function releaseKey_Rec(P,keyID)
 	end
 	P.keyPressing[keyID]=false
 end
-local function newEmptyPlayer(id,x,y,size)
+local function newEmptyPlayer(id,mini)
 	local P={id=id}
 	PLAYERS[id]=P
 	PLAYERS.alive[id]=P
@@ -90,23 +90,23 @@ local function newEmptyPlayer(id,x,y,size)
 	P.update=PLY.update.alive
 
 	P.fieldOff={x=0,y=0,vx=0,vy=0}--For shake FX
-	P.x,P.y,P.size=x,y,size or 1
+	P.x,P.y,P.size=0,0,1
 	P.frameColor=0
 
-	P.small=P.size<.1--If draw in small mode
+	P.mini=mini--If draw in small mode
-	if P.small then
+
-		P.fieldX,P.fieldY=P.x,P.y
+	--Set these at Player:setPosition()
-		P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
+	-- P.fieldX,P.fieldY=...
+	-- P.centerX,P.centerY=...
+	-- P.absFieldX,P.absFieldY=...
+
+	if P.mini then
 		P.canvas=love.graphics.newCanvas(60,120)
 		P.frameWait=rnd(30,120)
 		P.draw=PLY.draw.small
 	else
 		P.keyRec=true--If calculate keySpeed
-		P.fieldX,P.fieldY=P.x+150*P.size,P.y+70*P.size
-		P.centerX,P.centerY=P.x+300*P.size,P.y+370*P.size
-		P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
 		P.draw=PLY.draw.norm
-		P.bonus={}--Text objects
 	end
 	P.randGen=mt.newRandomGenerator(GAME.seed)
 
@@ -182,7 +182,7 @@ local function newEmptyPlayer(id,x,y,size)
 	P.finesseComboTime=0
 	P.dropFX,P.moveFX,P.lockFX,P.clearFX={},{},{},{}
 	P.tasks={}--Tasks
-	P.bonus={}--Texts
+	P.bonus={}--Text objects
 
 	P.endCounter=0--Used after gameover
 	P.result=nil--String:"WIN"/"K.O."
@@ -278,13 +278,14 @@ local function applyGameEnv(P)--Finish gameEnv processing
 
 	if ENV.nextCount==0 then ENV.nextPos=false end
 
-	if P.small then
+	if P.mini then
 		ENV.lockFX=nil
 		ENV.dropFX=nil
 		ENV.moveFX=nil
 		ENV.clearFX=nil
 		ENV.splashFX=nil
 		ENV.shakeFX=nil
+		ENV.text=nil
 	else
 		if ENV.lockFX==0 then	ENV.lockFX=nil	end
 		if ENV.dropFX==0 then	ENV.dropFX=nil	end
@@ -319,14 +320,11 @@ local DemoEnv={
 	life=1e99,
 	noMod=true,
 }
-function PLY.newDemoPlayer(id,x,y,size)
+function PLY.newDemoPlayer(id)
-	local P=newEmptyPlayer(id,x,y,size)
+	local P=newEmptyPlayer(id)
 	P.sound=true
+	P.demo=true
 
-	-- rewrite some args
-	P.fieldX,P.fieldY=P.x,P.y
-	P.centerX,P.centerY=P.x+300*P.size,P.y+600*P.size
-	P.absFieldX,P.absFieldY=P.x+150*P.size,P.y+60*P.size
 	P.draw=PLY.draw.demo
 	P.control=true
 	GAME.modeEnv=DemoEnv
@@ -344,8 +342,8 @@ function PLY.newDemoPlayer(id,x,y,size)
 	}
 	P:popNext()
 end
-function PLY.newRemotePlayer(id,x,y,size)
+function PLY.newRemotePlayer(id,mini)
-	local P=newEmptyPlayer(id,x,y,size)
+	local P=newEmptyPlayer(id,mini)
 	P.remote=true
 
 	-- P.updateAction=buildActionFunctionFromActions(P, actions)
@@ -355,8 +353,8 @@ function PLY.newRemotePlayer(id,x,y,size)
 	prepareSequence(P)
 end
 
-function PLY.newAIPlayer(id,x,y,size,AIdata)
+function PLY.newAIPlayer(id,AIdata,mini)
-	local P=newEmptyPlayer(id,x,y,size)
+	local P=newEmptyPlayer(id,mini)
 
 	loadGameEnv(P)
 	local ENV=P.gameEnv
@@ -366,8 +364,8 @@ function PLY.newAIPlayer(id,x,y,size,AIdata)
 	prepareSequence(P)
 	P:loadAI(AIdata)
 end
-function PLY.newPlayer(id,x,y,size)
+function PLY.newPlayer(id,mini)
-	local P=newEmptyPlayer(id,x,y,size)
+	local P=newEmptyPlayer(id,mini)
 	P.human=true
 	P.sound=true
 

parts/player/player.lua

@@ -104,7 +104,7 @@ function Player.createClearingFX(P,y,spd)
 end
 function Player.createBeam(P,R,send,color)
 	local x1,y1,x2,y2
-	if P.small then x1,y1=P.centerX,P.centerY
+	if P.mini then x1,y1=P.centerX,P.centerY
 	else x1,y1=P.x+(30*(P.curX+P.sc[2])-30+15+150)*P.size,P.y+(600-30*(P.curY+P.sc[1])+15+70)*P.size
 	end
 	if R.small then x2,y2=R.centerX,R.centerY
@@ -125,11 +125,47 @@ function Player.RND(P,a,b)
 	local R=P.randGen
 	return R:random(a,b)
 end
-function Player.newTask(P,code)
+function Player.newTask(P,code,...)
-	local L=P.tasks
 	local thread=ct.create(code)
-	ct.resume(thread,P)
+	ct.resume(thread,P,...)
-	L[#L+1]=thread
+	if ct.status(thread)~="dead"then
+		P.tasks[#P.tasks+1]={
+			thread=thread,
+			code=code,
+			args={...},
+		}
+	end
+end
+
+function Player.setPosition(P,x,y,size)
+	size=size or 1
+	P.x,P.y,P.size=x,y,size
+	if P.mini or P.demo then
+		P.fieldX,P.fieldY=x,y
+		P.centerX,P.centerY=x+300*size,y+600*size
+	else
+		P.fieldX,P.fieldY=x+150*size,y+70*size
+		P.centerX,P.centerY=x+300*size,y+370*size
+		P.absFieldX,P.absFieldY=x+150*size,y+60*size
+	end
+end
+local function task_movePosition(P,x,y,size)
+	local x1,y1,size1=P.x,P.y,P.size
+	while true do
+		coroutine.yield()
+		x1=x1*.93+x*.07
+		y1=y1*.93+y*.07
+		size1=size1*.93+size*.07
+		if(x1-x)^2+(y1-y)^2<6.26 then
+			P:setPosition(x,y,size)
+			return true
+		else
+			P:setPosition(x1,y1,size1)
+		end
+	end
+end
+function Player.movePosition(P,x,y,size)
+	P:newTask(task_movePosition,x,y,size or P.size)
 end
 
 function Player.set20G(P,if20g,init)--Only set init=true when initialize CC, do not use it

parts/player/update.lua

@@ -97,8 +97,9 @@ end
 local function updateTasks(P)
 	local L=P.tasks
 	for i=#L,1,-1 do
-		assert(ct.resume(L[i]))
+		local tr=L[i].thread
-		if ct.status(L[i])=="dead"then
+		assert(ct.resume(tr))
+		if ct.status(tr)=="dead"then
 			rem(L,i)
 		end
 	end

parts/scenes/main.lua

@@ -52,7 +52,8 @@ function scene.sceneInit()
 	destroyPlayers()
 	GAME.frame=0
 	GAME.seed=math.random(2e6)
-	PLY.newDemoPlayer(1,900,35,1.1)
+	PLY.newDemoPlayer(1)
+	PLAYERS[1]:setPosition(900,30,1.1)
 end
 
 function scene.update(dt)