diff --git a/FModel/ViewModels/AudioPlayerViewModel.cs b/FModel/ViewModels/AudioPlayerViewModel.cs index a8abbe9b..9ffada58 100644 --- a/FModel/ViewModels/AudioPlayerViewModel.cs +++ b/FModel/ViewModels/AudioPlayerViewModel.cs @@ -566,6 +566,7 @@ public class AudioPlayerViewModel : ViewModel, ISource, IDisposable switch (SelectedAudioFile.Extension) { + case "binka": case "adpcm": case "xvag": case "opus": @@ -586,7 +587,6 @@ public class AudioPlayerViewModel : ViewModel, ISource, IDisposable case "hca": return TryConvertCriware(); case "rada": - case "binka": { if (TryDecode(SelectedAudioFile.Extension, out var rawFilePath)) { diff --git a/FModel/ViewModels/GameDirectoryViewModel.cs b/FModel/ViewModels/GameDirectoryViewModel.cs index 16b11656..730b7895 100644 --- a/FModel/ViewModels/GameDirectoryViewModel.cs +++ b/FModel/ViewModels/GameDirectoryViewModel.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Windows; using System.Windows.Data; +using CUE4Parse.Compression; using CUE4Parse.UE4.IO; using CUE4Parse.UE4.Objects.Core.Misc; using CUE4Parse.UE4.VirtualFileSystem; @@ -69,6 +70,13 @@ public class FileItem : ViewModel set => SetProperty(ref _guid, value); } + private CompressionMethod[] _compressionMethods; + public CompressionMethod[] CompressionMethods + { + get => _compressionMethods; + set => SetProperty(ref _compressionMethods, value); + } + public FileItem(string name, long length) { Name = name; @@ -84,6 +92,7 @@ public class FileItem : ViewModel IsEnabled = false; Key = string.Empty; FileCount = reader is IoStoreReader storeReader ? (int) storeReader.TocResource.Header.TocEntryCount - 1 : 0; + CompressionMethods = reader.CompressionMethods; } public override string ToString() diff --git a/FModel/ViewModels/GameSelectorViewModel.cs b/FModel/ViewModels/GameSelectorViewModel.cs index b30ebf6d..f700a507 100644 --- a/FModel/ViewModels/GameSelectorViewModel.cs +++ b/FModel/ViewModels/GameSelectorViewModel.cs @@ -87,8 +87,8 @@ public class GameSelectorViewModel : ViewModel .OrderBy(value => ((int)value & 0xFF) == 0); private IEnumerable EnumerateDetectedGames() { - yield return GetUnrealEngineGame("Fortnite", "\\FortniteGame\\Content\\Paks", EGame.GAME_UE5_6); - yield return DirectorySettings.Default("Fortnite [LIVE]", Constants._FN_LIVE_TRIGGER, ue: EGame.GAME_UE5_6); + yield return GetUnrealEngineGame("Fortnite", "\\FortniteGame\\Content\\Paks", EGame.GAME_UE5_7); + yield return DirectorySettings.Default("Fortnite [LIVE]", Constants._FN_LIVE_TRIGGER, ue: EGame.GAME_UE5_7); yield return GetUnrealEngineGame("Pewee", "\\RogueCompany\\Content\\Paks", EGame.GAME_RogueCompany); yield return GetUnrealEngineGame("Rosemallow", "\\Indiana\\Content\\Paks", EGame.GAME_UE4_21); yield return GetUnrealEngineGame("Catnip", "\\OakGame\\Content\\Paks", EGame.GAME_Borderlands3);