Add 3D UI state above guard

GameDevHQ · Jan 4, 2018 · 831cfe7 · 831cfe7
1 parent a9aa41d
commit 831cfe7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 4 deletions.
diff --git a/Content/Blueprints/BP_Guard.uasset b/Content/Blueprints/BP_Guard.uasset
diff --git a/Content/Maps/FirstPersonExampleMap.umap b/Content/Maps/FirstPersonExampleMap.umap
diff --git a/Content/Maps/FirstPersonExampleMap_BuiltData.uasset b/Content/Maps/FirstPersonExampleMap_BuiltData.uasset
diff --git a/Content/UI/WBP_GuardState.uasset b/Content/UI/WBP_GuardState.uasset
diff --git a/Source/FPSGame/Private/FPSAIGuard.cpp b/Source/FPSGame/Private/FPSAIGuard.cpp
@@ -3,7 +3,8 @@
 #include "FPSGameMode.h"
 
 // Sets default values
-AFPSAIGuard::AFPSAIGuard()
+AFPSAIGuard::AFPSAIGuard():
+CurrentState(EAIState::Idle)
 {
  	// Set this character to call Tick() every frame.  You can turn this off to improve performance if you don't need it.
 	PrimaryActorTick.bCanEverTick = true;
@@ -32,10 +33,17 @@ void AFPSAIGuard::OnPawnSeen(APawn* Pawn)
     {
         GameMode->CompleteMission(Pawn, false);
     }
+
+    SetCurrentState(EAIState::Alerted);
 }
 
 void AFPSAIGuard::OnPawnHeard(APawn* NoiseInstigator, const FVector& Location, float Volume)
 {
+    if (CurrentState == EAIState::Alerted)
+    {
+        return;
+    }
+
     FVector Direction = Location - GetActorLocation();
     Direction.Normalize();
 
@@ -46,11 +54,33 @@ void AFPSAIGuard::OnPawnHeard(APawn* NoiseInstigator, const FVector& Location, f
 
     GetWorldTimerManager().ClearTimer(TimeHandle_ResetOrientation);
     GetWorldTimerManager().SetTimer(TimeHandle_ResetOrientation, this, &AFPSAIGuard::ResetOrientation, 3.0f);
+
+    if (CurrentState != EAIState::Alerted)
+    {
+        SetCurrentState(EAIState::Suspicious);
+    }
 }
 
 void AFPSAIGuard::ResetOrientation()
 {
+    if (CurrentState == EAIState::Alerted)
+    {
+        return;
+    }
+
     SetActorRotation(OriginalRotation);
+    SetCurrentState(EAIState::Idle);
+}
+
+void AFPSAIGuard::SetCurrentState(EAIState NewState)
+{
+    if (CurrentState == NewState)
+    {
+        return;
+    }
+
+    CurrentState = NewState;
+    OnStateChanged(NewState);
 }
 
 // Called every frame

diff --git a/Source/FPSGame/Public/FPSAIGuard.h b/Source/FPSGame/Public/FPSAIGuard.h
@@ -6,6 +6,15 @@
 
 class UPawnSensingComponent;
 
+UENUM(BlueprintType)
+enum class EAIState: uint8
+{
+    Idle,
+    Suspicious,
+    Alerted
+};
+
+
 UCLASS()
 class FPSGAME_API AFPSAIGuard : public ACharacter
 {
@@ -28,12 +37,17 @@ class FPSGAME_API AFPSAIGuard : public ACharacter
     UFUNCTION()
     void OnPawnHeard(APawn* NoiseInstigator, const FVector& Location, float Volume);
 
-    FRotator OriginalRotation;
-    FTimerHandle TimeHandle_ResetOrientation;
-
     UFUNCTION()
     void ResetOrientation();
 
+    UFUNCTION(BlueprintImplementableEvent, Category = "AI")
+    void OnStateChanged(EAIState NewState);
+
+    void SetCurrentState(EAIState NewState);
+
+    FRotator OriginalRotation;
+    FTimerHandle TimeHandle_ResetOrientation;
+    EAIState CurrentState;
 public:	
 	// Called every frame
 	virtual void Tick(float DeltaTime) override;