diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index abd9d56..a07c1b3 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -10,5 +10,5 @@ bDynamicReplication=False InvalidTagCharacters="\"\'," NumBitsForContainerSize=6 NetIndexFirstBitSegment=16 -+GameplayTagList=(Tag="ability.basicattack",DevComment="") ++GameplayTagList=(Tag="ability.basicattack",DevComment="Ability Tag assigned to basic attack abilities") diff --git a/Content/Characters/Crunch/Animation/AnimBP_Crunch.uasset b/Content/Characters/Crunch/Animation/AnimBP_Crunch.uasset index e322e73..53fb8e1 100644 --- a/Content/Characters/Crunch/Animation/AnimBP_Crunch.uasset +++ b/Content/Characters/Crunch/Animation/AnimBP_Crunch.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cef014a0bb099872b617ccaab9654a385ca11ff7730b3f9136d0b0fde61dea0 -size 366042 +oid sha256:aca3081ec170ef878365beaa830b7aeb8fdd5a2138f445f00112c83d337c108d +size 423887 diff --git a/Content/Characters/Crunch/GameplayAbility/Combo/Animations/AM_ComboCrunch.uasset b/Content/Characters/Crunch/GameplayAbility/Combo/Animations/AM_ComboCrunch.uasset index 1653f8b..6ad2df3 100644 --- a/Content/Characters/Crunch/GameplayAbility/Combo/Animations/AM_ComboCrunch.uasset +++ b/Content/Characters/Crunch/GameplayAbility/Combo/Animations/AM_ComboCrunch.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:642ef8a5f2307a501d2e94c67fbb891447d7fe0843c753b99f5167b38b16767c -size 10591 +oid sha256:527e90c2f11f888a3fe13c6ae78766802ef96c6750a6378a9e4b4676045f89ef +size 10611 diff --git a/Content/Characters/Crunch/GameplayAbility/Combo/GA_Combo_Crunch_BP.uasset b/Content/Characters/Crunch/GameplayAbility/Combo/GA_Combo_Crunch_BP.uasset index e7ff472..c361c62 100644 --- a/Content/Characters/Crunch/GameplayAbility/Combo/GA_Combo_Crunch_BP.uasset +++ b/Content/Characters/Crunch/GameplayAbility/Combo/GA_Combo_Crunch_BP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb91bcb97a77f92cff20b1c188b9730ab0e53fb77d12e9ebfb04f2e8412fdb8e -size 16945 +oid sha256:db55b4144dbe5e303e9cabe0a91ebd1796db238afe39bfc1a3af5e990c29d829 +size 16538 diff --git a/Content/ParagonCrunch/Characters/Heroes/Crunch/Animations/Ability_Combo_01.uasset b/Content/ParagonCrunch/Characters/Heroes/Crunch/Animations/Ability_Combo_01.uasset index 5d4a7fc..a9e66bc 100644 --- a/Content/ParagonCrunch/Characters/Heroes/Crunch/Animations/Ability_Combo_01.uasset +++ b/Content/ParagonCrunch/Characters/Heroes/Crunch/Animations/Ability_Combo_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4550e210fa9a0183dc05940d7f77bea876dd3d467600b8b9b7769a00de5d7474 -size 165739 +oid sha256:dd6c8c0cea6180df8899f60a0c29f2aee76c8cda4f20caa1fe43d96459adf5e5 +size 396263 diff --git a/Content/ParagonCrunch/Characters/Heroes/Crunch/Meshes/Crunch_Skeleton.uasset b/Content/ParagonCrunch/Characters/Heroes/Crunch/Meshes/Crunch_Skeleton.uasset index b07b50e..30eb125 100644 --- a/Content/ParagonCrunch/Characters/Heroes/Crunch/Meshes/Crunch_Skeleton.uasset +++ b/Content/ParagonCrunch/Characters/Heroes/Crunch/Meshes/Crunch_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88f3787a2084f3b147fd8eaeec4aeaf1acde50ee2d78c13eb8de13fc130a6541 -size 43719 +oid sha256:02e3fc57fb918c2960b46948b47d37e6b1758aa7347761400af120b9771da54e +size 57421 diff --git a/Source/Crunch/Private/GAS/GA_Combo.cpp b/Source/Crunch/Private/GAS/GA_Combo.cpp index e291f24..c0a1111 100644 --- a/Source/Crunch/Private/GAS/GA_Combo.cpp +++ b/Source/Crunch/Private/GAS/GA_Combo.cpp @@ -4,6 +4,13 @@ #include "GAS/GA_Combo.h" #include "Abilities/Tasks/AbilityTask_PlayMontageAndWait.h" +#include "GAS/UCAbilitySystemStatics.h" + +UGA_Combo::UGA_Combo() +{ + AbilityTags.AddTag(UCAbilitySystemStatics::GetBasicAttackAbilityTag()); + BlockAbilitiesWithTag.AddTag(UCAbilitySystemStatics::GetBasicAttackAbilityTag()); +} void UGA_Combo::ActivateAbility(const FGameplayAbilitySpecHandle Handle, const FGameplayAbilityActorInfo* ActorInfo, diff --git a/Source/Crunch/Public/GAS/GA_Combo.h b/Source/Crunch/Public/GAS/GA_Combo.h index a47bd8c..cb0973e 100644 --- a/Source/Crunch/Public/GAS/GA_Combo.h +++ b/Source/Crunch/Public/GAS/GA_Combo.h @@ -14,6 +14,7 @@ class CRUNCH_API UGA_Combo : public UCGameplayAbility { GENERATED_BODY() public: + UGA_Combo(); virtual void ActivateAbility(const FGameplayAbilitySpecHandle Handle, const FGameplayAbilityActorInfo* ActorInfo, const FGameplayAbilityActivationInfo ActivationInfo, const FGameplayEventData* TriggerEventData) override; private: UPROPERTY(EditDefaultsOnly, Category="Amination") diff --git a/Source/Crunch/Public/GAS/UCAbilitySystemStatics.cpp b/Source/Crunch/Public/GAS/UCAbilitySystemStatics.cpp new file mode 100644 index 0000000..aa8235e --- /dev/null +++ b/Source/Crunch/Public/GAS/UCAbilitySystemStatics.cpp @@ -0,0 +1,8 @@ +#include "UCAbilitySystemStatics.h" + +#include "GameplayTagContainer.h" + +FGameplayTag UCAbilitySystemStatics::GetBasicAttackAbilityTag() +{ + return FGameplayTag::RequestGameplayTag("ability.basicattack"); +} diff --git a/Source/Crunch/Public/GAS/UCAbilitySystemStatics.h b/Source/Crunch/Public/GAS/UCAbilitySystemStatics.h new file mode 100644 index 0000000..40175f4 --- /dev/null +++ b/Source/Crunch/Public/GAS/UCAbilitySystemStatics.h @@ -0,0 +1,16 @@ +#pragma once + +#include "CoreMinimal.h" +#include "GameplayTagContainer.h" +#include "UCAbilitySystemStatics.generated.h" + + +UCLASS() +class UCAbilitySystemStatics: public UObject +{ + GENERATED_BODY() +public: + static FGameplayTag GetBasicAttackAbilityTag(); + +}; +