Multiple fixed (Sanctify artifacts, 16:10 artifact scanning, auto cons), Feature to partial scan

InventoryKamera.sln

@@ -5,10 +5,6 @@ VisualStudioVersion = 17.2.32616.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryKamera", "InventoryKamera\InventoryKamera.csproj", "{7B7F907E-11F4-4000-B711-8E532A36F8A9}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Inventory Kamera Installer", "Inventory Kamera Installer\Inventory Kamera Installer.vdproj", "{A0A931B9-288D-48F5-9E1D-E0307BD5F3CD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InventoryKameraWPF", "InventoryKameraWPF\InventoryKameraWPF.csproj", "{01D9CF37-EF4D-4396-B955-28C1879359D7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

InventoryKamera/App.config

@@ -71,7 +71,7 @@
                 <value />
             </setting>
             <setting name="WandererName" serializeAs="String">
-                <value>wanderer</value>
+                <value>Wanderer</value>
             </setting>
             <setting name="Executables" serializeAs="Xml">
                 <value>
@@ -84,6 +84,18 @@
             <setting name="Slot1Key" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="SortByObtained" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="NumOfCharToScan" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="Manequin1Name" serializeAs="String">
+                <value>Manequin1</value>
+            </setting>
+            <setting name="Manequin2Name" serializeAs="String">
+                <value>Manequin2</value>
+            </setting>
         </InventoryKamera.Properties.Settings>
     </userSettings>
   <runtime>

InventoryKamera/InventoryKamera.csproj

@@ -193,6 +193,7 @@
       <DependentUpon>MainUI.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.manifest" />
+    <None Include="Properties\DataSources\InventoryKamera.Properties.Settings.datasource" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

InventoryKamera/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.17.*")]
+[assembly: AssemblyVersion("1.4.3.*")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: NeutralResourcesLanguage("en")]

InventoryKamera/Properties/DataSources/InventoryKamera.Properties.Settings.datasource

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="Settings" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>InventoryKamera.Properties.Settings, Properties.Resources.Designer.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>

InventoryKamera/Properties/Settings.settings

@@ -63,7 +63,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="WandererName" Type="System.String" Scope="User">
-      <Value Profile="(Default)">wanderer</Value>
+      <Value Profile="(Default)">Wanderer</Value>
     </Setting>
     <Setting Name="Executables" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
@@ -75,5 +75,17 @@
     <Setting Name="Slot1Key" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">1</Value>
     </Setting>
+    <Setting Name="SortByObtained" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="NumOfCharToScan" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="Manequin1Name" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Manequin1</Value>
+    </Setting>
+    <Setting Name="Manequin2Name" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Manequin2</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

InventoryKamera/data/DatabaseManager.cs

@@ -40,6 +40,7 @@ public string ListsDir
         private const string commitsAPIURL = "https://gitlab.com/api/v4/projects/53216109/repository/commits";
         private const string repoBaseURL = "https://gitlab.com/Dimbreath/AnimeGameData/-/raw/master/";
         private const string TextMapEnURL = repoBaseURL + "TextMap/TextMapEN.json";
+        private const string TextMapMediumEnURL = repoBaseURL + "TextMap/TextMap_MediumEN.json";
         private const string CharactersURL = repoBaseURL + "ExcelBinOutput/AvatarExcelConfigData.json";
         private const string ConstellationsURL = repoBaseURL + "ExcelBinOutput/FetterInfoExcelConfigData.json";
         private const string TalentsURL = repoBaseURL + "ExcelBinOutput/AvatarTalentExcelConfigData.json";
@@ -86,6 +87,15 @@ public DatabaseManager()
 
 
             LocalVersion = new Version(File.ReadAllText(ListsDir + NewVersion));
+
+
+            if (!(File.Exists(ListsDir + WeaponsJson) &&
+                File.Exists(ListsDir + ArtifactsJson) &&
+                File.Exists(ListsDir + CharactersJson) &&
+                File.Exists(ListsDir + MaterialsJson)))
+            {
+                UpdateGameData(force: true);
+            }
         }
 
         public bool UpdateAvailable()
@@ -251,10 +261,22 @@ private void LoadMappings()
             {
                 if (!Mappings.Any())
                 {
-                    Mappings = new ConcurrentDictionary<string, string>(JObject.Parse(LoadJsonFromURLAsync(TextMapEnURL))
+                    var mapping = JObject.Parse(LoadJsonFromURLAsync(TextMapEnURL))
+                        .ToObject<Dictionary<string, string>>()
+                        .Where(e => !string.IsNullOrWhiteSpace(e.Value)) // Remove any mapping with empty
+                        .ToDictionary(i => i.Key, i => i.Value);
+
+                    var mediumMapping = JObject.Parse(LoadJsonFromURLAsync(TextMapMediumEnURL))
                         .ToObject<Dictionary<string, string>>()
                         .Where(e => !string.IsNullOrWhiteSpace(e.Value)) // Remove any mapping with empty
-                        .ToDictionary(i => i.Key, i => i.Value));
+                        .ToDictionary(i => i.Key, i => i.Value);
+
+                    foreach (var entry in mediumMapping)
+                    {
+                        mapping[entry.Key] = entry.Value; // Should be no overlap
+                    }
+
+                    Mappings = new ConcurrentDictionary<string, string>(mapping);
                 }
             }
         }
