From 41284712b2cdb3c2f50bddb57888dd22f31009e3 Mon Sep 17 00:00:00 2001
From: Ange-Marie MAURIN <a-m.maurin@a2msystemes.fr>
Date: Thu, 18 Jul 2024 07:52:36 +0200
Subject: [PATCH] Adding Subsystem Timer TRigerring Functions  to trigger
 Delegates When needed

---
 .../DTFluxSubsystem/DTFluxSubsystemTimer.cpp  | 28 ++++++++++++-------
 .../DTFluxSubsystem/DTFluxSubsystemTimer.h    | 13 ++++++++-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp b/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp
index e57051f..5521101 100644
--- a/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp
+++ b/Source/DTFluxAPI/Private/DTFluxSubsystem/DTFluxSubsystemTimer.cpp
@@ -9,9 +9,9 @@
 void UDTFluxSubsystemTimer::Initialize(FSubsystemCollectionBase& Collection)
 {
 	Super::Initialize(Collection);
-
-	UDTFluxSubsystem* Subsystem = GetDTFluxSubSystem();
-	Subsystem->OnRaceDataReceived.AddDynamic(this, &UDTFluxSubsystemTimer::OnDataStorageInit);
+	// Not Necessary Anymore
+	// UDTFluxSubsystem* Subsystem = GetDTFluxSubSystem();
+	// Subsystem->OnRaceDataReceived.AddDynamic(this, &UDTFluxSubsystemTimer::OnDataStorageInit);
 
 }
 
@@ -31,7 +31,6 @@ void UDTFluxSubsystemTimer::OnDataStorageInit()
 {
 	UE_LOG(LogDTFluxAPI, Log, TEXT("DataStorage Has been Set Or Updated"));
 	UDTFluxDataStorage* DataStorage = GetDTFluxDataStorage();
-
 	for(const auto&Contest : DataStorage->Contests)
 	{
 		for (const auto& Stage: Contest.Stages)
@@ -40,7 +39,6 @@ void UDTFluxSubsystemTimer::OnDataStorageInit()
 			UWorld* World = GetWorld();
 			if(World)
 			{
-
 				FDTFluxContestTimerHandle StartContestTimerHandle;
 				StartContestTimerHandle.Type = EDTFluxTimerEventType::StageStart;
 				StartContestTimerHandle.ContestId = Contest.Id;
@@ -69,10 +67,7 @@ void UDTFluxSubsystemTimer::OnDataStorageInit()
 			}
 			
 		}
-
-		
 	}
-	
 }
 
 void UDTFluxSubsystemTimer::AddCutoffTimer(const int ContestID, const int StageID)
@@ -105,7 +100,6 @@ void UDTFluxSubsystemTimer::AddStageStartedTimer(const int ContestID, const int
 
 void UDTFluxSubsystemTimer::OnStartTimer()
 {
-	
 	UWorld* World = GetWorld();
 	if(World)
 	{
@@ -127,7 +121,6 @@ void UDTFluxSubsystemTimer::OnStartTimer()
 			Timers.RemoveAt(Idx);
 		}
 	}
-
 }
 void UDTFluxSubsystemTimer::OnCutOffTimer()
 {
@@ -171,6 +164,21 @@ void UDTFluxSubsystemTimer::ClearTimer(const int HandleIndex)
 {
 }
 
+void UDTFluxSubsystemTimer::TriggerOnCutOff(const int ContestId, const int StageId)
+{
+		OnCutoff.Broadcast(ContestId, StageId);
+}
+
+void UDTFluxSubsystemTimer::TriggerStartTime(const int ContestId, const int StageId)
+{
+		OnStageStarted.Broadcast(ContestId, StageId);
+}
+
+void UDTFluxSubsystemTimer::TriggerStageLoading(const int ContestId, const int StageId, int DelayBeforeStageStart)
+{
+		OnStageLoading.Broadcast(ContestId, StageId, DelayBeforeStageStart);
+}
+
 UDTFluxSubsystem* UDTFluxSubsystemTimer::GetDTFluxSubSystem()
 {
 	return GEngine->GetEngineSubsystem<UDTFluxSubsystem>();
diff --git a/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h b/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h
index 725d5b8..dc41d7d 100644
--- a/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h
+++ b/Source/DTFluxAPI/Public/DTFluxSubsystem/DTFluxSubsystemTimer.h
@@ -33,6 +33,7 @@ public:
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnCutoff, int, ContestId, int, StageId);
 DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnStageStarted, int, ContestId, int, StageId);
+DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnStageLoading, int, ContestId, int, StageId, int, DelayBeforeStageStart);
 
 
 UCLASS(BlueprintType, Category="DTFlux|Timer")
@@ -63,18 +64,28 @@ public:
 	UPROPERTY(BlueprintAssignable, Category="DTFlux|Timer")
 	FOnStageStarted OnStageStarted;
 
+	UPROPERTY(BlueprintAssignable, Category="DTFlux|Timer")
+	FOnStageLoading OnStageLoading;
+
 	UFUNCTION()
 	void OnDataStorageInit();
 
 	void AddCutoffTimer(const int ContestID, const int StageID);
 	void AddStageStartedTimer(const int ContestID, const int StageID);
-
 	void OnStartTimer();
 	void OnCutOffTimer();
 
 	void ClearTimer(FDTFluxContestTimerHandle TimerHandle);
 	void ClearTimer(const int HandleIndex);
 
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Timer")
+	void TriggerOnCutOff(const int ContestId, const int StageId);
+
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Timer")
+	void TriggerStartTime(const int ContestId, const int StageId);
+	
+	UFUNCTION(BlueprintCallable, Category="DTFlux|Timer")
+	void TriggerStageLoading(const int ContestId, const int StageId, int DelayBeforeStageStart);
 	static UDTFluxSubsystem* GetDTFluxSubSystem();
 	static UDTFluxDataStorage* GetDTFluxDataStorage();