Add required tags in gameplay ability window

Plugins/CogAbility/Source/CogAbility/Private/CogAbilityHelper.cpp

@@ -28,13 +28,28 @@ void FCogAbilityHelper::RenderTagContainer(const FGameplayTagContainer& Containe
 }
 
 //--------------------------------------------------------------------------------------------------------------------------
-void FCogAbilityHelper::RenderTagContainerHighlighted(const FGameplayTagContainer& Container, const FGameplayTagContainer& TagsToHighlight, const bool Inline, const ImVec4& NormalColor, const ImVec4& HighlightColor)
+void FCogAbilityHelper::RenderTagContainer(
+    const FGameplayTagContainer& ContainerTags,
+    const FGameplayTagContainer& TagsToMatch,
+    const bool InverseMatch,
+    const bool OnlyShowMatches,
+    const bool Inline,
+    const ImVec4& NormalColor,
+    const ImVec4& MatchColor)
 {
-    TArray<FGameplayTag> GameplayTags;
+    TArray<FGameplayTag> Tags;
-    Container.GetGameplayTagArray(GameplayTags);
+    ContainerTags.GetGameplayTagArray(Tags);
-    for (const FGameplayTag& Tag : GameplayTags)
+
+    for (const FGameplayTag& Tag : Tags)
     {
-        const ImVec4 Color = TagsToHighlight.HasTag(Tag) ? HighlightColor : NormalColor;
+        bool hasTag = TagsToMatch.HasTag(Tag);
+        hasTag = InverseMatch ? !hasTag : hasTag;
+
+        if (OnlyShowMatches && hasTag == false) {
+            continue;
+        }
+
+        const ImVec4 Color = hasTag ? MatchColor : NormalColor;
         FCogWindowWidgets::SmallButton(StringCast<ANSICHAR>(*Tag.ToString()).Get(), Color);
         if (Inline)
         {

Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Abilities.cpp

@@ -11,6 +11,7 @@
 #include "imgui.h"
 
 DEFINE_PRIVATE_ACCESSOR_VARIABLE(GameplayAbility_ActivationBlockedTags, UGameplayAbility, FGameplayTagContainer, ActivationBlockedTags);
+DEFINE_PRIVATE_ACCESSOR_VARIABLE(GameplayAbility_ActivationRequiredTags, UGameplayAbility, FGameplayTagContainer, ActivationRequiredTags);
 
 //--------------------------------------------------------------------------------------------------------------------------
 void FCogAbilityWindow_Abilities::Initialize()
@@ -161,9 +162,11 @@ void FCogAbilityWindow_Abilities::RenderAbiltiesMenu(AActor* Selection)
 
             ImGui::Separator();
 
-            ImGui::ColorEdit4("Active Color", (float*)&Config->ActiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
+            ImGui::ColorEdit4("Active Color", (float*)&Config->ActiveAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
-            ImGui::ColorEdit4("Inactive Color", (float*)&Config->InactiveColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
+            ImGui::ColorEdit4("Inactive Color", (float*)&Config->InactiveAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
-            ImGui::ColorEdit4("Blocked Color", (float*)&Config->BlockedColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
+            ImGui::ColorEdit4("Blocked Color", (float*)&Config->BlockedAbilityColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
+            ImGui::ColorEdit4("Default Tag Color", (float*)&Config->DefaultTagsColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
+            ImGui::ColorEdit4("Blocked Tag Color", (float*)&Config->BlockedTagsColor, ImGuiColorEditFlags_NoInputs | ImGuiColorEditFlags_AlphaPreviewHalf);
 
             ImGui::Separator();
 
@@ -339,21 +342,22 @@ void FCogAbilityWindow_Abilities::RenderAbilitiesTable(UAbilitySystemComponent&
             ImGui::TableNextColumn();
             if (Ability->DoesAbilitySatisfyTagRequirements(AbilitySystemComponent) == false)
             {
+                FGameplayTagContainer OwnedGameplayTags;
+                AbilitySystemComponent.GetOwnedGameplayTags(OwnedGameplayTags);
+
                 if (const FGameplayTagContainer* ActivationBlockedTags = &PRIVATE_ACCESS_PTR(Ability, GameplayAbility_ActivationBlockedTags))
                 {
                     FGameplayTagContainer AllBlockingTags;
                     AbilitySystemComponent.GetBlockedAbilityTags(AllBlockingTags);
-
-                    FGameplayTagContainer OwnedGameplayTags;
-                    AbilitySystemComponent.GetOwnedGameplayTags(OwnedGameplayTags);
                     AllBlockingTags.AppendTags(OwnedGameplayTags);
 
-                    FGameplayTagContainer FilteredTags = AllBlockingTags.FilterExact(*ActivationBlockedTags);
+                    FCogAbilityHelper::RenderTagContainer(*ActivationBlockedTags, AllBlockingTags, false, true, true, ImVec4(0, 0, 0, 0), FCogImguiHelper::ToImVec4(Config->BlockedTagsColor));
-                    FCogAbilityHelper::RenderTagContainer(FilteredTags, true, FCogImguiHelper::ToImVec4(Config->BlockedColor));
                 }
-                else
+
+                ImGui::SameLine();
+                if (const FGameplayTagContainer* ActivationRequiredTags = &PRIVATE_ACCESS_PTR(Ability, GameplayAbility_ActivationRequiredTags))
                 {
-                    ImGui::Text("Blocked");
+                    FCogAbilityHelper::RenderTagContainer(*ActivationRequiredTags, OwnedGameplayTags, true, true, true, ImVec4(0, 0, 0, 0), FCogImguiHelper::ToImVec4(Config->BlockedTagsColor));
                 }
             }
 
@@ -557,8 +561,23 @@ void FCogAbilityWindow_Abilities::RenderAbilityInfo(const UAbilitySystemComponen
         FCogAbilityHelper::RenderTagContainer(Ability->AbilityTags);
 
         //------------------------
-		// BlockingTags
+        // RequiredTags
-		//------------------------
+        //------------------------
+        FGameplayTagContainer OwnedGameplayTags;
+        AbilitySystemComponent.GetOwnedGameplayTags(OwnedGameplayTags);
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::TextColored(TextColor, "Required Tags");
+        ImGui::TableNextColumn();
+        if (const FGameplayTagContainer* ActivationRequiredTags = &PRIVATE_ACCESS_PTR(Ability, GameplayAbility_ActivationRequiredTags))
+        {
+            FCogAbilityHelper::RenderTagContainer(*ActivationRequiredTags, OwnedGameplayTags, true, false, false, FCogImguiHelper::ToImVec4(Config->DefaultTagsColor), FCogImguiHelper::ToImVec4(Config->BlockedTagsColor));
+        }
+
+        //------------------------
+        // BlockingTags
+        //------------------------
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
         ImGui::TextColored(TextColor, "Blocking Tags");
@@ -567,12 +586,9 @@ void FCogAbilityWindow_Abilities::RenderAbilityInfo(const UAbilitySystemComponen
         {
             FGameplayTagContainer AllBlockingTags;
             AbilitySystemComponent.GetBlockedAbilityTags(AllBlockingTags);
-
-            FGameplayTagContainer OwnedGameplayTags;
-            AbilitySystemComponent.GetOwnedGameplayTags(OwnedGameplayTags);
             AllBlockingTags.AppendTags(OwnedGameplayTags);
 
-            FCogAbilityHelper::RenderTagContainerHighlighted(*ActivationBlockedTags, AllBlockingTags, false, ImVec4(0.4f, 0.4f, 0.4f, 1.0f), FCogImguiHelper::ToImVec4(Config->BlockedColor));
+            FCogAbilityHelper::RenderTagContainer(*ActivationBlockedTags, AllBlockingTags, false, false, false, FCogImguiHelper::ToImVec4(Config->DefaultTagsColor), FCogImguiHelper::ToImVec4(Config->BlockedTagsColor));
         }
 
         ImGui::EndTable();
@@ -658,13 +674,13 @@ ImVec4 FCogAbilityWindow_Abilities::GetAbilityColor(const UAbilitySystemComponen
 
     if (Spec.IsActive())
     {
-        return FCogImguiHelper::ToImVec4(Config->ActiveColor);
+        return FCogImguiHelper::ToImVec4(Config->ActiveAbilityColor);
     }
 
     if (Ability != nullptr && Ability->DoesAbilitySatisfyTagRequirements(AbilitySystemComponent) == false)
     {
-        return FCogImguiHelper::ToImVec4(Config->BlockedColor);
+        return FCogImguiHelper::ToImVec4(Config->BlockedAbilityColor);
     }
 
-    return FCogImguiHelper::ToImVec4(Config->InactiveColor);
+    return FCogImguiHelper::ToImVec4(Config->InactiveAbilityColor);
 }

Plugins/CogAbility/Source/CogAbility/Public/CogAbilityHelper.h

@@ -17,6 +17,13 @@ public:
 
     static void RenderTagContainer(const FGameplayTagContainer& Container, const bool Inline = false, const ImVec4& Color = ImVec4(0.4f, 0.4f, 0.4f, 1.0f));
 
-    static void RenderTagContainerHighlighted(const FGameplayTagContainer& Container, const FGameplayTagContainer& TagsToHighlight, const bool Inline = false, const ImVec4& NormalColor = ImVec4(0.4f, 0.4f, 0.4f, 1.0f), const ImVec4& HighlightColor = ImVec4(1.0f, 0.0f, 0.0f, 1.0f));
+    static void RenderTagContainer(
+        const FGameplayTagContainer& ContainerTags,
+        const FGameplayTagContainer& TagsToMatch,
+        const bool InverseMatch = false,
+        const bool OnlyShowMatches = false,
+        const bool Inline = false,
+        const ImVec4& DefaultColor = ImVec4(0.4f, 0.4f, 0.4f, 1.0f),
+        const ImVec4& MatchColor = ImVec4(1.0f, 0.0f, 0.0f, 1.0f));
 
 };

Plugins/CogAbility/Source/CogAbility/Public/CogAbilityWindow_Abilities.h

@@ -92,13 +92,19 @@ public:
     bool ShowBlocked = true;
 
     UPROPERTY(Config)
-    FVector4f ActiveColor = FVector4f(0.0f, 1.0f, 0.5f, 1.0f);
+    FVector4f ActiveAbilityColor = FVector4f(0.0f, 1.0f, 0.5f, 1.0f);
 
     UPROPERTY(Config)
-    FVector4f InactiveColor = FVector4f(1.0f, 1.0f, 1.0f, 1.0f);
+    FVector4f InactiveAbilityColor = FVector4f(1.0f, 1.0f, 1.0f, 1.0f);
 
     UPROPERTY(Config)
-    FVector4f BlockedColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
+    FVector4f BlockedAbilityColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
+
+    UPROPERTY(Config)
+    FVector4f DefaultTagsColor = FVector4f(0.6f, 0.6f, 0.6f, 1.0f);
+
+    UPROPERTY(Config)
+    FVector4f BlockedTagsColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
 
     virtual void Reset() override
     {
@@ -108,8 +114,10 @@ public:
         ShowActive = true;
         ShowInactive = true;
         ShowBlocked = true;
-        ActiveColor = FVector4f(0.0f, 1.0f, 0.5f, 1.0f);
+        ActiveAbilityColor = FVector4f(0.0f, 1.0f, 0.5f, 1.0f);
-        InactiveColor = FVector4f(1.0f, 1.0f, 1.0f, 1.0f);
+        InactiveAbilityColor = FVector4f(1.0f, 1.0f, 1.0f, 1.0f);
-        BlockedColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
+        BlockedAbilityColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
+        DefaultTagsColor = FVector4f(0.6f, 0.6f, 0.6f, 1.0f);
+        BlockedTagsColor = FVector4f(1.0f, 0.5f, 0.5f, 1.0f);
     }
 };