From 19be23c539fe0e8dd9a33092cb44be0e56f060e7 Mon Sep 17 00:00:00 2001
From: Ruslan Ignatov <ruslanlena30@gmail.com>
Date: Tue, 21 Oct 2025 13:01:18 +0300
Subject: [PATCH] Reworked player controls

---
 game/entities/player.gd |  7 +------
 game/entities/ship.gd   | 35 ++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/game/entities/player.gd b/game/entities/player.gd
index 599da0e..2f2b920 100644
--- a/game/entities/player.gd
+++ b/game/entities/player.gd
@@ -10,9 +10,4 @@ var position : Vector2:
 
 func _process(delta: float) -> void:
 	var input_direction := Input.get_vector("move_left", "move_right", "move_up", "move_down")
-	
-	if input_direction.is_zero_approx():
-		$Ship.decelerate($Ship.deceleration * delta)
-	else:
-		var acceleration : Vector2 = input_direction * $Ship.acceleration * delta
-		$Ship.accelerate(acceleration)
+	$Ship.accelerate(input_direction, delta)
diff --git a/game/entities/ship.gd b/game/entities/ship.gd
index e0789d0..8f07f99 100644
--- a/game/entities/ship.gd
+++ b/game/entities/ship.gd
@@ -25,20 +25,25 @@ func _process(delta: float) -> void:
 	position += _velocity * delta
 
 
-func accelerate(value: Vector2) -> void:
-	_velocity += value
-	_velocity = _velocity.clamp(Vector2(-max_speed, -max_speed), Vector2(max_speed, max_speed))
+func accelerate(direction: Vector2, delta: float) -> void:
+	var accel : Vector2 = direction * acceleration * delta
+	var decel : float = deceleration * delta
+	
+	_velocity.x = _get_new_speed(accel.x, decel, _velocity.x)
+	_velocity.y = _get_new_speed(accel.y, decel, _velocity.y)
+
+	if _velocity.length() > max_speed:
+		_velocity = _velocity.normalized() * max_speed
 
 
-func decelerate(value: float) -> void:
-	var current_speed := _velocity.length()
-	
-	if current_speed <= 0:
-		_velocity = Vector2.ZERO
-		return
-	
-	var new_speed := current_speed - value
-	if new_speed < 0:
-		new_speed = 0
-	
-	_velocity = _velocity.normalized() * new_speed
+func _get_new_speed(accel: float, decel: float, current_speed: float) -> float:
+	if is_zero_approx(accel):
+		if absf(current_speed) < decel:
+			return 0.0
+		else:
+			if current_speed < 0:
+				return current_speed + decel
+			else:
+				return current_speed - decel
+	else:
+		return current_speed + accel