diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 46c2b735..077b6362 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -134,6 +134,11 @@ + + + + + diff --git a/FModel/MainWindow.Designer.cs b/FModel/MainWindow.Designer.cs index 9a2f91ff..85011d82 100644 --- a/FModel/MainWindow.Designer.cs +++ b/FModel/MainWindow.Designer.cs @@ -95,15 +95,15 @@ this.toolStripStatusLabel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.toolStripStatusLabel1.Margin = new System.Windows.Forms.Padding(1, 3, 50, 2); this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(65, 17); - this.toolStripStatusLabel1.Text = "FModel 2.0"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(74, 17); + this.toolStripStatusLabel1.Text = "FModel 2.0.1"; // // toolStripStatusLabel2 // this.toolStripStatusLabel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.toolStripStatusLabel2.Margin = new System.Windows.Forms.Padding(0, 3, 50, 2); this.toolStripStatusLabel2.Name = "toolStripStatusLabel2"; - this.toolStripStatusLabel2.Size = new System.Drawing.Size(976, 17); + this.toolStripStatusLabel2.Size = new System.Drawing.Size(936, 17); this.toolStripStatusLabel2.Spring = true; // // toolStripStatusLabel3 @@ -211,7 +211,7 @@ // saveImageToolStripMenuItem // this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem"; - this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.saveImageToolStripMenuItem.Text = "Save Image"; this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click); // @@ -219,18 +219,18 @@ // this.autoSaveImagesToolStripMenuItem.CheckOnClick = true; this.autoSaveImagesToolStripMenuItem.Name = "autoSaveImagesToolStripMenuItem"; - this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoSaveImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.autoSaveImagesToolStripMenuItem.Text = "Auto Save Images"; // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(165, 6); // // mergeImagesToolStripMenuItem // this.mergeImagesToolStripMenuItem.Name = "mergeImagesToolStripMenuItem"; - this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.mergeImagesToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.mergeImagesToolStripMenuItem.Text = "Merge Images"; this.mergeImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeImagesToolStripMenuItem_Click); // diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 0c03ee90..81fbca86 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1472,6 +1472,38 @@ namespace FModel AppendText("found", Color.Black, true); } //COSMETIC ITEM } + try + { + if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("Animated")) + { + Image animatedLogo = Properties.Resources.T_Icon_Animated_64; + g.DrawImage(Forms.Settings.ResizeImage(animatedLogo, 32, 32), new Point(6, -2)); + } + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("HasUpgradeQuests")) + { + Image questLogo = Properties.Resources.T_Icon_Quests_64; + g.DrawImage(Forms.Settings.ResizeImage(questLogo, 32, 40), new Point(6, 6)); + } + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("HasVariants")) + { + Image variantsLogo = Properties.Resources.T_Icon_Variant_64; + g.DrawImage(Forms.Settings.ResizeImage(variantsLogo, 32, 32), new Point(6, 6)); + } + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("Reactive")) + { + Image reactiveLogo = Properties.Resources.T_Icon_Adaptive_64; + g.DrawImage(Forms.Settings.ResizeImage(reactiveLogo, 32, 32), new Point(6, 6)); + } + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("Traversal")) + { + Image traversalLogo = Properties.Resources.T_Icon_Traversal_64; + g.DrawImage(Forms.Settings.ResizeImage(traversalLogo, 32, 32), new Point(6, 3)); + } + } + catch (Exception) + { + + } //COSMETIC USER FACING FLAGS #endregion pictureBox1.Image = bmp; diff --git a/FModel/MainWindow.resx b/FModel/MainWindow.resx index 9f8f9909..014c97d7 100644 --- a/FModel/MainWindow.resx +++ b/FModel/MainWindow.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABa - CAAAAk1TRnQBSQFMAgEBAgEAAXgBAAF4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYABAAGAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index d8c0f666..5839d343 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -220,6 +220,56 @@ namespace FModel.Properties { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Adaptive_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Adaptive_64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Animated_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Animated_64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Quests_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Quests_64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Traversal_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Traversal_64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Variant_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Variant_64", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Recherche une ressource localisée de type System.Drawing.Bitmap. /// diff --git a/FModel/Properties/Resources.resx b/FModel/Properties/Resources.resx index d3b35a7a..99bd216d 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -181,4 +181,19 @@ ..\Resources\Quest.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\T-Icon-Adaptive-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\T-Icon-Animated-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\T-Icon-Traversal-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\T-Icon-Variant-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\T-Icon-Quests-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/FModel/Resources/T-Icon-Adaptive-64.png b/FModel/Resources/T-Icon-Adaptive-64.png new file mode 100644 index 00000000..95b4789c Binary files /dev/null and b/FModel/Resources/T-Icon-Adaptive-64.png differ diff --git a/FModel/Resources/T-Icon-Animated-64.png b/FModel/Resources/T-Icon-Animated-64.png new file mode 100644 index 00000000..eea5002d Binary files /dev/null and b/FModel/Resources/T-Icon-Animated-64.png differ diff --git a/FModel/Resources/T-Icon-Quests-64.png b/FModel/Resources/T-Icon-Quests-64.png new file mode 100644 index 00000000..fc2a50f7 Binary files /dev/null and b/FModel/Resources/T-Icon-Quests-64.png differ diff --git a/FModel/Resources/T-Icon-Traversal-64.png b/FModel/Resources/T-Icon-Traversal-64.png new file mode 100644 index 00000000..9ac1e6a4 Binary files /dev/null and b/FModel/Resources/T-Icon-Traversal-64.png differ diff --git a/FModel/Resources/T-Icon-Variant-64.png b/FModel/Resources/T-Icon-Variant-64.png new file mode 100644 index 00000000..5f82477b Binary files /dev/null and b/FModel/Resources/T-Icon-Variant-64.png differ diff --git a/README.md b/README.md index 6ecdae4c..6cf6b1d3 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ ## DOCUMENTATION ### Important If you find this repository useful, feel free to give it a :star: thank you :kissing_heart: + If somehow FModel crash because of permissions (on an administrator account for example) please either disable Windows Defender or add and exception for FModel.exe ### Features 1. Extract