fixed attack in state machine
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=77 format=4 uid="uid://djr7vnr1hcx82"]
|
[gd_scene load_steps=78 format=4 uid="uid://djr7vnr1hcx82"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://cdofgtwevbray" path="res://scripts/spider.gd" id="1_7e7fe"]
|
[ext_resource type="Script" uid="uid://cdofgtwevbray" path="res://scripts/spider.gd" id="1_7e7fe"]
|
||||||
[ext_resource type="PackedScene" uid="uid://h5ojldugfyyu" path="res://assets/bullet_enemy.tscn" id="2_aew5r"]
|
[ext_resource type="PackedScene" uid="uid://h5ojldugfyyu" path="res://assets/bullet_enemy.tscn" id="2_aew5r"]
|
||||||
@@ -792,6 +792,10 @@ _surfaces = [{
|
|||||||
[sub_resource type="BoxShape3D" id="BoxShape3D_xxx55"]
|
[sub_resource type="BoxShape3D" id="BoxShape3D_xxx55"]
|
||||||
size = Vector3(0.816284, 0.725159, 0.75531)
|
size = Vector3(0.816284, 0.725159, 0.75531)
|
||||||
|
|
||||||
|
[sub_resource type="CylinderShape3D" id="CylinderShape3D_gicen"]
|
||||||
|
height = 0.356583
|
||||||
|
radius = 0.207031
|
||||||
|
|
||||||
[node name="spider" type="CharacterBody3D" node_paths=PackedStringArray("nav_agent") groups=["enemy", "persist"]]
|
[node name="spider" type="CharacterBody3D" node_paths=PackedStringArray("nav_agent") groups=["enemy", "persist"]]
|
||||||
collision_layer = 8
|
collision_layer = 8
|
||||||
collision_mask = 521
|
collision_mask = 521
|
||||||
@@ -825,8 +829,10 @@ script = ExtResource("9_6mvds")
|
|||||||
enemy = NodePath("../..")
|
enemy = NodePath("../..")
|
||||||
metadata/_custom_type_script = "uid://dhxolagi0b5s1"
|
metadata/_custom_type_script = "uid://dhxolagi0b5s1"
|
||||||
|
|
||||||
[node name="Attack" type="Node" parent="StateMachine"]
|
[node name="Attack" type="Node" parent="StateMachine" node_paths=PackedStringArray("enemy", "enemy_targets")]
|
||||||
script = ExtResource("10_gicen")
|
script = ExtResource("10_gicen")
|
||||||
|
enemy = NodePath("../..")
|
||||||
|
enemy_targets = [NodePath("../../body/backTarget")]
|
||||||
|
|
||||||
[node name="HealthBarSprite" parent="." node_paths=PackedStringArray("character") instance=ExtResource("7_87l3v")]
|
[node name="HealthBarSprite" parent="." node_paths=PackedStringArray("character") instance=ExtResource("7_87l3v")]
|
||||||
transform = Transform3D(0.254412, 0, 0, 0, 0.561068, 0, 0, 0, 1, 0, 2.41498, 0)
|
transform = Transform3D(0.254412, 0, 0, 0, 0.561068, 0, 0, 0, 1, 0, 2.41498, 0)
|
||||||
@@ -1016,6 +1022,10 @@ visible = false
|
|||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0258179, 1.03281, 0.00894165)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0258179, 1.03281, 0.00894165)
|
||||||
shape = SubResource("BoxShape3D_xxx55")
|
shape = SubResource("BoxShape3D_xxx55")
|
||||||
|
|
||||||
|
[node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5049, 0)
|
||||||
|
shape = SubResource("CylinderShape3D_gicen")
|
||||||
|
|
||||||
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
|
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
|
||||||
path_height_offset = 0.5
|
path_height_offset = 0.5
|
||||||
avoidance_enabled = true
|
avoidance_enabled = true
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ config_version=5
|
|||||||
|
|
||||||
config/name="First Person Test"
|
config/name="First Person Test"
|
||||||
config/tags=PackedStringArray("fps")
|
config/tags=PackedStringArray("fps")
|
||||||
run/main_scene="uid://bk4pn4k7n51ux"
|
run/main_scene="uid://f7e0v1r6ra6c"
|
||||||
config/features=PackedStringArray("4.4", "Forward Plus")
|
config/features=PackedStringArray("4.4", "Forward Plus")
|
||||||
config/icon="uid://6svuq1l83al5"
|
config/icon="uid://6svuq1l83al5"
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ script = ExtResource("1_8cuhv")
|
|||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.749, 0, 44.3496)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.749, 0, 44.3496)
|
||||||
script = ExtResource("5_ngmqi")
|
script = ExtResource("5_ngmqi")
|
||||||
room_lockdown = true
|
room_lockdown = true
|
||||||
number_of_enemies = 100
|
number_of_enemies = 25
|
||||||
number_of_drops = 30
|
number_of_drops = 30
|
||||||
|
|
||||||
[node name="EnemySpawner" parent="Level" instance=ExtResource("3_q77vb")]
|
[node name="EnemySpawner" parent="Level" instance=ExtResource("3_q77vb")]
|
||||||
|
|||||||
@@ -1,2 +1,31 @@
|
|||||||
extends EnemyState
|
extends EnemyState
|
||||||
class_name EnemyAttack
|
class_name EnemyAttack
|
||||||
|
|
||||||
|
var heartbeat : float = 3.0
|
||||||
|
|
||||||
|
@onready var player = get_tree().current_scene.player
|
||||||
|
|
||||||
|
func _Enter():
|
||||||
|
update_waypoint()
|
||||||
|
|
||||||
|
func update_waypoint():
|
||||||
|
enemy.nav_agent.set_target_position(player.global_position)
|
||||||
|
|
||||||
|
func Update(delta):
|
||||||
|
if heartbeat > 0:
|
||||||
|
heartbeat -= delta
|
||||||
|
else:
|
||||||
|
update_waypoint()
|
||||||
|
|
||||||
|
func Physics_Update(delta):
|
||||||
|
enemy.turret_look_next.look_at(player.global_position)
|
||||||
|
enemy.turret_look.look_at(player.global_position)
|
||||||
|
|
||||||
|
var destination = enemy.nav_agent.get_next_path_position()
|
||||||
|
var local_destination = destination - enemy.global_position
|
||||||
|
var direction = local_destination.normalized()
|
||||||
|
if enemy.global_position.distance_to(local_destination) > 1:
|
||||||
|
enemy.velocity = direction * move_speed
|
||||||
|
enemy.spider_look_next.look_at(destination)
|
||||||
|
var look_target = enemy.spider_look_next.global_rotation.y
|
||||||
|
enemy.global_rotation.y = lerp(enemy.global_rotation.y,look_target,delta * 3)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func randomize_wander():
|
|||||||
|
|
||||||
func randomize_turret_scan():
|
func randomize_turret_scan():
|
||||||
scan_direction = randf_range(-TURRET_TURN_AMT,TURRET_TURN_AMT)
|
scan_direction = randf_range(-TURRET_TURN_AMT,TURRET_TURN_AMT)
|
||||||
scan_time = randf_range(1,3)
|
scan_time = randf_range(5,10)
|
||||||
|
|
||||||
func _Enter():
|
func _Enter():
|
||||||
randomize_wander()
|
randomize_wander()
|
||||||
@@ -47,4 +47,7 @@ func Physics_Update(delta : float):
|
|||||||
var look_target = enemy.spider_look_next.global_rotation.y
|
var look_target = enemy.spider_look_next.global_rotation.y
|
||||||
enemy.global_rotation.y = lerp(enemy.global_rotation.y,look_target,delta * 3)
|
enemy.global_rotation.y = lerp(enemy.global_rotation.y,look_target,delta * 3)
|
||||||
|
|
||||||
enemy.turret.rotation.y = lerp(enemy.turret.rotation.y,deg_to_rad(scan_direction),delta)
|
enemy.turret_look.rotation.y = lerp(enemy.turret_look.rotation.y,deg_to_rad(scan_direction),delta)
|
||||||
|
|
||||||
|
if enemy.turret_look.is_colliding() and enemy.turret_look.get_collider() is Player:
|
||||||
|
Transitioned.emit(self,"attack")
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ func Enter():
|
|||||||
|
|
||||||
func die():
|
func die():
|
||||||
drop_loot()
|
drop_loot()
|
||||||
|
enemy.visible = false
|
||||||
#remove from parent array
|
#remove from parent array
|
||||||
var particlespawn = enemy.die_particles.instantiate()
|
var particlespawn = enemy.die_particles.instantiate()
|
||||||
particlespawn.position = enemy.global_position
|
particlespawn.position = enemy.global_position
|
||||||
|
|||||||
@@ -45,10 +45,5 @@ func explode():
|
|||||||
body.recoil.add_recoil(Vector3(1,.1,.1),10,10)
|
body.recoil.add_recoil(Vector3(1,.1,.1),10,10)
|
||||||
if body.has_method("hit") and !body.is_in_group("player"):
|
if body.has_method("hit") and !body.is_in_group("player"):
|
||||||
body.hit(1)
|
body.hit(1)
|
||||||
if body.is_in_group("enemy"):
|
if body is Enemy:
|
||||||
body.knocked = true
|
body.stun()
|
||||||
body.stunned = true
|
|
||||||
print("knocked")
|
|
||||||
body.knocked_timer.start()
|
|
||||||
body.stunned_timer.start()
|
|
||||||
body.velocity += blast_velocity
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ var last_enemy : bool = false
|
|||||||
@export_group("Taunts")
|
@export_group("Taunts")
|
||||||
@export var taunts : Array[String] = []
|
@export var taunts : Array[String] = []
|
||||||
|
|
||||||
|
@onready var state_machine: Node = $StateMachine
|
||||||
@onready var level_control = get_tree().current_scene
|
@onready var level_control = get_tree().current_scene
|
||||||
@onready var movement_shape = $MovementShape
|
@onready var movement_shape = $MovementShape
|
||||||
@onready var barrel_1 = $TurretLook/Turret/Barrel1
|
@onready var barrel_1 = $TurretLook/Turret/Barrel1
|
||||||
@@ -136,6 +136,8 @@ func spawn_casing():
|
|||||||
instance_casing.player_velocity = velocity * transform.basis
|
instance_casing.player_velocity = velocity * transform.basis
|
||||||
get_tree().get_root().add_child(instance_casing)
|
get_tree().get_root().add_child(instance_casing)
|
||||||
|
|
||||||
|
func stun():
|
||||||
|
state_machine.on_child_transition(state_machine.current_state,"stunned")
|
||||||
|
|
||||||
func save():
|
func save():
|
||||||
var save_dict = {
|
var save_dict = {
|
||||||
|
|||||||
Reference in New Issue
Block a user