Add Generic disable Gamecue

erlangs · Jun 24, 2022 · e3d7eba · e3d7eba
1 parent d907364
commit e3d7eba
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 8 deletions.
diff --git a/Content/Abilities/Cues/GC_Damage.uasset b/Content/Abilities/Cues/GC_Damage.uasset
diff --git a/Content/Abilities/Cues/GC_Disable.uasset b/Content/Abilities/Cues/GC_Disable.uasset
diff --git a/Content/Abilities/Effects/GE_Break.uasset b/Content/Abilities/Effects/GE_Break.uasset
diff --git a/Content/Abilities/Effects/GE_Disarm.uasset b/Content/Abilities/Effects/GE_Disarm.uasset
diff --git a/Content/Abilities/Effects/GE_Root.uasset b/Content/Abilities/Effects/GE_Root.uasset
diff --git a/Content/Abilities/Effects/GE_Silence.uasset b/Content/Abilities/Effects/GE_Silence.uasset
diff --git a/Content/Abilities/Effects/GE_Stun.uasset b/Content/Abilities/Effects/GE_Stun.uasset
diff --git a/Content/Widgets/StatusBars/DisableDuration.uasset b/Content/Widgets/StatusBars/DisableDuration.uasset
diff --git a/Source/Gamekit/Abilities/Blueprint/GKAbilityBlueprintLibrary.cpp b/Source/Gamekit/Abilities/Blueprint/GKAbilityBlueprintLibrary.cpp
@@ -144,6 +144,51 @@ FText UGKAbilityBlueprintLibrary::GetFailureReasonFor(UGameplayAbility     *Abil
     return NSLOCTEXT(NAMESPACE, "AbilityUnknown", "Internal Failure reason");
 }
 
