Added error handling. Fixed weapon and memoir collection count. Adjus…

…ted max force to be based on mission instead of current loadouts.
BillyCool · Mar 28, 2024 · a276e86 · a276e86
1 parent 2fc949c
commit a276e86
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/NierReincarnationRecap.SaveData/DataUploader.cs b/NierReincarnationRecap.SaveData/DataUploader.cs
@@ -50,12 +50,12 @@ private static UserDataDto GetUserData(DarkUserMemoryDatabase darkUserMemoryData
             FavoriteCostumeId = darkUserMemoryDatabase.EntityIUserProfileTable[0].FavoriteCostumeId,
             TotalLoginCount = darkUserMemoryDatabase.EntityIUserLoginTable[0].TotalLoginCount,
             Level = darkUserMemoryDatabase.EntityIUserStatusTable[0].Level,
-            MaxForce = darkUserMemoryDatabase.EntityIUserDeckTable.MaxBy(x => x.Power)?.Power,
+            MaxForce = darkUserMemoryDatabase.EntityIUserMissionTable.Find(x => x.MissionId == 400120)?.ProgressValue,
             DistanceWalked = darkUserMemoryDatabase.EntityIUserMissionTable.Find(x => x.MissionId == 410013)?.ProgressValue,
             CostumeCount = darkUserMemoryDatabase.EntityIUserCostumeTable.DistinctBy(x => x.CostumeId).Count(),
             WeaponCount = GetUniqueWeaponIdCount(darkUserMemoryDatabase),
             CompanionCount = darkUserMemoryDatabase.EntityIUserCompanionTable.Count,
-            MemoirCount = darkUserMemoryDatabase.EntityIUserPartsTable.DistinctBy(x => x.PartsId).Count(),
+            MemoirCount = darkUserMemoryDatabase.EntityIUserPartsGroupNoteTable.DistinctBy(x => x.PartsGroupId).Count(),
             DebrisCount = darkUserMemoryDatabase.EntityIUserThoughtTable.DistinctBy(x => x.ThoughtId).Count(),
             AwakeningCount = darkUserMemoryDatabase.EntityIUserCostumeTable.Sum(x => x.AwakenCount),
             ArenaRankings = darkUserMemoryDatabase.EntityIUserPvpWeeklyResultTable.GroupBy(x => x.PvpSeasonId)
@@ -83,7 +83,7 @@ private static UserDataDto GetUserData(DarkUserMemoryDatabase darkUserMemoryData
 
     private static int GetUniqueWeaponIdCount(DarkUserMemoryDatabase darkUserMemoryDatabase)
     {
-        List<int> weaponIds = [.. darkUserMemoryDatabase.EntityIUserWeaponTable
+        List<int> weaponIds = [.. darkUserMemoryDatabase.EntityIUserWeaponNoteTable
             .Select(x => x.WeaponId)
             .Distinct()
             .OrderBy(x => x)];

diff --git a/NierReincarnationRecap.SaveData/Program.cs b/NierReincarnationRecap.SaveData/Program.cs
@@ -24,6 +24,18 @@ public static class Program
     private static readonly JsonSerializerOptions JsonSerializerOptions = new(JsonSerializerDefaults.Web);
 
     public static async Task Main(string[] _)
+    {
+        try
+        {
+            await RunInternalAsync();
+        }
+        catch (Exception ex)
+        {
+            ShowErrorAndExit(ex);
+        }
+    }
+
+    private static async Task RunInternalAsync()
     {
         // Show region select
         ShowRegionSelect();
@@ -101,9 +113,13 @@ private static bool ShouldUploadUserData()
         };
     }
 
-    private static void ShowErrorAndExit()
+    private static void ShowErrorAndExit(Exception? ex = null)
     {
         Console.WriteLine("Something went wrong!");
+        if (ex is not null)
+        {
+            Console.WriteLine($"Error: {ex.Message}");
+        }
         Environment.Exit(0);
     }