Fix compile issue with 4.26

Source/FortniteGame/FortniteGame.Build.cs

@@ -16,7 +16,8 @@ public class FortniteGame : ModuleRules
                 "GameplayTags",
                 "GameplayAbilities",
                 "InputCore",
-                "Niagara"
+                "Niagara",
+                
     }
 );
 

Source/FortniteGame/FortniteGame.h

@@ -661,13 +661,13 @@ enum class EFortTemplateAccess : uint8
 };
 
 UENUM(BlueprintType)
-enum class EFortCustomGender : uint8
+enum class EFortCustomGender : uint8 
 {
-        Invalid= 0,
-	Male = 1,
-	Female = 2,
-	Both = 3,
-	EFortCustomGender_MAX= 4
+	Invalid,
+	Male,
+	Female,
+	Both,
+	EFortCustomGender_MAX,
 };
 
 UENUM()
@@ -853,4 +853,4 @@ enum class EFortDisplayTier : uint8
 	Sunbeam,
 	Moonglow,
 	EFortDisplayTier_MAX,
-};
+};

Source/FortniteGame/Public/Animation/FortAnimNotifyState.h

@@ -6,6 +6,7 @@
 #include "Animation/AnimNotifies/AnimNotify.h"
 #include "Animation/AnimNotifies/AnimNotifyState.h"
 #include "FortniteGame/FortniteGame.h"
