From f687d9878e25a1272bdb71b9d1c41f77ae637e48 Mon Sep 17 00:00:00 2001
From: Liam <67254223+RealFascinated@users.noreply.github.com>
Date: Fri, 21 Oct 2022 12:39:42 +0100
Subject: [PATCH] Change how cut values are handled

---
 pages/overlay.js             | 67 +++++++++++-------------------------
 src/components/ScoreStats.js | 12 +++----
 2 files changed, 26 insertions(+), 53 deletions(-)

diff --git a/pages/overlay.js b/pages/overlay.js
index b8ee4a0..eb43c56 100644
--- a/pages/overlay.js
+++ b/pages/overlay.js
@@ -40,12 +40,12 @@ export default class Overlay extends Component {
 			percentage: "100.00%",
 			failed: false,
 			mapStarCount: undefined,
-			leftHand: {
+			SaberA: {
 				averageCut: [15.0],
 				averagePreSwing: [70.0],
 				averagePostSwing: [30.0],
 			},
-			rightHand: {
+			SaberB: {
 				averageCut: [15.0],
 				averagePreSwing: [70.0],
 				averagePostSwing: [30.0],
@@ -342,53 +342,26 @@ export default class Overlay extends Component {
 		noteFullyCut: (data) => {
 			const { noteCut } = data;
 
-			// Left Saber
-			if (noteCut.saberType === "SaberA") {
-				const data = this.state.leftHand;
-				if (data.averageCut.includes(15) && data.averageCut.length === 1) {
-					data.averageCut = [];
-				}
-				if (
-					data.averagePreSwing.includes(70) &&
-					data.averagePreSwing.length === 1
-				) {
-					data.averagePreSwing = [];
-				}
-				if (
-					data.averagePostSwing.includes(30) &&
-					data.averagePostSwing.length === 1
-				) {
-					data.averagePostSwing = [];
-				}
-				data.averagePreSwing.push(noteCut.beforeSwingRating * 70);
-				data.averagePostSwing.push(noteCut.afterSwingRating * 30);
-				data.averageCut.push(noteCut.cutDistanceScore);
-				this.setState({ leftHand: data });
+			const cutData = this.state[noteCut.saberType];
+			if (cutData.averageCut.includes(15) && cutData.averageCut.length === 1) {
+				cutData.averageCut = [];
 			}
-
-			// Left Saber
-			if (noteCut.saberType === "SaberB") {
-				const data = this.state.rightHand;
-				if (data.averageCut.includes(15) && data.averageCut.length === 1) {
-					data.averageCut = [];
-				}
-				if (
-					data.averagePreSwing.includes(70) &&
-					data.averagePreSwing.length === 1
-				) {
-					data.averagePreSwing = [];
-				}
-				if (
-					data.averagePostSwing.includes(30) &&
-					data.averagePostSwing.length === 1
-				) {
-					data.averagePostSwing = [];
-				}
-				data.averagePreSwing.push(noteCut.beforeSwingRating * 70);
-				data.averagePostSwing.push(noteCut.afterSwingRating * 30);
-				data.averageCut.push(noteCut.cutDistanceScore);
-				this.setState({ rightHand: data });
+			if (
+				cutData.averagePreSwing.includes(70) &&
+				cutData.averagePreSwing.length === 1
+			) {
+				cutData.averagePreSwing = [];
 			}
+			if (
+				cutData.averagePostSwing.includes(30) &&
+				cutData.averagePostSwing.length === 1
+			) {
+				cutData.averagePostSwing = [];
+			}
+			cutData.averagePreSwing.push(noteCut.beforeCutScore);
+			cutData.averagePostSwing.push(noteCut.afterCutScore);
+			cutData.averageCut.push(noteCut.cutDistanceScore);
+			this.setState({ [noteCut.saberType]: cutData });
 		},
 		songStart: (data) => {
 			console.log("Going into level, resetting data.");
diff --git a/src/components/ScoreStats.js b/src/components/ScoreStats.js
index b07ca82..e9dfab5 100644
--- a/src/components/ScoreStats.js
+++ b/src/components/ScoreStats.js
@@ -44,14 +44,14 @@ export default class ScoreStats extends Component {
 				<p className={styles.scoreStatsAverageCut}>Average Cut</p>
 				<div className={styles.scoreStatsHands}>
 					<div className={styles.scoreStatsLeft}>
-						<p>{this.getAverage(data.leftHand.averagePreSwing).toFixed(2)}</p>
-						<p>{this.getAverage(data.leftHand.averagePostSwing).toFixed(2)}</p>
-						<p>{this.getAverage(data.leftHand.averageCut).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberA.averagePreSwing).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberA.averagePostSwing).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberA.averageCut).toFixed(2)}</p>
 					</div>
 					<div className={styles.scoreStatsRight}>
-						<p>{this.getAverage(data.rightHand.averagePreSwing).toFixed(2)}</p>
-						<p>{this.getAverage(data.rightHand.averagePostSwing).toFixed(2)}</p>
-						<p>{this.getAverage(data.rightHand.averageCut).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberB.averagePreSwing).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberB.averagePostSwing).toFixed(2)}</p>
+						<p>{this.getAverage(data.SaberB.averageCut).toFixed(2)}</p>
 					</div>
 				</div>
 			</div>