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

Compare commits

base: baz:c474aa440574fef0a33f7a0b7a59b24041357488
Branches Tags
baz:master
..
compare: baz:ad2034b15dc4be1c5e9035994c003fc2339f47fa
Branches Tags
baz:master

No commits in common. "c474aa440574fef0a33f7a0b7a59b24041357488" and "ad2034b15dc4be1c5e9035994c003fc2339f47fa" have entirely different histories.
c474aa4405 ... ad2034b15d

4 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

7
Source/Nakatomi/NakatomiCharacter.cpp
View File

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

3
Source/Nakatomi/NakatomiCharacter.h
View File

@ -42,9 +42,6 @@ public:
UPROPERTY(EditDefaultsOnly)
UAnimMontage* FireWeaponAnimMontage;
UPROPERTY(EditDefaultsOnly)
TArray<UAnimMontage*> OnDamagedHitAnimMontages;
protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
UNakatomiCMC* NakatomiCMC;

8
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -460,6 +460,14 @@ void APlayerCharacter::PlayOnFireAnimations()
void APlayerCharacter::OnDamaged()
{
Super::OnDamaged();
int32 randomAnimMontage = FMath::RandRange(0,OnDamagedHitAnimMontages.Num()-1);
if (OnDamagedHitAnimMontages[randomAnimMontage] != nullptr)
{
//TODO: Disable movement while playing animation montage
PlayAnimMontage(OnDamagedHitAnimMontages[randomAnimMontage]);
}
}
void APlayerCharacter::OnDeath()

3
Source/Nakatomi/PlayerCharacter.h
View File

@ -89,6 +89,9 @@ public:
UPROPERTY(EditDefaultsOnly)
UAnimMontage* ThrowExplosiveAnimMontage;
UPROPERTY(EditDefaultsOnly)
TArray<UAnimMontage*> OnDamagedHitAnimMontages;
UPROPERTY(EditDefaultsOnly)
UAnimMontage* FireWeaponADSAnimMontage;