From 7d1dae70afe56accd4b08b76f228c30c1db5f3d0 Mon Sep 17 00:00:00 2001
From: Asval <valentinb44800@gmail.com>
Date: Sun, 21 Apr 2019 17:47:48 +0200
Subject: [PATCH] Pet icon for Cosmetics.UserFacingFlags

---
 FModel/FModel.csproj                    |   1 +
 FModel/MainWindow.cs                    |   9 +++++++--
 FModel/Properties/Resources.Designer.cs |  10 ++++++++++
 FModel/Properties/Resources.resx        |   3 +++
 FModel/Resources/T-Icon-Pets-64.png     | Bin 0 -> 1598 bytes
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 FModel/Resources/T-Icon-Pets-64.png

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 @@
   <ItemGroup>
     <Content Include="DLLs\ScintillaNET FindReplaceDialog.dll" />
     <Content Include="FModel.ico" />
+    <None Include="Resources\T-Icon-Pets-64.png" />
     <None Include="Resources\T-Icon-Quests-64.png" />
     <None Include="Resources\T-Icon-Variant-64.png" />
     <None Include="Resources\T-Icon-Traversal-64.png" />
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 {
             }
         }
         
+        /// <summary>
+        ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap T_Icon_Pets_64 {
+            get {
+                object obj = ResourceManager.GetObject("T_Icon_Pets_64", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Recherche une ressource localisée de type System.Drawing.Bitmap.
         /// </summary>
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 @@
   <data name="T_Icon_Quests_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\T-Icon-Quests-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="T_Icon_Pets_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\T-Icon-Pets-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ 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 0000000000000000000000000000000000000000..fefbe7c507b468ccd2ad33ef36d7574aec532d6d
GIT binary patch
literal 1598
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

literal 0
HcmV?d00001