@@ -358,8 +380,12 @@ private UpdateStatus UpdateCharacters(bool force)
                         string nameKey = nameGOOD.ToLower();
                         int characterID = (int)character["id"];
 
+                        if (characterID > 10000900) return; // Not playable characters
+
                         string const3Description = "";
+                        string const5Description = "";
                         string skill = "";
+                        string auto = "Normal Attack";
 
                         var value = new JObject();
 
@@ -416,7 +442,6 @@ private UpdateStatus UpdateCharacters(bool force)
                                 skill = skills.First(entry => entry["skillIcon"].ToString().Contains($"Skill_S_{name}"))["nameTextMapHash"].ToString();
                                 skill = Mappings[skill].ToString();
 
-
                                 value.Add("ConstellationName", new JArray
                                 {
                                     GetConstellationNameFromId(characterID)
@@ -428,16 +453,34 @@ private UpdateStatus UpdateCharacters(bool force)
                                 const3Description = talents.Where(entry => entry["icon"].ToString().Contains(name)).ElementAt(2)["descTextMapHash"].ToString();
                                 const3Description = Mappings[const3Description].ToString();
 
-                                if (const3Description.Contains(skill))
+                                if (const3Description.Contains(auto))
+                                {
+                                    constellationOrder.Add("auto");
+                                } else if (const3Description.Contains(skill))
                                 {
                                     constellationOrder.Add("skill");
-                                    constellationOrder.Add("burst");
                                 }
                                 else
                                 {
                                     constellationOrder.Add("burst");
+                                }
+
+                                // The skill/burst name is always mentioned in the constellation's description so we'll check for it
+                                const5Description = talents.Where(entry => entry["icon"].ToString().Contains(name)).ElementAt(4)["descTextMapHash"].ToString();
+                                const5Description = Mappings[const5Description].ToString();
+
+                                if (const5Description.Contains(auto))
+                                {
+                                    constellationOrder.Add("auto");
+                                }
+                                else if (const5Description.Contains(skill))
+                                {
                                     constellationOrder.Add("skill");
                                 }
+                                else
+                                {
+                                    constellationOrder.Add("burst");
+                                }
 
                                 value.Add("ConstellationOrder", constellationOrder);
 

InventoryKamera/data/GOOD.cs

@@ -45,7 +45,7 @@ public GOOD(InventoryKamera genshinData) : this()
         {
             // Get rid of VS warning since we are converting this class to JSON
             Format = "GOOD";
-            Version = 2;
+            Version = 3;
             AppVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
             Source = "Inventory_Kamera";