[#60] Eliminate FGameplayTag::GetTag()

This was identical to `FGameplayTag::RequestGameplayTag()` in the `FName` case, and not that much extra effort to invoke `FName()` ourselves in the `FString` case, so it doesn't make sense for this to exist.
OpenPF2 · Jul 19, 2024 · 4eee547 · 4eee547
1 parent cbb091d
commit 4eee547
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 40 deletions.
diff --git a/Source/OpenPF2GameFramework/Private/Abilities/Attacks/PF2AttackAttributeStatics.cpp b/Source/OpenPF2GameFramework/Private/Abilities/Attacks/PF2AttackAttributeStatics.cpp
@@ -56,7 +56,7 @@ FGameplayTag FPF2AttackAttributeStatics::GetDamageTypeForDamageAttribute(const F
 	{
 		if (Pair.Value == Attribute.AttributeName)
 		{
-			FoundTag = PF2GameplayAbilityUtilities::GetTag(Pair.Key);
+			FoundTag = FGameplayTag::RequestGameplayTag(Pair.Key);
 			break;
 		}
 	}

diff --git a/Source/OpenPF2GameFramework/Private/Actors/Components/PF2AbilitySystemComponent.cpp b/Source/OpenPF2GameFramework/Private/Actors/Components/PF2AbilitySystemComponent.cpp
@@ -429,7 +429,7 @@ bool UPF2AbilitySystemComponent::DeactivatePassiveGameplayEffects(const FName We
 
 		Query.EffectTagQuery =
 			FGameplayTagQuery::MakeQuery_MatchAnyTags(
-				FGameplayTagContainer(PF2GameplayAbilityUtilities::GetTag(WeightGroup))
+				FGameplayTagContainer(FGameplayTag::RequestGameplayTag(WeightGroup))
 			);
 
 		NumRemoved = this->RemoveActiveEffects(Query);
@@ -785,7 +785,7 @@ void UPF2AbilitySystemComponent::ActivatePassiveGameplayEffect(
 	// Ensure that the GE spec is tagged with its weight no matter how the weight was set (either through API or through
 	// a tag in the InheritableGameplayEffectTags field on the GE definition class itself). Without this, only the tag
 	// from the GE definition spec would pass through.
-	GameplayEffectSpec->AddDynamicAssetTag(PF2GameplayAbilityUtilities::GetTag(WeightGroup));
+	GameplayEffectSpec->AddDynamicAssetTag(FGameplayTag::RequestGameplayTag(WeightGroup));
 
 	// Special case: If the GE being activated is our "dummy" GE for dynamic tags, apply tags to it.
 	//

diff --git a/Source/OpenPF2GameFramework/Private/CharacterStats/PF2TemlCalculation.cpp b/Source/OpenPF2GameFramework/Private/CharacterStats/PF2TemlCalculation.cpp
@@ -15,12 +15,12 @@
 #include "Utilities/PF2GameplayAbilityUtilities.h"
 
 FPF2TemlCalculation::FPF2TemlCalculation(const FString& TagPrefix, const FGameplayEffectSpec& Spec) :
-	FPF2TemlCalculation(PF2GameplayAbilityUtilities::GetTag(TagPrefix), Spec)
+	FPF2TemlCalculation(FName(TagPrefix), Spec)
 {
 }
 
 FPF2TemlCalculation::FPF2TemlCalculation(const FName TagPrefix, const FGameplayEffectSpec& Spec) :
-	FPF2TemlCalculation(PF2GameplayAbilityUtilities::GetTag(TagPrefix), Spec)
+	FPF2TemlCalculation(FGameplayTag::RequestGameplayTag(TagPrefix), Spec)
 {
 }
 

diff --git a/Source/OpenPF2GameFramework/Private/Utilities/PF2GameplayAbilityUtilities.cpp b/Source/OpenPF2GameFramework/Private/Utilities/PF2GameplayAbilityUtilities.cpp
@@ -13,6 +13,8 @@
 
 #include "CharacterStats/PF2CharacterAbilitySystemInterface.h"
 
+#include "GameplayTags/GameplayEffects/WeightGroups.h"
+
 /**
  * Utility logic for working with Gameplay Abilities.
  */
@@ -32,7 +34,7 @@ namespace PF2GameplayAbilityUtilities
 	FName GetWeightGroupOfGameplayEffect(const TSubclassOf<UGameplayEffect> GameplayEffect, const FName DefaultWeight)
 	{
 		FName                  WeightGroup;
-		const FGameplayTag     WeightTagParent = GetTag(FName(TEXT("PF2.GameplayEffect.WeightGroup")));
+		const FGameplayTag     WeightTagParent = Pf2TagGameplayEffectWeightGroups;
 		const UGameplayEffect* Effect          = GameplayEffect.GetDefaultObject();
 
 		const FGameplayTagContainer WeightTags = Effect->GetAssetTags().Filter(FGameplayTagContainer(WeightTagParent));

diff --git a/Source/OpenPF2GameFramework/Public/Utilities/PF2GameplayAbilityUtilities.h b/Source/OpenPF2GameFramework/Public/Utilities/PF2GameplayAbilityUtilities.h
@@ -26,38 +26,6 @@ class UPF2CharacterAttributeSet;
  */
 namespace PF2GameplayAbilityUtilities
 {
-	/**
-	 * Gets the specified tag out of the tags known to the project.
-	 *
-	 * The tag must already exist in one of the INI files under Config/Tags; otherwise, this will trigger an error.
-	 *
-	 * @param TagName
-	 *	The name of the tag, as an FName.
-	 *
-	 * @return
-	 *	The desired tag.
-	 */
-	FORCEINLINE OPENPF2GAMEFRAMEWORK_API FGameplayTag GetTag(const FName& TagName)
-	{
-		return FGameplayTag::RequestGameplayTag(TagName);
-	}
-
-	/**
-	 * Gets the specified tag out of the tags known to the project.
-	 *
-	 * The tag must already exist in one of the INI files under Config/Tags; otherwise, this will trigger an error.
-	 *
-	 * @param TagName
-	 *	The name of the tag, as a string.
-	 *
-	 * @return
-	 *	The desired tag.
-	 */
-	FORCEINLINE OPENPF2GAMEFRAMEWORK_API FGameplayTag GetTag(const FString& TagName)
-	{
-		return GetTag(FName(TagName));
-	}
-
 	/**
 	 * Checks if a tag with the given name or prefix is present.
 	 *

diff --git a/Source/OpenPF2Tests/Private/Tests/PF2SpecBase.cpp b/Source/OpenPF2Tests/Private/Tests/PF2SpecBase.cpp
@@ -343,12 +343,12 @@ FActiveGameplayEffectHandle FPF2SpecBase::InitializeAttributeAndApplyEffect(
 
 void FPF2SpecBase::ApplyUnreplicatedTag(const FString& TagName) const
 {
-	this->TestPawnAsc->AddLooseGameplayTag(PF2GameplayAbilityUtilities::GetTag(TagName));
+	this->TestPawnAsc->AddLooseGameplayTag(FGameplayTag::RequestGameplayTag(FName(TagName)));
 }
 
 void FPF2SpecBase::RemoveUnreplicatedTag(const FString& TagName) const
 {
-	this->TestPawnAsc->RemoveLooseGameplayTag(PF2GameplayAbilityUtilities::GetTag(TagName));
+	this->TestPawnAsc->RemoveLooseGameplayTag(FGameplayTag::RequestGameplayTag(FName(TagName)));
 }
 
 void FPF2SpecBase::TestCharacterHasCondition(const TScriptInterface<IPF2CharacterInterface>& Character,