diff --git a/FModel/App.config b/FModel/App.config index aff2ae65..1d63336a 100644 --- a/FModel/App.config +++ b/FModel/App.config @@ -22,6 +22,18 @@ 0 + + False + + + False + + + False + + + False + False diff --git a/FModel/PAKWindow.cs b/FModel/PAKWindow.cs index c3edcb0c..ea2a2bbb 100644 --- a/FModel/PAKWindow.cs +++ b/FModel/PAKWindow.cs @@ -103,11 +103,6 @@ namespace FModel SetTreeViewTheme(PAKTreeView.Handle); Properties.Settings.Default.ExtractAndSerialize = true; //SERIALIZE BY DEFAULT - Properties.Settings.Default.createIconForCosmetics = true; - Properties.Settings.Default.createIconForVariants = true; - Properties.Settings.Default.createIconForConsumablesWeapons = true; - Properties.Settings.Default.createIconForTraps = true; - Properties.Settings.Default.createIconForChallenges = true; docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + "\\FModel"; if (string.IsNullOrEmpty(Properties.Settings.Default.ExtractOutput)) @@ -2085,12 +2080,17 @@ namespace FModel Graphics g = Graphics.FromImage(bmp); g.TextRenderingHint = TextRenderingHint.AntiAlias; int iamY = 400; + int justSkip = 0; foreach (var d in questDictFinal) { + justSkip += 1; iamY += 100; g.DrawString(d.Key, new Font(pfc.Families[1], 50), new SolidBrush(Color.White), new Point(100, iamY)); g.DrawString("/" + d.Value, new Font(pfc.Families[1], 50), new SolidBrush(Color.FromArgb(255, 149, 213, 255)), new Point(2410, iamY), rightString); - g.DrawLine(new Pen(Color.FromArgb(30, 255, 255, 255)), 100, iamY - 10, 2410, iamY - 10); + if (justSkip != 1) + { + g.DrawLine(new Pen(Color.FromArgb(30, 255, 255, 255)), 100, iamY - 10, 2410, iamY - 10); + } } try { diff --git a/FModel/Properties/Settings.Designer.cs b/FModel/Properties/Settings.Designer.cs index 49a25d02..2cf2fd36 100644 --- a/FModel/Properties/Settings.Designer.cs +++ b/FModel/Properties/Settings.Designer.cs @@ -84,6 +84,7 @@ namespace FModel.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool createIconForCosmetics { get { return ((bool)(this["createIconForCosmetics"])); @@ -95,6 +96,7 @@ namespace FModel.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool createIconForConsumablesWeapons { get { return ((bool)(this["createIconForConsumablesWeapons"])); @@ -106,6 +108,7 @@ namespace FModel.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool createIconForTraps { get { return ((bool)(this["createIconForTraps"])); @@ -117,6 +120,7 @@ namespace FModel.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool createIconForVariants { get { return ((bool)(this["createIconForVariants"])); diff --git a/FModel/Properties/Settings.settings b/FModel/Properties/Settings.settings index 202b7f7d..0947947c 100644 --- a/FModel/Properties/Settings.settings +++ b/FModel/Properties/Settings.settings @@ -17,17 +17,17 @@ 0 - - + + False - - + + False - - + + False - - + + False False diff --git a/README.md b/README.md index 8f2ed706..d78b79dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # FModel -[![](https://img.shields.io/badge/Releases-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases) -[![](https://img.shields.io/github/downloads/iAmAsval/FModel/1.2/total.svg?color=green&label=Downloads&logo=buzzfeed&logoColor=white)](https://github.com/iAmAsval/FModel/releases/tag/1.2) +[![](https://img.shields.io/github/downloads/iAmAsval/FModel/total.svg?color=green&label=Downloads&logo=buzzfeed&logoColor=white)](https://github.com/iAmAsval/FModel/releases/tag/1.2) [![](https://img.shields.io/badge/License-GPL-blue.svg?logo=gnu)](https://github.com/iAmAsval/FModel/blob/master/LICENSE) [![](https://img.shields.io/badge/Twitter-@AsvalFN-1da1f2.svg?logo=twitter)](https://twitter.com/AsvalFN) [![](https://img.shields.io/badge/Discord-Need%20Help%3F-7289da.svg?logo=discord)](https://discord.gg/JmWvXKb) @@ -12,6 +11,8 @@ ## GETTING STARTED ### Prerequisites [.NET Framework 4.6.1](https://dotnet.microsoft.com/download/dotnet-framework-runtime/net461) +### Download +[![](https://img.shields.io/badge/Releases-Executable-orange.svg?logo=github)](https://github.com/iAmAsval/FModel/releases) ### How does it works **1.** Once you start the executable, you'll be asked to set your path to your Fortnite .PAK files. Meanwhile a `FModel` subfolder will be created in your `Documents` folder and it'll automatically download the latest version of the modded Fortnite Asset Parser in this subfolder. ![](https://i.imgur.com/sO6G6Vy.gif) @@ -23,13 +24,13 @@ **4.** Clicking on **Extract Asset** will extract the selected Asset to your `Documents` folder, try to serialize it and will display infos about it - Asset is an **_ID_**: - - Try to create an [Icon](https://i.imgur.com/PStlmUV.png) with **Name**, **Description**, **Rarity**, **Type** and the **Cosmetic Source** + - Try to create an [Icon](https://i.imgur.com/R0OhRpw.png) with **Name**, **Description**, **Rarity**, **Type** and the **Cosmetic Source** - Asset is a **_Texture_**: - Try to display the Asset as PNG - Asset is a **_Sound_**: - Try to convert the Asset to OGG and play the sound - Asset is a **_Bundle Of Challenges_**: - - Try to create an [Icon](https://i.imgur.com/s18aMEe.png) with all challenges' description & amount needed to complete them + - Try to create an [Icon](https://i.imgur.com/6AjoVVm.png) with all challenges' description & amount needed to complete them - Asset is a **_Font_**: - Try to convert the Asset to OTF