From 9ad5df5bde7430125acf1d80800e88febd0f5f03 Mon Sep 17 00:00:00 2001 From: RemainingToast Date: Tue, 14 Nov 2023 19:34:20 +1000 Subject: [PATCH] Fix Ragdolling Grounded --- Content/ALSLyra/Character/B_Als_Hat.uasset | Bin 66855 -> 66741 bytes Source/ALS/Private/AlsCharacter_Actions.cpp | 18 ++++++++---------- Source/ALS/Public/State/AlsRagdollingState.h | 3 --- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Content/ALSLyra/Character/B_Als_Hat.uasset b/Content/ALSLyra/Character/B_Als_Hat.uasset index 2caf8696f0355432d226736b2c2167736a517732..58bab9ec5d2e63c7c203505b0bf5c2fc2a992ad6 100644 GIT binary patch delta 5333 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 YpmR`5-~8xNZ8Ke6U6U$-6{XGp2RV+UKmY&$ delta 5769 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 W_4evnSm^2-?%StZp1h>C{(k_&-kt~m diff --git a/Source/ALS/Private/AlsCharacter_Actions.cpp b/Source/ALS/Private/AlsCharacter_Actions.cpp index 5364b7b51..6e66a5aa8 100644 --- a/Source/ALS/Private/AlsCharacter_Actions.cpp +++ b/Source/ALS/Private/AlsCharacter_Actions.cpp @@ -1,21 +1,17 @@ -#include "AbilitySystemComponent.h" #include "AlsCharacter.h" #include "AlsAnimationInstance.h" #include "AlsCharacterMovementComponent.h" #include "DrawDebugHelpers.h" -#include "Abilities/Tasks/AbilityTask.h" #include "Components/CapsuleComponent.h" #include "Components/SkeletalMeshComponent.h" #include "Engine/NetConnection.h" #include "Equipment/LyraQuickBarComponent.h" #include "TimerManager.h" -#include "Components/CapsuleComponent.h" #include "Components/SkeletalMeshComponent.h" #include "Engine/NetConnection.h" #include "Engine/SkeletalMesh.h" #include "Net/Core/PushModel/PushModel.h" -#include "Player/LyraPlayerController.h" #include "RootMotionSources/AlsRootMotionSource_Mantling.h" #include "Settings/AlsCharacterSettings.h" #include "Utility/AlsConstants.h" @@ -972,7 +968,8 @@ void AAlsCharacter::LimitRagdollSpeed() const bool AAlsCharacter::IsRagdollingAllowedToStop() const { - return LocomotionAction == AlsLocomotionActionTags::Ragdolling && RagdollingState.Grounded; + bool bGrounded; RagdollTraceGround(bGrounded); + return LocomotionAction == AlsLocomotionActionTags::Ragdolling && bGrounded; } bool AAlsCharacter::StopRagdolling() @@ -1032,8 +1029,9 @@ void AAlsCharacter::StopRagdollingImplementation() GetCharacterMovement()->NetworkSmoothingMode = ENetworkSmoothingMode::Exponential; GetCharacterMovement()->bIgnoreClientMovementErrorChecksAndCorrection = false; - - const auto NewActorLocation{RagdollTraceGround(RagdollingState.Grounded)}; + + bool bGrounded; + const auto NewActorLocation{RagdollTraceGround(bGrounded)}; // Determine whether the ragdoll is facing upward or downward and set the actor rotation accordingly. @@ -1085,7 +1083,7 @@ void AAlsCharacter::StopRagdollingImplementation() AlsCharacterMovement->SetMovementModeLocked(false); - if (RagdollingState.Grounded) + if (bGrounded) { GetCharacterMovement()->SetMovementMode(MOVE_Walking); } @@ -1099,7 +1097,7 @@ void AAlsCharacter::StopRagdollingImplementation() OnRagdollEnded.Broadcast(); - if (RagdollingState.Grounded && + if (bGrounded && GetMesh()->GetAnimInstance()->Montage_Play(SelectGetUpMontage(bRagdollFacingUpward), 1.0f, EMontagePlayReturnType::MontageLength, 0.0f, true)) { @@ -1110,7 +1108,7 @@ void AAlsCharacter::StopRagdollingImplementation() // Re-equip active slot - casting hell... // TODO: Fix with Activate Ability // @Game-Change - Start - if (const ALyraPlayerController* PlayerController = Cast(GetController())) + if (const APlayerController* PlayerController = Cast(GetController())) { UActorComponent* FoundComponent = PlayerController->FindComponentByClass(ULyraQuickBarComponent::StaticClass()); if (ULyraQuickBarComponent* QuickBar = Cast(FoundComponent)) diff --git a/Source/ALS/Public/State/AlsRagdollingState.h b/Source/ALS/Public/State/AlsRagdollingState.h index 7ee81463b..ce400739b 100644 --- a/Source/ALS/Public/State/AlsRagdollingState.h +++ b/Source/ALS/Public/State/AlsRagdollingState.h @@ -6,9 +6,6 @@ USTRUCT(BlueprintType) struct ALS_API FAlsRagdollingState { GENERATED_BODY() - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS") - bool Grounded; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ALS") FVector Velocity{ForceInit};