diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj index 077b6362..430f2803 100644 --- a/FModel/FModel.csproj +++ b/FModel/FModel.csproj @@ -134,6 +134,7 @@ + diff --git a/FModel/MainWindow.cs b/FModel/MainWindow.cs index 81fbca86..ba75d3b7 100644 --- a/FModel/MainWindow.cs +++ b/FModel/MainWindow.cs @@ -1479,10 +1479,15 @@ private void createItemIcon(Parser.Items.ItemsIDParser theItem, bool athIteDef = 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")) + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("HasUpgradeQuests") && theItem.ExportType != "AthenaPetCarrierItemDefinition") { Image questLogo = Properties.Resources.T_Icon_Quests_64; - g.DrawImage(Forms.Settings.ResizeImage(questLogo, 32, 40), new Point(6, 6)); + g.DrawImage(Forms.Settings.ResizeImage(questLogo, 32, 40), new Point(6, 4)); + } + else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("HasUpgradeQuests") && theItem.ExportType == "AthenaPetCarrierItemDefinition") + { + Image petLogo = Properties.Resources.T_Icon_Pets_64; + g.DrawImage(Forms.Settings.ResizeImage(petLogo, 32, 32), new Point(6, 6)); } else if (theItem.GameplayTags.GameplayTagsGameplayTags[Array.FindIndex(theItem.GameplayTags.GameplayTagsGameplayTags, x => x.StartsWith("Cosmetics.UserFacingFlags."))].Contains("HasVariants")) { diff --git a/FModel/Properties/Resources.Designer.cs b/FModel/Properties/Resources.Designer.cs index 5839d343..ff5f571f 100644 --- a/FModel/Properties/Resources.Designer.cs +++ b/FModel/Properties/Resources.Designer.cs @@ -240,6 +240,16 @@ internal static System.Drawing.Bitmap T_Icon_Animated_64 { } } + /// + /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap T_Icon_Pets_64 { + get { + object obj = ResourceManager.GetObject("T_Icon_Pets_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 99bd216d..6da36422 100644 --- a/FModel/Properties/Resources.resx +++ b/FModel/Properties/Resources.resx @@ -196,4 +196,7 @@ ..\Resources\T-Icon-Quests-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\T-Icon-Pets-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-Pets-64.png b/FModel/Resources/T-Icon-Pets-64.png new file mode 100644 index 00000000..fefbe7c5 Binary files /dev/null and b/FModel/Resources/T-Icon-Pets-64.png differ