diff --git a/Source/vampires/EnemyCharacter.cpp b/Source/vampires/EnemyCharacter.cpp index 00775d7..ddfe6ab 100644 --- a/Source/vampires/EnemyCharacter.cpp +++ b/Source/vampires/EnemyCharacter.cpp @@ -118,6 +118,7 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* Enem OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem; HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth); GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed; + Damage = EnemyDataAsset->Damage; PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset); PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset); @@ -136,6 +137,7 @@ void AEnemyCharacter::ResetData_Implementation() OnDeathNiagaraSystem = nullptr; HealthComponent->SetMaxHealth(100.0f); GetCharacterMovement()->MaxWalkSpeed = 300.0f; + Damage = 5.0f; } float AEnemyCharacter::GetCapsuleRadius_Implementation() diff --git a/Source/vampires/EnemyDataAsset.h b/Source/vampires/EnemyDataAsset.h index d6e7e44..f73be48 100644 --- a/Source/vampires/EnemyDataAsset.h +++ b/Source/vampires/EnemyDataAsset.h @@ -51,4 +51,7 @@ public: UPROPERTY(EditDefaultsOnly, Category = "Properties") float MovementSpeed = 300.0f; + + UPROPERTY(EditDefaultsOnly, Category = "Properties") + float Damage = 5.0f; }; diff --git a/Source/vampires/VampireGameMode.cpp b/Source/vampires/VampireGameMode.cpp index 143d121..efc3258 100644 --- a/Source/vampires/VampireGameMode.cpp +++ b/Source/vampires/VampireGameMode.cpp @@ -148,12 +148,14 @@ AObjectPoolManager* AVampireGameMode::GetPickupObjectPoolManager_Implementation( void AVampireGameMode::AddRandomEnemyTypeToPool() { - if (EnemyDataAssets.Num() > 0) - { - int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1); - SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]); - EnemyDataAssets.RemoveAt(rand); - } + // if (EnemyDataAssets.Num() > 0) + // { + // int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1); + // SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]); + // EnemyDataAssets.RemoveAt(rand); + // } + + SpawnableEnemyDataAssets = EnemyDataAssets; } void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)