Game timer changePhase (#565)

* changePhase

* Fix run issues

Author: vck3000

src/gameplay/avalon/cards/lady of the lake.js

@@ -57,7 +57,7 @@ class LadyOfTheLake {
       numSuccess < 3 &&
       numFail < 3
     ) {
-      this.thisRoom.phase = Phase.lady;
+      this.thisRoom.changePhase(Phase.lady);
       this.lastMissionUsed = this.thisRoom.missionNum;
 
       return true;

src/gameplay/avalon/cards/ref of the rain.js

@@ -66,7 +66,7 @@ class RefOfTheLake {
       numSuccess < 3 &&
       numFail < 3
     ) {
-      this.thisRoom.phase = Phase.ref;
+      this.thisRoom.changePhase(Phase.ref);
       this.lastMissionUsed = this.thisRoom.missionNum;
 
       return true;

src/gameplay/avalon/cards/sire of the sea.js

@@ -63,7 +63,7 @@ class SireOfTheSea {
       numSuccess < 3 &&
       numFail < 3
     ) {
-      this.thisRoom.phase = Phase.sire;
+      this.thisRoom.changePhase(Phase.sire);
       this.lastMissionUsed = this.thisRoom.missionNum;
 
       return true;

src/gameplay/avalon/phases/lady.js

@@ -115,7 +115,7 @@ class Lady {
       );
 
       // update phase
-      this.thisRoom.phase = Phase.pickingTeam;
+      this.thisRoom.changePhase(Phase.pickingTeam);
     }
     // The requester is not the lady holder. Ignore the request.
     else {

src/gameplay/avalon/phases/ref.js

@@ -115,7 +115,7 @@ class Ref {
       );
 
       // update phase
-      this.thisRoom.phase = Phase.pickingTeam;
+      this.thisRoom.changePhase(Phase.pickingTeam);
     }
     // The requester is not the ref holder. Ignore the request.
     else {

src/gameplay/avalon/phases/sire.js

@@ -142,7 +142,7 @@ class Sire {
       );
 
       // update phase
-      this.thisRoom.phase = Phase.pickingTeam;
+      this.thisRoom.changePhase(Phase.pickingTeam);
     }
     // The requester is not the sire holder. Ignore the request.
     else {

src/gameplay/avalon/roles/assassin.ts

@@ -85,7 +85,7 @@ class Assassin implements Role {
         ) {
           // Set the assassination phase
           this.room.startAssassinationTime = new Date();
-          this.room.phase = this.specialPhase;
+          this.room.changePhase(this.specialPhase);
           return true;
         }
       }

src/gameplay/commonPhases/pickingTeam.js

@@ -1,5 +1,6 @@
 import usernamesIndexes from '../../myFunctions/usernamesIndexes';
 import Phase from '../avalon/phases/phases';
+import { MIN_PLAYERS } from '../game';
 
 function PickingTeam(thisRoom_) {
   this.thisRoom = thisRoom_;
@@ -39,7 +40,7 @@ PickingTeam.prototype.gameMove = function (
 
     let num =
       this.thisRoom.numPlayersOnMission[
-        this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+        this.thisRoom.playersInGame.length - MIN_PLAYERS
       ][this.thisRoom.missionNum - 1];
     // console.log("Num player for this.thisRoom mission : " + num);
 
@@ -89,7 +90,7 @@ PickingTeam.prototype.gameMove = function (
 
     this.thisRoom.VHUpdateTeamPick();
 
-    this.thisRoom.phase = Phase.votingTeam;
+    this.thisRoom.changePhase(Phase.votingTeam);
   } else {
     console.log(
       `User ${socket.request.user.username} is not the team leader. Cannot pick.`,
@@ -135,7 +136,7 @@ PickingTeam.prototype.buttonSettings = function (indexOfPlayer) {
 PickingTeam.prototype.numOfTargets = function (indexOfPlayer) {
   let num =
     this.thisRoom.numPlayersOnMission[
-      this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+      this.thisRoom.playersInGame.length - MIN_PLAYERS
     ][this.thisRoom.missionNum - 1];
   // console.log("Num player for this.thisRoom mission : " + num);
 
@@ -161,7 +162,7 @@ PickingTeam.prototype.getStatusMessage = function (indexOfPlayer) {
   ) {
     const num =
       this.thisRoom.numPlayersOnMission[
-        this.thisRoom.playersInGame.length - this.thisRoom.minPlayers
+        this.thisRoom.playersInGame.length - MIN_PLAYERS
       ][this.thisRoom.missionNum - 1];
 
     return `Your turn to pick a team. Pick ${num} players.`;

src/gameplay/commonPhases/votingMission.js

@@ -147,7 +147,7 @@ VotingMission.prototype.gameMove = function (
           1 +
           this.thisRoom.playersInGame.length) %
         this.thisRoom.playersInGame.length;
-      this.thisRoom.phase = Phase.pickingTeam;
+      this.thisRoom.changePhase(Phase.pickingTeam);
     }
     this.thisRoom.requireSave = true;
   }

src/gameplay/commonPhases/votingTeam.js

@@ -56,7 +56,7 @@ VotingTeam.prototype.gameMove = function (
       const outcome = calcVotes(this.thisRoom.votes);
 
       if (outcome === 'yes') {
-        this.thisRoom.phase = Phase.votingMission;
+        this.thisRoom.changePhase(Phase.votingMission);
         this.thisRoom.playersYetToVote = this.thisRoom.proposedTeam.slice();
 
         var str = `Mission ${this.thisRoom.missionNum}.${
@@ -84,7 +84,7 @@ VotingTeam.prototype.gameMove = function (
         this.thisRoom.finishGame('Spy');
       } else if (outcome === 'no') {
         this.thisRoom.proposedTeam = [];
-        this.thisRoom.phase = Phase.pickingTeam;
+        this.thisRoom.changePhase(Phase.pickingTeam);
 
         var str = `Mission ${this.thisRoom.missionNum}.${
           this.thisRoom.pickNum

src/gameplay/game.ts

@@ -17,7 +17,7 @@ import { gameModeObj } from './gameModes';
 import Phase from './avalon/phases/phases';
 
 export const WAITING = 'Waiting';
-const MIN_PLAYERS = 5;
+export const MIN_PLAYERS = 5;
 
 class Game extends Room {
   gameStarted = false;
@@ -161,7 +161,7 @@ class Game extends Room {
     _.merge(this.specialCards, storedData.specialCards);
 
     this.phaseBeforeFrozen = this.phase;
-    this.phase = Phase.frozen;
+    this.changePhase(Phase.frozen);
   }
 
   playerJoinRoom(socket, inputPassword) {
@@ -184,7 +184,7 @@ class Game extends Room {
         this.phase === 'frozen' &&
         this.socketsOfPlayers.length >= this.playersInGame.length
       ) {
-        this.phase = this.phaseBeforeFrozen;
+        this.changePhase(this.phaseBeforeFrozen);
       }
 
       const resultOfRoomJoin = Room.prototype.playerJoinRoom.call(
@@ -714,6 +714,10 @@ class Game extends Room {
     this.distributeGameData();
   }
 
+  changePhase(phase: Phase) {
+    this.phase = phase;
+  }
+
   toShowGuns() {
     // Common phases
     if (
@@ -1122,7 +1126,7 @@ class Game extends Room {
       throw new Error('Winner var is not Resistance or Spy');
 
     const thisGame = this;
-    this.phase = Phase.finished;
+    this.changePhase(Phase.finished);
 
     if (this.checkRoleCardSpecialMoves() === true) {
       return;
@@ -1809,7 +1813,7 @@ class Game extends Room {
         `${rolePrefix} ${modUsername} has unpaused the game.`,
         'server-text',
       );
-      this.phase = this.phaseBeforePause;
+      this.changePhase(this.phaseBeforePause);
       this.distributeGameData();
     }
     // if unpaused, we pause
@@ -1821,7 +1825,7 @@ class Game extends Room {
       );
       // store the current phase, change to paused and update.
       this.phaseBeforePause = this.phase;
-      this.phase = Phase.paused;
+      this.changePhase(Phase.paused);
       this.distributeGameData();
     }
   }

src/gameplay/room.ts

@@ -3,6 +3,7 @@ import { AVALON, AVALON_BOT, GAME_MODE_NAMES, gameModeObj } from './gameModes';
 import commonPhasesIndex from './indexCommonPhases';
 import usernamesIndexes from '../myFunctions/usernamesIndexes';
 import { SocketUser } from '../sockets/types';
+import { MIN_PLAYERS } from './game';
 
 class Room {
   host: string;
@@ -656,7 +657,7 @@ class Room {
 
     if (this.canJoin === true) {
       // check before starting
-      if (this.socketsOfPlayers.length < this.minPlayers) {
+      if (this.socketsOfPlayers.length < MIN_PLAYERS) {
         // NEED AT LEAST FIVE PLAYERS, SHOW ERROR MESSAGE BACK
         // console.log("Not enough players.");
         this.socketsOfPlayers[0].emit(

src/sockets/sockets.ts

@@ -143,6 +143,10 @@ setTimeout(async () => {
         .skip(i)
         .limit(1)
         .exec((err, foundSaveGameArr) => {
+          if (!foundSaveGameArr || foundSaveGameArr.length === 0) {
+            run = false;
+            return;
+          }
           const foundSaveGame = foundSaveGameArr[0];
 
           if (foundSaveGame && foundSaveGame.room) {