Merge branch 'wstest_3_28' into main

parts/modes/custom_clear.lua

@@ -71,7 +71,7 @@ return{
 			PLY.newAIPlayer(2,AIBUILDER("CC",2*AIlevel-1,math.floor(AIlevel*.5+1),true,20000+5000*AIlevel))
 		end
 
-		for _,P in next,PLAYERS.alive do
+		for _,P in next,PLY_ALIVE do
 			setField(P,1)
 		end
 	end,

parts/modes/marathon_h.lua

@@ -9,17 +9,15 @@ return{
 		task=function(P)P.modeData.target=50 end,
 		dropPiece=function(P)
 			if P.stat.row>=P.modeData.target then
-				local T=P.modeData.target
-				if T==50 then
+				if P.modeData.target==50 then
 					P.gameEnv.drop=.25
 					P.modeData.target=100
 					SFX.play("reach")
-				elseif T==100 then
+				elseif P.modeData.target==100 then
 					P:set20G(true)
 					P.modeData.target=200
 					SFX.play("reach")
 				else
-					P.stat.row=200
 					P:win("finish")
 				end
 			end

parts/modes/marathon_n.lua

@@ -8,14 +8,15 @@ return{
 		drop=60,wait=8,fall=20,
 		task=function(P)P.modeData.target=10 end,
 		dropPiece=function(P)
-			local T=P.modeData.target
-			if P.stat.row>=T then
-				if T==200 then
+			if P.stat.row<180 then
+				P.stat.row=180
+			end
+			if P.stat.row>=P.modeData.target then
+				if P.modeData.target==200 then
 					P:win("finish")
 				else
-					T=T+10
-					P.gameEnv.drop=dropSpeed[T/10]
-					P.modeData.target=T
+					P.gameEnv.drop=dropSpeed[P.modeData.target/10]
+					P.modeData.target=P.modeData.target+10
 					SFX.play("reach")
 				end
 			end
@@ -31,7 +32,7 @@ return{
 	mesDisp=function(P)
 		setFont(45)
 		mStr(P.stat.row,69,320)
-		mStr(P.modeData.target+10,69,370)
+		mStr(P.modeData.target,69,370)
 		gc.rectangle("fill",25,375,90,4)
 	end,
 	score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,

parts/modes/netBattle.lua

@@ -4,15 +4,16 @@ return{
 		drop=30,
 		freshLimit=15,
 		noMod=true,
+		bg="space",
 	},
-	load=function(playerData)
+	load=function()
 		PLY.newPlayer(1)
 		local N=2
-		for i=1,#playerData do
-			if playerData[i].id==tostring(USER.id)then
-				PLAYERS[1].subID=playerData[1].sid
+		for i=1,#PLY_NET do
+			if PLY_NET[i].uid==USER.uid then
+				PLAYERS[1].subID=PLY_NET[1].sid
 			else
-				PLY.newRemotePlayer(N,false,playerData[i])
+				PLY.newRemotePlayer(N,false,PLY_NET[i])
 				N=N+1
 			end
 		end

parts/modes/round_e.lua

@@ -1,5 +1,5 @@
 local function update_round(P)
-	if #PLAYERS.alive>1 then
+	if #PLY_ALIVE>1 then
 		P.control=false
 		local ID=P.id
 		repeat

parts/modes/round_h.lua

@@ -1,5 +1,5 @@
 local function update_round(P)
-	if #PLAYERS.alive>1 then
+	if #PLY_ALIVE>1 then
 		P.control=false
 		local ID=P.id
 		repeat

parts/modes/round_l.lua

@@ -1,5 +1,5 @@
 local function update_round(P)
-	if #PLAYERS.alive>1 then
+	if #PLY_ALIVE>1 then
 		P.control=false
 		local ID=P.id
 		repeat

parts/modes/round_n.lua

@@ -1,5 +1,5 @@
 local function update_round(P)
-	if #PLAYERS.alive>1 then
+	if #PLY_ALIVE>1 then
 		P.control=false
 		local ID=P.id
 		repeat

parts/modes/round_u.lua

@@ -1,5 +1,5 @@
 local function update_round(P)
-	if #PLAYERS.alive>1 then
+	if #PLY_ALIVE>1 then
 		P.control=false
 		local ID=P.id
 		repeat

parts/modes/techmino49_e.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/49",69,175)
+		mStr(#PLY_ALIVE.."/49",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)

parts/modes/techmino49_h.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/49",69,175)
+		mStr(#PLY_ALIVE.."/49",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)

parts/modes/techmino49_u.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/49",69,175)
+		mStr(#PLY_ALIVE.."/49",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)

parts/modes/techmino99_e.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/99",69,175)
+		mStr(#PLY_ALIVE.."/99",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)

parts/modes/techmino99_h.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/99",69,175)
+		mStr(#PLY_ALIVE.."/99",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)

parts/modes/techmino99_u.lua

@@ -59,7 +59,7 @@ return{
 	end,
 	mesDisp=function(P)
 		setFont(35)
-		mStr(#PLAYERS.alive.."/99",69,175)
+		mStr(#PLY_ALIVE.."/99",69,175)
 		mStr(P.modeData.ko,80,215)
 		gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
 		setFont(20)