From 6b0ad46704186a09ce09999a08e997d19a126439 Mon Sep 17 00:00:00 2001 From: TjgL Date: Fri, 14 Mar 2025 14:02:13 +0100 Subject: [PATCH] Updated sound handling for firing animations Signed-off-by: TjgL --- Content/Legumix/Weapon/Revolver/BP_Revolver.uasset | 4 ++-- .../Weapon/Revolver/FireAnimationTest/AM_Arms_Fire.uasset | 4 ++-- .../Weapon/Revolver/FireAnimationTest/AM_Revolver_Fire.uasset | 4 ++-- Source/LegumeMix/Private/Player/LMMovementComponent.cpp | 2 -- Source/LegumeMix/Private/Weapon/LMRevolver.cpp | 1 - Source/LegumeMix/Private/Weapon/LMShotgun.cpp | 1 - Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp | 3 ++- Source/LegumeMix/Public/Weapon/LMWeaponBase.h | 4 ---- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset index 92a847a..eee6a19 100644 --- a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset +++ b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1eee27429be23ec90a0198461a714754f31e35522fb90cfed1b36418035628d -size 41121 +oid sha256:5ab24c5cba0f1316130d619e956a722029dfabf90cd52eb6663424c300833b3a +size 40933 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Arms_Fire.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Arms_Fire.uasset index a39d0b1..7094c2a 100644 --- a/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Arms_Fire.uasset +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Arms_Fire.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:855d73bcfa5e25367347516a9224bc10fb96d76093e8dc3ef17925998557fed8 -size 11228 +oid sha256:4f5ace6f765194ccd96acf84fcdda453b9e9127e590117829f76d8764a38dab2 +size 8630 diff --git a/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Revolver_Fire.uasset b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Revolver_Fire.uasset index 69b73bb..d1e159e 100644 --- a/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Revolver_Fire.uasset +++ b/Content/Legumix/Weapon/Revolver/FireAnimationTest/AM_Revolver_Fire.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd11587ecdf7670c85147fab8c54c9eed9458d7f6bde32729ffddb5b59a39c4d -size 9654 +oid sha256:eb0bc469bc20c59eff1d8ff60040dcfd52dac32211cd567d014b0a44ef53b3ad +size 12271 diff --git a/Source/LegumeMix/Private/Player/LMMovementComponent.cpp b/Source/LegumeMix/Private/Player/LMMovementComponent.cpp index 4d1955c..5161537 100644 --- a/Source/LegumeMix/Private/Player/LMMovementComponent.cpp +++ b/Source/LegumeMix/Private/Player/LMMovementComponent.cpp @@ -154,7 +154,6 @@ bool ULMMovementComponent::IsCustomMovementMode(ECustomMovementModes InCustomMov void ULMMovementComponent::EnterSlide() { - UE_LOG(LogTemp, Error, TEXT("Entering Slide")); bWantsToCrouch = true; Velocity += Velocity.GetSafeNormal2D() * SlideEnterImpulse; SetMovementMode(EMovementMode::MOVE_Custom, ECustomMovementModes::ECMM_Sliding); @@ -162,7 +161,6 @@ void ULMMovementComponent::EnterSlide() void ULMMovementComponent::ExitSlide() { - UE_LOG(LogTemp, Error, TEXT("Exiting Slide")); bWantsToCrouch = false; FQuat NewRotation = FRotationMatrix::MakeFromXZ(UpdatedComponent->GetForwardVector().GetSafeNormal2D(), FVector::UpVector).ToQuat(); diff --git a/Source/LegumeMix/Private/Weapon/LMRevolver.cpp b/Source/LegumeMix/Private/Weapon/LMRevolver.cpp index 994d261..cbf2f5e 100644 --- a/Source/LegumeMix/Private/Weapon/LMRevolver.cpp +++ b/Source/LegumeMix/Private/Weapon/LMRevolver.cpp @@ -30,7 +30,6 @@ void ALMRevolver::PrimaryFire() return; } - PlayEvent(FireEvent); PlayAnimation(PrimaryFireAnimation); Player->PlayAnimation(PrimaryFireArmsAnimation); diff --git a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp index 4f81507..0312f59 100644 --- a/Source/LegumeMix/Private/Weapon/LMShotgun.cpp +++ b/Source/LegumeMix/Private/Weapon/LMShotgun.cpp @@ -30,7 +30,6 @@ void ALMShotgun::PrimaryFire() return; } - PlayEvent(FireEvent); PlayAnimation(PrimaryFireAnimation); const FVector Origin = Player->GetWeaponFiringOrigin(); diff --git a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp index cbb8d8d..5b21505 100644 --- a/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp +++ b/Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp @@ -100,12 +100,13 @@ bool ALMWeaponBase::DefaultReload() if (ClipAmmo >= MaxClip) return false; + // TODO: replace with anim notifies PlayEvent(ReloadSound); PlayAnimation(ReloadAnimation); + Player->PlayAnimation(ReloadArmsAnimation); State = EWeaponState::EWS_Reloading; - // TODO: Use Animations OnDefaultReload(); GetWorldTimerManager().SetTimer(ReloadTimer, this, &ALMWeaponBase::AllowRefire, ReloadDelay); Player->OnReload(); diff --git a/Source/LegumeMix/Public/Weapon/LMWeaponBase.h b/Source/LegumeMix/Public/Weapon/LMWeaponBase.h index 6742944..28deb93 100644 --- a/Source/LegumeMix/Public/Weapon/LMWeaponBase.h +++ b/Source/LegumeMix/Public/Weapon/LMWeaponBase.h @@ -71,10 +71,6 @@ public: protected: /* Weapon Data */ FTimerHandle FireTimer; FTimerHandle ReloadTimer; - - /** The sound to play when firing. */ - UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds") - TObjectPtr FireEvent; UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds") TObjectPtr ReloadSound;