+#include "../Athena/Items/AthenaCosmeticItemDefinition.h"
 #include "FortAnimNotifyState.generated.h"
 
 /**
@@ -20,7 +21,7 @@ public:
 };
 
 UCLASS(BlueprintType)
-class UFortAnimNotifyState_EmoteSound : public UAnimNotifyState
+class FORTNITEGAME_API UFortAnimNotifyState_EmoteSound : public UAnimNotifyState
 {
 
 	GENERATED_BODY()
@@ -50,7 +51,7 @@ public:
 
 };
 USTRUCT(BlueprintType)
-struct FEmoteRetargetingNotifyParameters 
+struct FORTNITEGAME_API FEmoteRetargetingNotifyParameters
 {
 	GENERATED_BODY()
 
@@ -66,7 +67,7 @@ public:
 };
 
 UCLASS(BlueprintType)
-class UFortAnimNotifyState_EmoteRetargeting : public UAnimNotifyState 
+class FORTNITEGAME_API UFortAnimNotifyState_EmoteRetargeting : public UAnimNotifyState
 {
 	GENERATED_BODY()
 
@@ -74,4 +75,93 @@ public:
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	 TArray<FEmoteRetargetingNotifyParameters> EmoteParameters;
 
+};
+USTRUCT(BlueprintType)
+struct FORTNITEGAME_API FEmotePropMaterialScalarParam 
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+	FName ParamName;
+
+	UPROPERTY(EditAnywhere)
+	float ParamValue;
+};
+
+UCLASS(BlueprintType)
+class FORTNITEGAME_API UFortAnimNotifyState_SpawnProp : public UAnimNotifyState
+{
+
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		FName SocketName;
+
+	UPROPERTY(EditAnywhere)
+		FVector LocationOffset;
+
+	UPROPERTY(EditAnywhere)
+		FRotator RotationOffset;
+
+	UPROPERTY(EditAnywhere)
+		FVector Scale;
+
+	UPROPERTY(EditAnywhere)
+		AActor* ActorProp;
+
+	UPROPERTY(EditAnywhere)
+		USkeletalMesh* SkeletalMeshProp;
+
+	UPROPERTY(EditAnywhere)
+		UAnimationAsset* SkeletalMeshPropAnimation;
+
+	UPROPERTY(EditAnywhere)
+		UAnimInstance* SkeletalMeshPropAnimClass;
+
+	UPROPERTY(EditAnywhere)
+		bool bInheritScale;
+
+	UPROPERTY(EditAnywhere)
+		bool bAbsoluteScale;
+
+	UPROPERTY(EditAnywhere)
+		bool bUseAttachParentBound;
+
+	UPROPERTY(EditAnywhere)
+		bool bPropAnimLooping;
+
+	UPROPERTY(EditAnywhere)
+		bool bSyncMontage;
+
+	UPROPERTY(EditAnywhere)
+		bool bPrestreamTextures;
+
+	UPROPERTY(EditAnywhere)
+		float PrestreamTextureDuration;
+
+	UPROPERTY(EditAnywhere)
+		UStaticMesh* StaticMeshProp;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FEmotePropMaterialScalarParam> PropMaterialScalarParams;
+
+	UPROPERTY(EditAnywhere)
+		int PropId;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UAthenaCosmeticItemDefinition> VariantsCosmeticItemDef;
+
+	UPROPERTY(EditAnywhere)
+		bool bApplyVariantsToSpawnedItems;
+
+	UPROPERTY(EditAnywhere)
+		bool bTrackComponentPropInGC;
+
+	UPROPERTY(EditAnywhere)
+		TMap<UMeshComponent*, UMeshComponent*> PersistComponents;
+
 };

Source/FortniteGame/Public/Athena/Items/AthenaBackpackItemDefinition.h

@@ -13,5 +13,10 @@ UCLASS()
 class FORTNITEGAME_API UAthenaBackpackItemDefinition : public UAthenaCharacterPartItemDefinition
 {
 	GENERATED_BODY()
-	
+
+public:
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaBackpack", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaBattleBusItemDefinition.h

@@ -33,4 +33,12 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		FSoftClassPath BusPrefabClass;
+
+
+
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaBattleBus", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaCosmeticItemDefinition.h

@@ -7,6 +7,7 @@
 #include "GameplayTags.h"
 #include "Customization/FortCosmeticVariant.h"
 #include "Particles/ParticleSystem.h"
+#include "Customization/FortCosmeticVariant.h"
 #include "AthenaCosmeticItemDefinition.generated.h"
 
 class UAthenaCharacterItemDefinition;
@@ -36,19 +37,6 @@ public:
 	TSoftObjectPtr<UMaterialInterface> OverrideMaterial;
 };
 
-USTRUCT(BlueprintType)
-struct FCosmeticVariantInfo
-{
-	GENERATED_USTRUCT_BODY()
-
-public:
-	UPROPERTY(EditAnywhere, BlueprintReadOnly)
-		FGameplayTag VariantChannelTag;
-
-	UPROPERTY(EditAnywhere, BlueprintReadOnly)
-		FGameplayTag ActiveVariantTag;
-};
-
 
 USTRUCT(BlueprintType)
 struct FFortCosmeticAdaptiveStatPair 
@@ -152,7 +140,7 @@ public:
 		FGameplayTag VariantChannelToUseForThumbnails;
 
 	UPROPERTY(EditAnywhere)
-		TArray<FortCosmeticVariantPreview> ItemVariantPreviews;
+		TArray<FFortCosmeticVariantPreview> ItemVariantPreviews;
 
 	UPROPERTY(EditAnywhere)
 		FText DirectAquisitionStyleDisclaimerOverride;

Source/FortniteGame/Public/Athena/Items/AthenaEmojiItemDefinition.h

@@ -60,4 +60,9 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		UMaterialInstance* GeneratedMaterial;
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaDance", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaGliderItemDefinition.h

@@ -14,4 +14,9 @@ class FORTNITEGAME_API UAthenaGliderItemDefinition : public UAthenaCosmeticItemD
 {
 	GENERATED_BODY()
 	
+public:
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaItemWrap", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaItemWrapDefinition.h

@@ -24,5 +24,8 @@ public:
 		TSoftObjectPtr<UMaterialInstance>        ItemWrapMaterial;
 
 
-
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaItemWrap", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaLoadingScreenItemDefinition.h

@@ -29,4 +29,10 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		FLinearColor                      BackgroundColor;
+
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaLoadingScreen", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaPetItemDefinition.h

@@ -62,4 +62,8 @@ public:
 	UPROPERTY(EditAnywhere)
 		TSoftObjectPtr<UFortTaggedSoundBank> PetSoundBank;
 
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaPetItemDefinition", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaPickaxeItemDefinition.h

@@ -4,14 +4,59 @@
 
 #include "CoreMinimal.h"
 #include "Athena/Items/AthenaCosmeticItemDefinition.h"
+#include "../../Weapons/Data/FortWeaponMeleeItemDefinition.h"
+#include "../../Weapons/Data/FortWeaponAdditionalData.h"
 #include "AthenaPickaxeItemDefinition.generated.h"
 
 /**
  * 
  */
