Merge pull request #4 from Zingabopp/BS1.0.0

artemiswkearney · web-flow · commit c6cb9ffe3ada · 2019-05-22T12:58:23.000-07:00
Updated for BS 1.0.0
diff --git a/HitScoreVisualizer/Config.cs b/HitScoreVisualizer/Config.cs
@@ -115,7 +115,7 @@ public struct SegmentJudgment
   ""displayMode"": ""format"",
   ""judgments"": [
     {
-      ""threshold"": 110,
+      ""threshold"": 115,
       ""text"": ""%BFantastic%A%n%s"",
       ""color"": [
         1.0,
@@ -188,7 +188,7 @@ public struct SegmentJudgment
   ],
   ""accuracyJudgments"": [
     {
-      ""threshold"": 10,
+      ""threshold"": 15,
       ""text"": ""+""
     },
     {
diff --git a/HitScoreVisualizer/Harmony Patches/FlyingScoreEffectHandleSaberAfterCutSwingRatingCounterDidChangeEvent.cs b/HitScoreVisualizer/Harmony Patches/FlyingScoreEffectHandleSaberAfterCutSwingRatingCounterDidChangeEvent.cs
@@ -14,7 +14,7 @@ class FlyingScoreEffectHandleSaberAfterCutSwingRatingCounterDidChangeEvent
     {
         static bool Prefix(SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo ____noteCutInfo)
         {
-            ScoreController.ScoreWithoutMultiplier(____noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);
+            ScoreController.RawScoreWithoutMultiplier(____noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);
             int total = before_plus_acc + after;
             Config.judge(__instance, ____noteCutInfo, saberAfterCutSwingRatingCounter, ref ____color, total, before_plus_acc - accuracy, after, accuracy);
             return false;
diff --git a/HitScoreVisualizer/Harmony Patches/FlyingScoreEffectInitAndPresent.cs b/HitScoreVisualizer/Harmony Patches/FlyingScoreEffectInitAndPresent.cs
@@ -20,7 +20,7 @@ class FlyingScoreEffectInitAndPresent
     {
         static void Postfix(SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo noteCutInfo)
         {
-            ScoreController.ScoreWithoutMultiplier(noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);
+            ScoreController.RawScoreWithoutMultiplier(noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);
             int total = before_plus_acc + after;
             Config.judge(__instance, noteCutInfo, saberAfterCutSwingRatingCounter, ref ____color, total, before_plus_acc - accuracy, after, accuracy);
         }
diff --git a/HitScoreVisualizer/HitScoreVisualizer.csproj b/HitScoreVisualizer/HitScoreVisualizer.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HitScoreVisualizer</RootNamespace>
     <AssemblyName>HitScoreVisualizer</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public struct SegmentJudgment`
`115`	`115`	`""displayMode"": ""format"",`
`116`	`116`	`""judgments"": [`
`117`	`117`	`{`
`118`		`- ""threshold"": 110,`
	`118`	`+ ""threshold"": 115,`
`119`	`119`	`""text"": ""%BFantastic%A%n%s"",`
`120`	`120`	`""color"": [`
`121`	`121`	`1.0,`
`@@ -188,7 +188,7 @@ public struct SegmentJudgment`
`188`	`188`	`],`
`189`	`189`	`""accuracyJudgments"": [`
`190`	`190`	`{`
`191`		`- ""threshold"": 10,`
	`191`	`+ ""threshold"": 15,`
`192`	`192`	`""text"": ""+""`
`193`	`193`	`},`
`194`	`194`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class FlyingScoreEffectHandleSaberAfterCutSwingRatingCounterDidChangeEvent`
`14`	`14`	`{`
`15`	`15`	`static bool Prefix(SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo ____noteCutInfo)`
`16`	`16`	`{`
`17`		`- ScoreController.ScoreWithoutMultiplier(____noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);`
	`17`	`+ ScoreController.RawScoreWithoutMultiplier(____noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);`
`18`	`18`	`int total = before_plus_acc + after;`
`19`	`19`	`Config.judge(__instance, ____noteCutInfo, saberAfterCutSwingRatingCounter, ref ____color, total, before_plus_acc - accuracy, after, accuracy);`
`20`	`20`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FlyingScoreEffectInitAndPresent`
`20`	`20`	`{`
`21`	`21`	`static void Postfix(SaberAfterCutSwingRatingCounter saberAfterCutSwingRatingCounter, FlyingScoreEffect __instance, ref Color ____color, NoteCutInfo noteCutInfo)`
`22`	`22`	`{`
`23`		`- ScoreController.ScoreWithoutMultiplier(noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);`
	`23`	`+ ScoreController.RawScoreWithoutMultiplier(noteCutInfo, saberAfterCutSwingRatingCounter, out int before_plus_acc, out int after, out int accuracy);`
`24`	`24`	`int total = before_plus_acc + after;`
`25`	`25`	`Config.judge(__instance, noteCutInfo, saberAfterCutSwingRatingCounter, ref ____color, total, before_plus_acc - accuracy, after, accuracy);`
`26`	`26`	`}`