baz/vampires
baz/vampires
1
0
Fork 0
Code Issues 11 Projects 1 Activity

Add Damage parameter to Data Asset

Browse Source
This commit is contained in:
baz 2025-09-15 23:32:07 +01:00
parent 02e2318761
commit f549ed403d
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/vampires/EnemyCharacter.cpp
View File

@ -118,6 +118,7 @@ void AEnemyCharacter::LoadDataFromDataAsset_Implementation(UEnemyDataAsset* Enem
OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem; OnDeathNiagaraSystem = EnemyDataAsset->OnDeathNiagaraSystem;
HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth); HealthComponent->SetMaxHealth(EnemyDataAsset->MaxHealth);
GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed; GetCharacterMovement()->MaxWalkSpeed = EnemyDataAsset->MovementSpeed;
Damage = EnemyDataAsset->Damage;
PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset); PickupArray.Add(EnemyDataAsset->CommonPickupDataAsset);
PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset); PickupArray.Add(EnemyDataAsset->UncommonPickupDataAsset);
@ -136,6 +137,7 @@ void AEnemyCharacter::ResetData_Implementation()
OnDeathNiagaraSystem = nullptr; OnDeathNiagaraSystem = nullptr;
HealthComponent->SetMaxHealth(100.0f); HealthComponent->SetMaxHealth(100.0f);
GetCharacterMovement()->MaxWalkSpeed = 300.0f; GetCharacterMovement()->MaxWalkSpeed = 300.0f;
Damage = 5.0f;
} }
float AEnemyCharacter::GetCapsuleRadius_Implementation() float AEnemyCharacter::GetCapsuleRadius_Implementation()

3
Source/vampires/EnemyDataAsset.h
View File

@ -51,4 +51,7 @@ public:
UPROPERTY(EditDefaultsOnly, Category = "Properties") UPROPERTY(EditDefaultsOnly, Category = "Properties")
float MovementSpeed = 300.0f; float MovementSpeed = 300.0f;
UPROPERTY(EditDefaultsOnly, Category = "Properties")
float Damage = 5.0f;
}; };

14
Source/vampires/VampireGameMode.cpp
View File

@ -148,12 +148,14 @@ AObjectPoolManager* AVampireGameMode::GetPickupObjectPoolManager_Implementation(
void AVampireGameMode::AddRandomEnemyTypeToPool() void AVampireGameMode::AddRandomEnemyTypeToPool()
{ {
if (EnemyDataAssets.Num() > 0) // if (EnemyDataAssets.Num() > 0)
{ // {
int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1); // int32 rand = FMath::RandRange(0, EnemyDataAssets.Num() - 1);
SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]); // SpawnableEnemyDataAssets.Add(EnemyDataAssets[rand]);
EnemyDataAssets.RemoveAt(rand); // EnemyDataAssets.RemoveAt(rand);
} // }
SpawnableEnemyDataAssets = EnemyDataAssets;
} }
void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo) void AVampireGameMode::OnPlayerDeath(FDamageInfo DamageInfo)