+
 UCLASS()
 class FORTNITEGAME_API UAthenaPickaxeItemDefinition : public UAthenaCosmeticItemDefinition
 {
 	GENERATED_BODY()
 	
+
+public:
+	UPROPERTY(EditAnywhere)
+		UFortWeaponMeleeItemDefinition* WeaponDefinition;
+
+	UPROPERTY(EditAnywhere)
+		FName MainMeshAttachmentSocketName;
+
+	UPROPERTY(EditAnywhere)
+		FName OffhandMeshAttachmentSocketName;
+
+	UPROPERTY(EditAnywhere)
+		FTransform MainMeshRelativeTransform;
+
+	UPROPERTY(EditAnywhere)
+		FTransform OffhandMeshRelativeTransform;
+
+	UPROPERTY(EditAnywhere)
+		FVector PickaxeImpactFXPreviewOffset;
+
+	UPROPERTY(EditAnywhere)
+		FVector PickaxeDualWieldPreviewOffset;
+
+	UPROPERTY(EditAnywhere)
+		FRotator PickaxeDualWieldPreviewRotation;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UAnimMontage> PreviewIdleMontage;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UAnimMontage> PreviewSwingMontage;
+
+	UPROPERTY(EditAnywhere)
+		FFortUICameraFrameTargetBounds CameraFramingBounds;
+
+	UPROPERTY(EditAnywhere)
+		FVector CameraFramingBoundsCenterOffset;
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaPickaxe", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaSeasonItemDefinition.h

@@ -6,25 +6,28 @@
 #include "Items/FortAccountItemDefinition.h"
 #include "GameplayTags.h"
 #include "FortniteGame/FortniteGame.h"
+#include "Heroes/FortTokenType.h"
 //#include "Items/FortWorldItemDefinition"
+#include "Items/FortMedalsPunchCardItemDefinition.h"
+#include "Items/FortQuestItemDefinition.h"
 #include "Items/FortItemDefinition.h"
 #include "Items/FortGiftBoxItemDefinition.h"
 #include "AthenaSeasonItemDefinition.generated.h"
 
 /**
- * 
+ *
  */
 USTRUCT(BlueprintType)
-struct FORTNITEGAME_API FFortGiftBoxFortmatData 
+struct FORTNITEGAME_API FFortGiftBoxFortmatData
 {
 	GENERATED_BODY()
 
 public:
 	UPROPERTY(EditAnywhere)
-	FString StringAssetType; 
+		FString StringAssetType;
 
 	UPROPERTY(EditAnywhere)
-	FString StringData;
+		FString StringData;
 };
 
 USTRUCT()
@@ -56,43 +59,43 @@ public:
 };
 
 USTRUCT(BlueprintType)
-struct FORTNITEGAME_API FChallengeGiftBoxData 
+struct FORTNITEGAME_API FChallengeGiftBoxData
 {
 	GENERATED_BODY()
 
 public:
 	UPROPERTY(EditAnywhere)
-	 TSoftObjectPtr<UFortGiftBoxItemDefinition> GiftBoxToUse; 
+		TSoftObjectPtr<UFortGiftBoxItemDefinition> GiftBoxToUse;
 
 	UPROPERTY(EditAnywhere)
-	 TArray<FFortGiftBoxFortmatData> GiftBoxFormatData;
+		TArray<FFortGiftBoxFortmatData> GiftBoxFormatData;
 };
 USTRUCT(BlueprintType)
-struct FORTNITEGAME_API FAthenaRewardItemReference 
+struct FORTNITEGAME_API FAthenaRewardItemReference
 {
 	GENERATED_BODY()
 
 public:
 	UPROPERTY(EditAnywhere)
-	TSoftObjectPtr<UFortItemDefinition> ItemDefinition;
+		TSoftObjectPtr<UFortItemDefinition> ItemDefinition;
 
 	UPROPERTY(EditAnywhere)
-	FString TemplateId;
+		FString TemplateId;
 
 	UPROPERTY(EditAnywhere)
-	int Quantity; 
+		int Quantity;
 
 	UPROPERTY(EditAnywhere)
-	FChallengeGiftBoxData RewardGiftBox; 
+		FChallengeGiftBoxData RewardGiftBox;
 
 	UPROPERTY(EditAnywhere)
-	bool IsChaseReward;
+		bool IsChaseReward;
 
 	UPROPERTY(EditAnywhere)
-	EAthenaRewardItemType RewardType; 
+		EAthenaRewardItemType RewardType;
 
 	UPROPERTY(EditAnywhere)
-	EAthenaRewardVisualImportanceType RewardVisualImportanceType; 
+		EAthenaRewardVisualImportanceType RewardVisualImportanceType;
 };
 
 USTRUCT(BlueprintType)
@@ -102,7 +105,7 @@ struct FORTNITEGAME_API FAthenaRewardScheduleLevel
 
 public:
 	UPROPERTY(EditAnywhere)
-	TArray<FAthenaRewardItemReference> Rewards;
+		TArray<FAthenaRewardItemReference> Rewards;
 
 };
 
@@ -113,7 +116,7 @@ struct FAthenaRewardSchedule
 
 public:
 	UPROPERTY(EditAnywhere)
