feat: add state machine movement classes, double barrel shotgun weapon, and test level builder utility

movement/states/state_air.gd

@@ -31,20 +31,23 @@ func update(delta: float) -> void:
 	# ── Air control ───────────────────────────────────────────────────────
 	var wish_dir: Vector3 = machine.wish_dir_world
 	var hvel := Vector3(vel.x, 0.0, vel.z)
-	var current_speed := hvel.length()
 
 	if wish_dir.length_squared() > 0.01:
-		var target_speed := maxf(current_speed, params.walk_speed)
-		target_speed = minf(target_speed, params.max_air_speed)
+		wish_dir = wish_dir.normalized()
+		var current_speed = hvel.length()
 		
-		var target_vel := wish_dir * target_speed
-		var new_hvel = hvel.lerp(target_vel, 1.0 - exp(-params.air_control * params.air_acceleration * delta))
+		# Add a strong force in the wish direction
+		var air_accel = params.air_strafe_accel * delta
+		var new_hvel = hvel + wish_dir * air_accel
 		
-		# Prevent speed loss during sharp turns, but allow braking if holding backward
-		if hvel.dot(target_vel) >= 0.0 and current_speed > params.walk_speed:
-			if new_hvel.length_squared() > 0.01:
-				new_hvel = new_hvel.normalized() * current_speed
-				
+		# Limit the speed so we don't gain speed purely from air control.
+		# We only allow air control to change our direction (strafing) 
+		# or to accelerate us up to our walk speed if we started slow.
+		var max_allowed_speed = maxf(current_speed, params.walk_speed)
+		
+		if new_hvel.length() > max_allowed_speed:
+			new_hvel = new_hvel.normalized() * max_allowed_speed
+			
 		hvel = new_hvel
 	else:
 		# No input: slight air drag (very subtle)
@@ -64,7 +67,7 @@ func update(delta: float) -> void:
 		# Bunny hop: if jump was buffered or pressed on landing frame
 		if machine.input_jump_pressed or machine.jump_buffer_time > 0.0:
 			var land_speed := Vector3(player.velocity.x, 0.0, player.velocity.z).length()
-			var bhop_speed := minf(land_speed + params.bunny_hop_speed_gain, params.bunny_hop_speed_cap)
+			var bhop_speed := maxf(land_speed, minf(land_speed + params.bunny_hop_speed_gain, params.bunny_hop_speed_cap))
 			# Maintain horizontal direction, boost speed
 			var hdir := Vector3(player.velocity.x, 0.0, player.velocity.z)
 			if hdir.length_squared() > 0.01:

movement/states/state_ground.gd

@@ -26,6 +26,33 @@ func update(delta: float) -> void:
 	var player := machine.player
 	var vel: Vector3 = player.velocity
 
+	# ── Jump (coyote time + jump buffer) ──────────────────────────────────
+	if machine.input_jump_just_pressed and machine.coyote_timer > 0.0:
+		player.velocity.y = params.jump_velocity
+		machine.current_jump_count = 1
+		machine.on_ground = false
+		machine.coyote_timer = 0.0
+		machine.register_chain_mechanic("jump")
+		machine.switch_to("air")
+		return
+
+	# Jump buffer: player pressed jump just before landing
+	if machine.on_ground and machine.jump_buffer_time > 0.0:
+		player.velocity.y = params.jump_velocity
+		machine.current_jump_count = 1
+		machine.on_ground = false
+		machine.jump_buffer_time = 0.0
+		machine.register_chain_mechanic("jump")
+		machine.switch_to("air")
+		return
+
+	# ── Slide (crouch while moving fast enough) ───────────────────────────
+	if machine.input_crouch and machine.slide_cooldown_timer <= 0.0:
+		var hspeed := Vector3(player.velocity.x, 0.0, player.velocity.z).length()
+		if hspeed > params.slide_min_speed:
+			machine.switch_to("slide")
+			return
+
 	# ── Determine target speed ────────────────────────────────────────────
 	var wish_dir: Vector3 = machine.wish_dir_world
 	var speed := params.walk_speed
@@ -66,38 +93,11 @@ func update(delta: float) -> void:
 	else:
 		machine.on_ground = false
 
-	# ── Jump (coyote time + jump buffer) ──────────────────────────────────
-	if machine.input_jump_just_pressed and machine.coyote_timer > 0.0:
-		player.velocity.y = params.jump_velocity
-		machine.current_jump_count = 1
-		machine.on_ground = false
-		machine.coyote_timer = 0.0
-		machine.register_chain_mechanic("jump")
-		machine.switch_to("air")
-		return
-
-	# Jump buffer: player pressed jump just before landing
-	if machine.on_ground and machine.jump_buffer_time > 0.0:
-		player.velocity.y = params.jump_velocity
-		machine.current_jump_count = 1
-		machine.on_ground = false
-		machine.jump_buffer_time = 0.0
-		machine.register_chain_mechanic("jump")
-		machine.switch_to("air")
-		return
-
 	# ── Falling off ledge → air state ─────────────────────────────────────
 	if not machine.on_ground and machine.coyote_timer <= 0.0:
 		machine.switch_to("air")
 		return
 
-	# ── Slide (crouch while moving fast enough) ───────────────────────────
-	if machine.input_crouch and machine.slide_cooldown_timer <= 0.0:
-		var hspeed := Vector3(player.velocity.x, 0.0, player.velocity.z).length()
-		if hspeed > params.slide_min_speed:
-			machine.switch_to("slide")
-			return
-
 	# ── Wall run check ────────────────────────────────────────────────────
 	var wall_n := machine.detect_wall_horizontal()
 	if wall_n != Vector3.ZERO and machine.input_dir.length() > 0.1:

movement/states/state_slide.gd

@@ -93,7 +93,8 @@ func update(delta: float) -> void:
 		var hvel := Vector3(player.velocity.x, 0.0, player.velocity.z)
 		if hvel.length_squared() > 0.01:
 			var dir := hvel.normalized()
-			var jump_speed := minf(hvel.length() + params.slide_jump_speed_boost, params.bunny_hop_speed_cap)
+			var current_speed := hvel.length()
+			var jump_speed := maxf(current_speed, minf(current_speed + params.slide_jump_speed_boost, params.bunny_hop_speed_cap))
 			player.velocity.x = dir.x * jump_speed
 			player.velocity.z = dir.z * jump_speed
 		machine.current_jump_count = 1