poret/UnrealFightingFramework
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove state entry conditions

Browse Source
This commit is contained in:
Kevin Poretti 2023-08-01 21:13:02 -04:00
parent 87c2aafd49
commit d89face881
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/UnrealFightingFramework/State/FFState.cpp
View File

@ -28,7 +28,7 @@ bool UFFState::CanTransition(const FFFStateContext& InStateContext)
IFFStateAvatarInterface* SAI = Cast<IFFStateAvatarInterface>(InStateContext.Avatar); IFFStateAvatarInterface* SAI = Cast<IFFStateAvatarInterface>(InStateContext.Avatar);
if(SAI) if(SAI)
{ {
if(!(SAI->CheckStance(StanceRequired) && SAI->CheckStateEnabled(StateType) && SAI->CheckStateEntryConditions(EntryConditions))) if(!(SAI->CheckStance(StanceRequired) && SAI->CheckStateEnabled(StateType)))
{ {
return false; return false;
} }

4
Source/UnrealFightingFramework/State/FFState.h
View File

@ -79,10 +79,6 @@ public:
UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="UFF State Properties") UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category="UFF State Properties")
int32 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<int32> EntryConditions;
/** /**
* Input sequences that needs to be present in the controlling player's input buffer for this * Input sequences that needs to be present in the controlling player's input buffer for this
* state to be eligible for transitioning. * state to be eligible for transitioning.

2
Source/UnrealFightingFramework/State/IFFStateAvatarInterface.h
View File

@ -24,6 +24,4 @@ public:
virtual bool CheckStance(int32 Stance) = 0; virtual bool CheckStance(int32 Stance) = 0;
virtual bool CheckStateEnabled(int32 StateType) = 0; virtual bool CheckStateEnabled(int32 StateType) = 0;
virtual bool CheckStateEntryConditions(const TArray<int32>& EntryConditions) = 0;
}; };