-	TArray<FAthenaRewardScheduleLevel> Levels;
+		TArray<FAthenaRewardScheduleLevel> Levels;
 };
 
 USTRUCT()
@@ -132,6 +135,154 @@ public:
 		int CategoryStartingLevel;
 };
 
+USTRUCT(BlueprintType)
+struct FORTNITEGAME_API FAthenaMidSeasonUpdateItemReq
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortItemDefinition> Item;
+
+	UPROPERTY(EditAnywhere)
+		int Count;
+};
+
+USTRUCT(BlueprintType)
+struct FORTNITEGAME_API FAthenaMidSeasonUpdateQuestReq
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+	TSoftObjectPtr<UFortQuestItemDefinition> Quest; 
+
+	UPROPERTY(EditAnywhere)
+		bool bCompletionRequired;
+};
+
+USTRUCT(BlueprintType)
+struct FORTNITEGAME_API FAthenaMidSeasonUpdate
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		int SeasonLevelRequirement;
+
+	UPROPERTY(EditAnywhere)
+		int BookLevelRequirement;
+
+	UPROPERTY(EditAnywhere)
+		bool SeasonPurchasedRequirement;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FAthenaMidSeasonUpdateItemReq> ItemRequirements;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FAthenaMidSeasonUpdateQuestReq> QuestRequirements;
+
+	UPROPERTY(EditAnywhere)
+		FAthenaRewardScheduleLevel Grants;
+
+	UPROPERTY(EditAnywhere)
+		TArray<TSoftObjectPtr<UFortItemDefinition>> Removals;
+};
+USTRUCT(BlueprintType)
+struct FAthenaSeasonBannerLevel 
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+	TSoftObjectPtr<UTexture2D> SurroundImage;
+
+	UPROPERTY(EditAnywhere)
+	TSoftObjectPtr<UMaterialInterface> BannerMaterial; 
+};
+
+USTRUCT(BlueprintType)
+struct FAthenaSeasonBannerLevelSchedule 
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+	TArray<FAthenaSeasonBannerLevel> Levels; 
+};
+
+USTRUCT(BlueprintType)
+struct FXpDisplayConversion
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortItemDefinition> XpItemDef;
+
+	UPROPERTY(EditAnywhere)
+		int ValueToReplaceAt;
+};
+
+UCLASS(BlueprintType)
+class UFortCollectionDataEntry : public UObject
+{
+
+	GENERATED_BODY()
+
+public:
+
+};
+
+UCLASS(BlueprintType)
+class UFortCollectionData : public UDataAsset
+{
+
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		TArray<UFortCollectionDataEntry*> Entries;
+
+};
+
+USTRUCT(BlueprintType)
+struct FFortCollectionDataMapping 
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+	 FString CollectionType; 
+
+	UPROPERTY(EditAnywhere)
+	bool bEnsureAllTaggedItemsAreInTheCollection; 
+
+	UPROPERTY(EditAnywhere)
+	TSoftObjectPtr<UFortCollectionData> Collection;
+};
+
+UCLASS(BlueprintType)
+class UFortCollectionsDataTable : public UDataAsset
+{
+
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortCollectionDataMapping> Collections;
+
+};
+
 UCLASS(BlueprintType)
 class FORTNITEGAME_API UAthenaSeasonItemDefinition : public UFortAccountItemDefinition
 {
@@ -145,17 +296,15 @@ public:
 	UPROPERTY(EditAnywhere)
 		bool bUseAccoladePunchCard;
 
-	//Missed Offset
-
 	UPROPERTY(EditAnywhere)
 		UDataTable* SeasonXpOnlyExtendedCurve;
-	/*
+	
 	UPROPERTY(EditAnywhere)
-		UFortMedalsPunchCardItemDefinition* DailyPunchCard;
+		TSoftObjectPtr<UFortMedalsPunchCardItemDefinition> DailyPunchCard;
 
 	UPROPERTY(EditAnywhere)
-		UFortRepeatableDailiesCardItemDefinition* RepeatableDailiesCard;
-*/
+		TSoftObjectPtr<UFortRepeatableDailiesCardItemDefinition> RepeatableDailiesCard;
+		
 	UPROPERTY(EditAnywhere)
 		int RestedXpDailyGrant;
 
@@ -186,8 +335,6 @@ public:
 	UPROPERTY(EditAnywhere)
 		EAthenaChallengeTabVisibility ChallengesVisibility;
 
-	//Missed Offset
-
 	UPROPERTY(EditAnywhere)
 		UDataTable* SeasonXpCurve;
 
@@ -224,68 +371,66 @@ public:
 	UPROPERTY(EditAnywhere)
 		TArray<FTrackDynamicBackground> TrackPageBackgrounds;
 
-
-
 	UPROPERTY(EditAnywhere)
 		FAthenaRewardSchedule SeasonXpScheduleFree;
 
 	UPROPERTY(EditAnywhere)
 		FGameplayTag FreeSeasonItemContentTag;
-	
-   UPROPERTY(EditAnywhere)
-	FAthenaRewardSchedule BookXpScheduleFree;
-	
+
+	UPROPERTY(EditAnywhere)
+		FAthenaRewardSchedule BookXpScheduleFree;
+
 	UPROPERTY(EditAnywhere)
 		FGameplayTag BattlePassFreeItemContentTag;
-	
-   UPROPERTY(EditAnywhere)
-	FAthenaRewardSchedule BookXpSchedulePaid;
-	
+
+	UPROPERTY(EditAnywhere)
+		FAthenaRewardSchedule BookXpSchedulePaid;
+
 	UPROPERTY(EditAnywhere)
 		FGameplayTag BattlePassPaidItemContentTag;
-	
-   UPROPERTY(EditAnywhere)
-	FAthenaRewardSchedule AdditionalBookSchedule;
-	
+
+	UPROPERTY(EditAnywhere)
+		FAthenaRewardSchedule AdditionalBookSchedule;
+
 	UPROPERTY(EditAnywhere)
 		FGameplayTag BattlePassAdditionalItemContentTag;
-	/*
+	
    UPROPERTY(EditAnywhere)
 	FAthenaSeasonBannerLevelSchedule SeasonBannerSchedule;
-   UPROPERTY(EditAnywhere)
-   class UFortChallengeBundleItemDefinition* SeasonalGlyphChallengeBundle;
-   */
+
+   //UPROPERTY(EditAnywhere)
+   //class UFortChallengeBundleItemDefinition* SeasonalGlyphChallengeBundle;
+   
 	UPROPERTY(EditAnywhere)
 		FString GlyphTokenTemplateId;
 
 	UPROPERTY(EditAnywhere)
 		class UDataTable* SeasonalGlyphRewards;
 
-
-	/*
 	UPROPERTY(EditAnywhere)
-	class UFortChallengeBundleScheduleDefinition* ChallengeSchedulePaid;
+	 UFortChallengeBundleScheduleDefinition* ChallengeSchedulePaid;
+
 	UPROPERTY(EditAnywhere)
 	TArray<UFortChallengeBundleScheduleDefinition*> ChallengeSchedulesAlwaysShown;
+
 	UPROPERTY(EditAnywhere)
 	 FAthenaRewardScheduleLevel SeasonGrantsToEveryone;
-	 */
+	 
 	UPROPERTY(EditAnywhere)
 		FGameplayTag SeasonGrantsToEveryoneItemContentTag;
 
-	/*
-   UPROPERTY(EditAnywhere)
+    UPROPERTY(EditAnywhere)
 	FAthenaRewardScheduleLevel SeasonFirstWinRewards;
-	*/
+	
 	UPROPERTY(EditAnywhere)
 		FGameplayTag SeasonFirstWinItemContentTag;
 
-	/*
 	UPROPERTY(EditAnywhere)
 	FAthenaRewardScheduleLevel BattleStarSubstitutionReward;
+
 	UPROPERTY(EditAnywhere)
 	TArray<FXpDisplayConversion> XpDisplayOverride;
-	*/
+	
 	UPROPERTY(EditAnywhere)
 		TSoftObjectPtr<UFortItemDefinition> XpItemDef;
 
@@ -294,16 +439,27 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		TArray<TSoftObjectPtr<UFortItemDefinition>> TokensToRemoveAtSeasonEnd;
-	/*
+	
 	UPROPERTY(EditAnywhere)
 	TArray<FAthenaMidSeasonUpdate> MidSeasonUpdates;
-	*/
+	
 	UPROPERTY(EditAnywhere)
 		bool bRemoveAllDailyQuestsAtSeasonEnd;
+	
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortTokenType> NoBattleBundleToken;
 
-	//Missed Offset
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortCollectionsDataTable> CollectionsDataTable;
+		
+	UPROPERTY(EditAnywhere)
+		UDataTable* NPCConversationQuests;
 
 	UPROPERTY(EditAnywhere)
 		TArray<FGameplayTag> FirstTimeTrackedBitFlags;
 
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaSeason", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaSkyDiveContrailItemDefinition.h

@@ -42,4 +42,10 @@ public:
 	UPROPERTY(EditAnywhere)
 		TArray<FFloatParticleParameter>    FloatParameters;
 	*/
+
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaSkyDiveContrail", GetFName());
+	}
 };

