they talk to each other now
This commit is contained in:
@@ -11,6 +11,7 @@ var shot_timer = 0.0
|
||||
func Enter():
|
||||
initial_timer = initial_wait_time
|
||||
alert_sound.play()
|
||||
clear_points_of_interest()
|
||||
|
||||
func Physics_Update(delta):
|
||||
if enemy.is_player_visible():
|
||||
@@ -57,6 +58,7 @@ func attack():
|
||||
|
||||
func fire(barrel):
|
||||
enemy.ammo -= 1
|
||||
SignalBus.emit_signal("engaging_target",enemy,enemy.player_last_seen)
|
||||
var instance_bullet = enemy.bullet.instantiate()
|
||||
instance_bullet.position = barrel.global_position
|
||||
instance_bullet.transform.basis = barrel.global_transform.basis
|
||||
|
||||
@@ -11,6 +11,7 @@ var scan_direction = scan_cone_angle/2
|
||||
func Enter():
|
||||
scan_timer = scan_time
|
||||
get_new_wander_point()
|
||||
clear_points_of_interest()
|
||||
|
||||
func Update(delta):
|
||||
attack_on_sight()
|
||||
|
||||
@@ -32,8 +32,13 @@ func Physics_Update(delta):
|
||||
turret_scan(Vector3(0,scan_direction,0),delta)
|
||||
|
||||
func get_new_point_of_interest():
|
||||
if enemy.player_last_seen != null and enemy.player_last_seen != move_target:
|
||||
if enemy.player_last_seen != null:
|
||||
move_target = enemy.player_last_seen
|
||||
enemy.player_last_seen = null
|
||||
enemy.nav_agent.set_target_position(move_target)
|
||||
elif enemy.points_of_interest.size() > 0:
|
||||
var point_of_interest = enemy.points_of_interest.pop_back()
|
||||
move_target = point_of_interest["point"]
|
||||
enemy.nav_agent.set_target_position(move_target)
|
||||
else:
|
||||
Transitioned.emit(self,"idle")
|
||||
|
||||
@@ -114,7 +114,9 @@ func turret_look3D(delta):
|
||||
|
||||
func turret_scan_look(target,scan_direction,delta):
|
||||
enemy.turret_look.global_rotation.y = rotate_to_face2D(enemy.turret_look,target,scan_direction,delta,turret_speed)
|
||||
|
||||
|
||||
func clear_points_of_interest():
|
||||
enemy.points_of_interest = []
|
||||
|
||||
func debug_marker(target_pos):
|
||||
if enemy.debug_tools:
|
||||
|
||||
@@ -21,3 +21,4 @@ signal weapon_list_changed()
|
||||
|
||||
##ENEMY
|
||||
signal suspicious_sound(position,loudness,max_distance)
|
||||
signal engaging_target(enemy,target_position)
|
||||
|
||||
@@ -9,6 +9,7 @@ var last_enemy : bool = false
|
||||
@export var start_health = 3
|
||||
@export var max_ammo = 10
|
||||
@export var loot_amount = 2
|
||||
@export var join_ally_max_distance = 10
|
||||
@export var nav_agent : NavigationAgent3D
|
||||
@export var hit_targets : Array[Area3D]
|
||||
@export var visibility_areas : Array[Area3D]
|
||||
@@ -78,10 +79,11 @@ var ammo
|
||||
|
||||
var line_of_sight_target
|
||||
var player_last_seen
|
||||
var point_of_interest
|
||||
var points_of_interest = []
|
||||
|
||||
func _ready():
|
||||
SignalBus.suspicious_sound.connect(add_point_of_interest)
|
||||
SignalBus.engaging_target.connect(investigate_nearby_combat)
|
||||
health = start_health
|
||||
ammo = max_ammo
|
||||
player = level_control.player
|
||||
@@ -151,12 +153,29 @@ func cache_player_pos():
|
||||
player_last_seen = line_of_sight_ray.get_collision_point()
|
||||
|
||||
func add_point_of_interest(point,loudness,max_distance):
|
||||
var distance_to_point = global_position.distance_to(point)
|
||||
if distance_to_point <= max_distance:
|
||||
var perceived_loudness = 1/distance_to_point * loudness
|
||||
var add_point = {"point" : point, "loudness" : perceived_loudness}
|
||||
point_of_interest = add_point
|
||||
|
||||
var current_state_name = state_machine.current_state.name.to_lower()
|
||||
if current_state_name == "idle" or current_state_name == "search":
|
||||
var distance_to_point = global_position.distance_to(point)
|
||||
if distance_to_point <= max_distance:
|
||||
var perceived_loudness = 1/distance_to_point * loudness
|
||||
var add_point = {"point" : point, "loudness" : perceived_loudness}
|
||||
points_of_interest.append(add_point)
|
||||
|
||||
if current_state_name == "idle":
|
||||
change_state_to("search")
|
||||
|
||||
if current_state_name == "search":
|
||||
pass
|
||||
#get new waypoint
|
||||
#state_machine.current_state.investigate_points_of_interest()
|
||||
|
||||
func investigate_nearby_combat(ally,target):
|
||||
if ally != self:
|
||||
var distance_to_ally = global_position.distance_to(ally.global_position)
|
||||
if distance_to_ally < join_ally_max_distance:
|
||||
player_last_seen = target
|
||||
if state_machine.current_state.name.to_lower() == "idle":
|
||||
change_state_to("search")
|
||||
|
||||
func save():
|
||||
var save_dict = {
|
||||
|
||||
Reference in New Issue
Block a user