diff --git a/assets/player.tscn b/assets/player.tscn index c85a98a..4719128 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=39 format=3 uid="uid://drwae3loscbw7"] +[gd_scene load_steps=40 format=3 uid="uid://drwae3loscbw7"] [ext_resource type="Script" uid="uid://bieeh1iro4ji1" path="res://scripts/player.gd" id="1_x7wms"] [ext_resource type="Script" uid="uid://csju024nerln6" path="res://scripts/StateMachine.gd" id="2_irwor"] [ext_resource type="Script" uid="uid://s2nes6cthron" path="res://scripts/recoil.gd" id="3_405jc"] [ext_resource type="Script" uid="uid://o7g6oowyn6pe" path="res://scripts/player_on_foot.gd" id="3_ib4e7"] +[ext_resource type="Script" uid="uid://dlymy0m127nt0" path="res://scripts/player_crouched.gd" id="4_67mtf"] [ext_resource type="Texture2D" uid="uid://cknftvqq8rbrm" path="res://assets/Textures/Cookie_tutorial_texture_flashlight.png" id="4_x670l"] [ext_resource type="PackedScene" uid="uid://dqgtnykkbngem" path="res://assets/weapon_select.tscn" id="5_bvbcl"] [ext_resource type="PackedScene" uid="uid://br882tlh3cfwu" path="res://hud.tscn" id="5_yenaw"] @@ -136,9 +137,9 @@ script = ExtResource("1_x7wms") SENSITIVITY = 0.008 weapon_holder = NodePath("Head/Recoil/Camera3D/WeaponHolder") -[node name="States" type="Node" parent="." node_paths=PackedStringArray("player_character", "initial_state")] +[node name="States" type="Node" parent="." node_paths=PackedStringArray("character", "initial_state")] script = ExtResource("2_irwor") -player_character = NodePath("..") +character = NodePath("..") initial_state = NodePath("On Foot") [node name="On Foot" type="Node" parent="States"] @@ -146,6 +147,9 @@ script = ExtResource("3_ib4e7") metadata/_custom_type_script = "uid://dk0vg5btak80a" [node name="Crouched" type="Node" parent="States"] +script = ExtResource("4_67mtf") +move_speed = 5.0 +move_transition_speed = 3.0 [node name="Jumping" type="Node" parent="States"] diff --git a/scripts/PlayerStates.gd b/scripts/PlayerStates.gd index 6ab3f16..874975b 100644 --- a/scripts/PlayerStates.gd +++ b/scripts/PlayerStates.gd @@ -4,11 +4,11 @@ class_name PlayerState @export var move_speed: float = 12 @export var move_transition_speed : float = 7 -@onready var player_character = get_parent().player_character +@onready var character = get_parent().character var move_target var look_target func standard_movement(delta): - player_character.velocity.x = lerp(player_character.velocity.x, player_character.movement_input().x * move_speed,delta * move_transition_speed) - player_character.velocity.z = lerp(player_character.velocity.z, player_character.movement_input().z * move_speed,delta * move_transition_speed) + character.velocity.x = lerp(character.velocity.x, character.movement_input().x * move_speed,delta * move_transition_speed) + character.velocity.z = lerp(character.velocity.z, character.movement_input().z * move_speed,delta * move_transition_speed) diff --git a/scripts/StateMachine.gd b/scripts/StateMachine.gd index aed1ab0..59245a4 100644 --- a/scripts/StateMachine.gd +++ b/scripts/StateMachine.gd @@ -1,7 +1,7 @@ extends Node class_name StateMachine -@export var player_character : Player +@export var character : Player @export var initial_state : State var current_state : State