dash + fire rate

This commit is contained in:
Michael Campbell 2026-02-18 14:03:41 -05:00
parent 5bac9ddd2a
commit 1318fdd9fc
7 changed files with 105 additions and 16 deletions

View file

@ -1,7 +1,14 @@
class_name Player
extends CharacterBody3D
enum State {
NORMAL,
DASHING,
LOCKED,
}
const MOVE_SPEED := 5.
const DASH_SPEED := 25.
static var instance: Player
@ -17,18 +24,39 @@ var health := 3:
if is_node_ready():
%HealthLabel.text = "Health: %d" % v
var state := State.NORMAL
var dash_direction: Vector2
var stamina := 1.0
func _init() -> void:
instance = self
func _ready() -> void:
health = health
func _process_stamina(delta: float) -> void:
stamina = move_toward(stamina, 1., delta * 0.2)
%StaminaBar.value = stamina
func _process_movement() -> void:
var input = Input.get_vector("move_left", "move_right", "move_up", "move_down")
input.normalized()
velocity = Vector3(input.x, 0., input.y) * MOVE_SPEED
move_and_slide()
if Input.is_action_just_pressed("dash") and stamina >= 1.:
stamina = 0.
dash_direction = input
state = State.DASHING
await get_tree().create_timer(.25, false).timeout
state = State.LOCKED
await get_tree().create_timer(.5, false).timeout
state = State.NORMAL
func _process_dash() -> void:
velocity = Vector3(dash_direction.x, 0., dash_direction.y) * DASH_SPEED
move_and_slide()
func _process_aim() -> void:
var viewport_mouse_pos := get_viewport().get_mouse_position()
var r_origin: Vector3 = %Camera3D.project_ray_origin(viewport_mouse_pos)
@ -48,13 +76,22 @@ func _process_aim() -> void:
%Reticle.position = to_mouse_pos
func _process_shoot() -> void:
if Input.is_action_just_pressed("fire"):
var fire_clock := 0.
func _process_shoot(delta: float) -> void:
var clock_mul := 1.
match state:
State.DASHING: clock_mul = 2.5
State.LOCKED: clock_mul = 2.5
fire_clock -= delta * clock_mul
if Input.is_action_pressed("fire") and fire_clock <= 0.:
var dir := Vector3.RIGHT.rotated(Vector3.UP, aim_angle)
var player_projectile: PlayerProjectile = preload("player_projectile.tscn").instantiate()
player_projectile.init(dir)
player_projectile.global_position = global_position + Vector3.UP * 0.5
add_sibling(player_projectile)
fire_clock = 60. / 125.
func _process_cam_shake(delta: float) -> void:
shake_duration -= delta
@ -72,18 +109,27 @@ func _process_cam_shake(delta: float) -> void:
%Camera3D.position += v * .5
func _process(delta: float) -> void:
_process_movement()
match state:
State.NORMAL: _process_movement()
State.DASHING: _process_dash()
State.LOCKED: pass
_process_aim()
_process_shoot()
_process_shoot(delta)
_process_cam_shake(delta)
_process_stamina(delta)
damage_clock -= delta
func damage() -> void:
if damage_clock <= 0.:
health -= 1
damage_clock = 3
shake_duration = .25
func damage(damager: Node3D) -> void:
if state == State.DASHING:
damager.queue_free()
else:
if damage_clock <= 0.:
health -= 1
damage_clock = 3
shake_duration = .25
if health == 0:
get_tree().reload_current_scene()
if health == 0:
get_tree().reload_current_scene()