teatov/tli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move wandering functionality to Unit class

Browse Source
This commit is contained in:
Teatov
2024-10-06 08:26:21 +10:00
parent 0327861764
commit 3ad9d2a6ac
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/units/aphid.gd
View File

@@ -5,15 +5,8 @@ enum AphidState {
WANDERING, WANDERING,
} }
const MAX_WANDER_DISTANCE: float = 5
const MIN_WANDER_INTERVAL: float = 0.25
const MAX_WANDER_INTERVAL: float = 5
var wandering_timer: float = 0
var state: AphidState = AphidState.WANDERING var state: AphidState = AphidState.WANDERING
@onready var wandering_center: Vector3 = global_position
func _process(delta: float) -> void: func _process(delta: float) -> void:
super._process(delta) super._process(delta)
@@ -24,13 +17,4 @@ func _handle_wandering(delta: float) -> void:
if state != AphidState.WANDERING: if state != AphidState.WANDERING:
return return
wandering_timer -= delta _wander(delta)
if wandering_timer <= 0:
var new_pos_offset := Vector3(
randf_range(-MAX_WANDER_DISTANCE, MAX_WANDER_DISTANCE),
0,
randf_range(-MAX_WANDER_DISTANCE, MAX_WANDER_DISTANCE),
)
var new_pos := wandering_center + new_pos_offset
nav_agent.set_target_position(new_pos)
wandering_timer = randf_range(-MIN_WANDER_INTERVAL, MAX_WANDER_INTERVAL)

19
scripts/units/unit.gd
View File

@@ -4,8 +4,13 @@ class_name Unit
const MOVE_SPEED: float = 3 const MOVE_SPEED: float = 3
const TURN_SPEED: float = 10 const TURN_SPEED: float = 10
const MAX_WANDER_DISTANCE: float = 5
const MIN_WANDER_INTERVAL: float = 0.25
const MAX_WANDER_INTERVAL: float = 5
var hovered: bool = false var hovered: bool = false
var is_on_screen: bool = false var is_on_screen: bool = false
var wandering_timer: float = 0
@onready var hover_sprite: Sprite3D = $HoverSprite @onready var hover_sprite: Sprite3D = $HoverSprite
@onready var nav_agent: NavigationAgent3D = $NavigationAgent3D @onready var nav_agent: NavigationAgent3D = $NavigationAgent3D
@@ -13,6 +18,7 @@ var is_on_screen: bool = false
@onready var visibility_notifier: VisibleOnScreenNotifier3D = ( @onready var visibility_notifier: VisibleOnScreenNotifier3D = (
$VisibleOnScreenNotifier3D $VisibleOnScreenNotifier3D
) )
@onready var wandering_center: Vector3 = global_position
func _ready() -> void: func _ready() -> void:
@@ -84,6 +90,19 @@ func _animate(delta: float) -> void:
hover_sprite.visible = hovered hover_sprite.visible = hovered
func _wander(delta: float) -> void:
wandering_timer -= delta
if wandering_timer <= 0:
var new_pos_offset := Vector3(
randf_range(-MAX_WANDER_DISTANCE, MAX_WANDER_DISTANCE),
0,
randf_range(-MAX_WANDER_DISTANCE, MAX_WANDER_DISTANCE),
)
var new_pos := wandering_center + new_pos_offset
nav_agent.set_target_position(new_pos)
wandering_timer = randf_range(-MIN_WANDER_INTERVAL, MAX_WANDER_INTERVAL)
func _on_nav_agent_velocity_computed(safe_velocity: Vector3) -> void: func _on_nav_agent_velocity_computed(safe_velocity: Vector3) -> void:
velocity = safe_velocity velocity = safe_velocity
move_and_slide() move_and_slide()