derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Started work and initial commit

Browse Source
This commit is contained in:
derek
2024-10-02 14:54:32 -05:00
parent 5d2cd1a13e
commit 3121e9d4d2
22 changed files with 763 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/player.gd
View File

@@ -44,10 +44,10 @@ var start_sensitivity
var gun : Node
@onready var gun_ray = $Head/Camera3D/GunRay
@onready var gun_ray = $Head/Recoil/Camera3D/GunRay
@onready var level_control = get_tree().current_scene
@onready var interact_ray = $Head/Camera3D/InteractRay
@onready var bullet_ray = $Head/Camera3D/BulletRay
@onready var interact_ray = $Head/Recoil/Camera3D/InteractRay
@onready var bullet_ray = $Head/Recoil/Camera3D/BulletRay
var instance_bullet
var instance_casing
var instance_mag
@@ -77,19 +77,19 @@ var pickup_announce = load("res://assets/pickup_announce.tscn")
var dead_announce = load("res://assets/dead_announce.tscn")
var pickupmsg
@onready var crosshair = $Head/Camera3D/Crosshair
@onready var crosshair = $Head/Recoil/Camera3D/Crosshair
@onready var head = $Head
@onready var camera = $Head/Camera3D
@onready var camera = $Head/Recoil/Camera3D
@onready var world_environment = $"../WorldEnvironment"
@onready var pickup_sound = $Audio/PickupSound
@onready var ear_wind = $Audio/EarWind
@onready var land_sound: AudioStreamPlayer = $Audio/LandSound
@onready var hurt_audio = $Audio/Hurt
@onready var health_indicator = $HealthIndicator
@onready var ammo_counter = $Head/Camera3D/AmmoCounter
@onready var stamina_counter = $Head/Camera3D/StaminaCounter
@onready var weapon_spawner = $Head/Camera3D/WeaponHolder/WeaponSpawner
@onready var ammo_counter = $Head/Recoil/Camera3D/AmmoCounter
@onready var stamina_counter = $Head/Recoil/Camera3D/StaminaCounter
@onready var recoil: Node3D = $Head/Recoil
@onready var weapon_spawner = $Head/Recoil/Camera3D/WeaponHolder/WeaponSpawner
@onready var pick_up_detection = $pick_up_detection
@onready var item_holder: Node3D = $Head/ItemHolder
@@ -333,7 +333,5 @@ func weapon_bob(vel : float, delta):
weapon_holder.position.y = lerp(weapon_holder.position.y, def_weapon_holder_pos.y, .1 * delta)
weapon_holder.position.x = lerp(weapon_holder.position.x, def_weapon_holder_pos.x, .1 * delta)
func weapon_recoil(delta):
func weapon_recoil():
pass
#var recoil_to = camera.rotation.x + gun.recoil_amount
#camera.rotation.x = clamp(lerp(camera.rotation.x,recoil_to, .05), deg_to_rad(-90), deg_to_rad(85))