baz/Nakatomi
baz
/
Nakatomi
1
0
Fork 0
Code Issues Pull Requests Activity

Compare commits

base: baz:d6770f8d4bf248ad7c7929c9ac8c8275ab138ead
Branches Tags
baz:master
..
compare: baz:95a7b28db261f6822ab30f17ee52b33883a27562
Branches Tags
baz:master

No commits in common. "d6770f8d4bf248ad7c7929c9ac8c8275ab138ead" and "95a7b28db261f6822ab30f17ee52b33883a27562" have entirely different histories.
d6770f8d4b ... 95a7b28db2

3 changed files with 9 additions and 14 deletions
Show Stats Expand all files Collapse all files

BIN
Content/Weapons/Shotgun/Shotgun.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
Source/Nakatomi/EnemyCharacter.cpp
View File

@ -142,9 +142,7 @@ void AEnemyCharacter::OnDamaged()
{ {
Super::OnDamaged(); Super::OnDamaged();
if (AEnemyAIController* controller = Cast<AEnemyAIController>(GetController())) AEnemyAIController* controller = Cast<AEnemyAIController>(GetController());
{
controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth()); controller->GetBlackboardComponent()->SetValueAsFloat("CurrentHealth", GetHealthComponent()->GetCurrentHealth());
}
} }

3
Source/Nakatomi/NakatomiCharacter.cpp
View File

@ -275,8 +275,6 @@ void ANakatomiCharacter::PlayOnFireAnimations()
void ANakatomiCharacter::OnDamaged() void ANakatomiCharacter::OnDamaged()
{ {
if (OnDamagedHitAnimMontages.Num() > 0)
{
int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1); int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr) if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
@ -284,7 +282,6 @@ void ANakatomiCharacter::OnDamaged()
//TODO: Disable movement while playing animation montage //TODO: Disable movement while playing animation montage
// PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]); // PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
} }
}
} }
void ANakatomiCharacter::OnDeath() void ANakatomiCharacter::OnDeath()