Switch to unreal 5.3 (Fix warning)

Plugins/CogAbility/Source/CogAbility/Private/CogAbilityConfig_Alignment.cpp

@@ -31,7 +31,7 @@ FVector4f UCogAbilityConfig_Alignment::GetEffectColor(const UCogAbilityDataAsset
         return NeutralColor;
     }
 
-    const FGameplayTagContainer& Tags = Effect.InheritableGameplayEffectTags.CombinedTags;
+    const FGameplayTagContainer& Tags = Effect.GetAssetTags();
 
     if (Tags.HasTag(Asset->NegativeEffectTag))
     {

Plugins/CogAbility/Source/CogAbility/Private/CogAbilityWindow_Effects.cpp

@@ -139,8 +139,8 @@ void FCogAbilityWindow_Effects::RenderEffectsTable()
                 bool AlignmentOrder = false;
                 if (Config->SortByAlignment && Asset != nullptr)
                 {
-                    const FGameplayTagContainer& Tags1 = Effect1->InheritableGameplayEffectTags.CombinedTags;
-                    const FGameplayTagContainer& Tags2 = Effect2->InheritableGameplayEffectTags.CombinedTags;
+                    const FGameplayTagContainer& Tags1 = Effect1->GetAssetTags();
+                    const FGameplayTagContainer& Tags2 = Effect2->GetAssetTags();
                     const int32 Pos1 = Tags1.HasTag(Asset->PositiveEffectTag) ? 1 : Tags1.HasTag(Asset->NegativeEffectTag) ? -1 : 0;
                     const int32 Pos2 = Tags2.HasTag(Asset->PositiveEffectTag) ? 1 : Tags2.HasTag(Asset->NegativeEffectTag) ? -1 : 0;
                     const int32 Diff = Pos2 - Pos1;
@@ -419,7 +419,7 @@ void FCogAbilityWindow_Effects::RenderRemainingTime(const UAbilitySystemComponen
 //--------------------------------------------------------------------------------------------------------------------------
 void FCogAbilityWindow_Effects::RenderStacks(const FActiveGameplayEffect& ActiveEffect, const UGameplayEffect& Effect)
 {
-    const int32 CurrentStackCount = ActiveEffect.Spec.StackCount;
+    const int32 CurrentStackCount = ActiveEffect.Spec.GetStackCount();
     if (Effect.StackLimitCount <= 0)
     {
         ImGui::Text("0");

Source/CogSample/CogSampleAreaComponent.cpp

@@ -463,9 +463,9 @@ void UCogSampleAreaComponent::RefreshOtherComponentsValues()
         }
         else if (UNiagaraComponent* NiagaraComponent = Cast<UNiagaraComponent>(SceneComponent))
         {
-            NiagaraComponent->SetNiagaraVariableVec3("HalfExtent", HalfExtent);
-            NiagaraComponent->SetNiagaraVariableFloat("TickRate", TickRate);
-            NiagaraComponent->SetNiagaraVariableFloat("Duration", Duration);
+            NiagaraComponent->SetVariableVec3(HalfExtentName, HalfExtent);
+            NiagaraComponent->SetVariableFloat(TickRateName, TickRate);
+            NiagaraComponent->SetVariableFloat(DurationName, Duration);
         }
     }
 }

Source/CogSample/CogSampleAreaComponent.h

@@ -100,6 +100,15 @@ public:
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Area")
     bool OnlyDetectOnAuthority = true;
 
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Area")
+    FName HalfExtentName = "HalfExtent";
+    
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Area")
+    FName TickRateName = "TickRate";
+    
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Area")
+    FName DurationName = "Duration";
+
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Area")
     TArray<FCogSampleAreaEffectConfig> Effects;
 

Source/CogSample/CogSampleCharacter.cpp

@@ -122,12 +122,6 @@ void ACogSampleCharacter::BeginPlay()
 void ACogSampleCharacter::EndPlay(const EEndPlayReason::Type EndPlayReason)
 {
     Super::EndPlay(EndPlayReason);
-}
-
-//--------------------------------------------------------------------------------------------------------------------------
-void ACogSampleCharacter::MarkComponentsAsPendingKill()
-{
-    Super::MarkComponentsAsPendingKill();
 
     UnregisterFromAbilitySystemEvents();
 }
@@ -138,7 +132,6 @@ UAbilitySystemComponent* ACogSampleCharacter::GetAbilitySystemComponent() const
     return AbilitySystem; 
 }
 
-
 //--------------------------------------------------------------------------------------------------------------------------
 void ACogSampleCharacter::PossessedBy(AController* NewController)
 {

Source/CogSample/CogSampleCharacter.h

@@ -105,8 +105,6 @@ public:
 
     virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
 
-    virtual void MarkComponentsAsPendingKill() override;
-
     virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;
 
     virtual void PossessedBy(AController* NewController) override;

Source/CogSample/CogSampleFunctionLibrary_Gameplay.cpp

@@ -490,3 +490,15 @@ void UCogSampleFunctionLibrary_Gameplay::MakeOutgoingSpecs(
         }
     }
 }
