Patch 1.4.4 - More fixes to role queue support

Martin Nielsen · Martin Nielsen · commit 1e72f40276af · 2019-08-23T03:32:51.000+02:00
diff --git a/BetterOverwatch/AppData.cs b/BetterOverwatch/AppData.cs
@@ -24,7 +24,8 @@ internal class AppData
         public static Stopwatch 
             frameTimer = new Stopwatch(),
             getInfoTimeout = new Stopwatch(),
-            statsTimer = new Stopwatch();
+            statsTimer = new Stopwatch(),
+            ratingsTimer = new Stopwatch();
     }
     internal enum State
     {
diff --git a/BetterOverwatch/Forms/WinratesForm.Designer.cs b/BetterOverwatch/Forms/WinratesForm.Designer.cs
diff --git a/BetterOverwatch/Functions.cs b/BetterOverwatch/Functions.cs
@@ -191,7 +191,7 @@ public static bool BitmapIsCertainColor(Bitmap image, int red, int green, int bl
                         int g = row[(x * 4) + 1];
                         int r = row[(x * 4) + 2];
 
-                        if (blue - b > 8 || green - g > 8 || red - r > 8)
+                        if (blue - b > 12 || green - g > 12 || red - r > 12)
                             return false;
                     }
                 }
@@ -225,27 +225,32 @@ public static void InvertColors(Bitmap image)
         }
         public static double CompareStrings(string string1, string string2)
         {
-            string1 = string1.ToLower();
-            string2 = string2.ToLower();
-            int[,] d = new int[string1.Length + 1, string2.Length + 1];
+            try
+            {
+                string1 = string1.ToLower();
+                string2 = string2.ToLower();
+                int[,] d = new int[string1.Length + 1, string2.Length + 1];
 
-            if (string1.Length == 0) return string2.Length;
-            if (string2.Length == 0) return string1.Length;
-            for (int i = 0; i <= string1.Length; d[i, 0] = i++) { }
-            for (int j = 0; j <= string2.Length; d[0, j] = j++) { }
+                if (string1.Length == 0) return string2.Length;
+                if (string2.Length == 0) return string1.Length;
+                for (int i = 0; i <= string1.Length; d[i, 0] = i++) { }
+                for (int j = 0; j <= string2.Length; d[0, j] = j++) { }
 
-            for (int i = 1; i <= string1.Length; i++)
-            {
-                for (int j = 1; j <= string2.Length; j++)
+                for (int i = 1; i <= string1.Length; i++)
                 {
-                    int cost = (string2[j - 1] == string1[i - 1]) ? 0 : 1;
+                    for (int j = 1; j <= string2.Length; j++)
+                    {
+                        int cost = (string2[j - 1] == string1[i - 1]) ? 0 : 1;
 
-                    d[i, j] = Math.Min(Math.Min(d[i - 1, j] + 1, d[i, j - 1] + 1), d[i - 1, j - 1] + cost);
+                        d[i, j] = Math.Min(Math.Min(d[i - 1, j] + 1, d[i, j - 1] + 1), d[i - 1, j - 1] + cost);
+                    }
                 }
-            }
-            int big = Math.Max(string1.Length, string2.Length);
+                int big = Math.Max(string1.Length, string2.Length);
 
-            return Math.Floor(Convert.ToDouble(big - d[string1.Length, string2.Length]) / Convert.ToDouble(big) * 100);
+                return Math.Floor(Convert.ToDouble(big - d[string1.Length, string2.Length]) / Convert.ToDouble(big) * 100);
+            }
+            catch (Exception e) { Console.WriteLine($"CompareStrings error: {e}"); }
+            return 0.00;
         }
         public static string CheckMaps(string input)
         {
@@ -295,10 +300,10 @@ public static string BitmapToText(Bitmap frame, int x, int y, int width, int hei
                     AdjustContrast(result, 255f, invertColors, limeToWhite);
                 }
                 output = FetchTextFromImage(result, network);
-                //result.Save(@"C:\test\" + Guid.NewGuid() + ".png");
+
                 result.Dispose();
             }
