Merge pull request #665 from TheTrackerCouncil/ap-fixes

AP fixes

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.SeedGenerator/FileData/Patches/LocationsPatch.cs

@@ -177,7 +177,14 @@ private static ParsedRomLocationDetails GetParsedLocationDetails(byte[] rom, Loc
             var itemNumber = BitConverter.ToInt16(bytes, 2);
             var ownerPlayerId = BitConverter.ToInt16(bytes, 4);
             var archipelagoFlags = BitConverter.ToInt16(bytes, 6);
-            playerName = playerNames[ownerPlayerId];
+            if (ownerPlayerId < playerNames.Count)
+            {
+                playerName = playerNames[ownerPlayerId];
+            }
+            else
+            {
+                playerName = $"Player {ownerPlayerId}";
+            }
             isProgression = archipelagoFlags > 0;
 
             if (!isLocal)

src/TrackerCouncil.Smz3.SeedGenerator/FileData/Patches/MetadataPatch.cs

@@ -53,15 +53,16 @@ public static string GetGameTitle(byte[] rom)
     public static List<string> GetPlayerNames(byte[] rom)
     {
         var toReturn = new List<string>();
-        for (var i = 0; i < 128; i++)
+        for (var i = 0; i < 256; i++)
         {
             var nameBytes = rom.Skip(s_addrPlayerNames + i * 16).Take(16).ToArray();
-            var name = Encoding.ASCII.GetString(nameBytes);
-            if (name == "123456789012\0\0\0\0")
+            var name = Encoding.ASCII.GetString(nameBytes).Replace("\0", string.Empty).Trim();
+            if (name == "123456789012" || string.IsNullOrEmpty(name))
             {
                 break;
             }
-            toReturn.Add(name.Replace("\0", string.Empty).Trim());
+
+            toReturn.Add(name);
         }
 
         return toReturn;

src/TrackerCouncil.Smz3.UI/Services/SoloRomListService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -165,8 +166,10 @@ public async Task LaunchTracker(GeneratedRomViewModel rom)
 
     public async Task<bool> OpenArchipelagoModeAsync()
     {
+
+        var userFolder = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
         var storageItem = await CrossPlatformTools.OpenFileDialogAsync(ParentWindow, FileInputControlType.OpenFile,
-                    "Rom file (*.sfc)|*.sfc|All files (*.*)|*.*", "/home/matt/Games/Randomizers/Archipelago");
+                    "Rom file (*.sfc)|*.sfc|All files (*.*)|*.*", userFolder);
 
         var pathString = storageItem?.TryGetLocalPath();