From e40331009beded0d069fc9ace38ab0d82154162b Mon Sep 17 00:00:00 2001
From: Luke <sabolukas03@gmail.com>
Date: Thu, 20 Oct 2022 13:30:25 +0200
Subject: [PATCH] fix(web/skillcheck): use proper skill check calculations

Changed the areaSize to use degrees rather than the length of the arch which was causing issues

Co-authored-by: DokaDoka <31368547+DokaDoka@users.noreply.github.com>
---
 web/src/features/skillcheck/index.tsx     | 22 ++++++++++++----------
 web/src/features/skillcheck/indicator.tsx |  8 +++++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/web/src/features/skillcheck/index.tsx b/web/src/features/skillcheck/index.tsx
index 149fe0f..85bf5f6 100644
--- a/web/src/features/skillcheck/index.tsx
+++ b/web/src/features/skillcheck/index.tsx
@@ -18,18 +18,20 @@ export interface SkillCheckProps {
   difficulty: GameDifficulty;
 }
 
+export const circleCircumference = 2 * 50 * Math.PI;
+
 const getRandomAngle = (min: number, max: number) => Math.floor(Math.random() * (max - min)) + min;
 
 const difficultyOffsets = {
-  easy: 275,
-  medium: 290,
-  hard: 295,
+  easy: 50,
+  medium: 40,
+  hard: 25,
 };
 
 debugData([
   {
     action: 'startSkillCheck',
-    data: [{ areaSize: 250, speedMultiplier: 2 }, 'easy', 'hard'],
+    data: ['hard'],
   },
 ]);
 
@@ -39,7 +41,7 @@ const SkillCheck: React.FC = () => {
   const dataIndexRef = useRef<number>(0);
   const [skillCheck, setSkillCheck] = useState<SkillCheckProps>({
     angle: 0,
-    difficultyOffset: 315,
+    difficultyOffset: 50,
     difficulty: 'easy',
   });
 
@@ -49,7 +51,7 @@ const SkillCheck: React.FC = () => {
     const gameData = Array.isArray(data) ? data[0] : data;
     const offset = typeof gameData === 'object' ? gameData.areaSize : difficultyOffsets[gameData];
     setSkillCheck({
-      angle: -90 + getRandomAngle(120, 360 - (315 - offset)),
+      angle: -90 + getRandomAngle(120, 360 - offset),
       difficultyOffset: offset,
       difficulty: gameData,
     });
@@ -72,7 +74,7 @@ const SkillCheck: React.FC = () => {
     const data = dataRef.current[dataIndexRef.current];
     const offset = typeof data === 'object' ? data.areaSize : difficultyOffsets[data];
     setSkillCheck({
-      angle: -90 + getRandomAngle(120, 360 - (315 - offset)),
+      angle: -90 + getRandomAngle(120, 360 - offset),
       difficultyOffset: offset,
       difficulty: data,
     });
@@ -91,7 +93,7 @@ const SkillCheck: React.FC = () => {
               fill="transparent"
               stroke="rgba(0, 0, 0, 0.4)"
               strokeWidth={5}
-              strokeDasharray={360}
+              strokeDasharray={circleCircumference}
             />
             {/*SkillCheck area*/}
             <circle
@@ -100,8 +102,8 @@ const SkillCheck: React.FC = () => {
               cy={250}
               fill="transparent"
               stroke="white"
-              strokeDasharray={315}
-              strokeDashoffset={skillCheck.difficultyOffset}
+              strokeDasharray={circleCircumference}
+              strokeDashoffset={circleCircumference - (Math.PI * 50 * skillCheck.difficultyOffset) / 180}
               strokeWidth={5}
               transform={`rotate(${skillCheck.angle}, 250, 250)`}
             />
diff --git a/web/src/features/skillcheck/indicator.tsx b/web/src/features/skillcheck/indicator.tsx
index 23fd285..1f76980 100644
--- a/web/src/features/skillcheck/indicator.tsx
+++ b/web/src/features/skillcheck/indicator.tsx
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react';
 import { useKeyPress } from '../../hooks/useKeyPress';
 import { SkillCheckProps } from './index';
 import { useInterval } from '@chakra-ui/react';
+import { circleCircumference } from './index';
 
 interface Props {
   angle: number;
@@ -41,7 +42,8 @@ const Indicator: React.FC<Props> = ({ angle, offset, multiplier, handleComplete,
     if (!isKeyPressed) return;
 
     setGameState(false);
-    if (indicatorAngle < angle || indicatorAngle > angle + (315 - offset)) handleComplete(false);
+
+    if (indicatorAngle < angle || indicatorAngle > angle + offset) handleComplete(false);
     else handleComplete(true);
   }, [isKeyPressed]);
 
@@ -53,8 +55,8 @@ const Indicator: React.FC<Props> = ({ angle, offset, multiplier, handleComplete,
       fill="transparent"
       stroke="red"
       strokeWidth={15}
-      strokeDasharray={315}
-      strokeDashoffset={312}
+      strokeDasharray={circleCircumference}
+      strokeDashoffset={circleCircumference - 3}
       transform={`rotate(${indicatorAngle}, 250, 250)`}
     />
   );