-            catch { }
+            catch (Exception e) { Console.WriteLine($"BitmapToText error: {e}"); }
             return output;
         }
         public static int[,] LabelImage(Bitmap image, out int labelCount)
@@ -593,11 +598,8 @@ public static string FetchTextFromImage(Bitmap image, Network network)
                     {
                         text += FetchLetterFromImage(BetterOverwatchNetworks.teamSkillRatingNN, bitmaps[i], network);
                     }
-                    else if(network == Network.Ratings)
+                    else if (network == Network.Ratings)
                     {
-                        //StringBuilder sb = GetHashFromImage(bitmaps[i]);
-                        //bitmaps[i].Save($@"D:\Repos\Visual Studio 2019\NeuralNetwork.Trainer\NeuralNetwork.Trainer\TrainData\ratings_rolequeue\test_data\{FetchLetterFromImage(BetterOverwatchNetworks.ratingsNN, bitmaps[i], network)}_{sb.ToString()}.png");
-
                         text += FetchLetterFromImage(BetterOverwatchNetworks.ratingsNN, bitmaps[i], network);
                     }
                     else if (network == Network.Numbers)
@@ -612,7 +614,7 @@ public static string FetchTextFromImage(Bitmap image, Network network)
                     {
                         text += FetchLetterFromImage(BetterOverwatchNetworks.playersNN, bitmaps[i], network);
                     }
-                    //bitmaps[i].Save($@"C:\test\{text}_{Guid.NewGuid()}.png");
+
                     bitmaps[i].Dispose();
                 }
             }
@@ -641,7 +643,9 @@ public static void DebugMessage(string msg)
             catch { }
             Debug.WriteLine(msg);
         }
