chore: onerandom mode done

lugvitc · Jul 28, 2024 · 9e32725 · 9e32725
1 parent 8f3d66a
commit 9e32725
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 16 deletions.
diff --git a/frontend/src/ts/config.ts b/frontend/src/ts/config.ts
@@ -143,7 +143,7 @@ export function setMode(mode: ConfigTypes.Mode, nosave?: boolean): boolean {
     setNumbers(false);
   } else if (config.mode === "onerandom") {
     setPunctuation(true);
-    setNumbers(true);
+    setNumbers(false);
   }
   saveToLocalStorage("mode", nosave);
   ConfigEvent.dispatch("mode", config.mode, nosave, previous);

diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
@@ -650,7 +650,7 @@ function updateTestType(randomQuote: MonkeyTypes.Quote | null): void {
 
   testType += Config.mode;
 
-  if (Config.mode === "time") {
+  if (Config.mode === "time" || Config.mode === "onerandom") {
     testType += " " + Config.time;
   } else if (Config.mode === "words" || Config.mode === "easy") {
     testType += " " + Config.words;

diff --git a/frontend/src/ts/test/test-config.ts b/frontend/src/ts/test/test-config.ts
@@ -38,14 +38,14 @@ export async function instantUpdate(): Promise<void> {
     $("#testConfig .time").removeClass("hidden");
 
     updateExtras("time", Config.time);
-  } else if (Config.mode === "words" || Config.mode === "easy") {
+  } else if (Config.mode === "words") {
     $("#testConfig .puncAndNum").removeClass("hidden");
     $("#testConfig .leftSpacer").removeClass("scrolled");
     $("#testConfig .rightSpacer").removeClass("scrolled");
     $("#testConfig .wordCount").removeClass("hidden");
 
     updateExtras("words", Config.words);
-  } else if (Config.mode === "quote" || Config.mode === "medium") {
+  } else if (Config.mode === "quote") {
     $("#testConfig .rightSpacer").removeClass("scrolled");
     $("#testConfig .quoteLength").removeClass("hidden");
 
@@ -267,7 +267,7 @@ ConfigEvent.subscribe((eventKey, eventValue, _nosave, eventPreviousValue) => {
 
     let m2;
 
-    if (Config.mode === "time") {
+    if (Config.mode === "time" || Config.mode === "onerandom") {
       m2 = Config.time;
     } else if (Config.mode === "words" || Config.mode === "easy") {
       m2 = Config.words;

diff --git a/frontend/src/ts/test/test-logic.ts b/frontend/src/ts/test/test-logic.ts
@@ -950,8 +950,10 @@ export async function finish(difficultyFailed = false): Promise<void> {
     Notifications.add("Test invalid - repeated", 0);
     dontSave = true;
   } else if (
-    (Config.mode === "time" && mode2Number < 15 && mode2Number > 0) ||
-    (Config.mode === "time" &&
+    ((Config.mode === "time" || Config.mode === "onerandom") &&
+      mode2Number < 15 &&
+      mode2Number > 0) ||
+    ((Config.mode === "time" || Config.mode === "onerandom") &&
       mode2Number === 0 &&
       completedEvent.testDuration < 15) ||
     ((Config.mode === "words" || Config.mode === "easy") &&

diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts
@@ -179,7 +179,7 @@ export function setStart(s: number): void {
 export function calculateAfkSeconds(testSeconds: number): number {
   let extraAfk = 0;
   if (testSeconds !== undefined) {
-    if (Config.mode === "time") {
+    if (Config.mode === "time" || Config.mode === "onerandom") {
       extraAfk =
         Math.round(testSeconds) - TestInput.keypressCountHistory.length;
     } else {

diff --git a/frontend/src/ts/test/test-timer.ts b/frontend/src/ts/test/test-timer.ts
@@ -47,6 +47,7 @@ function updateTimer(): void {
   if (timerDebug) console.time("timer progress update");
   if (
     Config.mode === "time" ||
+    Config.mode === "onerandom" ||
     (Config.mode === "custom" && CustomText.getLimitMode() === "time")
   ) {
     TimerProgress.update();
@@ -86,7 +87,7 @@ function layoutfluid(): void {
   if (timerDebug) console.time("layoutfluid");
   if (
     Config.funbox.split("#").includes("layoutfluid") &&
-    Config.mode === "time"
+    (Config.mode === "time" || Config.mode === "onerandom")
   ) {
     const layouts = Config.customLayoutfluid
       ? Config.customLayoutfluid.split("#")
@@ -149,12 +150,13 @@ function checkIfTimeIsUp(): void {
   if (timerDebug) console.time("times up check");
   if (
     Config.mode === "time" ||
+    Config.mode === "onerandom" ||
     (Config.mode === "custom" && CustomText.getLimitMode() === "time")
   ) {
     if (
       (Time.get() >= Config.time &&
         Config.time !== 0 &&
-        Config.mode === "time") ||
+        (Config.mode === "time" || Config.mode === "onerandom")) ||
       (Time.get() >= CustomText.getLimitValue() &&
         CustomText.getLimitValue() !== 0 &&
         Config.mode === "custom")
@@ -209,7 +211,9 @@ export async function start(): Promise<void> {
       nextDelay: delay,
     });
     if (
-      (Config.mode === "time" && Config.time < 130 && Config.time > 0) ||
+      ((Config.mode === "time" || Config.mode === "onerandom") &&
+        Config.time < 130 &&
+        Config.time > 0) ||
       ((Config.mode === "words" || Config.mode === "easy") &&
         Config.words < 250 &&
         Config.words > 0)

diff --git a/frontend/src/ts/test/timer-progress.ts b/frontend/src/ts/test/timer-progress.ts
@@ -46,6 +46,7 @@ export function reset(): void {
   let width = "0vw";
   if (
     Config.mode === "time" ||
+    Config.mode === "onerandom" ||
     (Config.mode === "custom" && CustomText.getLimitMode() === "time")
   ) {
     width = "100vw";
@@ -103,6 +104,7 @@ export function update(): void {
   const time = Time.get();
   if (
     Config.mode === "time" ||
+    Config.mode === "onerandom" ||
     (Config.mode === "custom" && CustomText.getLimitMode() === "time")
   ) {
     let maxtime = Config.time;

diff --git a/frontend/src/ts/test/words-generator.ts b/frontend/src/ts/test/words-generator.ts
@@ -634,6 +634,20 @@ export async function generateWords(
     wordList = await getQuoteWordList(language, wordOrder);
   } else if (Config.mode === "zen") {
     wordList = [];
+  } else if (Config.mode === "onerandom") {
+    // generate list of words from special characters
+    const special_characters = "``!@#$%^&*()_-+={[}]|\\:;\"'<,>.?/";
+    wordList = [];
+    for (let i = 0; i < 1000; i++) {
+      let word = "";
+      for (let i = 0; i < 10; i++) {
+        word +=
+          special_characters[
+            Math.floor(Math.random() * special_characters.length)
+          ] ?? "@";
+      }
+      wordList.push(word);
+    }
   }
 
   const limit = getWordsLimit();
@@ -755,6 +769,7 @@ export async function getNextWord(
 
       if (
         Config.mode === "time" ||
+        Config.mode === "onerandom" ||
         (Config.mode === "custom" && CustomText.getLimitMode() === "time") ||
         (Config.mode === "custom" &&
           CustomText.getLimitMode() === "word" &&

diff --git a/frontend/src/ts/utils/misc.ts b/frontend/src/ts/utils/misc.ts
@@ -224,7 +224,8 @@ export function canQuickRestart(
   customTextIsLong: boolean
 ): boolean {
   const wordsLong = mode === "words" && (words >= 1000 || words === 0);
-  const timeLong = mode === "time" && (time >= 900 || time === 0);
+  const timeLong =
+    (mode === "time" || mode === "onerandom") && (time >= 900 || time === 0);
   const customTextLong = mode === "custom" && customTextIsLong;
 
   const customTextRandomWordsLong =
@@ -385,7 +386,7 @@ export function getMode2<M extends keyof PersonalBests>(
   const mode = config.mode;
   let retVal: string;
 
-  if (mode === "time") {
+  if (mode === "time" || mode === "onerandom") {
     retVal = config.time.toString();
   } else if (mode === "words") {
     retVal = config.words.toString();
@@ -397,8 +398,6 @@ export function getMode2<M extends keyof PersonalBests>(
     retVal = `${randomQuote?.id ?? -1}`;
   } else if (mode === "easy") {
     retVal = config.words.toString();
-  } else if (mode === "onerandom") {
-    retVal = config.words.toString();
   } else {
     throw new Error("Invalid mode");
   }

diff --git a/frontend/src/ts/utils/url-handler.ts b/frontend/src/ts/utils/url-handler.ts
@@ -135,7 +135,7 @@ export function loadTestSettingsFromUrl(getOverride?: string): void {
   }
 
   if (de[1] !== null) {
-    if (Config.mode === "time") {
+    if (Config.mode === "time" || Config.mode === "onerandom") {
       UpdateConfig.setTimeConfig(parseInt(de[1], 10), true);
     } else if (Config.mode === "words" || Config.mode === "easy") {
       UpdateConfig.setWordCount(parseInt(de[1], 10), true);