From c652716895d2d495c2a324cf84c3a35165f0a847 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Fri, 21 Jul 2023 23:25:45 -0400 Subject: [PATCH] Change state property types so they can be edited as enums --- Source/UnrealFightingFramework/State/FFState.h | 8 ++++---- .../State/IFFStateAvatarInterface.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/UnrealFightingFramework/State/FFState.h b/Source/UnrealFightingFramework/State/FFState.h index d02282f..63541f9 100644 --- a/Source/UnrealFightingFramework/State/FFState.h +++ b/Source/UnrealFightingFramework/State/FFState.h @@ -38,7 +38,7 @@ struct FFFStateContext * A state is an object that provides rules and conditions for when a state can be transitioned into * and logic to run when the state is entered, exited, and active. */ -UCLASS() +UCLASS(Blueprintable) class UNREALFIGHTINGFRAMEWORK_API UFFState : public UObject { GENERATED_BODY() @@ -62,18 +62,18 @@ public: * crouching, standing, or airborne for this state to be eligible for transitioning. */ UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="UFF State Properties") - uint8 StanceRequired; + int32 StanceRequired; /** * What is this state's category. * Used for determining what types of state can prematurely cancel this one. */ UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="UFF State Properties") - uint8 StateType; + int32 StateType; /** Conditions that need to be met in order for this state to be transitioned into */ UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="UFF State Properties") - TArray EntryConditions; + TArray EntryConditions; /** * Input sequences that needs to be present in the controlling player's input buffer for this diff --git a/Source/UnrealFightingFramework/State/IFFStateAvatarInterface.h b/Source/UnrealFightingFramework/State/IFFStateAvatarInterface.h index 7b96379..ed332e6 100644 --- a/Source/UnrealFightingFramework/State/IFFStateAvatarInterface.h +++ b/Source/UnrealFightingFramework/State/IFFStateAvatarInterface.h @@ -21,9 +21,9 @@ class UNREALFIGHTINGFRAMEWORK_API IFFStateAvatarInterface GENERATED_BODY() public: - virtual bool CheckStance(uint8 Stance) = 0; + virtual bool CheckStance(int32 Stance) = 0; - virtual bool CheckStateEnabled(uint8 StateType) = 0; + virtual bool CheckStateEnabled(int32 StateType) = 0; - virtual bool CheckStateEntryConditions(const TArray& EntryConditions) = 0; + virtual bool CheckStateEntryConditions(const TArray& EntryConditions) = 0; };