Source/FortniteGame/Public/Athena/Items/AthenaSprayItemDefinition.h

@@ -28,4 +28,10 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		TSoftObjectPtr<UTexture2D>                   DecalTexture;
+
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("AthenaDance", GetFName());
+	}
 };

Source/FortniteGame/Public/Customization/CustomCharacterPartData.h

@@ -155,7 +155,7 @@ public:
 };
 
 UCLASS(BlueprintType)
-class FORTNITEGAME_API UCustomCharacterBackpackData : public UCustomCharacterPartData
+class FORTNITEGAME_API UCustomCharacterBackpackData : public UCustomCharacterAccessoryData
 {
 	GENERATED_BODY()
 

Source/FortniteGame/Public/Customization/FortCosmeticVariant.h

@@ -14,7 +14,21 @@
  * 
  */
 USTRUCT(BlueprintType)
-struct FMcpVariantChannelInfo
+struct FCosmeticVariantInfo
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
+	FGameplayTag VariantChannelTag; 
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly)
+	FGameplayTag ActiveVariantTag; 
+};
+
+USTRUCT(BlueprintType)
+struct FMcpVariantChannelInfo : public FCosmeticVariantInfo
 {
 	GENERATED_USTRUCT_BODY()
 
@@ -43,7 +57,7 @@ public:
 };
 
 USTRUCT(BlueprintType)
