backwards compatibility with old fightcade games.json for launching, …

…looks in directory for existing lst to be safe

README.md

@@ -1,4 +1,4 @@
-# NullDC-NAOMI Netplay Launcher Distribution 0.6.5.3
+# NullDC-NAOMI Netplay Launcher Distribution 0.6.5.4
 Configuration optimized by blueminder *(June 30, 2020)*
 
 **Special Thanks**

nullDCNetplayLauncher/Launcher.cs

@@ -159,12 +159,28 @@ public static String GetRomPathFromGameId(string gameid)
                 var GamesJsonTxt = File.ReadAllText(GameJsonPath);
 
                 var GamesJson = JsonConvert.DeserializeObject<List<Launcher.Game>>(GamesJsonTxt);
-                var games = GamesJson.Where(g => g.ID == $"nulldc_{gameid}");
+                var games = GamesJson.Where(g => g.ID == $"nulldc_{gameid}" || g.GameID == $"nulldc_{gameid}");
 
                 if (games.Count() > 0)
                 {
-                    var lst = games.First().Assets.Where(a => a.LocalName().EndsWith(".lst")).First();
-                    path = Path.Combine(Launcher.rootDir, DistroDir, games.First().Root, games.First().Name, lst.LocalName());
+                    if (games.First().Name.Contains("\\"))
+                    {
+                        var entry = games.First().Name.Split(new[] { "\\" }, StringSplitOptions.None);
+                        var folder = entry[0];
+                        var lst = entry[1];
+
+                        var full_folder_path = Path.Combine(Launcher.rootDir, DistroDir, "roms", folder);
+                        path = Path.Combine(full_folder_path, lst);
+
+                        if (!File.Exists(path))
+                            path = full_folder_path;
+                    }
+                    else
+                    {
+                        var lst = games.First().Assets.Where(a => a.LocalName().EndsWith(".lst")).First();
+                        path = Path.Combine(Launcher.rootDir, DistroDir, games.First().Root, games.First().Name, lst.LocalName());
+                    }
+
                 }
 
                 if (!File.Exists(path))
@@ -818,6 +834,9 @@ public static void RestoreNullDcFresh(bool force = false)
 
         public class Game
         {
+            [JsonProperty("gameid")]
+            public string GameID { get; set; }
+
             [JsonProperty("id")]
             public string ID { get; set; }
 
@@ -832,7 +851,7 @@ public class Game
 
             [JsonProperty("root")]
             public string Root { get; set; }
-            
+
         }
 
         public class Asset

nullDCNetplayLauncher/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // 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("0.6.5.3")]
-[assembly: AssemblyFileVersion("0.6.5.3")]
+[assembly: AssemblyVersion("0.6.5.4")]
+[assembly: AssemblyFileVersion("0.6.5.4")]