Merge pull request #7 from NNanfeng/nnanfeng_test

update flowstate
r5rcn · May 16, 2023 · b212870 · b212870
2 parents a1316b2 + 11474a2
commit b212870
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/r5_flowstate/platform/scripts/vscripts/gamemodes/custom_ctf/_gamemode_custom_ctf.nut b/r5_flowstate/platform/scripts/vscripts/gamemodes/custom_ctf/_gamemode_custom_ctf.nut
@@ -1137,6 +1137,8 @@ void function _OnPlayerConnected(entity player)
     if( !IsAlive(player) )
         _HandleRespawn(player)
 
+	thread Flowstate_InitAFKThreadForPlayer(player)
+
     switch ( GetGameState() )
     {
     case eGameState.WaitingForPlayers:

diff --git a/r5_flowstate/platform/scripts/vscripts/gamemodes/fs_1v1/_gamemode_1v1.nut b/r5_flowstate/platform/scripts/vscripts/gamemodes/fs_1v1/_gamemode_1v1.nut
@@ -1316,10 +1316,12 @@ void function soloModeThread(LocPair waitingRoomLocation)
 
 			thread respawnInSoloMode(eachPlayer, index)
 		}
-		newGroup.ring = CreateSmallRingBoundary(soloLocations[newGroup.slotIndex].Center)
-
-		if(IsValid(GetMainRingBoundary()))
-			newGroup.ring.SetParent(GetMainRingBoundary())
+		try{
+			newGroup.ring = CreateSmallRingBoundary(soloLocations[newGroup.slotIndex].Center)
+
+			if(IsValid(GetMainRingBoundary()))
+				newGroup.ring.SetParent(GetMainRingBoundary())
+		}catch(e420){}
 
 		setRealms_1v1(newGroup.ring,newGroup.slotIndex+1)
 		//realms = 0 means visible for everyone,so it should be more than 1

diff --git a/r5_flowstate/platform/scripts/vscripts/gamemodes/fs_movementgym/cl_movement_gym.nut b/r5_flowstate/platform/scripts/vscripts/gamemodes/fs_movementgym/cl_movement_gym.nut
@@ -179,7 +179,7 @@ void function MG_Speedometer(){
 
 					playerVel = sqrt(playerVelV.x * playerVelV.x + playerVelV.y * playerVelV.y + playerVelV.z * playerVelV.z)
 
-					float playerVelNormal = playerVel * (0.091392) //KM/H
+					float playerVelNormal = playerVel * (0.06858) //KM/H
 
 					int playerVelNormalInt = playerVelNormal.tointeger()
 
@@ -196,7 +196,7 @@ void function MG_Speedometer(){
 
 						playerVel = sqrt(playerVelV.x * playerVelV.x + playerVelV.y * playerVelV.y + playerVelV.z * playerVelV.z)
 
-						float playerVelNormal = playerVel * (0.091392) //KM/H
+						float playerVelNormal = playerVel * (0.06858) //KM/H
 
 						int playerVelNormalInt = playerVelNormal.tointeger()
 
@@ -220,7 +220,7 @@ void function MG_Speedometer(){
 
 					playerVel = sqrt(playerVelV.x * playerVelV.x + playerVelV.y * playerVelV.y + playerVelV.z * playerVelV.z)
 
-					float playerVelNormal = playerVel * (0.091392) //KM/H
+					float playerVelNormal = playerVel * (0.06858) //KM/H
 					float playerVelBigMac = playerVelNormal * (0.621371) //MPH
 
 					int playerVelNormalInt = playerVelNormal.tointeger()
@@ -239,7 +239,7 @@ void function MG_Speedometer(){
 
 						playerVel = sqrt(playerVelV.x * playerVelV.x + playerVelV.y * playerVelV.y + playerVelV.z * playerVelV.z)
 
-						float playerVelNormal = playerVel * (0.091392) //KM/H
+						float playerVelNormal = playerVel * (0.06858) //KM/H
 						float playerVelBigMac = playerVelNormal * (0.621371) //MPH
 
 						int playerVelNormalInt = playerVelNormal.tointeger()