-struct FortCosmeticVariantPreview
+struct FFortCosmeticVariantPreview
 {
 	GENERATED_USTRUCT_BODY()
 
@@ -102,3 +116,46 @@ public:
 	UPROPERTY(EditAnywhere)
 		TArray<FPartVariantDef> PartOptions;
 };
+
+
+UCLASS()
+class UFortVariantTokenType : public UFortAccountItemDefinition
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(EditAnywhere)
+	EItemProfileType ProfileType;
+
+	UPROPERTY(EditAnywhere)
+	UFortItemDefinition* cosmetic_item;
+
+	UPROPERTY(EditAnywhere)
+	FGameplayTag VariantChanelTag; 
+
+	UPROPERTY(EditAnywhere)
+	FGameplayTag VariantNameTag; 
+
+	UPROPERTY(EditAnywhere)
+	TArray<FCosmeticVariantInfo> VariantPreviewOverrides;
+
+	UPROPERTY(EditAnywhere)
+	bool bAutoEquipVariant;
+
+	UPROPERTY(EditAnywhere)
+	bool bMarkItemUnseen; 
+
+	UPROPERTY(EditAnywhere)
+	bool bCreateGiftbox; 
+
+	UPROPERTY(EditAnywhere)
+	FString CustomGiftbox; 
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("CosmeticVariantToken", GetFName());
+	}
+};
+
+
+

Source/FortniteGame/Public/Items/FortAlterationItemDefinition.h

@@ -4,6 +4,8 @@
 
 #include "CoreMinimal.h"
 #include "Items/FortAccountItemDefinition.h"
