diff --git a/Source/OpenPF2GameFramework/Private/CharacterStats/AbilityBoosts/PF2AbilityBoostBase.cpp b/Source/OpenPF2GameFramework/Private/CharacterStats/AbilityBoosts/PF2AbilityBoostBase.cpp index fd4c4c51..ebe93c50 100644 --- a/Source/OpenPF2GameFramework/Private/CharacterStats/AbilityBoosts/PF2AbilityBoostBase.cpp +++ b/Source/OpenPF2GameFramework/Private/CharacterStats/AbilityBoosts/PF2AbilityBoostBase.cpp @@ -10,6 +10,7 @@ #include "CharacterStats/AbilityBoosts/PF2AbilityBoostRuleOptionValidator.h" #include "CharacterStats/AbilityBoosts/PF2GameplayAbilityTargetData_BoostAbility.h" +#include "GameplayTags/Encounters/AbilityTriggers.h" #include "GameplayTags/GameplayAbilities/AbilityTypes.h" UPF2AbilityBoostBase::UPF2AbilityBoostBase() @@ -17,7 +18,7 @@ UPF2AbilityBoostBase::UPF2AbilityBoostBase() FAbilityTriggerData TriggerData; TriggerData.TriggerSource = EGameplayAbilityTriggerSource::GameplayEvent; - TriggerData.TriggerTag = Pf2TagGameplayAbilityTypeAbilityBoost; + TriggerData.TriggerTag = Pf2TagTriggerTagCategoryAnytimeAbilityBoost; this->AbilityTriggers.Add(TriggerData); diff --git a/Source/OpenPF2GameFramework/Private/GameplayTags/Encounters/AbilityTriggers.cpp b/Source/OpenPF2GameFramework/Private/GameplayTags/Encounters/AbilityTriggers.cpp index 555e98a1..c8e86f26 100644 --- a/Source/OpenPF2GameFramework/Private/GameplayTags/Encounters/AbilityTriggers.cpp +++ b/Source/OpenPF2GameFramework/Private/GameplayTags/Encounters/AbilityTriggers.cpp @@ -8,6 +8,21 @@ // The UE editor requires these tags to be under a root tag of `TriggerTagCategory` in order for them to be selectable // in the UI. +// ===================================================================================================================== +// Tags that trigger Gameplay Abilities that can be used at any time. +// ===================================================================================================================== +UE_DEFINE_GAMEPLAY_TAG_COMMENT( + Pf2TagTriggerTagCategoryAnytime, + "TriggerTagCategory.PF2.Anytime", + "Tags that trigger Gameplay Abilities that can be used at any time." +) + +UE_DEFINE_GAMEPLAY_TAG_COMMENT( + Pf2TagTriggerTagCategoryAnytimeAbilityBoost, + "TriggerTagCategory.PF2.Anytime.AbilityBoost", + "Tag to trigger ." +) + // ===================================================================================================================== // Tags that trigger Encounter-related Gameplay Abilities. // ===================================================================================================================== diff --git a/Source/OpenPF2GameFramework/Private/PF2CharacterBase.cpp b/Source/OpenPF2GameFramework/Private/PF2CharacterBase.cpp index ddc4ba9b..09aa72fb 100644 --- a/Source/OpenPF2GameFramework/Private/PF2CharacterBase.cpp +++ b/Source/OpenPF2GameFramework/Private/PF2CharacterBase.cpp @@ -24,6 +24,7 @@ #include "Commands/PF2CommandQueueComponent.h" +#include "GameplayTags/Encounters/AbilityTriggers.h" #include "GameplayTags/GameplayAbilities/AbilityTypes.h" #include "Utilities/PF2InterfaceUtilities.h" @@ -468,7 +469,7 @@ void APF2CharacterBase::ActivateAbilityBoost( Asc->TriggerAbilityFromGameplayEvent( BoostSpec->Handle, Asc->AbilityActorInfo.Get(), - Pf2TagGameplayAbilityTypeAbilityBoost, + Pf2TagTriggerTagCategoryAnytimeAbilityBoost, &BoostEventInfo, *Asc );