Fix clothing type detection

SwitchGiftDataManager.Core/Classes/WCManager/GiftData/OtherGift.cs

@@ -39,7 +39,7 @@ namespace SwitchGiftDataManager.Core
                             ClothingType8.Gloves => Properties.Resources.SWSHClothingGloves.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                             ClothingType8.Bottoms => Properties.Resources.SWSHClothingBottoms.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                             ClothingType8.Legwear => Properties.Resources.SWSHClothingLegwear.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
-                            ClothingType8.Shoes => Properties.Resources.SWSHClothingShoes.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                            ClothingType8.Footwear => Properties.Resources.SWSHClothingShoes.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                             _ => throw new ArgumentOutOfRangeException(),
                         };
                         str = $"[{category}] {description}";
@@ -67,13 +67,13 @@ namespace SwitchGiftDataManager.Core
                     var category = (ClothingType8A)id;
                     var description = category switch
                     {
-                        ClothingType8A.Heads => Properties.Resources.PLAClothingHeads.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType8A.Headwear => Properties.Resources.PLAClothingHeads.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                         ClothingType8A.Tops => Properties.Resources.PLAClothingTops.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                         ClothingType8A.Bottoms => Properties.Resources.PLAClothingBottoms.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
                         ClothingType8A.Outfit => "",
-                        ClothingType8A.Shoes => "",
+                        ClothingType8A.Footwear => "",
                         ClothingType8A.Glasses => "",
-                        ClothingType8A.Eyes => "",
+                        ClothingType8A.Eyewear => "",
                         _ => throw new ArgumentOutOfRangeException(),
                     };
                     if(string.IsNullOrWhiteSpace(description))
@@ -92,12 +92,19 @@ namespace SwitchGiftDataManager.Core
                     var category = (ClothingType9)id;
                     var description = category switch
                     {
-                        _ => Properties.Resources.SCVIClothingBags.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Uniform => Properties.Resources.SCVIClothingUniform.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Legwear => Properties.Resources.SCVIClothingLegwear.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Footwear => Properties.Resources.SCVIClothingFootwear.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Gloves => Properties.Resources.SCVIClothingGloves.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Bags => Properties.Resources.SCVIClothingBags.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Headwear => Properties.Resources.SCVIClothingHeadwear.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.Eyewear => Properties.Resources.SCVIClothingEyewear.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        ClothingType9.PhoneCase => Properties.Resources.SCVIClothingPhoneCase.Split(new String[] { "\n" }, StringSplitOptions.None)[opt],
+                        _ => "",
                     };
                     if (string.IsNullOrWhiteSpace(description))
                         description = $"{opt:X4}";
-                    //str = $"[{category}] {description}";
-                    str = $"{description}";
+                    str = $"[{category.ToString().Replace("Uniform", "Clothing")}] {description}";
                 }
                 else
                     str = ((GiftType9)type).ToString();

SwitchGiftDataManager.Core/Enums/Enums.cs

@@ -121,32 +121,32 @@
         Gloves = 0x0B,
         Bottoms = 0x0C,
         Legwear = 0x0D,
-        Shoes = 0x0E,
+        Footwear = 0x0E,
         None = 0xFF,
     }
 
     internal enum ClothingType8A: byte
     {
-        Heads = 0x00,
+        Headwear = 0x00,
         Tops = 0x01,
         Bottoms = 0x02,
         Outfit = 0x03,
-        Shoes = 0x5,
+        Footwear = 0x5,
         Glasses = 0x06,
-        Eyes = 0x08,
+        Eyewear = 0x08,
         None = 0xFF,
     }
 
     internal enum ClothingType9 : byte
     {
         Uniform = 0x00,
-        Legs = 0x01,
-        Foots = 0x02,
+        Legwear = 0x01,
+        Footwear = 0x02,
         Gloves = 0x03,
         Bags = 0x04,
-        Heads = 0x5,
-        Eyes = 0x06,
-        Rotom = 0x08,
+        Headwear = 0x5,
+        Eyewear = 0x06,
+        PhoneCase = 0x08,
         None = 0xFF,
     }
 }

SwitchGiftDataManager.Core/Properties/Resources.resx

@@ -136,6 +136,27 @@
   <data name="SCVIClothingBags" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SCVIClothingBags.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="SCVIClothingEyewear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingEyewear.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingFootwear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingFootwear.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingGloves" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingGloves.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingHeadwear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingHeadwear.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingLegwear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingLegwear.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingPhoneCase" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingPhoneCase.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="SCVIClothingUniform" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SCVIClothingUniform.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="Species" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Species.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>