+TArray<FGKFailureTagMapping> GenerateDisableNameMapping()
+{
+    // TODO: make this a datatable
+    auto &ASGlobals = (UGKAbilitySystemGlobals &)(UGKAbilitySystemGlobals::Get());
+
+    FText DisableStunName     = NSLOCTEXT(NAMESPACE, "Stun Effect", "Stun");
+    FText DisableSilenceName  = NSLOCTEXT(NAMESPACE, "Silence", "Silence");
+    FText DisableRootName     = NSLOCTEXT(NAMESPACE, "Root", "Root");
+    FText DisableBreakName    = NSLOCTEXT(NAMESPACE, "Break", "Break");
+    FText DisableMuteName     = NSLOCTEXT(NAMESPACE, "Mute", "Mute");
+    FText DisableDisarmedName = NSLOCTEXT(NAMESPACE, "Disarmed", "Disarmed");
+    FText DisableEtheralName  = NSLOCTEXT(NAMESPACE, "Etheral", "Etheral");
+
+    return TArray<FGKFailureTagMapping>{
+            FGKFailureTagMapping{DisableStun, DisableStunName},
+            FGKFailureTagMapping{DisableSilence, DisableSilenceName},
+            FGKFailureTagMapping{DisableRoot, DisableRootName},
+            FGKFailureTagMapping{DisableBreak, DisableBreakName},
+            FGKFailureTagMapping{DisableMute, DisableMuteName},
+            FGKFailureTagMapping{DisableDisarmed, DisableDisarmedName},
+            FGKFailureTagMapping{DisableEtheral, DisableEtheralName},
+    };
+}
+
+TArray<FGKFailureTagMapping> const &GetDisableNames()
+{
+    static TArray<FGKFailureTagMapping> Mappings = GenerateDisableNameMapping();
+    return Mappings;
+}
+
+FText UGKAbilityBlueprintLibrary::GetDisableName(FGameplayTagContainer Tags)
+{
+    FGameplayTag Tag = Tags.GetByIndex(0);
+
+    for (FGKFailureTagMapping const &Entry: GetDisableNames())
+    {
+        if (Entry.FailureTag == Tag)
+        {
+            return Entry.LocalReason;
+        }
+    }
+
+    return NSLOCTEXT(NAMESPACE, "DisableUnknown", "Disable has no name");
+}
+
 UEnum *UGKAbilityBlueprintLibrary::GetDefaultAbilityInputEnum()
 {
     static UEnum *InputEnum = StaticEnum<EGK_MOBA_AbilityInputID>();
@@ -156,7 +201,7 @@ void UGKAbilityBlueprintLibrary::GetAbilityData(class UDataTable *Table,
                                                 FGKAbilityStatic &AbilityData)
 {
     FGKAbilityStatic *Result = Table->FindRow<FGKAbilityStatic>(Row, "", false);
-     bValid = false;
+    bValid                   = false;
 
     if (Result != nullptr)
     {
@@ -173,4 +218,11 @@ void UGKAbilityBlueprintLibrary::DisableAbilityAutoGeneration(class UDataTable *
     {
         Result->bAutoGenerate = false;
     }
+}
+
+void UGKAbilityBlueprintLibrary::GetActiveEffectsWithAnyTags(UAbilitySystemComponent             *AbilitySystem,
+                                                             FGameplayTagContainer const         &Tags,
+                                                             TArray<FActiveGameplayEffectHandle> &ActiveGameplayEffects)
+{
+    ActiveGameplayEffects = AbilitySystem->GetActiveEffects(FGameplayEffectQuery::MakeQuery_MatchAnyEffectTags(Tags));
 }
diff --git a/Source/Gamekit/Abilities/Blueprint/GKAbilityBlueprintLibrary.h b/Source/Gamekit/Abilities/Blueprint/GKAbilityBlueprintLibrary.h
@@ -105,6 +105,9 @@ class GAMEKIT_API UGKAbilityBlueprintLibrary: public UBlueprintFunctionLibrary
     UFUNCTION(BlueprintPure)
     static void GetAbilityData(class UDataTable *Table, FName Row, bool &bValid, FGKAbilityStatic &AbilityData);
 
+    UFUNCTION(BlueprintPure)
+    static FText GetDisableName(FGameplayTagContainer Tags);
+
     UFUNCTION(BlueprintCallable)
     static void DisableAbilityAutoGeneration(class UDataTable *Table, FName Row);
 
@@ -120,4 +123,23 @@ class GAMEKIT_API UGKAbilityBlueprintLibrary: public UBlueprintFunctionLibrary
         InputID        = AbilitySpec.InputID;
         ActivationInfo = AbilitySpec.ActivationInfo;
     }
+
+    UFUNCTION(BlueprintPure)
+    static void BreakGameplayEffectContextHandle(FGameplayEffectContextHandle const &EffectContext,
+                                                 bool                               &bIsValid,
+                                                 FGameplayTagContainer              &ActorTagContainer,
+                                                 FGameplayTagContainer              &SpecTagContainer,
+                                                 UGameplayAbility                  *&Ability,
+                                                 UAbilitySystemComponent           *&AbilitySystem)
+    {
+        bIsValid = EffectContext.IsValid();
+        EffectContext.GetOwnedGameplayTags(ActorTagContainer, SpecTagContainer);
+        Ability       = const_cast<UGameplayAbility *>(EffectContext.GetAbility());
+        AbilitySystem = const_cast<UAbilitySystemComponent *>(EffectContext.GetInstigatorAbilitySystemComponent());
+    }
+
+    UFUNCTION(BlueprintCallable)
+    static void GetActiveEffectsWithAnyTags(UAbilitySystemComponent             *AbilitySystem,
+                                            FGameplayTagContainer const         &Tags,
+                                            TArray<FActiveGameplayEffectHandle> &ActiveGameplayEffects);
 };
diff --git a/Source/Gamekit/Widget/GKAbilityWidget.cpp b/Source/Gamekit/Widget/GKAbilityWidget.cpp
@@ -99,34 +99,33 @@ void UGKAbilityWidget::RemoveListeners()
         Ability->OnAbilityLevelUp.RemoveAll(this);
     }
 
-    // TODO: investigate why the dask got destroyed already
-    // is it because of the order of NativeDestruct
+    // This is not necessary, they get cleanup automatically already
+    /*
     if (IsValid(CooldownChangedTask) && !CooldownChangedTask->IsDestroyed())
     {
-        //*
         if (CooldownChangedTask->HasCooldownTags())
         {
             CooldownChangedTask->OnCooldownBegin.RemoveAll(this);
             CooldownChangedTask->OnCooldownEnd.RemoveAll(this);
         }
-        //*/
         CooldownChangedTask->EndTask();
     }
 
     if (IsValid(AttributeChangedTask) && !AttributeChangedTask->IsDestroyed())
     {
-        AttributeChangedTask->OnAttributeChanged.RemoveAll(this);
+        // AttributeChangedTask->OnAttributeChanged.RemoveAll(this);
         AttributeChangedTask->EndTask();
     }
+    */
 
     bBound = false;
 }
 
 void UGKAbilityWidget::NativeDestruct()
 {
-    UUserWidget::NativeDestruct();
-
     RemoveListeners();
+
+    UUserWidget::NativeDestruct();
 }
 
 void UGKAbilityWidget::OnAbilityInsufficientResources_Native(FGameplayAttribute Attribute,