Rafal/EndlessVendetta
Rafal/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Update Character to Trigger Pistol Reload Animation

Browse Source
This commit is contained in:
Philip W 2024-03-14 17:33:41 +00:00
parent eab0b2b18b
commit 5ac9e3fda5
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/FirstPerson/Blueprints/BP_MainCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/__ExternalActors__/Levels/MovementTest/C/ZX/8GZK30F02QUUO234VY329I.uasset (Stored with Git LFS)
View File

Binary file not shown.

17
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.cpp
View File

@ -54,7 +54,15 @@ void AEndlessVendettaCharacter::DecrementRestrictedBoundsCount()
void AEndlessVendettaCharacter::ReloadAnimationComplete() void AEndlessVendettaCharacter::ReloadAnimationComplete()
{ {
bIsReloading = false; if (IsValid(PrimaryWeapon))
{
PrimaryWeapon->WeaponReload();
}
if (IsValid(SecondaryWeapon))
{
if (!bIsReloading) return;
SecondaryWeapon->WeaponReload();
}
} }
void AEndlessVendettaCharacter::SetOverlayState(const EOverlayState OverlayState) const void AEndlessVendettaCharacter::SetOverlayState(const EOverlayState OverlayState) const
@ -639,12 +647,15 @@ void AEndlessVendettaCharacter::GunReload()
if (InPauseMenu) return; if (InPauseMenu) return;
if (IsValid(PrimaryWeapon)) if (IsValid(PrimaryWeapon))
{ {
if (PrimaryWeapon->currentAmmoCount == PrimaryWeapon->MagazineSize) return;
PrimaryWeapon->ReloadTimer(); PrimaryWeapon->ReloadTimer();
bIsReloading = true; bIsReloading = true;
} }
if (IsValid(SecondaryWeapon)) else if (IsValid(SecondaryWeapon))
{ {
SecondaryWeapon->ReloadTimer(); if (SecondaryWeapon->currentAmmoCount == SecondaryWeapon->MagazineSize) return;
StartReload.Broadcast();
SecondaryWeapon->ShowReloadingWidget();
bIsReloading = true; bIsReloading = true;
} }
} }

5
EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h
View File

@ -150,7 +150,10 @@ public:
void IncrementRestrictedBoundsCount(); void IncrementRestrictedBoundsCount();
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
void DecrementRestrictedBoundsCount(); void DecrementRestrictedBoundsCount();
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FReloadAnimationComplete); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FStartReload);
UPROPERTY(BlueprintAssignable, Category = "Weapon")
FStartReload StartReload;
UFUNCTION(BlueprintCallable, Category = "Weapon") UFUNCTION(BlueprintCallable, Category = "Weapon")
void ReloadAnimationComplete(); void ReloadAnimationComplete();

5
EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
View File

@ -43,8 +43,6 @@ protected:
float recoilResultPitch = 0; float recoilResultPitch = 0;
float recoilResultYaw = 0; float recoilResultYaw = 0;
UFUNCTION(BlueprintImplementableEvent)
void ShowReloadingWidget();
UFUNCTION(BlueprintImplementableEvent) UFUNCTION(BlueprintImplementableEvent)
void HideReloadingWidget(); void HideReloadingWidget();
@ -177,6 +175,9 @@ public:
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
void SetupSilencerAttachment(UStaticMesh* SilencerMesh); void SetupSilencerAttachment(UStaticMesh* SilencerMesh);
UFUNCTION(BlueprintImplementableEvent)
void ShowReloadingWidget();
UFUNCTION(BlueprintImplementableEvent) UFUNCTION(BlueprintImplementableEvent)
void ShowNeedReloadUI(); void ShowNeedReloadUI();