+#include "../Abilities/FortAbilitySet.h"
+#include "NiagaraSystem.h"
 #include "FortAlterationItemDefinition.generated.h"
 
 /**

Source/FortniteGame/Public/Items/FortBannerTokenType.h

@@ -0,0 +1,30 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Items/FortAccountItemDefinition.h"
+#include "../FortniteGame.h"
+#include "FortBannerTokenType.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class FORTNITEGAME_API UFortBannerTokenType : public UFortAccountItemDefinition
+{
+	GENERATED_BODY()
+	
+public:
+	UPROPERTY(EditAnywhere)
+	EItemProfileType ProfileType; 
+
+	UPROPERTY(EditAnywhere)
+	FString BannerIconTemplateName; 
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId("BannerToken", GetFName());
+	}
+};
+

Source/FortniteGame/Public/Items/FortMedalsPunchCardItemDefinition.h

@@ -0,0 +1,64 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Items/FortPersistableItemDefinition.h"
+#include "AttributeSet.h"
+#include "Items/FortAccountItemDefinition.h"
+#include "FortMedalsPunchCardItemDefinition.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class FORTNITEGAME_API UFortMedalsPunchCardItemDefinition : public UFortPersistableItemDefinition
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		int NumPunches;
+
+	UPROPERTY(EditAnywhere)
+		bool bAllowMedalReplacement;
+
+	UPROPERTY(EditAnywhere)
+		FScalableFloat PunchCardXpRewards;
+
+	UPROPERTY(EditAnywhere)
+		FScalableFloat PunchCardRestXp;
+
+};
+
+UCLASS(BlueprintType)
+class UFortRepeatableDailiesCardItemDefinition : public UFortAccountItemDefinition
+{
+
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere)
+		FString GranterQuestPack;
+
+	UPROPERTY(EditAnywhere)
+		int FillCount;
+
+	UPROPERTY(EditAnywhere)
+		FScalableFloat ReplacedRestedXpValue;
+
+	UPROPERTY(EditAnywhere)
+		FScalableFloat ReducedXPReward;
+
+	UPROPERTY(EditAnywhere)
+		FScalableFloat ReplacedRestedXpValueScalarForMissedDays;
+
+	//UPROPERTY(EditAnywhere)
+		//TSoftObjectPtr<UFortAthenaRewardEventGraphPurchaseToken> RequiredItemDef;
+
+//	UPROPERTY(EditAnywhere)
+	//	TArray<FRepeatableDailiesCardDateOverride> DateOverrides;
+
+};

Source/FortniteGame/Public/Items/FortMontageItemDefinitionBase.h

@@ -65,6 +65,9 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		EFortCustomGender Gender;
+
+	UPROPERTY(EditAnywhere)
+	 TSoftObjectPtr<UAnimMontage> EmoteMontage;
 };
 
 UCLASS(BlueprintType)

Source/FortniteGame/Public/Items/FortQuestItemDefinition.h

@@ -0,0 +1,212 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Items/FortAccountItemDefinition.h"
+#include "FortQuestItemDefinition.generated.h"
+
+/**
+ * 
+ */
+UCLASS(BlueprintType)
+class FORTNITEGAME_API UFortQuestItemDefinition : public UFortAccountItemDefinition
+{
+	GENERATED_BODY()
+
+public:
+	/*
+	UPROPERTY(EditAnywhere)
+		EFortQuestType QuestType;
+
+	UPROPERTY(EditAnywhere)
+		EFortQuestSubtype QuestSubtype;
+
+	UPROPERTY(EditAnywhere)
+		bool bShouldDisplayOverallQuestInformation;
+
+	UPROPERTY(EditAnywhere)
+		bool bAthenaUpdateObjectiveOncePerMatch;
+
+	UPROPERTY(EditAnywhere)
+		bool bAthenaGrantRarityToken;
+
+	UPROPERTY(EditAnywhere)
+		bool bAthenaMustCompleteInSingleMatch;
+
+	UPROPERTY(EditAnywhere)
+		bool bUpdateObjectiveOncePerMatch;
+
+	UPROPERTY(EditAnywhere)
+		bool IsStreamingRequired;
+
+	UPROPERTY(EditAnywhere)
+		bool bExpandsStormShield;
+
+	UPROPERTY(EditAnywhere)
+		bool bHidden;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortTandemCharacterData> TandemCharacterData;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<USoundBase> CharacterCompletionAudio;
+
+	UPROPERTY(EditAnywhere)
+		float CharacterCompletionAudioDelay;
+
+	UPROPERTY(EditAnywhere)
+		bool bSuppressQuestGrantedEvent;
+
+	UPROPERTY(EditAnywhere)
+		bool bInitiallySuppressedReplacementQuest;
+
+	UPROPERTY(EditAnywhere)
+		bool bIncludedInCategories;
+
+	UPROPERTY(EditAnywhere)
+		bool bAutoLaunch;
+
+	UPROPERTY(EditAnywhere)
+		bool bDeprecated;
+
+	UPROPERTY(EditAnywhere)
+		bool bDisableBackendConditionEvaluation;
+
+	UPROPERTY(EditAnywhere)
+		bool bAllowTileMatching;
+
+	UPROPERTY(EditAnywhere)
+		bool bAllowPlayNowNavigation;
+
+	UPROPERTY(EditAnywhere)
+		bool bAllowMissionAlertMatchesBypassingTileRequirements;
+
+	UPROPERTY(EditAnywhere)
+		bool bTutorialQuest;
+
+	UPROPERTY(EditAnywhere)
+		bool bHideStageDescription;
+
+	UPROPERTY(EditAnywhere)
+		bool bHideIncompleteObjectiveLocations;
+
+	UPROPERTY(EditAnywhere)
+		int ExpirationDuration;
+
+	UPROPERTY(EditAnywhere)
+		int ObjectiveCompletionCount;
+
+	UPROPERTY(EditAnywhere)
+		int Threshold;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortItemQuantityPair> Rewards;
+
+	UPROPERTY(EditAnywhere)
+		UDataTable* RewardsTable;
+
+	UPROPERTY(EditAnywhere)
+		FString QuestPool;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortHiddenRewardQuantityPair> HiddenRewards;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FString> FeatureRewards;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortMcpQuestRewardInfo> SelectableRewards;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortMcpQuestObjectiveInfo> Objectives;
+
+	UPROPERTY(EditAnywhere)
+		TArray<TSoftObjectPtr<UFortQuestItemDefinition>> TransientPrerequisiteQuests;
+
+	UPROPERTY(EditAnywhere)
+		bool bGrantTransientQuestToSquad;
+
+	UPROPERTY(EditAnywhere)
+		bool bTransientAutoComplete;
+
+	UPROPERTY(EditAnywhere)
+		bool bAllowMultipleCompletionsPerMatch;
+
+	UPROPERTY(EditAnywhere)
+		FGameplayTagContainer Prerequisites;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortQuestItemDefinition> PrerequisiteQuest;
+
+	UPROPERTY(EditAnywhere)
+		FDataTableRowHandle PrerequisiteObjective;
+
+	UPROPERTY(EditAnywhere)
+		float Weight;
+
+	UPROPERTY(EditAnywhere)
+		int GranterWindowPeriodMinutes;
+
+	UPROPERTY(EditAnywhere)
+		int GranterCooldownPeriodSeconds;
+
+	UPROPERTY(EditAnywhere)
+		FDataTableRowHandle Category;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortConversation> IntroConversation;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortConversation> SelectRewardsConversation;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortConversation> ClaimConversation;
+
+	UPROPERTY(EditAnywhere)
+		FText RewardHeaderText;
+
+	UPROPERTY(EditAnywhere)
+		FText RewardDescription;
+
+	UPROPERTY(EditAnywhere)
+		FText CompletionText;
+
+	UPROPERTY(EditAnywhere)
+		FText NPCInteractionText;
+
+	UPROPERTY(EditAnywhere)
+		TArray<FFortQuestMissionCreationContext> MissionCreationContexts;
+
+	UPROPERTY(EditAnywhere)
+		FFortMissionConfigDataParams MissionConfigMetadata;
+
+	UPROPERTY(EditAnywhere)
+		int ClaimPriority;
+
+	UPROPERTY(EditAnywhere)
+		int SortPriority;
+
+	UPROPERTY(EditAnywhere)
+		TSoftObjectPtr<UFortAbilitySet> QuestAbilitySet;
+
+	UPROPERTY(EditAnywhere)
+		bool bHideQuestProgressNotification;
+
+	UPROPERTY(EditAnywhere)
+		bool bHideQuestRewardNotification;
+
+	UPROPERTY(EditAnywhere)
+		bool bForceExpiryExport;*/
+};
+
+
+UCLASS(BlueprintType)
+class UFortChallengeBundleScheduleDefinition : public UFortAccountItemDefinition
+{
+
+	GENERATED_BODY()
+
+public:
+
+};

