diff --git a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset index 451c1d20..257daa66 100644 --- a/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset +++ b/EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b9691348b0387fe562e57c87b0e8845ffa92550d889cfae62593d00a3529297 -size 584566 +oid sha256:7fcfdbe044a7e3e7965a328e6f750023336e21e4161dc81cea890ec2f69d311a +size 780869 diff --git a/EndlessVendetta/Content/Vignette/DamageVig.uasset b/EndlessVendetta/Content/Vignette/DamageVig.uasset new file mode 100644 index 00000000..fb273b28 --- /dev/null +++ b/EndlessVendetta/Content/Vignette/DamageVig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:784e27833c7128c7490d789eb80ff95af1bdb0f0b1aaea66b9c9fb66a33cf894 +size 11309 diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp index 59a2ce85..bc30ecb2 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp @@ -324,6 +324,7 @@ float AEndlessVendettaCharacter::TakeDamage(const float DamageAmount, FDamageEve UGameplayStatics::OpenLevel(this, FName(*GetWorld()->GetName()), false); return Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser); } + TookDamage.Broadcast(); GetWorld()->GetTimerManager().ClearTimer(RegenHealthTimerHandle); GetWorld()->GetTimerManager().SetTimer(RegenHealthTimerHandle, this, &AEndlessVendettaCharacter::RegenHealth, 5.0f, true); diff --git a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h index 5889e23e..1527e099 100644 --- a/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h +++ b/EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h @@ -275,6 +275,11 @@ public: UFUNCTION(BlueprintCallable, Category = "Damage Control") virtual float TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser) override; + DECLARE_DYNAMIC_MULTICAST_DELEGATE(FTookDamage); + + UPROPERTY(BlueprintAssignable, Category = "Damage Control") + FTookDamage TookDamage; + void WeaponPickUpSystem(); void EquipPrimary();