Fix key and browser inputs

game/src/scenes/game.js

@@ -16,8 +16,6 @@ import {
     ICON_START_Y
 } from "../constants.js";
 import {
-    toggleCapsLock,
-    shouldUppercase,
     preventError,
     shuffle,
     makeBlink
@@ -286,6 +284,8 @@ const gameScene = (params) => {
     }
 
     function resetGameStats() {
+        errorCharsIndexes.length = 0;
+        Object.keys(errorCharsReplaces).forEach(k => delete errorCharsReplaces[k]);
         playerStartedTyping = false;
         completedBlocks = 0;
         startTime = 0;
@@ -298,8 +298,8 @@ const gameScene = (params) => {
         totalTypedCharacters = 0;
         totalCorrectlines = 0;
         rivalSpeed = EASY_RIVAL_SPEED;
-        errorCharsIndexes = [];
-        errorCharsReplaces = {};
+        currentBlockIndex = -1;
+        window.removeEventListener("keydown", keydownHandler);
     }
     function updateTitleTexts() {
         const titleTexts = k.get("menuItem");
@@ -789,34 +789,33 @@ const gameScene = (params) => {
         eventBuffer[idx]++;
     }
 
-    let capsLockActive = false;
-    k.onKeyPress("capslock", () => {
-        toggleCapsLock();
-    });
+    const keydownHandler = (event) => {
 
-    k.onKeyPress((keyPressed) => {
+        const keyPressed = event.key;
         const prevChar = playerState.cursorPos > 0 ? fixedText[playerState.cursorPos] : '';
         if (prevChar === "\n") return;
 
         const correctChar = fixedText[playerState.cursorPos];
-        const shouldUpper = shouldUppercase(k);
 
         let key = keyPressed;
         let errorKey;
         let isCorrect = false;
 
-        if (key === "backspace" || key === "enter" || key === "shift") return;
+        if (key === "Backspace" || key === "Enter" || key === "Shift") return;
 
-        if (key.length === 1) {
-            key = shouldUpper ? key.toUpperCase() : key.toLowerCase();
-            errorKey = key;
-        } else if (key === "space") {
+        if (errorCharsIndexes.length > maxMistakes) {
+            event.preventDefault();
+            return preventError(k, settings);
+        }
+
+        if (key === " ") {
             key = " ";
             errorKey = "_";
+        } else if (key.length === 1) {
+            errorKey = key;
         } else {
             return;
         }
-
         totalTypedCharacters++;
         isCorrect = key === correctChar;
 
@@ -836,9 +835,14 @@ const gameScene = (params) => {
             if (!settings.mute) k.play("wrong_typing");
             totalIcorrectCorrectChars++;
         }
+
         if (!playerStartedTyping && (totalCorrectChars > 0 || totalIcorrectCorrectChars > 0)) {
             playerStartedTyping = true;
         }
+    };
+    window.addEventListener("keydown", keydownHandler);
+    k.onDestroy(() => {
+        window.removeEventListener("keydown", keydownHandler);
     });
     // Line jump
     k.onKeyPress("enter", () => {

game/src/scenes/selectionScene.js

@@ -1,7 +1,6 @@
 import {
     escapeBackslashes,
     preventError,
-    setCapsLockActive
 } from "../data/utilities.js";
 import { getMute, saveMute } from "../systems/preferences.js";
 import { resizablePos } from "../components/resizablePos.js";
@@ -431,14 +430,12 @@ k.scene("selection", () => {
             case "interview":
                 if (stage === 3) {
                     window.removeEventListener("keydown", handleKeydown);
-                    setCapsLockActive(settings.isCapsOn);
                     k.go("game");
                 }
                 break;
             case "practice":
                 if (stage === 3) {
                     settings.practiceMode = true;
-                    setCapsLockActive(settings.isCapsOn);
                     window.removeEventListener("keydown", handleKeydown);
                     k.go("game");
                 }
@@ -489,6 +486,7 @@ k.scene("selection", () => {
 
     function setupKeyboardInput() {
         handleKeydown = (e) => {
+            e.preventDefault();
             if (e.getModifierState && typeof e.getModifierState === "function") {
                 settings.isCapsOn = e.getModifierState("CapsLock");
             }
@@ -502,14 +500,6 @@ k.scene("selection", () => {
                     k.play("code_sound");
                 }
             }
-
-            if (e.key === " ") {
-                e.preventDefault();
-                previousInput = rawInput;
-                rawInput += " ";
-                name.text = escapeBackslashes(rawInput);
-                handleInputUpdate(rawInput);
-            }
         };
 
         window.addEventListener("keydown", handleKeydown);
@@ -522,13 +512,6 @@ k.scene("selection", () => {
         handleInputUpdate(rawInput);
     });
 
-    k.onKeyPress("space", () => {
-        previousInput = rawInput;
-        rawInput += " ";
-        name.text = escapeBackslashes(rawInput);
-        handleInputUpdate(rawInput);
-    });
-
     k.onKeyDown("escape", () => {
         ResetGame();
     });