diff --git a/FModel/Creator/Creator.cs b/FModel/Creator/Creator.cs index ce4bb457..ed53ad1f 100644 --- a/FModel/Creator/Creator.cs +++ b/FModel/Creator/Creator.cs @@ -7,7 +7,9 @@ using FModel.Creator.Texts; using FModel.ViewModels.ImageBox; using PakReader.Parsers.Class; using PakReader.Parsers.Objects; +using PakReader.Parsers.PropertyTagData; using SkiaSharp; +using System.Diagnostics; using System.IO; namespace FModel.Creator @@ -51,6 +53,7 @@ namespace FModel.Creator case "FortTokenType": case "FortAbilityKit": case "FortWorkerType": + case "RewardGraphToken": case "FortBannerTokenType": case "FortVariantTokenType": case "FortFeatItemDefinition": @@ -71,6 +74,7 @@ namespace FModel.Creator case "FortResourceItemDefinition": case "FortSchematicItemDefinition": case "FortIngredientItemDefinition": + case "FortAccountBuffItemDefinition": case "FortWeaponMeleeItemDefinition": case "FortContextTrapItemDefinition": case "FortPlayerPerksItemDefinition": @@ -83,6 +87,7 @@ namespace FModel.Creator case "FortHardcoreModifierItemDefinition": case "FortConsumableAccountItemDefinition": case "FortConversionControlItemDefinition": + case "FortAccountBuffCreditItemDefinition": case "FortPersistentResourceItemDefinition": case "FortCampaignHeroLoadoutItemDefinition": case "FortConditionalResourceItemDefinition": @@ -238,6 +243,20 @@ namespace FModel.Creator } return true; } + case "StreamedVideoDataAsset": + { + if (Globals.Game.ActualGame == EGame.Valorant && exports[index].GetExport("Uuid") is StructProperty s && s.Value is FGuid uuid) + { + Process.Start(new ProcessStartInfo + { + FileName = string.Format( + "http://valorant.dyn.riotcdn.net/x/videos/release-01.04/{0}_default_universal.mp4", + $"{uuid.A:x8}-{uuid.B >> 16:x4}-{uuid.B & 0xFFFF:x4}-{uuid.C >> 16:x4}-{uuid.C & 0xFFFF:x4}{uuid.D:x8}"), + UseShellExecute = true + }); + } + return false; + } } return false; } diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index c1b78a68..cfc6322e 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -38,7 +38,6 @@ - @@ -124,7 +123,6 @@ - diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs index 989e09b2..6a38ab04 100644 --- a/FModel/MainWindow.xaml.cs +++ b/FModel/MainWindow.xaml.cs @@ -252,10 +252,10 @@ namespace FModel Application.Current.Shutdown(); } } - private void FModel_MI_Help_Donate_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://www.paypal.me/FModel", UseShellExecute = true }); + private void FModel_MI_Help_Trello_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://trello.com/b/DfmzkVQB/fmodel", UseShellExecute = true }); + private void FModel_MI_Help_Donate_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EP9SSWG8MW4UC&source=url", UseShellExecute = true }); private void FModel_MI_Help_Changelog_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://github.com/iAmAsval/FModel/releases/latest", UseShellExecute = true }); private void FModel_MI_Help_BugsReport_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://github.com/iAmAsval/FModel/issues/new", UseShellExecute = true }); - private void FModel_MI_Help_Trello_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://trello.com/b/DfmzkVQB/fmodel", UseShellExecute = true }); private void FModel_MI_Help_Discord_Click(object sender, RoutedEventArgs e) => Process.Start(new ProcessStartInfo { FileName = "https://discord.gg/fdkNYYQ", UseShellExecute = true }); private void FModel_MI_Help_About_Click(object sender, RoutedEventArgs e) { diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index fdcfc10e..b2f5829a 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -321,16 +321,6 @@ namespace FModel.Properties { } } - /// - /// Recherche une ressource localisée de type System.Byte[]. - /// - public static byte[] Base { - get { - object obj = ResourceManager.GetObject("Base", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). /// diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index 2ff46666..6d590378 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -1075,9 +1075,6 @@ It's now the most used free software to leak on Fortnite. ..\Resources\trello.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Base.xshd;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Resources\Cpp.xshd;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/FModel/Resources/Base.xshd b/FModel/Resources/Base.xshd deleted file mode 100644 index 94a79d6b..00000000 --- a/FModel/Resources/Base.xshd +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - \# - - - - <\# - \#> - - - - " - " - - - - - - - - ' - ' - - - - - - - - @" - "@ - - - - - - - - while - param - end - define - else - from - foreach - var - dynamicparam - filter - dp - until - for - exit - switch - process - begin - elseif - if - in - data - class - using - function - - - - catch - finally - throw - trap - try - - - - break - continue - return - - - - class - - - - -not - -band - -bor - -replace - -ireplace - -creplace - -and - -or - -is - -isnot - -as - -lt - -le - -gt - -ge - -eq - -ne - -contains - -notcontains - -like - -notlike - -match - -notmatch - - - - \$[\d\w_]+ - - - - [\w]+-[\w]+ - - - - - \b0[xX][0-9a-fA-F]+ # hex number - | - ( \b\d+(\.[0-9]+)? #number with optional floating point - | \.[0-9]+ #or just starting with floating point - ) - ([eE][+-]?[0-9]+)? # optional exponent - - - - [?,.;()\[\]{}+\-/%*<>^+~!|&]+ - - - diff --git a/FModel/Utils/Assets.cs b/FModel/Utils/Assets.cs index a33d3665..2ec179d0 100644 --- a/FModel/Utils/Assets.cs +++ b/FModel/Utils/Assets.cs @@ -86,8 +86,8 @@ namespace FModel.Utils IHighlightingDefinition syntax = ext switch { ".ini" => AvalonEditVm.IniHighlighter, - ".txt" => AvalonEditVm.BaseHighlighter, - ".bat" => AvalonEditVm.BaseHighlighter, + ".txt" => AvalonEditVm.IniHighlighter, + ".bat" => AvalonEditVm.IniHighlighter, ".xml" => AvalonEditVm.XmlHighlighter, ".h" => AvalonEditVm.CppHighlighter, _ => AvalonEditVm.JsonHighlighter diff --git a/FModel/ViewModels/AvalonEdit/AvalonEditViewModel.cs b/FModel/ViewModels/AvalonEdit/AvalonEditViewModel.cs index f332c274..36f3bd14 100644 --- a/FModel/ViewModels/AvalonEdit/AvalonEditViewModel.cs +++ b/FModel/ViewModels/AvalonEdit/AvalonEditViewModel.cs @@ -89,7 +89,6 @@ namespace FModel.ViewModels.AvalonEdit public static readonly IHighlightingDefinition IniHighlighter = LoadHighlighter("Ini.xshd"); public static readonly IHighlightingDefinition XmlHighlighter = LoadHighlighter("Xml.xshd"); public static readonly IHighlightingDefinition CppHighlighter = LoadHighlighter("Cpp.xshd"); - public static readonly IHighlightingDefinition BaseHighlighter = LoadHighlighter("Base.xshd"); public static IHighlightingDefinition LoadHighlighter(string resourceName) { Assembly executingAssembly = Assembly.GetExecutingAssembly(); diff --git a/README.md b/README.md index c243a09d..1a0c080a 100644 --- a/README.md +++ b/README.md @@ -166,7 +166,7 @@ This software uses the following open source packages: This project is not my full time job, donations are greatly appreciated. - + ## You may also like...