implemented ui functionalities

Developer-The-Great · Jan 3, 2022 · 69f3c6f · 69f3c6f
1 parent 666493e
commit 69f3c6f
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 2 deletions.
diff --git a/ProjectManus/Content/BP/FlyingCharacterPawnBP.uasset b/ProjectManus/Content/BP/FlyingCharacterPawnBP.uasset
diff --git a/ProjectManus/Content/BP/RestartCheckerActorBP.uasset b/ProjectManus/Content/BP/RestartCheckerActorBP.uasset
diff --git a/ProjectManus/Content/BP/VictoryTriggerVolume.uasset b/ProjectManus/Content/BP/VictoryTriggerVolume.uasset
diff --git a/ProjectManus/Content/Level/ArtMap.umap b/ProjectManus/Content/Level/ArtMap.umap
diff --git a/ProjectManus/Content/Level/ZaxxonTest.umap b/ProjectManus/Content/Level/ZaxxonTest.umap
diff --git a/ProjectManus/Content/UI/AltitudeLimitUI.uasset b/ProjectManus/Content/UI/AltitudeLimitUI.uasset
diff --git a/ProjectManus/Content/UserInterface/GameOverScreen.uasset b/ProjectManus/Content/UserInterface/GameOverScreen.uasset
diff --git a/ProjectManus/Content/UserInterface/HUD.uasset b/ProjectManus/Content/UserInterface/HUD.uasset
diff --git a/ProjectManus/Content/UserInterface/VictoryScreen.uasset b/ProjectManus/Content/UserInterface/VictoryScreen.uasset
diff --git a/ProjectManus/Source/ProjectManus/Private/WaypointOrganizer.cpp b/ProjectManus/Source/ProjectManus/Private/WaypointOrganizer.cpp
@@ -135,7 +135,7 @@ float AWaypointOrganizer::CalculateWaypointProgress(const FVector& layerPoint) c
 
 float AWaypointOrganizer::CalculateLayerProgress(int index)
 {
-	if (!playerActor) { return 1.0f; }
+	if (!playerActor.IsValid()) { return 1.0f; }
 
 	FVector playerLoc = playerActor->GetActorLocation();
 

diff --git a/ProjectManus/Source/ProjectManus/Public/HealthComponent.h b/ProjectManus/Source/ProjectManus/Public/HealthComponent.h
@@ -39,6 +39,12 @@ class PROJECTMANUS_API UHealthComponent : public USceneComponent
 	// Called every frame
 	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
 
+	UFUNCTION(BlueprintCallable, Category = "Health")
+	float GetCurrentHealth() const { return currentHealth; }
+
+	UFUNCTION(BlueprintCallable, Category = "Health")
+		float GetMaxHealth() const { return defaultHealth; }
+
 private:
 
 	UFUNCTION()

diff --git a/ProjectManus/Source/ProjectManus/Public/ShieldComponent.h b/ProjectManus/Source/ProjectManus/Public/ShieldComponent.h
@@ -57,6 +57,9 @@ class PROJECTMANUS_API UShieldComponent : public UStaticMeshComponent
 
 	void DamageShield(float damage);
 
+	UFUNCTION(BlueprintCallable, Category = "Shield")
+	float GetShieldHealth() const { return isShieldActive ? shieldHealthCurrent : 0.0f; }
+
 	UPROPERTY(BlueprintAssignable, Category = "Events")
 	FShieldEnabledSignature OnShieldEnabled;
 

diff --git a/ProjectManus/Source/ProjectManus/Public/WaypointOrganizer.h b/ProjectManus/Source/ProjectManus/Public/WaypointOrganizer.h
@@ -18,7 +18,7 @@ class PROJECTMANUS_API AWaypointOrganizer : public AActor
 private:
 	TArray<AWaypointActor*> waypointArray;
 
-	AActor* playerActor = nullptr;
+	TWeakObjectPtr<AActor> playerActor = nullptr;
 
 	UPROPERTY(Category = "AI Layer System", EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"))
 	TArray<float> layerOffset;