diff --git a/FModel/Creator/Bases/BaseBundle.cs b/FModel/Creator/Bases/BaseBundle.cs index d2f83a8c..c39b5a93 100644 --- a/FModel/Creator/Bases/BaseBundle.cs +++ b/FModel/Creator/Bases/BaseBundle.cs @@ -80,7 +80,8 @@ namespace FModel.Creator.Bases { if (!itemDefinition.Value.AssetPathName.IsNone && !itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Items/Tokens/") && - !itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Athena/Items/Quests")) + !itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Athena/Items/Quests") && + !itemDefinition.Value.AssetPathName.String.StartsWith("/BattlepassS15/Items/Tokens/")) { CompletionRewards.Add(new CompletionReward(completionCount, quantity, itemDefinition)); } diff --git a/FModel/Creator/Bases/BaseIcon.cs b/FModel/Creator/Bases/BaseIcon.cs index a49c46b2..a6003f98 100644 --- a/FModel/Creator/Bases/BaseIcon.cs +++ b/FModel/Creator/Bases/BaseIcon.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Windows; - using FModel.Creator.Icons; using FModel.Creator.Rarities; using FModel.Creator.Stats; @@ -12,9 +10,6 @@ using FModel.PakReader.Parsers.Class; using FModel.PakReader.Parsers.PropertyTagData; using FModel.Properties; using FModel.Utils; - -using Fortnite_API.Objects; -using Fortnite_API.Objects.V1; using SkiaSharp; namespace FModel.Creator.Bases diff --git a/FModel/Creator/Bases/BaseSeason.cs b/FModel/Creator/Bases/BaseSeason.cs index f8e5c160..3dc9d8d6 100644 --- a/FModel/Creator/Bases/BaseSeason.cs +++ b/FModel/Creator/Bases/BaseSeason.cs @@ -5,7 +5,6 @@ using SkiaSharp.HarfBuzz; using System; using System.Collections.Generic; using System.Linq; -using System.Windows.Documents; using FModel.PakReader.Parsers.Class; using FModel.PakReader.Parsers.PropertyTagData; @@ -66,6 +65,7 @@ namespace FModel.Creator.Bases if (reward.Value is UObject o && o.GetExport("ItemDefinition") is SoftObjectProperty itemDefinition && !itemDefinition.Value.AssetPathName.String.StartsWith("/Game/Items/Tokens/") && + !itemDefinition.Value.AssetPathName.String.StartsWith("/BattlepassS15/Items/Tokens/") && o.GetExport("Quantity") is IntProperty quantity) { BookXpSchedule[i].Add(new Reward(quantity, itemDefinition.Value)); diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index 9023dc46..ed6d8ad8 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -107,7 +107,7 @@ namespace FModel } else { - Globals.gNotifier.ShowCustomMessage("Mappings", "Fail to reload"); + Globals.gNotifier.ShowCustomMessage("Mappings", "Failed to reload"); } } diff --git a/FModel/PakReader/Parsers/IoPackageReader.cs b/FModel/PakReader/Parsers/IoPackageReader.cs index 84324a2d..5e6c04ed 100644 --- a/FModel/PakReader/Parsers/IoPackageReader.cs +++ b/FModel/PakReader/Parsers/IoPackageReader.cs @@ -8,7 +8,6 @@ using FModel.PakReader.IO; using FModel.PakReader.Parsers.Class; using FModel.PakReader.Parsers.Objects; using FModel.Utils; -using UsmapNET.Classes; namespace FModel.PakReader.Parsers { @@ -146,7 +145,6 @@ namespace FModel.PakReader.Parsers } FName exportType; - if (GlobalData != null && GlobalData.ScriptObjectByGlobalId.TryGetValue(trigger, out var scriptObject)) { exportType = scriptObject.Name; diff --git a/FModel/PakReader/Parsers/Objects/FPackageIndex.cs b/FModel/PakReader/Parsers/Objects/FPackageIndex.cs index ad68bad5..79483105 100644 --- a/FModel/PakReader/Parsers/Objects/FPackageIndex.cs +++ b/FModel/PakReader/Parsers/Objects/FPackageIndex.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Diagnostics; using Newtonsoft.Json; namespace FModel.PakReader.Parsers.Objects diff --git a/README.md b/README.md index b080f75c..b01d1d55 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # FModel -FModel Logo +FModel Logo Created in March 2019, FModel is a .PAK file explorer fully dedicated to Fortnite but also work with some other Unreal Engine's games. It quickly became popular to quickly generate images of new cosmetics added to the game. Over time, new features got added and new users discovered the program. @@ -19,30 +19,32 @@ Over time, new features got added and new users discovered the program. Load one or several .PAK files, see assets properties, create icons for cosmetics, challenges, and much more. Built with C#, FModel is the most feature-rich software to leak on Fortnite and is 100% free. -

- -

+[![FModel Features](https://fmodel.app/images/fmodel/NsAZOdHbQU.png)](https://youtu.be/fSmWby80Tzc) +
FModel Features - Quick Overview
## Features A few of the things you can do with FModel: * .PAK Files - - Load all - - Load one - - Load new assets - - Load modified assets - - Load new and modified assets - - Backup all assets + - Load multiple files with different keys + - Load new assets only + - Load modified assets only + - Backup all current assets + - Jump to a specific directory * Assets - Extract properties - Export RAW data + - Bulk extract and export + - Search and filter them with ease - Copy path / name * Icons - All BR / STW cosmetics and challenges - - 15 different languages available + - Create your own icon theme + - Merge selected icons into 1 image + - 15+ different languages available * Audio Player - - OGG / WAV files + - OGG / WAV / ADPCM / ... files ## Installation