disable controls in initial game counter loop

Author: Tschuck

backend/src/game/Game.ts

@@ -13,9 +13,6 @@ class Game {
   /** users ids mapped to the index to improve performance for incremental updates */
   indexIdMap: Record<number, string>;
 
-  /** ensure game is started */
-  isStarted = false;
-
   /** started date */
   started: Date;
 
@@ -92,6 +89,7 @@ class Game {
     logger.debug(`Game started with: ${this.userIds.join(', ')}`);
     // show countdown
     await this.initLoop();
+
     // start the actual game log
     this.users.forEach((user) => user.start());
     // directly show new blocks for the users

backend/src/game/GameUser.ts

@@ -80,6 +80,7 @@ class BackendGameUser extends GameUser {
   }
 
   start() {
+    this.gameIsStarted = true;
     this.map = mapHelper.getEmptyMap(20);
     // ensure random game block
     this.setNewBlock();

frontend/src/components/SinglePlayer.vue

@@ -87,15 +87,16 @@ import Loading from './Loading.vue';
       starting.value = true;
 
       await props.onStart();
-      if (!roomConn.ws) {
-        await roomConn.connect();
-        await new Promise((resolve) => setTimeout(resolve, 300));
-      }
       await roomConn.send(WsMessageType.GAME_JOIN);
       await new Promise((resolve) => setTimeout(resolve, 300));
       await roomConn.send(WsMessageType.GAME_ACCEPT);
     };
 
+    (async () => {
+      await roomConn.connect();
+      isMatchRunning.value = roomConn?.isMatchRunning;
+    })();
+
     return {
       currUserId,
       isMatchRunning,

frontend/src/game/KeyHandler.ts

@@ -58,6 +58,8 @@ export default class KeyHandler implements KeyMapInterface {
   /** prevent duplicated key presses */
   keyLock: Record<number, boolean> = {};
 
+  rts: number;
+
   constructor(user: UserInterface, gameUser: GameUser) {
     let activeKeyMap = user.keyMaps.find(
       (keyMap) => keyMap.id === user.activeKeyMap,
@@ -78,6 +80,7 @@ export default class KeyHandler implements KeyMapInterface {
     this.id = activeKeyMap.id;
     this.keys = activeKeyMap.keys;
     this.name = activeKeyMap.name;
+    this.rts = activeKeyMap.rts;
     this.sdf = activeKeyMap.sdf;
 
     Object.keys(this.keys).forEach((stateChange: string) => {
@@ -88,17 +91,12 @@ export default class KeyHandler implements KeyMapInterface {
     });
   }
 
-  rts: number;
-
   listen() {
     const keyToStateChange = this.keyToStateChange;
     const keyDownListener = ($event: KeyboardEvent) => {
       const actionCode = parseInt(keyToStateChange[$event.keyCode], 10);
       // only react on known and single key presses, when command is pressed
       if (typeof keyToStateChange[$event.keyCode] !== 'undefined') {
-        $event.preventDefault();
-        $event.stopPropagation();
-
         if (!this.keyLock[actionCode] && !this.keyDas[actionCode] && !this.keyArr[actionCode]) {
           if (repeatKeys.includes(actionCode)) {
             this.sendKey(actionCode);
@@ -125,20 +123,24 @@ export default class KeyHandler implements KeyMapInterface {
                 // wait for the dcd timeout and retrigger arr, if the keys are still pressed
                 setTimeout(() => {
                   if (this.keyArr[key]) {
+                    const parsedKey = parseInt(key, 10);
                     this.keyArr[key] = setInterval(
-                      () => this.sendKey(parseInt(key, 10)),
+                      () => this.sendKey(parsedKey),
                       // use different speed for soft drop, turn and arrow keys
-                      this.getRepeatValue(this.keyArr[key]),
+                      this.getRepeatValue(parsedKey),
                     );
                   }
                 }, this.dcd);
               });
             }
           }
         }
-
-        return false;
       }
+
+      $event.preventDefault();
+      $event.stopPropagation();
+
+      return false;
     };
 
     const keyUpListener = ($event: KeyboardEvent) => {
@@ -156,12 +158,10 @@ export default class KeyHandler implements KeyMapInterface {
       delete this.keyLock[actionCode];
 
       // clear pressed key stack
-      if (typeof keyToStateChange[$event.keyCode] !== 'undefined') {
-        $event.preventDefault();
-        $event.stopPropagation();
+      $event.preventDefault();
+      $event.stopPropagation();
 
-        return false;
-      }
+      return false;
     };
 
     // bind listeners and unmount functions

frontend/src/lib/versions.ts

@@ -92,6 +92,16 @@ const versions: Record<string, VersionInterface> = {
     ],
     title: 'Custom Controls & Hold',
   },
+  '1.4.1': {
+    bugs: [],
+    classes: [],
+    features: [
+      'disable controls in initial game counter loop',
+      'load last session in laboratory',
+      'broken game state',
+    ],
+    title: 'Bug Fix Round',
+  },
 };
 
 export {

shared/functions/GameUser.ts

@@ -123,6 +123,9 @@ class GameUser {
   /** hold will be blocked, until the next stone was set */
   holdLock: boolean;
 
+  /** disable controls, when the game is not started (e.g. in init number loop) */
+  gameIsStarted: boolean;
+
   constructor(
     user: Partial<GameUser>|GameUser,
     gameUserIndex = -1,
@@ -346,7 +349,7 @@ class GameUser {
    */
   onNewStateChange(key: GameStateChange|UserStateChange): void {
     // disable keys when lost
-    if (this.lost) {
+    if (this.lost || !this.gameIsStarted) {
       return;
     }
 

shared/functions/gameHelper.ts

@@ -28,6 +28,7 @@ export enum GameUserMapping {
   cooldowns = 24,
   hold = 25,
   holdLock = 26,
+  gameIsStarted = 27,
 }
 
 /**