From ab8c4da1d8f6d9e060fb6f556c82c572ee174991 Mon Sep 17 00:00:00 2001 From: Niklas Date: Sat, 13 Apr 2024 21:04:36 +0200 Subject: [PATCH] hopefully fix cooking errors --- Config/DefaultGame.ini | 1 - Source/FortniteGame/Private/AthenaDanceItemDefinition.cpp | 4 ++++ Source/FortniteGame/Private/AthenaEmojiItemDefinition.cpp | 6 +++++- Source/FortniteGame/Private/AthenaSprayItemDefinition.cpp | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 1dcbbb11..2d30ee44 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -346,7 +346,6 @@ ActiveTheaterListPath=/Game/World/ActiveTheaterList.ActiveTheaterList +PrimaryAssetTypesToScan=(PrimaryAssetType="Alteration",AssetBaseClass=/Script/FortniteGame.FortAlterationItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/Alterations"),(Path="/Game/Items/Alteration_v2")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) +PrimaryAssetTypesToScan=(PrimaryAssetType="Ammo",AssetBaseClass=/Script/FortniteGame.FortAmmoItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/Ammo"),(Path="/Game/Athena/Items/Ammo")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) +PrimaryAssetTypesToScan=(PrimaryAssetType="CardPack",AssetBaseClass=/Script/FortniteGame.FortCardPackItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/CardPacks")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) -+PrimaryAssetTypesToScan=(PrimaryAssetType="CharacterCosmetic",AssetBaseClass=/Script/FortniteGame.FortCharacterCosmeticItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/CharacterCosmetics")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) +PrimaryAssetTypesToScan=(PrimaryAssetType="ConsumableAccountItem",AssetBaseClass=/Script/FortniteGame.FortConsumableAccountItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/AccountConsumables")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) +PrimaryAssetTypesToScan=(PrimaryAssetType="ConversionControl",AssetBaseClass=/Script/FortniteGame.FortConversionControlItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/DirectedAcquisition/ConversionControl")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) +PrimaryAssetTypesToScan=(PrimaryAssetType="Currency",AssetBaseClass=/Script/FortniteGame.FortCurrencyItemDefinition,bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Items/Currency")),SpecificAssets=,Rules=(Priority=20,bApplyRecursively=True,ChunkId=0,CookRule=AlwaysCook)) diff --git a/Source/FortniteGame/Private/AthenaDanceItemDefinition.cpp b/Source/FortniteGame/Private/AthenaDanceItemDefinition.cpp index 19cf4546..b9b46db8 100644 --- a/Source/FortniteGame/Private/AthenaDanceItemDefinition.cpp +++ b/Source/FortniteGame/Private/AthenaDanceItemDefinition.cpp @@ -1,4 +1,6 @@ #include "AthenaDanceItemDefinition.h" +#include "GameplayTagContainer.h" +#include "GameplayTagsManager.h" FText UAthenaDanceItemDefinition::GetChatTriggerCommandName() const { return FText::GetEmpty(); @@ -9,6 +11,8 @@ UAthenaDanceItemDefinition::UAthenaDanceItemDefinition() { this->bMoveForwardOnly = false; this->WalkForwardSpeed = 300.00f; ItemType = EFortItemType::AthenaDance; + UGameplayTagsManager& Manager = UGameplayTagsManager::Get(); + Manager.AddNativeGameplayTag(TEXT("Cosmetics.EmoteType.Dance")); GameplayTags.AddTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Dance"))); } diff --git a/Source/FortniteGame/Private/AthenaEmojiItemDefinition.cpp b/Source/FortniteGame/Private/AthenaEmojiItemDefinition.cpp index 728bdf84..a768524a 100644 --- a/Source/FortniteGame/Private/AthenaEmojiItemDefinition.cpp +++ b/Source/FortniteGame/Private/AthenaEmojiItemDefinition.cpp @@ -1,4 +1,6 @@ #include "AthenaEmojiItemDefinition.h" +#include "GameplayTagContainer.h" +#include "GameplayTagsManager.h" void UAthenaEmojiItemDefinition::ConfigureParticleSystem(UParticleSystemComponent* ParticleSystem, TSoftObjectPtr OverrideImage) { } @@ -13,8 +15,10 @@ UAthenaEmojiItemDefinition::UAthenaEmojiItemDefinition() { this->GeneratedMaterial = NULL; ItemType = EFortItemType::AthenaDance; bMovingEmote = true; - GameplayTags.AddTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Emoji"))); GameplayTags.RemoveTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Dance"))); DisplayName = FText::FromString("Emoticon"); + UGameplayTagsManager& Manager = UGameplayTagsManager::Get(); + Manager.AddNativeGameplayTag(TEXT("Cosmetics.EmoteType.Emoji")); + GameplayTags.AddTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Emoji"))); } diff --git a/Source/FortniteGame/Private/AthenaSprayItemDefinition.cpp b/Source/FortniteGame/Private/AthenaSprayItemDefinition.cpp index 73361ec8..967efad3 100644 --- a/Source/FortniteGame/Private/AthenaSprayItemDefinition.cpp +++ b/Source/FortniteGame/Private/AthenaSprayItemDefinition.cpp @@ -1,4 +1,6 @@ #include "AthenaSprayItemDefinition.h" +#include "GameplayTagContainer.h" +#include "GameplayTagsManager.h" bool UAthenaSprayItemDefinition::ShouldUseBannerAsTexture() const { return false; @@ -15,7 +17,9 @@ TSoftObjectPtr UAthenaSprayItemDefinition::GetDecalMaterial( UAthenaSprayItemDefinition::UAthenaSprayItemDefinition() { this->bUseBannerAsTexture = false; ItemType = EFortItemType::AthenaDance; - GameplayTags.AddTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Spray"))); GameplayTags.RemoveTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Dance"))); + UGameplayTagsManager& Manager = UGameplayTagsManager::Get(); + Manager.AddNativeGameplayTag(TEXT("Cosmetics.EmoteType.Spray")); + GameplayTags.AddTag(FGameplayTag::RequestGameplayTag(FName("Cosmetics.EmoteType.Spray"))); }