diff --git a/Source/FortniteGame/FortniteGame.Build.cs b/Source/FortniteGame/FortniteGame.Build.cs index 46ea1eb0..415f648f 100644 --- a/Source/FortniteGame/FortniteGame.Build.cs +++ b/Source/FortniteGame/FortniteGame.Build.cs @@ -16,7 +16,8 @@ public class FortniteGame : ModuleRules "GameplayTags", "GameplayAbilities", "InputCore", - "Niagara" + "Niagara", + } ); diff --git a/Source/FortniteGame/FortniteGame.h b/Source/FortniteGame/FortniteGame.h index 921e0020..aed6a3db 100644 --- a/Source/FortniteGame/FortniteGame.h +++ b/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, -}; +}; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Animation/FortAnimNotifyState.h b/Source/FortniteGame/Public/Animation/FortAnimNotifyState.h index 15ce3d01..aecba415 100644 --- a/Source/FortniteGame/Public/Animation/FortAnimNotifyState.h +++ b/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 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 PropMaterialScalarParams; + + UPROPERTY(EditAnywhere) + int PropId; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr VariantsCosmeticItemDef; + + UPROPERTY(EditAnywhere) + bool bApplyVariantsToSpawnedItems; + + UPROPERTY(EditAnywhere) + bool bTrackComponentPropInGC; + + UPROPERTY(EditAnywhere) + TMap PersistComponents; + }; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaBackpackItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaBackpackItemDefinition.h index ad13ad5c..3f9b0f87 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaBackpackItemDefinition.h +++ b/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()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaBattleBusItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaBattleBusItemDefinition.h index 074a8c8b..d963749c 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaBattleBusItemDefinition.h +++ b/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()); + } }; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaCosmeticItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaCosmeticItemDefinition.h index 3250c353..41481b07 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaCosmeticItemDefinition.h +++ b/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 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 ItemVariantPreviews; + TArray ItemVariantPreviews; UPROPERTY(EditAnywhere) FText DirectAquisitionStyleDisclaimerOverride; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaEmojiItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaEmojiItemDefinition.h index 1b883bad..daaa56eb 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaEmojiItemDefinition.h +++ b/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()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaGliderItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaGliderItemDefinition.h index 9d214580..4ea5e376 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaGliderItemDefinition.h +++ b/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()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaItemWrapDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaItemWrapDefinition.h index fa8731d2..87fe967a 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaItemWrapDefinition.h +++ b/Source/FortniteGame/Public/Athena/Items/AthenaItemWrapDefinition.h @@ -24,5 +24,8 @@ public: TSoftObjectPtr ItemWrapMaterial; - + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaItemWrap", GetFName()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaLoadingScreenItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaLoadingScreenItemDefinition.h index 34d45e25..a52150be 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaLoadingScreenItemDefinition.h +++ b/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()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaPetItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaPetItemDefinition.h index 5f73dc59..96cf093c 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaPetItemDefinition.h +++ b/Source/FortniteGame/Public/Athena/Items/AthenaPetItemDefinition.h @@ -62,4 +62,8 @@ public: UPROPERTY(EditAnywhere) TSoftObjectPtr PetSoundBank; + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaPetItemDefinition", GetFName()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaPickaxeItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaPickaxeItemDefinition.h index 08067b96..4ef81c24 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaPickaxeItemDefinition.h +++ b/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 PreviewIdleMontage; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr PreviewSwingMontage; + + UPROPERTY(EditAnywhere) + FFortUICameraFrameTargetBounds CameraFramingBounds; + + UPROPERTY(EditAnywhere) + FVector CameraFramingBoundsCenterOffset; + + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaPickaxe", GetFName()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaSeasonItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaSeasonItemDefinition.h index 07b590dc..9767062b 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaSeasonItemDefinition.h +++ b/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 GiftBoxToUse; + TSoftObjectPtr GiftBoxToUse; UPROPERTY(EditAnywhere) - TArray GiftBoxFormatData; + TArray GiftBoxFormatData; }; USTRUCT(BlueprintType) -struct FORTNITEGAME_API FAthenaRewardItemReference +struct FORTNITEGAME_API FAthenaRewardItemReference { GENERATED_BODY() public: UPROPERTY(EditAnywhere) - TSoftObjectPtr ItemDefinition; + TSoftObjectPtr 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 Rewards; + TArray Rewards; }; @@ -113,7 +116,7 @@ struct FAthenaRewardSchedule public: UPROPERTY(EditAnywhere) - TArray Levels; + TArray Levels; }; USTRUCT() @@ -132,6 +135,154 @@ public: int CategoryStartingLevel; }; +USTRUCT(BlueprintType) +struct FORTNITEGAME_API FAthenaMidSeasonUpdateItemReq +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TSoftObjectPtr Item; + + UPROPERTY(EditAnywhere) + int Count; +}; + +USTRUCT(BlueprintType) +struct FORTNITEGAME_API FAthenaMidSeasonUpdateQuestReq +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TSoftObjectPtr 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 ItemRequirements; + + UPROPERTY(EditAnywhere) + TArray QuestRequirements; + + UPROPERTY(EditAnywhere) + FAthenaRewardScheduleLevel Grants; + + UPROPERTY(EditAnywhere) + TArray> Removals; +}; +USTRUCT(BlueprintType) +struct FAthenaSeasonBannerLevel +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TSoftObjectPtr SurroundImage; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr BannerMaterial; +}; + +USTRUCT(BlueprintType) +struct FAthenaSeasonBannerLevelSchedule +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TArray Levels; +}; + +USTRUCT(BlueprintType) +struct FXpDisplayConversion +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TSoftObjectPtr 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 Entries; + +}; + +USTRUCT(BlueprintType) +struct FFortCollectionDataMapping +{ + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + FString CollectionType; + + UPROPERTY(EditAnywhere) + bool bEnsureAllTaggedItemsAreInTheCollection; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr Collection; +}; + +UCLASS(BlueprintType) +class UFortCollectionsDataTable : public UDataAsset +{ + + GENERATED_BODY() + +public: + + UPROPERTY(EditAnywhere) + TArray 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 DailyPunchCard; UPROPERTY(EditAnywhere) - UFortRepeatableDailiesCardItemDefinition* RepeatableDailiesCard; -*/ + TSoftObjectPtr 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 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 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 XpDisplayOverride; - */ + UPROPERTY(EditAnywhere) TSoftObjectPtr XpItemDef; @@ -294,16 +439,27 @@ public: UPROPERTY(EditAnywhere) TArray> TokensToRemoveAtSeasonEnd; - /* + UPROPERTY(EditAnywhere) TArray MidSeasonUpdates; - */ + UPROPERTY(EditAnywhere) bool bRemoveAllDailyQuestsAtSeasonEnd; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr NoBattleBundleToken; - //Missed Offset + UPROPERTY(EditAnywhere) + TSoftObjectPtr CollectionsDataTable; + + UPROPERTY(EditAnywhere) + UDataTable* NPCConversationQuests; UPROPERTY(EditAnywhere) TArray FirstTimeTrackedBitFlags; + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaSeason", GetFName()); + } }; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaSkyDiveContrailItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaSkyDiveContrailItemDefinition.h index 707143d4..8d54f355 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaSkyDiveContrailItemDefinition.h +++ b/Source/FortniteGame/Public/Athena/Items/AthenaSkyDiveContrailItemDefinition.h @@ -42,4 +42,10 @@ public: UPROPERTY(EditAnywhere) TArray FloatParameters; */ + + + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaSkyDiveContrail", GetFName()); + } }; diff --git a/Source/FortniteGame/Public/Athena/Items/AthenaSprayItemDefinition.h b/Source/FortniteGame/Public/Athena/Items/AthenaSprayItemDefinition.h index 6d564f80..2ae9f537 100644 --- a/Source/FortniteGame/Public/Athena/Items/AthenaSprayItemDefinition.h +++ b/Source/FortniteGame/Public/Athena/Items/AthenaSprayItemDefinition.h @@ -28,4 +28,10 @@ public: UPROPERTY(EditAnywhere) TSoftObjectPtr DecalTexture; + + + virtual FPrimaryAssetId GetPrimaryAssetId() const override + { + return FPrimaryAssetId("AthenaDance", GetFName()); + } }; diff --git a/Source/FortniteGame/Public/Customization/CustomCharacterPartData.h b/Source/FortniteGame/Public/Customization/CustomCharacterPartData.h index b4ab6b29..33a3a0d1 100644 --- a/Source/FortniteGame/Public/Customization/CustomCharacterPartData.h +++ b/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() diff --git a/Source/FortniteGame/Public/Customization/FortCosmeticVariant.h b/Source/FortniteGame/Public/Customization/FortCosmeticVariant.h index 1a118996..763eb7da 100644 --- a/Source/FortniteGame/Public/Customization/FortCosmeticVariant.h +++ b/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 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 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()); + } +}; + + + diff --git a/Source/FortniteGame/Public/Items/FortAlterationItemDefinition.h b/Source/FortniteGame/Public/Items/FortAlterationItemDefinition.h index 21debcda..6771f634 100644 --- a/Source/FortniteGame/Public/Items/FortAlterationItemDefinition.h +++ b/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" /** diff --git a/Source/FortniteGame/Public/Items/FortBannerTokenType.h b/Source/FortniteGame/Public/Items/FortBannerTokenType.h new file mode 100644 index 00000000..90dedeb4 --- /dev/null +++ b/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()); + } +}; + diff --git a/Source/FortniteGame/Public/Items/FortMedalsPunchCardItemDefinition.h b/Source/FortniteGame/Public/Items/FortMedalsPunchCardItemDefinition.h new file mode 100644 index 00000000..884b9d85 --- /dev/null +++ b/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 RequiredItemDef; + +// UPROPERTY(EditAnywhere) + // TArray DateOverrides; + +}; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Items/FortMontageItemDefinitionBase.h b/Source/FortniteGame/Public/Items/FortMontageItemDefinitionBase.h index b573da80..5f619359 100644 --- a/Source/FortniteGame/Public/Items/FortMontageItemDefinitionBase.h +++ b/Source/FortniteGame/Public/Items/FortMontageItemDefinitionBase.h @@ -65,6 +65,9 @@ public: UPROPERTY(EditAnywhere) EFortCustomGender Gender; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr EmoteMontage; }; UCLASS(BlueprintType) diff --git a/Source/FortniteGame/Public/Items/FortQuestItemDefinition.h b/Source/FortniteGame/Public/Items/FortQuestItemDefinition.h new file mode 100644 index 00000000..a5d64a23 --- /dev/null +++ b/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 TandemCharacterData; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr 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 Rewards; + + UPROPERTY(EditAnywhere) + UDataTable* RewardsTable; + + UPROPERTY(EditAnywhere) + FString QuestPool; + + UPROPERTY(EditAnywhere) + TArray HiddenRewards; + + UPROPERTY(EditAnywhere) + TArray FeatureRewards; + + UPROPERTY(EditAnywhere) + TArray SelectableRewards; + + UPROPERTY(EditAnywhere) + TArray Objectives; + + UPROPERTY(EditAnywhere) + TArray> TransientPrerequisiteQuests; + + UPROPERTY(EditAnywhere) + bool bGrantTransientQuestToSquad; + + UPROPERTY(EditAnywhere) + bool bTransientAutoComplete; + + UPROPERTY(EditAnywhere) + bool bAllowMultipleCompletionsPerMatch; + + UPROPERTY(EditAnywhere) + FGameplayTagContainer Prerequisites; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr PrerequisiteQuest; + + UPROPERTY(EditAnywhere) + FDataTableRowHandle PrerequisiteObjective; + + UPROPERTY(EditAnywhere) + float Weight; + + UPROPERTY(EditAnywhere) + int GranterWindowPeriodMinutes; + + UPROPERTY(EditAnywhere) + int GranterCooldownPeriodSeconds; + + UPROPERTY(EditAnywhere) + FDataTableRowHandle Category; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr IntroConversation; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr SelectRewardsConversation; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr ClaimConversation; + + UPROPERTY(EditAnywhere) + FText RewardHeaderText; + + UPROPERTY(EditAnywhere) + FText RewardDescription; + + UPROPERTY(EditAnywhere) + FText CompletionText; + + UPROPERTY(EditAnywhere) + FText NPCInteractionText; + + UPROPERTY(EditAnywhere) + TArray MissionCreationContexts; + + UPROPERTY(EditAnywhere) + FFortMissionConfigDataParams MissionConfigMetadata; + + UPROPERTY(EditAnywhere) + int ClaimPriority; + + UPROPERTY(EditAnywhere) + int SortPriority; + + UPROPERTY(EditAnywhere) + TSoftObjectPtr QuestAbilitySet; + + UPROPERTY(EditAnywhere) + bool bHideQuestProgressNotification; + + UPROPERTY(EditAnywhere) + bool bHideQuestRewardNotification; + + UPROPERTY(EditAnywhere) + bool bForceExpiryExport;*/ +}; + + +UCLASS(BlueprintType) +class UFortChallengeBundleScheduleDefinition : public UFortAccountItemDefinition +{ + + GENERATED_BODY() + +public: + +}; \ No newline at end of file diff --git a/Source/FortniteGame/Public/Weapons/Data/FortWeaponMeleeItemDefinition.h b/Source/FortniteGame/Public/Weapons/Data/FortWeaponMeleeItemDefinition.h index 65878b66..e1c16236 100644 --- a/Source/FortniteGame/Public/Weapons/Data/FortWeaponMeleeItemDefinition.h +++ b/Source/FortniteGame/Public/Weapons/Data/FortWeaponMeleeItemDefinition.h @@ -159,7 +159,7 @@ public: UPROPERTY(EditAnywhere) bool bAttachAnimTrailsToWeapon; - + /* UPROPERTY(EditAnywhere) TMap, TSoftObjectPtr> ImpactPhysicalSurfaceEffectsMap; @@ -168,7 +168,7 @@ public: UPROPERTY(EditAnywhere) TMap, TSoftObjectPtr> ImpactNiagaraPhysicalSurfaceEffectsMap; - + */ UPROPERTY(EditAnywhere) TArray ParticleComponentsDefs; @@ -180,7 +180,7 @@ public: UPROPERTY(EditAnywhere) TSoftObjectPtr SingleAnimationToPlay; - + /* UPROPERTY(EditAnywhere) TMap, TSoftObjectPtr> ImpactPhysicalSurfaceSoundsMap; @@ -189,7 +189,7 @@ public: UPROPERTY(EditAnywhere) TMap> PrimaryFireSoundMap; - + */ UPROPERTY(EditAnywhere) TSoftObjectPtr GenericImpactSound;