Adding a crit mission timer

assets/scripts/lobby/buttonEventListeners2.js

@@ -70,7 +70,8 @@ function greenButtonFunction() {
         gameMode: $($('.gameModeSelect')[1]).val(),
         timeouts: {
           default: ((parseInt($('#startGameOptionsDefaultPhaseTimeoutMin').val()) * 60 + parseInt($('#startGameOptionsDefaultPhaseTimeoutSec').val())) * 1000).toString(),
-          assassination: ((parseInt($('#startGameOptionsAssassinationPhaseTimeoutMin').val()) * 60 + parseInt($('#startGameOptionsAssassinationPhaseTimeoutSec').val())) * 1000).toString()
+          critMission: ((parseInt($('#startGameOptionsCritMissionTimeoutMin').val()) * 60 + parseInt($('#startGameOptionsCritMissionTimeoutSec').val())) * 1000).toString(),
+          assassination: ((parseInt($('#startGameOptionsAssassinationPhaseTimeoutMin').val()) * 60 + parseInt($('#startGameOptionsAssassinationPhaseTimeoutSec').val())) * 1000).toString(),
         },
         anonymousMode: $('#startGameOptionsAnonymousMode')[0].checked,
       };
@@ -236,6 +237,14 @@ $('#startGameOptionsDefaultPhaseTimeoutSec').on('change', () => {
   handleTimeoutInput('#startGameOptionsDefaultPhaseTimeoutSec');
 });
 
+$('#startGameOptionsCritMissionTimeoutMin').on('change', () => {
+  handleTimeoutInput('#startGameOptionsCritMissionTimeoutMin');
+});
+
+$('#startGameOptionsCritMissionTimeoutSec').on('change', () => {
+  handleTimeoutInput('#startGameOptionsCritMissionTimeoutSec');
+});
+
 $('#startGameOptionsAssassinationPhaseTimeoutMin').on('change', () => {
   handleTimeoutInput('#startGameOptionsAssassinationPhaseTimeoutMin');
 });

src/gameplay/game.ts

@@ -97,6 +97,7 @@ class Game extends Room {
   // Game misc variables
   winner: Alliance = '';
   requireSave = false;
+  critMission = false;
 
   // TODO This shouldn't be here! Should be in Assassin file.
   startAssassinationTime: Date;
@@ -550,10 +551,12 @@ class Game extends Room {
     this.sendText(str, 'gameplay-text');
 
     const timeouts = this.gameTimer.getTimeouts();
-    if (timeouts.assassination || timeouts.default) {
+    if (timeouts.assassination || timeouts.default || timeouts.critMission) {
       this.sendText(
         `Timeouts: Default = ${millisToStr(
           timeouts.default,
+        )}, Critical Mission = ${millisToStr(
+          timeouts.critMission,
         )}, Assassination = ${millisToStr(timeouts.assassination)}`,
         'gameplay-text',
       );

src/gameplay/gameTimer.ts

@@ -11,6 +11,7 @@ export interface Timeouts {
   // All in milliseconds
   default: number;
   assassination: number;
+  critMission: number;
 }
 
 export class GameTimer {
@@ -22,6 +23,7 @@ export class GameTimer {
   private timeoutSettings: Timeouts = {
     default: 0,
     assassination: 0,
+    critMission: 0,
   };
 
   private playersVotedPause: Set<string> = new Set();
@@ -36,6 +38,11 @@ export class GameTimer {
   }
 
   configureTimeouts(timeouts: Timeouts): void {
+    // Set crit mission timer to default if unset.
+    if (timeouts.critMission == 0) {
+      timeouts.critMission = timeouts.default;
+    }
+
     this.timeoutSettings = timeouts;
   }
 
@@ -111,10 +118,15 @@ export class GameTimer {
     // Kinda sad to have direct knowledge of the phase here
     // but not much we can do. We don't want the timeout settings
     // in game.ts
-    let timerDuration =
-      this.game.phase === Phase.Assassination
-        ? this.timeoutSettings.assassination
-        : this.timeoutSettings.default;
+    let timerDuration;
+
+    if (this.game.phase === Phase.Assassination) {
+      timerDuration = this.timeoutSettings.assassination;
+    } else if (this.game.critMission) {
+      timerDuration = this.timeoutSettings.critMission;
+    } else {
+      timerDuration = this.timeoutSettings.default;
+    }
 
     // Timeout not enabled
     if (timerDuration === 0) {

src/gameplay/phases/common/votingMission.ts

@@ -127,6 +127,11 @@ class VotingMission implements IPhase {
         }
       }
 
+      // Critical mission if 2 fails
+      if (numOfFails == 2) {
+        this.thisRoom.critMission = true;
+      }
+
       // game over if more than 3 fails or successes
       if (numOfFails >= 3) {
         this.thisRoom.winner = Alliance.Spy;

src/gameplay/room.ts

@@ -640,6 +640,9 @@ class Room {
     rolesInStr += `<br>Ranked: ${this.ranked}`;
     rolesInStr += `<br>Mute Spectators: ${this.muteSpectators}`;
     rolesInStr += `<br>Default timeout: ${millisToStr(timeouts.default)}`;
+    rolesInStr += `<br>Critical Mission timeout: ${millisToStr(
+      timeouts.critMission,
+    )}`;
     rolesInStr += `<br>Assassination timeout: ${millisToStr(
       timeouts.assassination,
     )}`;

src/sockets/sockets.ts

@@ -1597,6 +1597,7 @@ function startGame(data) {
   const timeouts = {
     default: processTimeout(timeoutsStr.default),
     assassination: processTimeout(timeoutsStr.assassination),
+    critMission: processTimeout(timeoutsStr.critMission),
   };
 
   if (

src/views/lobby.ejs

@@ -966,6 +966,9 @@
         <label>Default Timeout: min: <input type="text" id="startGameOptionsDefaultPhaseTimeoutMin" style="width: 3em;" value="0" min="0" max="99"></label>
         <label>sec: <input type="text" id="startGameOptionsDefaultPhaseTimeoutSec" style="width: 3em;" value="0" min="0" max="60"></label>
         <br>
+        <label>Critical Mission Timeout: min:  <input type="number" id="startGameOptionsCritMissionTimeoutMin" style="width: 3em;" value="0" min="0" max="99"></label>
+        <label>sec:  <input type="text" id="startGameOptionsCritMissionTimeoutSec" style="width: 3em;" value="0" min="0" max="60"></label>
+        <br>
         <label>Assassination Timeout: min:  <input type="number" id="startGameOptionsAssassinationPhaseTimeoutMin" style="width: 3em;" value="0" min="0" max="99"></label>
         <label>sec:  <input type="text" id="startGameOptionsAssassinationPhaseTimeoutSec" style="width: 3em;" value="0" min="0" max="60"></label>
         <br>