Update for game version 1.0.0; fix config updating bug

Author: artemiswkearney

HitScoreVisualizer/Config.cs

@@ -1,11 +1,8 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using TMPro;
 using UnityEngine;
 
@@ -78,7 +75,7 @@ public struct SegmentJudgment
         // - %a: The score contributed by the part of the swing after cutting the block.
         // - %B, %C, %A: As above, except using the appropriate judgment from that part of the swing (as configured for "beforeCutAngleJudgments", "accuracyJudgments", or "afterCutAngleJudgments").
         // - %s: The total score for the cut.
-        // - %p: The percent out of 110 you achieved with your swing's score
+        // - %p: The percent out of 115 you achieved with your swing's score
         // - %%: A literal percent symbol.
         // - %n: A newline.
         //
@@ -109,8 +106,8 @@ public struct SegmentJudgment
 
         private const string DEFAULT_JSON = @"{
   ""majorVersion"": 2,
-  ""minorVersion"": 1,
-  ""patchVersion"": 6,
+  ""minorVersion"": 2,
+  ""patchVersion"": 0,
   ""isDefaultConfig"": true,
   ""displayMode"": ""format"",
   ""judgments"": [
@@ -267,11 +264,37 @@ public static void load()
                     loaded.patchVersion = 0;
                     isDirty = true;
                 }
-                if (loaded.majorVersion == 2 && loaded.minorVersion == 1 && loaded.patchVersion < Plugin.patchVersion)
+                if (loaded.majorVersion == 2 && loaded.minorVersion == 1)
                 {
-                    loaded.patchVersion = Plugin.patchVersion;
+                    // Beat Saber version 1.0.0 increased the max score given for cut accuracy from 10 to 15, and thus the max total score from 110 to 115.
+                    // We assume that anyone whose config contained a judgment requiring an accuracy score of 10 or a total score of 110 intended those values
+                    // to refer to the highest achievable score rather than those exact numbers, and thus update them accordingly.
+                    // As we can't know what users would want done with their other judgment thresholds, those are left unchanged.
+                    if (loaded.judgments != null)
+                    {
+                        for (int i = 0; i < loaded.judgments.Length; i++)
+                        {
+                            if (loaded.judgments[i].threshold == 110)
+                            {
+                                loaded.judgments[i].threshold = 115;
+                            }
+                        }
+                    }
+                    if (loaded.accuracyJudgments != null)
+                    {
+                        for (int i = 0; i < loaded.accuracyJudgments.Length; i++)
+                        {
+                            if (loaded.accuracyJudgments[i].threshold == 10)
+                            {
+                                loaded.accuracyJudgments[i].threshold = 15;
+                            }
+                        }
+                    }
+                    loaded.minorVersion = 2;
+                    loaded.patchVersion = 0;
                     isDirty = true;
                 }
+                instance = loaded;
                 if (isDirty) save();
             }
             instance = loaded;
@@ -406,7 +429,7 @@ public static void judge(FlyingScoreEffect scoreEffect, NoteCutInfo noteCutInfo,
                             formattedBuilder.Append(score);
                             break;
                         case 'p':
-                            formattedBuilder.Append(string.Format("{0:0}", score / 110d * 100));
+                            formattedBuilder.Append(string.Format("{0:0}", score / 115d * 100));
                             break;
                         case '%':
                             formattedBuilder.Append("%");

HitScoreVisualizer/HitScoreVisualizer.csproj

@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="0Harmony">

HitScoreVisualizer/Plugin.cs

@@ -9,11 +9,11 @@ namespace HitScoreVisualizer
     public class Plugin : IPlugin
     {
         public string Name => "HitScoreVisualizer";
-        public string Version => "2.1.6";
+        public string Version => "2.2.0";
 
         internal const int majorVersion = 2;
-        internal const int minorVersion = 1;
-        internal const int patchVersion = 6;
+        internal const int minorVersion = 2;
+        internal const int patchVersion = 0;
 
         public void OnApplicationStart()
         {

HitScoreVisualizer/Properties/AssemblyInfo.cs

@@ -32,5 +32,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("2.1.6.0")]
-[assembly: AssemblyFileVersion("2.1.6.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]