+
+//--------------------------------------------------------------------------------------------------------------------------
+const UGameplayEffectComponent* UCogSampleFunctionLibrary_Gameplay::GetEffectComponent(const UGameplayEffect* Effect, TSubclassOf<UGameplayEffectComponent> ClassToFind)
+{
+    if (Effect == nullptr)
+    {
+        return nullptr;
+    }
+
+    const UGameplayEffectComponent* EffectComponent = Effect->FindComponent(ClassToFind);
+    return EffectComponent;
+}

Source/CogSample/CogSampleFunctionLibrary_Gameplay.h

@@ -88,6 +88,9 @@ public:
     UFUNCTION(BlueprintCallable)
     static bool IsDead(const AActor* Actor);
 
+    UFUNCTION(BlueprintCallable)
+    static const UGameplayEffectComponent* GetEffectComponent(const UGameplayEffect* Effect, TSubclassOf<UGameplayEffectComponent> ClassToFind);
+
     static void AdjustAttributeForMaxChange(UAbilitySystemComponent* AbilityComponent, FGameplayAttributeData& AffectedAttribute, float OldValue, float NewMaxValue, const FGameplayAttribute& AffectedAttributeProperty);
 
     static FCollisionObjectQueryParams ConfigureCollisionObjectParams(const TArray<TEnumAsByte<EObjectTypeQuery>>& ObjectTypes);
@@ -109,5 +112,4 @@ public:
     static void MakeOutgoingSpecs(const AActor* Actor, const TArray<TSubclassOf<UGameplayEffect>>& Effects, const TArray<FGameplayEffectSpecHandle>& BakedEffects, TMap<TSubclassOf<UGameplayEffect>, FGameplayEffectSpecHandle>& Result);
 
     static APlayerController* GetFirstLocalPlayerController(UObject* WorldContextObject);
-
 };

Source/CogSample/CogSampleGameplayAbility.cpp

@@ -101,7 +101,7 @@ bool UCogSampleGameplayAbility::CheckCost(const FGameplayAbilitySpecHandle Handl
         //-----------------------------------------------------------------------------------
         // Can start ability if it cost stamina and stamina > 0 
         //-----------------------------------------------------------------------------------
-        if (CostEffect->InheritableGameplayEffectTags.CombinedTags.HasTag(Tag_Effect_Type_Cost_Stamina))
+        if (CostEffect->GetAssetTags().HasTag(Tag_Effect_Type_Cost_Stamina))
         {
             const float Stamina = ActorInfo->AbilitySystemComponent->GetNumericAttribute(UCogSampleAttributeSet_Caster::GetStaminaAttribute());
             if (Stamina > 0)