From 09c817ef49275128d63b41efbef76961fb769bc0 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Fri, 20 Oct 2023 15:34:41 -0400 Subject: [PATCH] Don't finish state if move mode changes but no move mode is required --- Content/BPML_StateMacros.uasset | Bin 65713 -> 82095 bytes .../Input/FFPlayerController.h | 2 ++ .../UnrealFightingFramework/State/FFState.cpp | 7 ++++++- .../State/IFFStateOwnerInterface.h | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Content/BPML_StateMacros.uasset b/Content/BPML_StateMacros.uasset index be47fa1dc9839c0700e26f085253240c6282f3c8..a5b5ec8878ef3f3dfb91aa3fd1bc62851374585f 100644 GIT binary patch literal 82095 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 Ox;_8cQ1)6V|Nj6`F|;ZG literal 65713 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 InputSequences) override; virtual void DisableMostRecentInput() override; diff --git a/Source/UnrealFightingFramework/State/FFState.cpp b/Source/UnrealFightingFramework/State/FFState.cpp index 231beac..962480f 100644 --- a/Source/UnrealFightingFramework/State/FFState.cpp +++ b/Source/UnrealFightingFramework/State/FFState.cpp @@ -142,7 +142,12 @@ void UFFState::MovementModeChanged(EMovementMode PrevMovementMode, uint8 Previou OnMovementModeChanged(PrevMovementMode, PreviousCustomMode, NewMovementMode, NewCustomMode, InStateContext); - if(NewMovementMode != ReqMovementMode || ((ReqMovementMode == MOVE_Custom) && NewCustomMode != RequiredCustomMode)) + // TODO: Movement mode MOVE_None means movement is disabled but in this context it means no movement + // mode is specifically required to stay in this state i.e. changing from falling to walking + // will not exit out of this state. I think I want to use my own movement mode enum just so I + // can explicitly document this is what is meant by none + if((ReqMovementMode != EMovementMode::MOVE_None && NewMovementMode != ReqMovementMode) || + ((ReqMovementMode == MOVE_Custom) && NewCustomMode != RequiredCustomMode)) { Finish(InStateContext); } diff --git a/Source/UnrealFightingFramework/State/IFFStateOwnerInterface.h b/Source/UnrealFightingFramework/State/IFFStateOwnerInterface.h index 75631aa..5aeb2e4 100644 --- a/Source/UnrealFightingFramework/State/IFFStateOwnerInterface.h +++ b/Source/UnrealFightingFramework/State/IFFStateOwnerInterface.h @@ -7,7 +7,7 @@ #include "IFFStateOwnerInterface.generated.h" -UINTERFACE(MinimalAPI) +UINTERFACE(MinimalAPI, NotBlueprintable) class UFFStateOwnerInterface : public UInterface { GENERATED_BODY() @@ -21,8 +21,10 @@ class UNREALFIGHTINGFRAMEWORK_API IFFStateOwnerInterface GENERATED_BODY() public: + UFUNCTION(BlueprintCallable, Category="UFF State Owner Interface") virtual bool CheckInputSequence(const FFFInputSequence& InInputSequence) = 0; + UFUNCTION(BlueprintCallable, Category="UFF State Owner Interface") virtual bool CheckInputSequences(const TArray& InInputSequences) = 0; virtual void DisableMostRecentInput() = 0;