1

Assets/Artists/Scripts/Vehicle/BITFALL.Vehicle.Runtime.asmdef

@@ -7,7 +7,9 @@
         "GUID:709caf8d7fb6ef24bbba0ab9962a3ad0",
         "GUID:1235ca61e7f433b408ed5a68767e7123",
         "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:2e7f0f7a8ee6e144db6fb95614c6d8fe"
+        "GUID:2e7f0f7a8ee6e144db6fb95614c6d8fe",
+        "GUID:d525ad6bd40672747bde77962f1c401e",
+        "GUID:49b49c76ee64f6b41bf28ef951cb0e50"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Artists/Scripts/Vehicle/WorldHelicopter.cs

@@ -22,6 +22,8 @@ namespace BITKit.Vehicles
 		[SerializeField] private new Rigidbody rigidbody;
 		[SerializeField] private new Collider collider;
 		[SerializeField] private Transform model;
+		
+		[SerializeReference,SubclassSelector] private IPlayerFixedPlace fixedPlace;
 
 		private Vector2 _movement;
 
@@ -32,9 +34,10 @@ namespace BITKit.Vehicles
 		private bool _hover;
 		private bool _reset;
 
-		private IPlayerFixedPlace _fixedPlace;
+	
 		private Transform Transform;
-private Vector3 _initialPosition;
+		private Vector3 _initialPosition;
+		private readonly ValidHandle _resetHandle=new();
 		
 		private void Start()
 		{
@@ -50,6 +53,9 @@ private Vector3 _initialPosition;
 			var newRotation = Quaternion.LookRotation(Vector3.ProjectOnPlane(Transform.forward, Vector3.up));
 			
 			rigidbody.MoveRotation(newRotation);
+
+			fixedPlace.OnPlayerEntered += x => _resetHandle.RemoveElement(111);
+			fixedPlace.OnPlayerExited += x => _resetHandle.AddElement(111);
 		}
 
 		private void FixedUpdate()
@@ -59,7 +65,7 @@ private Vector3 _initialPosition;
 			var offsetX = Mathf.PerlinNoise(Time.time, 0) - 0.5f;
 			var offsetY = Mathf.PerlinNoise(0, Time.time) - 0.5f;
 
-
+			_resetHandle.SetElements(123,_reset);
 
 			rigidbody.useGravity = !_hover;
 
@@ -70,7 +76,8 @@ private Vector3 _initialPosition;
 			var moveForce = up * (_AscendAndDescend * upForce * Time.fixedDeltaTime);
 
 			var newRotation = Quaternion.LookRotation(Vector3.ProjectOnPlane(Transform.forward, Vector3.up));
-			if (_reset)
+			
+			if (_resetHandle)
 			{
 				rigidbody.AddTorque(MathV.CalculateTorque(Transform,newRotation) * (torqueResetDelta * Time.fixedDeltaTime),
 					ForceMode.VelocityChange);
@@ -161,7 +168,5 @@ private Vector3 _initialPosition;
 				_reset = false;
 			}
 		}
-
-		
 	}
 }