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

Compare commits

base: baz:65756306490435afdd9cf6d49bf4ec9b14a3c3ce
Branches Tags
baz:master
..
compare: baz:8e03d3e27dcd09a702605b66d8339f14dfeace57
Branches Tags
baz:master

No commits in common. "65756306490435afdd9cf6d49bf4ec9b14a3c3ce" and "8e03d3e27dcd09a702605b66d8339f14dfeace57" have entirely different histories.
6575630649 ... 8e03d3e27d

5 changed files with 2 additions and 36 deletions
Show Stats Expand all files Collapse all files

BIN
Content/ParticleEffects/BulletImpact/NS_BulletImpact.uasset (Stored with Git LFS)
View File

Binary file not shown.

12
Source/Nakatomi/EnemyCharacter.cpp
View File

@ -144,18 +144,6 @@ void AEnemyCharacter::ProcessHits(TArray<FHitResult> hits, FVector dir)
healthComponent->TakeDamage(Hit.GetActor(), CurrentWeapon->GetWeaponProperties()->WeaponDamage, nullptr, healthComponent->TakeDamage(Hit.GetActor(), CurrentWeapon->GetWeaponProperties()->WeaponDamage, nullptr,
GetController(), this); GetController(), this);
} }
auto character = Cast<ANakatomiCharacter>(Hit.GetActor());
if (character && character->GetOnDamagedHitNiagaraSystem())
{
UNiagaraFunctionLibrary::SpawnSystemAtLocation(this,
character->GetOnDamagedHitNiagaraSystem(),
Hit.ImpactPoint,
dir.MirrorByVector(Hit.ImpactNormal).Rotation(),
FVector(1),
true);
}
} }
auto staticMeshComponent = Hit.GetActor()->GetComponentByClass<UStaticMeshComponent>(); auto staticMeshComponent = Hit.GetActor()->GetComponentByClass<UStaticMeshComponent>();

5
Source/Nakatomi/NakatomiCharacter.cpp
View File

@ -257,11 +257,6 @@ bool ANakatomiCharacter::GetCrouched()
return false; return false;
} }
UNiagaraSystem* ANakatomiCharacter::GetOnDamagedHitNiagaraSystem()
{
return OnDamagedHitNiagaraSystem;
}
void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits, FVector* dir) void ANakatomiCharacter::CalculateHits(TArray<FHitResult>* hits, FVector* dir)
{ {
} }

5
Source/Nakatomi/NakatomiCharacter.h
View File

@ -45,9 +45,6 @@ public:
UPROPERTY(EditDefaultsOnly) UPROPERTY(EditDefaultsOnly)
TArray<UAnimMontage*> OnDamagedHitAnimMontages; TArray<UAnimMontage*> OnDamagedHitAnimMontages;
UPROPERTY(EditDefaultsOnly)
UNiagaraSystem* OnDamagedHitNiagaraSystem;
protected: protected:
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true")) UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Meta = (AllowPrivateAccess = "true"))
UNakatomiCMC* NakatomiCMC; UNakatomiCMC* NakatomiCMC;
@ -118,8 +115,6 @@ public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
bool GetCrouched(); bool GetCrouched();
UNiagaraSystem* GetOnDamagedHitNiagaraSystem();
protected: protected:
virtual void CalculateHits(TArray<FHitResult>* hits, FVector* dir); virtual void CalculateHits(TArray<FHitResult>* hits, FVector* dir);

12
Source/Nakatomi/PlayerCharacter.cpp
View File

@ -406,18 +406,6 @@ void APlayerCharacter::ProcessHits(TArray<FHitResult> hits, FVector dir)
{ {
healthComponent->TakeDamage(Hit.GetActor(), CurrentWeapon->GetWeaponProperties()->WeaponDamage, nullptr, healthComponent->TakeDamage(Hit.GetActor(), CurrentWeapon->GetWeaponProperties()->WeaponDamage, nullptr,
GetController(), this); GetController(), this);
auto character = Cast<ANakatomiCharacter>(Hit.GetActor());
if (character && character->GetOnDamagedHitNiagaraSystem())
{
UNiagaraFunctionLibrary::SpawnSystemAtLocation(this,
character->GetOnDamagedHitNiagaraSystem(),
Hit.ImpactPoint,
dir.MirrorByVector(Hit.ImpactNormal).Rotation(),
FVector(1),
true);
}
if (!healthComponent->GetIsDead()) if (!healthComponent->GetIsDead())
{ {