-        private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG
+        /*
+ * UNUSED METHODS
+         private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG
         {
             byte[] bytes;
             using (MemoryStream ms = new MemoryStream())
@@ -661,9 +665,6 @@ private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG
 
             return sb;
         }
-        /*
- * UNUSED METHODS
-
 private static Bitmap Downscale(Image original)
 {
     double widthPercent = (double)original.Width / 1920 * 1366;
diff --git a/BetterOverwatch/GameMethods.cs b/BetterOverwatch/GameMethods.cs
@@ -1,4 +1,5 @@
-﻿using System.Drawing;
+﻿using System;
+using System.Drawing;
 using System.IO;
 using System.Text.RegularExpressions;
 using BetterOverwatch.Game;
@@ -85,23 +86,38 @@ public static void ReadRoleRatings(Bitmap frame)
                     AppData.gameData.currentRatings.tank = tankRating;
                     if (AppData.settings.outputToTextFiles)
                     {
-                        File.WriteAllText("tank.txt", tankRating.ToString());
+                        try
+                        {
+                            File.WriteAllText("tank.txt", tankRating.ToString());
+                            Functions.DebugMessage($"Updated tank.txt with '{tankRating}'");
+                        }
+                        catch (Exception e) { Functions.DebugMessage($"Failed to update tank.txt : {e.Message}"); }
                     }
                 }
                 if (damageCheck)
                 {
                     AppData.gameData.currentRatings.damage = damageRating;
                     if (AppData.settings.outputToTextFiles)
                     {
-                        File.WriteAllText("damage.txt", damageRating.ToString());
+                        try
+                        {
+                            File.WriteAllText("damage.txt", damageRating.ToString());
+                            Functions.DebugMessage($"Updated damage.txt with '{damageRating}'");
+                        }
+                        catch (Exception e) { Functions.DebugMessage($"Failed to update damage.txt : {e.Message}"); }
                     }
                 }
                 if (supportCheck)
                 {
                     AppData.gameData.currentRatings.support = supportRating;
                     if (AppData.settings.outputToTextFiles)
                     {
-                        File.WriteAllText("support.txt", supportRating.ToString());
+                        try
+                        {
+                            File.WriteAllText("support.txt", supportRating.ToString());
+                            Functions.DebugMessage($"Updated support.txt with '{supportRating}'");
+                        }
+                        catch (Exception e) { Functions.DebugMessage($"Failed to update support.txt : {e.Message}"); }
                     }
                 }
                 AppData.successSound.Play();
@@ -173,6 +189,7 @@ public static void ReadStats(Bitmap frame)
                 }
                 AppData.gameData.stats.Add(new Stat((int)AppData.gameData.gameTimer.Elapsed.TotalSeconds, eliminations, damage, objectiveKills, healing, deaths, heroStats));
                 AppData.statsTimer.Restart();
+                Functions.DebugMessage($"Hero stats recorded after {AppData.gameData.gameTimer.Elapsed.TotalSeconds} seconds");
             }
         }
         public static void ReadCompetitiveGameEntered(Bitmap frame)
@@ -214,7 +231,7 @@ public static void ReadMap(Bitmap frame)
                     {
                         AppData.gameData.map = mapText;
                         AppData.getInfoTimeout.Restart();
-                        Functions.DebugMessage("Recognized map: '" + mapText + "'");
+                        Functions.DebugMessage($"Recognized map: '{mapText}'");
                     }
                 }
             }
@@ -233,7 +250,7 @@ public static void ReadTeamsSkillRating(Bitmap frame)
                     if (int.TryParse(team1Rating, out int rating) && rating > 999 && rating < 5000)
                     {
                         AppData.gameData.team1Rating = rating;
-                        Functions.DebugMessage("Recognized team 1 SR: '" + team1Rating + "'");
+                        Functions.DebugMessage($"Recognized team 1 rating: '{team1Rating}'");
                     }
                 }
             }
@@ -249,7 +266,7 @@ public static void ReadTeamsSkillRating(Bitmap frame)
                     if (int.TryParse(team2Rating, out int rating) && rating > 999 && rating < 5000)
                     {
                         AppData.gameData.team2Rating = rating;
-                        Functions.DebugMessage("Recognized team 2 SR: '" + team2Rating + "'");
+                        Functions.DebugMessage($"Recognized team 2 rating: '{team2Rating}'");
                     }
                 }
             }
@@ -302,6 +319,7 @@ public static bool ReadHeroPlayed(Bitmap frame)
                         }
                         AppData.gameData.heroTimer.Restart();
                         AppData.gameData.heroesPlayed.Add(new HeroPlayed(Constants.heroList[h].name, (int)AppData.gameData.gameTimer.Elapsed.TotalSeconds));
+                        Functions.DebugMessage($"Now playing hero {Constants.heroList[h].name} at {AppData.gameData.gameTimer.Elapsed.TotalSeconds} seconds");
                         return true;
                     }
                 }
@@ -310,20 +328,20 @@ public static bool ReadHeroPlayed(Bitmap frame)
         }
         public static void ReadRoundCompleted(Bitmap frame)
         {
-            string roundCompletedText = Functions.BitmapToText(frame, 940, 160, 290, 76);
+            string roundCompletedText = Functions.BitmapToText(frame, 940, 160, 290, 80);
 
-            if (!roundCompletedText.Equals(string.Empty))
+            if (roundCompletedText != string.Empty && Functions.CompareStrings(roundCompletedText, "COMPLETE") >= 70)
             {
-                if (Functions.CompareStrings(roundCompletedText, "COMPLETED") >= 70)
+                if (AppData.gameData.heroesPlayed.Count > 0)
                 {
                     AppData.gameData.heroesPlayed[AppData.gameData.heroesPlayed.Count - 1].time = (int)AppData.gameData.heroTimer.Elapsed.TotalSeconds;
-                    //Vars.gameData.heroesPlayed.Add(new HeroPlayed(Vars.gameData.heroesPlayed[Vars.gameData.heroesPlayed.Count - 1].name, (int)Vars.gameData.gameTimer.Elapsed.TotalSeconds));
-                    AppData.gameData.state = State.RoundComplete;
-                    AppData.gameData.heroTimer.Stop();
-                    AppData.gameData.gameTimer.Stop();
-                    AppData.getInfoTimeout.Restart();
-                    Functions.DebugMessage($"Recognized round completed");
                 }
+                //Vars.gameData.heroesPlayed.Add(new HeroPlayed(Vars.gameData.heroesPlayed[Vars.gameData.heroesPlayed.Count - 1].name, (int)Vars.gameData.gameTimer.Elapsed.TotalSeconds));
+                AppData.gameData.state = State.RoundComplete;
+                AppData.gameData.heroTimer.Stop();
+                AppData.gameData.gameTimer.Stop();
+                AppData.getInfoTimeout.Restart();
+                Functions.DebugMessage($"Recognized round completed");
             }
         }
         public static bool ReadRoundStarted(Bitmap frame)
@@ -412,14 +430,15 @@ public static void ReadPlayerNamesAndRank(Bitmap frame)
                 playerNameX += 945;
                 playerRankX += 422;
             }
+            Functions.DebugMessage("Captured player list");
         }
         public static bool IsValidGame()
         {
-            if (AppData.gameData.timer.Elapsed.TotalSeconds < 300)
+            if (AppData.gameData.timer.Elapsed.TotalSeconds < 300 && !ScreenCaptureHandler.debug)
             {
                 if (AppData.gameData.state >= State.Recording)
                 {
-                    Functions.DebugMessage("Invalid game");
+                    Functions.DebugMessage($"Invalid game state={AppData.gameData.state} gameData.timer={AppData.gameData.timer.Elapsed.TotalSeconds}");
                     ScreenCaptureHandler.trayMenu.ChangeTray("Ready to record, enter a competitive game to begin", Resources.Icon_Active);
                 }
                 return false;
diff --git a/BetterOverwatch/Program.cs b/BetterOverwatch/Program.cs
@@ -22,7 +22,7 @@ internal class Program
         private static void Main()
         {
             AppData.initalize = new Initalize(
-                "1.4.3",
+                "1.4.4",
                 "betteroverwatch.com",
                 "https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");
             Application.EnableVisualStyles();
diff --git a/BetterOverwatch/Properties/AssemblyInfo.cs b/BetterOverwatch/Properties/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Better Overwatch - BETA Ratings")]
+[assembly: AssemblyTitle("Better Overwatch")]
 [assembly: AssemblyDescription("A competitive match tracker for Overwatch")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://betteroverwatch.com")]
@@ -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("1.4.3.0")]
-[assembly: AssemblyFileVersion("1.4.3.0")]
+[assembly: AssemblyVersion("1.4.4.0")]
+[assembly: AssemblyFileVersion("1.4.4.0")]
diff --git a/BetterOverwatch/ScreenCaptureHandler.cs b/BetterOverwatch/ScreenCaptureHandler.cs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ internal class AppData`
`24`	`24`	`public static Stopwatch`
`25`	`25`	`frameTimer = new Stopwatch(),`
`26`	`26`	`getInfoTimeout = new Stopwatch(),`
`27`		`- statsTimer = new Stopwatch();`
	`27`	`+ statsTimer = new Stopwatch(),`
	`28`	`+ ratingsTimer = new Stopwatch();`
`28`	`29`	`}`
`29`	`30`	`internal enum State`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public static bool BitmapIsCertainColor(Bitmap image, int red, int green, int bl`
`191`	`191`	`int g = row[(x * 4) + 1];`
`192`	`192`	`int r = row[(x * 4) + 2];`
`193`	`193`
`194`		`- if (blue - b > 8 \|\| green - g > 8 \|\| red - r > 8)`
	`194`	`+ if (blue - b > 12 \|\| green - g > 12 \|\| red - r > 12)`
`195`	`195`	`return false;`
`196`	`196`	`}`
`197`	`197`	`}`
`@@ -225,27 +225,32 @@ public static void InvertColors(Bitmap image)`
`225`	`225`	`}`
`226`	`226`	`public static double CompareStrings(string string1, string string2)`
`227`	`227`	`{`
`228`		`- string1 = string1.ToLower();`
`229`		`- string2 = string2.ToLower();`
`230`		`- int[,] d = new int[string1.Length + 1, string2.Length + 1];`
	`228`	`+ try`
	`229`	`+ {`
	`230`	`+ string1 = string1.ToLower();`
	`231`	`+ string2 = string2.ToLower();`
	`232`	`+ int[,] d = new int[string1.Length + 1, string2.Length + 1];`
`231`	`233`
`232`		`- if (string1.Length == 0) return string2.Length;`
`233`		`- if (string2.Length == 0) return string1.Length;`
`234`		`- for (int i = 0; i <= string1.Length; d[i, 0] = i++) { }`
`235`		`- for (int j = 0; j <= string2.Length; d[0, j] = j++) { }`
	`234`	`+ if (string1.Length == 0) return string2.Length;`
	`235`	`+ if (string2.Length == 0) return string1.Length;`
	`236`	`+ for (int i = 0; i <= string1.Length; d[i, 0] = i++) { }`
	`237`	`+ for (int j = 0; j <= string2.Length; d[0, j] = j++) { }`
`236`	`238`
`237`		`- for (int i = 1; i <= string1.Length; i++)`
`238`		`- {`
`239`		`- for (int j = 1; j <= string2.Length; j++)`
	`239`	`+ for (int i = 1; i <= string1.Length; i++)`
`240`	`240`	`{`
`241`		`- int cost = (string2[j - 1] == string1[i - 1]) ? 0 : 1;`
	`241`	`+ for (int j = 1; j <= string2.Length; j++)`
	`242`	`+ {`
	`243`	`+ int cost = (string2[j - 1] == string1[i - 1]) ? 0 : 1;`
`242`	`244`
`243`		`- d[i, j] = Math.Min(Math.Min(d[i - 1, j] + 1, d[i, j - 1] + 1), d[i - 1, j - 1] + cost);`
	`245`	`+ d[i, j] = Math.Min(Math.Min(d[i - 1, j] + 1, d[i, j - 1] + 1), d[i - 1, j - 1] + cost);`
	`246`	`+ }`
`244`	`247`	`}`
`245`		`- }`
`246`		`- int big = Math.Max(string1.Length, string2.Length);`
	`248`	`+ int big = Math.Max(string1.Length, string2.Length);`
`247`	`249`
`248`		`- return Math.Floor(Convert.ToDouble(big - d[string1.Length, string2.Length]) / Convert.ToDouble(big) * 100);`
	`250`	`+ return Math.Floor(Convert.ToDouble(big - d[string1.Length, string2.Length]) / Convert.ToDouble(big) * 100);`
	`251`	`+ }`
	`252`	`+ catch (Exception e) { Console.WriteLine($"CompareStrings error: {e}"); }`
	`253`	`+ return 0.00;`
`249`	`254`	`}`
`250`	`255`	`public static string CheckMaps(string input)`
`251`	`256`	`{`
`@@ -295,10 +300,10 @@ public static string BitmapToText(Bitmap frame, int x, int y, int width, int hei`
`295`	`300`	`AdjustContrast(result, 255f, invertColors, limeToWhite);`
`296`	`301`	`}`
`297`	`302`	`output = FetchTextFromImage(result, network);`
`298`		`- //result.Save(@"C:\test\" + Guid.NewGuid() + ".png");`
	`303`	`+`
`299`	`304`	`result.Dispose();`
`300`	`305`	`}`
`301`		`- catch { }`
	`306`	`+ catch (Exception e) { Console.WriteLine($"BitmapToText error: {e}"); }`
`302`	`307`	`return output;`
`303`	`308`	`}`
`304`	`309`	`public static int[,] LabelImage(Bitmap image, out int labelCount)`
`@@ -593,11 +598,8 @@ public static string FetchTextFromImage(Bitmap image, Network network)`
`593`	`598`	`{`
`594`	`599`	`text += FetchLetterFromImage(BetterOverwatchNetworks.teamSkillRatingNN, bitmaps[i], network);`
`595`	`600`	`}`
`596`		`- else if(network == Network.Ratings)`
	`601`	`+ else if (network == Network.Ratings)`
`597`	`602`	`{`
`598`		`- //StringBuilder sb = GetHashFromImage(bitmaps[i]);`
`599`		`- //bitmaps[i].Save($@"D:\Repos\Visual Studio 2019\NeuralNetwork.Trainer\NeuralNetwork.Trainer\TrainData\ratings_rolequeue\test_data\{FetchLetterFromImage(BetterOverwatchNetworks.ratingsNN, bitmaps[i], network)}_{sb.ToString()}.png");`
`600`		`-`
`601`	`603`	`text += FetchLetterFromImage(BetterOverwatchNetworks.ratingsNN, bitmaps[i], network);`
`602`	`604`	`}`
`603`	`605`	`else if (network == Network.Numbers)`
`@@ -612,7 +614,7 @@ public static string FetchTextFromImage(Bitmap image, Network network)`
`612`	`614`	`{`
`613`	`615`	`text += FetchLetterFromImage(BetterOverwatchNetworks.playersNN, bitmaps[i], network);`
`614`	`616`	`}`
`615`		`- //bitmaps[i].Save($@"C:\test\{text}_{Guid.NewGuid()}.png");`
	`617`	`+`
`616`	`618`	`bitmaps[i].Dispose();`
`617`	`619`	`}`
`618`	`620`	`}`
`@@ -641,7 +643,9 @@ public static void DebugMessage(string msg)`
`641`	`643`	`catch { }`
`642`	`644`	`Debug.WriteLine(msg);`
`643`	`645`	`}`
`644`		`- private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG`
	`646`	`+ /*`
	`647`	`+ * UNUSED METHODS`
	`648`	`+ private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG`
`645`	`649`	`{`
`646`	`650`	`byte[] bytes;`
`647`	`651`	`using (MemoryStream ms = new MemoryStream())`
`@@ -661,9 +665,6 @@ private static StringBuilder GetHashFromImage(Bitmap bitmap) // DEBUG`
`661`	`665`
`662`	`666`	`return sb;`
`663`	`667`	`}`
`664`		`- /*`
`665`		`- * UNUSED METHODS`
`666`		`-`
`667`	`668`	`private static Bitmap Downscale(Image original)`
`668`	`669`	`{`
`669`	`670`	`double widthPercent = (double)original.Width / 1920 * 1366;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Drawing;`
	`1`	`+using System;`
	`2`	`+using System.Drawing;`
`2`	`3`	`using System.IO;`
`3`	`4`	`using System.Text.RegularExpressions;`
`4`	`5`	`using BetterOverwatch.Game;`
`@@ -85,23 +86,38 @@ public static void ReadRoleRatings(Bitmap frame)`
`85`	`86`	`AppData.gameData.currentRatings.tank = tankRating;`
`86`	`87`	`if (AppData.settings.outputToTextFiles)`
`87`	`88`	`{`
`88`		`- File.WriteAllText("tank.txt", tankRating.ToString());`
	`89`	`+ try`
	`90`	`+ {`
	`91`	`+ File.WriteAllText("tank.txt", tankRating.ToString());`
	`92`	`+ Functions.DebugMessage($"Updated tank.txt with '{tankRating}'");`
	`93`	`+ }`
	`94`	`+ catch (Exception e) { Functions.DebugMessage($"Failed to update tank.txt : {e.Message}"); }`
`89`	`95`	`}`
`90`	`96`	`}`
`91`	`97`	`if (damageCheck)`
`92`	`98`	`{`
`93`	`99`	`AppData.gameData.currentRatings.damage = damageRating;`
`94`	`100`	`if (AppData.settings.outputToTextFiles)`
`95`	`101`	`{`
`96`		`- File.WriteAllText("damage.txt", damageRating.ToString());`
	`102`	`+ try`
	`103`	`+ {`
	`104`	`+ File.WriteAllText("damage.txt", damageRating.ToString());`
	`105`	`+ Functions.DebugMessage($"Updated damage.txt with '{damageRating}'");`
	`106`	`+ }`
	`107`	`+ catch (Exception e) { Functions.DebugMessage($"Failed to update damage.txt : {e.Message}"); }`
`97`	`108`	`}`
`98`	`109`	`}`
`99`	`110`	`if (supportCheck)`
`100`	`111`	`{`
`101`	`112`	`AppData.gameData.currentRatings.support = supportRating;`
`102`	`113`	`if (AppData.settings.outputToTextFiles)`
`103`	`114`	`{`
`104`		`- File.WriteAllText("support.txt", supportRating.ToString());`
	`115`	`+ try`
	`116`	`+ {`
	`117`	`+ File.WriteAllText("support.txt", supportRating.ToString());`
	`118`	`+ Functions.DebugMessage($"Updated support.txt with '{supportRating}'");`
	`119`	`+ }`
	`120`	`+ catch (Exception e) { Functions.DebugMessage($"Failed to update support.txt : {e.Message}"); }`
`105`	`121`	`}`
`106`	`122`	`}`
`107`	`123`	`AppData.successSound.Play();`
`@@ -173,6 +189,7 @@ public static void ReadStats(Bitmap frame)`
`173`	`189`	`}`
`174`	`190`	`AppData.gameData.stats.Add(new Stat((int)AppData.gameData.gameTimer.Elapsed.TotalSeconds, eliminations, damage, objectiveKills, healing, deaths, heroStats));`
`175`	`191`	`AppData.statsTimer.Restart();`
	`192`	`+ Functions.DebugMessage($"Hero stats recorded after {AppData.gameData.gameTimer.Elapsed.TotalSeconds} seconds");`
`176`	`193`	`}`
`177`	`194`	`}`
`178`	`195`	`public static void ReadCompetitiveGameEntered(Bitmap frame)`
`@@ -214,7 +231,7 @@ public static void ReadMap(Bitmap frame)`
`214`	`231`	`{`
`215`	`232`	`AppData.gameData.map = mapText;`
`216`	`233`	`AppData.getInfoTimeout.Restart();`
`217`		`- Functions.DebugMessage("Recognized map: '" + mapText + "'");`
	`234`	`+ Functions.DebugMessage($"Recognized map: '{mapText}'");`
`218`	`235`	`}`
`219`	`236`	`}`
`220`	`237`	`}`
`@@ -233,7 +250,7 @@ public static void ReadTeamsSkillRating(Bitmap frame)`
`233`	`250`	`if (int.TryParse(team1Rating, out int rating) && rating > 999 && rating < 5000)`
`234`	`251`	`{`
`235`	`252`	`AppData.gameData.team1Rating = rating;`
`236`		`- Functions.DebugMessage("Recognized team 1 SR: '" + team1Rating + "'");`
	`253`	`+ Functions.DebugMessage($"Recognized team 1 rating: '{team1Rating}'");`
`237`	`254`	`}`
`238`	`255`	`}`
`239`	`256`	`}`
`@@ -249,7 +266,7 @@ public static void ReadTeamsSkillRating(Bitmap frame)`
`249`	`266`	`if (int.TryParse(team2Rating, out int rating) && rating > 999 && rating < 5000)`
`250`	`267`	`{`
`251`	`268`	`AppData.gameData.team2Rating = rating;`
`252`		`- Functions.DebugMessage("Recognized team 2 SR: '" + team2Rating + "'");`
	`269`	`+ Functions.DebugMessage($"Recognized team 2 rating: '{team2Rating}'");`
`253`	`270`	`}`
`254`	`271`	`}`
`255`	`272`	`}`
`@@ -302,6 +319,7 @@ public static bool ReadHeroPlayed(Bitmap frame)`
`302`	`319`	`}`
`303`	`320`	`AppData.gameData.heroTimer.Restart();`
`304`	`321`	`AppData.gameData.heroesPlayed.Add(new HeroPlayed(Constants.heroList[h].name, (int)AppData.gameData.gameTimer.Elapsed.TotalSeconds));`
	`322`	`+ Functions.DebugMessage($"Now playing hero {Constants.heroList[h].name} at {AppData.gameData.gameTimer.Elapsed.TotalSeconds} seconds");`
`305`	`323`	`return true;`
`306`	`324`	`}`
`307`	`325`	`}`
`@@ -310,20 +328,20 @@ public static bool ReadHeroPlayed(Bitmap frame)`
`310`	`328`	`}`
`311`	`329`	`public static void ReadRoundCompleted(Bitmap frame)`
`312`	`330`	`{`
`313`		`- string roundCompletedText = Functions.BitmapToText(frame, 940, 160, 290, 76);`
	`331`	`+ string roundCompletedText = Functions.BitmapToText(frame, 940, 160, 290, 80);`
`314`	`332`
`315`		`- if (!roundCompletedText.Equals(string.Empty))`
	`333`	`+ if (roundCompletedText != string.Empty && Functions.CompareStrings(roundCompletedText, "COMPLETE") >= 70)`
`316`	`334`	`{`
`317`		`- if (Functions.CompareStrings(roundCompletedText, "COMPLETED") >= 70)`
	`335`	`+ if (AppData.gameData.heroesPlayed.Count > 0)`
`318`	`336`	`{`
`319`	`337`	`AppData.gameData.heroesPlayed[AppData.gameData.heroesPlayed.Count - 1].time = (int)AppData.gameData.heroTimer.Elapsed.TotalSeconds;`
`320`		`- //Vars.gameData.heroesPlayed.Add(new HeroPlayed(Vars.gameData.heroesPlayed[Vars.gameData.heroesPlayed.Count - 1].name, (int)Vars.gameData.gameTimer.Elapsed.TotalSeconds));`
`321`		`- AppData.gameData.state = State.RoundComplete;`
`322`		`- AppData.gameData.heroTimer.Stop();`
`323`		`- AppData.gameData.gameTimer.Stop();`
`324`		`- AppData.getInfoTimeout.Restart();`
`325`		`- Functions.DebugMessage($"Recognized round completed");`
`326`	`338`	`}`
	`339`	`+ //Vars.gameData.heroesPlayed.Add(new HeroPlayed(Vars.gameData.heroesPlayed[Vars.gameData.heroesPlayed.Count - 1].name, (int)Vars.gameData.gameTimer.Elapsed.TotalSeconds));`
	`340`	`+ AppData.gameData.state = State.RoundComplete;`
	`341`	`+ AppData.gameData.heroTimer.Stop();`
	`342`	`+ AppData.gameData.gameTimer.Stop();`
	`343`	`+ AppData.getInfoTimeout.Restart();`
	`344`	`+ Functions.DebugMessage($"Recognized round completed");`
`327`	`345`	`}`
`328`	`346`	`}`
`329`	`347`	`public static bool ReadRoundStarted(Bitmap frame)`
`@@ -412,14 +430,15 @@ public static void ReadPlayerNamesAndRank(Bitmap frame)`
`412`	`430`	`playerNameX += 945;`
`413`	`431`	`playerRankX += 422;`
`414`	`432`	`}`
	`433`	`+ Functions.DebugMessage("Captured player list");`
`415`	`434`	`}`
`416`	`435`	`public static bool IsValidGame()`
`417`	`436`	`{`
`418`		`- if (AppData.gameData.timer.Elapsed.TotalSeconds < 300)`
	`437`	`+ if (AppData.gameData.timer.Elapsed.TotalSeconds < 300 && !ScreenCaptureHandler.debug)`
`419`	`438`	`{`
`420`	`439`	`if (AppData.gameData.state >= State.Recording)`
`421`	`440`	`{`
`422`		`- Functions.DebugMessage("Invalid game");`
	`441`	`+ Functions.DebugMessage($"Invalid game state={AppData.gameData.state} gameData.timer={AppData.gameData.timer.Elapsed.TotalSeconds}");`
`423`	`442`	`ScreenCaptureHandler.trayMenu.ChangeTray("Ready to record, enter a competitive game to begin", Resources.Icon_Active);`
`424`	`443`	`}`
`425`	`444`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal class Program`
`22`	`22`	`private static void Main()`
`23`	`23`	`{`
`24`	`24`	`AppData.initalize = new Initalize(`
`25`		`- "1.4.3",`
	`25`	`+ "1.4.4",`
`26`	`26`	`"betteroverwatch.com",`
`27`	`27`	`"https://api.github.com/repos/MartinNielsenDev/OverwatchTracker/releases/latest");`
`28`	`28`	`Application.EnableVisualStyles();`