Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix

Source/LegumeMix/Private/LMSpawnPosition.cpp

@@ -74,14 +74,14 @@ bool ALMSpawnPosition::IsPlayerVisible() const
 void ALMSpawnPosition::StarCooldown()
 {
 	IsOnCooldow = true;
-	UE_LOG(LogTemp, Warning, TEXT("Spawner Cooldown"));
+	//UE_LOG(LogTemp, Warning, TEXT("Spawner Cooldown"));
 	GetWorld()->GetTimerManager().SetTimer(ProcessCooldown, this, &ALMSpawnPosition::EndCooldown, TimerCooldown, false);
 }
 
 void ALMSpawnPosition::EndCooldown()
 {
 	IsOnCooldow = false;
-	UE_LOG(LogTemp, Warning, TEXT("Spawner End Cooldown"));
+	//UE_LOG(LogTemp, Warning, TEXT("Spawner End Cooldown"));
 }
 
 

Source/LegumeMix/Private/LMWaveManager.cpp

@@ -18,7 +18,6 @@ ALMWaveManager::ALMWaveManager()
 void ALMWaveManager::BeginPlay()
 {
 	Super::BeginPlay();
-	StartWave();
 
 	SpawnPositionsList.Empty(); // Nettoie la liste avant de remplir
 
@@ -30,6 +29,8 @@ void ALMWaveManager::BeginPlay()
 			SpawnPositionsList.Add(SpawnPos);
 		}
 	}
+
+	StartWave();
 }
 
 void ALMWaveManager::SpawnEnemy(ALMSpawnPosition* spawnPosition)
@@ -115,8 +116,11 @@ void ALMWaveManager::GetRandomDataWaveRow()
 	CurrentWaveName = WaveName.ToString();
 	FLMWaveStructure* InfoWaveRow = WaveDatePreset->FindRow<FLMWaveStructure>(WaveName, "");
 
-	EnemyNumberInWave = InfoWaveRow->EnemyCount;
+	//Set le nombre d'ennemis dans la wave en fonction de la Row, de la courbe et du nombre de vague passée
-	MaxEnemyInstantiate = InfoWaveRow->MaxEnemyCount;
+	EnemyNumberInWave = FMath::CeilToInt((InfoWaveRow->EnemyCount)* CurveForScalingEnemyInWave->GetFloatValue(WaveNumber));
+	
+	//Set le nombre d'ennemis max spawnés en fonction de la Row, de la courbe, et du nombre de vague passée
+	MaxEnemyInstantiate = FMath::CeilToInt((InfoWaveRow->MaxEnemyCount) * CurveForScalingMaxEnemyInstantiate->GetFloatValue(WaveNumber));
 
 	AllEnemyType.Empty();
 	for (const FLMEnemyRatio& EnemyRatio : InfoWaveRow->WaveComposition)
@@ -175,18 +179,18 @@ void ALMWaveManager::Tick(float DeltaTime)
 		{
 			//lauch break time
 			// Lance un breaktime avant de relancer une wave
-			UE_LOG(LogTemp, Warning, TEXT("Start a new wave"));
 			OnCooldown = true;
 			GetWorld()->GetTimerManager().SetTimer(BreakTimer, this, &ALMWaveManager::StartWave, BreakTime, false);
 		}
 	}
-
 }
 
 
 void ALMWaveManager::StartWave()
 {
+	UE_LOG(LogTemp, Warning, TEXT("Start a new wave"));
 	GetRandomDataWaveRow();
 	EnemySpawned = 0;
 	OnCooldown = false;
+	WaveNumber++;
 }

Source/LegumeMix/Public/LMWaveManager.h

@@ -35,7 +35,7 @@ public:
 	int MaxEnemyInstantiate; // Nombre d'ennemis max spawnés
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix")
-	float BreakTime; // Nombre d'ennemis dans la wave
+	float BreakTime;
 
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category = "Legumix")
 	UDataTable* WaveDatePreset;
@@ -49,6 +49,15 @@ public:
 	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Legumix")
 	TArray<int> EnemiesPerType;
 
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Legumix")
+	int WaveNumber = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category="Legumix")
+	UCurveFloat* CurveForScalingEnemyInWave; // Nombre d'ennemis max spawnés
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (AllowPrivateAccess = "true"), Category="Legumix")
+	UCurveFloat* CurveForScalingMaxEnemyInstantiate; // Nombre d'ennemis max spawnés
+	
 protected:
 	// Called when the game starts or when spawned
 	virtual void BeginPlay() override;