Source/FortniteGame/Public/Weapons/Data/FortWeaponMeleeItemDefinition.h

@@ -159,7 +159,7 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		bool bAttachAnimTrailsToWeapon;
-
+	/*
 	UPROPERTY(EditAnywhere)
 		TMap<TEnumAsByte<EPhysicalSurface>, TSoftObjectPtr<UParticleSystem>> ImpactPhysicalSurfaceEffectsMap;
 
@@ -168,7 +168,7 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		TMap<TEnumAsByte<EPhysicalSurface>, TSoftObjectPtr<UNiagaraSystem>> ImpactNiagaraPhysicalSurfaceEffectsMap;
-
+		*/
 	UPROPERTY(EditAnywhere)
 		TArray<FAttachedParticleComponentDef> ParticleComponentsDefs;
 
@@ -180,7 +180,7 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		TSoftObjectPtr<UAnimationAsset> SingleAnimationToPlay;
-
+	/*
 	UPROPERTY(EditAnywhere)
 		TMap<TEnumAsByte<EPhysicalSurface>, TSoftObjectPtr<USoundBase>> ImpactPhysicalSurfaceSoundsMap;
 
@@ -189,7 +189,7 @@ public:
 
 	UPROPERTY(EditAnywhere)
 		TMap<EFortWeaponSoundState, TSoftObjectPtr<USoundBase>> PrimaryFireSoundMap;
-
+		*/
 	UPROPERTY(EditAnywhere)
 		TSoftObjectPtr<USoundBase> GenericImpactSound;