This commit is contained in:
Marco 2025-06-21 15:41:29 +02:00
commit ede8f2028a
34 changed files with 1418 additions and 417 deletions

View file

@ -8,39 +8,35 @@ public partial class Alert : EnemyStateBase
{
public override EnemyState StateId => EnemyState.Alert;
[Export]
public EnemyStorageModule StorageModule { get; private set; }
[Export]
public PlayerDetectionModule PlayerDetection { get; private set; }
[Export]
public GenericDamageReceiver DamageReceiver { get; private set; }
[Export]
public NavigationMovementModule NavigationModule { get; private set; }
[Export] public EnemyStorageModule StorageModule { get; private set; }
[Export] public PlayerDetectionModule PlayerDetection { get; private set; }
[Export] public GenericDamageReceiver DamageReceiver { get; private set; }
[Export] public NavigationMovementModule NavigationModule { get; private set; }
private bool _isPlayerInRange = false;
public override void EnterState()
{
base.EnterState();
NavigationModule.Init(MainObject);
PlayerDetection.SetRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
//_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange);
//GD.Print($"Player In Range: {_isPlayerInRange}");
PlayerDetection.PlayerInRange += PlayerDetectionOnPlayerInRange;
PlayerDetection.PlayerOutOfRange += PlayerDetectionOnPlayerOutOfRange;
DamageReceiver.ChangeState(true);
DamageReceiver.HealthProvider.ResourceDepleted += HealthProviderOnResourceDepleted;
}
private void HealthProviderOnResourceDepleted()
{
ChangeState(EnemyState.Dead);
@ -55,12 +51,12 @@ public partial class Alert : EnemyStateBase
{
base.ExitState();
PlayerDetection.PlayerInRange -= PlayerDetectionOnPlayerInRange;
PlayerDetection.PlayerOutOfRange -= PlayerDetectionOnPlayerOutOfRange;
DamageReceiver.HealthProvider.ResourceDepleted -= HealthProviderOnResourceDepleted;
DamageReceiver.ChangeState(false);
NavigationModule.SetTarget(null);
NavigationModule.SetTarget(null);
}
private void PlayerDetectionOnPlayerInRange()
@ -71,12 +67,13 @@ public partial class Alert : EnemyStateBase
public override void PhysicsProcessState(double delta)
{
base.PhysicsProcessState(delta);
if (PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange) && PlayerDetection.IsPlayerInSight())
if (PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange) &&
PlayerDetection.IsPlayerInSight())
{
StateMachine.SetState(EnemyState.Shooting);
return;
}
// if player is outside disengage range, change to idle (later on, search)
if (MainObject.GlobalPosition.DistanceTo(GameManager.Instance.PlayerPosition.Value) >=
StorageModule.Root.EnemyResource.PlayerDisengageRange)
@ -84,13 +81,13 @@ public partial class Alert : EnemyStateBase
StateMachine.SetState(EnemyState.Idle);
return;
}
// Move towards last known position
if (PlayerDetection.LastKnownPlayerPosition.HasValue)
{
MoveTowardsPosition(PlayerDetection.LastKnownPlayerPosition.Value);
}
NavigationModule.Move(StorageModule.EnemyData.MovementSpeed);
StorageModule.FacingDirection = MainObject.Velocity.SnapToCardinal().Normalized();