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

made tracker gun and blunderbuss tweaks

Browse Source
This commit is contained in:
Derek
2024-11-24 20:48:18 -06:00
parent 0312da48b8
commit cca03000e5
10 changed files with 2356 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/trackerGun.gd
View File

@@ -38,10 +38,12 @@ extends Node3D
@onready var player = get_tree().current_scene.player
@onready var level_control = get_tree().current_scene
@onready var ammo_current
@onready var tracker_marker = load("res://assets/shoot_marker.tscn")
@onready var tracker_marker = load("res://assets/tracker_marker.tscn")
@onready var tracker_indicator_material = tracker_indicator.get_surface_override_material(0)
var tracker : Node
var tracker_check_mesh
var check_track : bool = false
var start_position
var start_rotation
var random_spread_start
@@ -57,8 +59,11 @@ const tracker_assigned_color = Color(0, 0.853, 0)
# Called when the node enters the scene tree for the first time.
func _ready():
random_spread_start = random_spread_amt
tracker_check_mesh = tracker_marker.instantiate()
get_tree().get_root().add_child(tracker_check_mesh)
tracker_check_mesh.visible = false
random_spread_start = random_spread_amt
ammo_current = level_control.ammo_current[gun_index]
ammo_reserve = level_control.ammo_reserve[gun_index]
@@ -81,6 +86,9 @@ func _process(_delta):
tracker_indicator_material.emission = tracker_assigned_color
else:
tracker_indicator_material.emission = tracker_null_color
if check_track:
tracker_checker(_delta)
func reload_finished():
@@ -94,8 +102,10 @@ func reload_finished():
func shoot(delta):
if !anim_player.is_playing():
if tracker == null and Input.is_action_just_pressed("shoot"):
fire_tracker()
else:
check_track = true
tracker_check_mesh.visible = true
tracker_check_mesh.anim_player.play("check")
if tracker != null and !check_track:
fire()
@@ -111,7 +121,6 @@ func fire():
spawn_casing()
player.recoil.add_recoil(Vector3(0,recoil_amount.y,recoil_amount.z),10,10)
player.recoil.add_gun_recoil(recoil_amount.x)
#player.velocity += player.bullet_ray.global_basis * Vector3(0,0, kick_amount)
if fire_mode != 0:
cycle_count -= 1
@@ -119,6 +128,15 @@ func fire():
anim_player.play("empty")
audio_empty.play()
func tracker_checker(_delta):
if player.bullet_ray.is_colliding():
var spawn_loc = player.bullet_ray.get_collision_point()
tracker_check_mesh.global_transform.origin = spawn_loc
tracker_check_mesh.global_rotation = Vector3(0,0,0)
if check_track == true and Input.is_action_just_released("shoot"):
fire_tracker()
check_track = false
func fire_tracker():
anim_player.play("fire_tracker")
var instance_tracker = tracker_marker.instantiate()
@@ -128,7 +146,9 @@ func fire_tracker():
if spawn_parent != null:
spawn_parent.add_child(instance_tracker)
instance_tracker.global_transform.origin = spawn_loc
instance_tracker.anim_player.play("mark")
tracker = instance_tracker
tracker_check_mesh.visible = false
func remove_tracker():
if tracker != null:
@@ -187,4 +207,5 @@ func bullet_fire():
func swapped_out():
tracker_check_mesh.visible = false
queue_free()