diff --git a/assets/player.tscn b/assets/player.tscn index 4719128..1ab6e06 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=40 format=3 uid="uid://drwae3loscbw7"] +[gd_scene load_steps=42 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://linvnr16djav" path="res://scripts/PlayerStateMachine.gd" id="2_1npgd"] [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="Script" uid="uid://clyi3lxv4xt4g" path="res://scripts/player_jumping.gd" id="5_m0ick"] [ext_resource type="PackedScene" uid="uid://br882tlh3cfwu" path="res://hud.tscn" id="5_yenaw"] +[ext_resource type="Script" uid="uid://dac0eeav1jped" path="res://scripts/player_falling.gd" id="6_1npgd"] [ext_resource type="AudioStream" uid="uid://bki17g7j4kqn4" path="res://assets/Audio/PickupSound Mixdown 3.wav" id="8_dwqsx"] [ext_resource type="Shader" uid="uid://djbvmc8hurccm" path="res://assets/Shaders/speedlines.gdshader" id="10_5hu7c"] [ext_resource type="AudioStream" uid="uid://dyd272r7n2ecd" path="res://assets/Audio/footsteps-shoes-jump-land-beach-sand-SBA-300118001.wav" id="10_tn0pn"] @@ -138,7 +140,7 @@ SENSITIVITY = 0.008 weapon_holder = NodePath("Head/Recoil/Camera3D/WeaponHolder") [node name="States" type="Node" parent="." node_paths=PackedStringArray("character", "initial_state")] -script = ExtResource("2_irwor") +script = ExtResource("2_1npgd") character = NodePath("..") initial_state = NodePath("On Foot") @@ -149,9 +151,13 @@ 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 +move_transition_speed = 4.0 [node name="Jumping" type="Node" parent="States"] +script = ExtResource("5_m0ick") + +[node name="Falling" type="Node" parent="States"] +script = ExtResource("6_1npgd") [node name="Wall Running" type="Node" parent="States"] diff --git a/scripts/PlayerStateMachine.gd b/scripts/PlayerStateMachine.gd index 4f335b2..06ad459 100644 --- a/scripts/PlayerStateMachine.gd +++ b/scripts/PlayerStateMachine.gd @@ -1,7 +1,7 @@ extends Node class_name PlayerStateMachine -@export var player : Player +@export var character : Player @export var initial_state : State var current_state : State @@ -39,4 +39,4 @@ func on_child_transition(state,new_state_name): new_state.Enter() current_state = new_state - print("STATE CHANGED TO : ",current_state) + print("PLAYER STATE CHANGED TO : ",current_state) diff --git a/scripts/PlayerStates.gd b/scripts/PlayerStates.gd index 874975b..74019f5 100644 --- a/scripts/PlayerStates.gd +++ b/scripts/PlayerStates.gd @@ -12,3 +12,6 @@ var look_target func standard_movement(delta): 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) + +func apply_gravity(delta): + character.velocity.y -= 9.8 * 1.25 * delta diff --git a/scripts/StateMachine.gd b/scripts/StateMachine.gd index 59245a4..e88bc19 100644 --- a/scripts/StateMachine.gd +++ b/scripts/StateMachine.gd @@ -39,4 +39,4 @@ func on_child_transition(state,new_state_name): new_state.Enter() current_state = new_state - print("STATE CHANGED TO : ",current_state) + #print("STATE CHANGED TO : ",current_state)