Pet icon for Cosmetics.UserFacingFlags

4sval · Apr 21, 2019 · 7d1dae7 · 7d1dae7
1 parent 37c660c
commit 7d1dae7
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git 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
@@ -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
diff --git 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>
diff --git a/FModel/Resources/T-Icon-Pets-64.png b/FModel/Resources/T-Icon-Pets-64.png