Allow users to toggle ready status during the countdown, update room status when game starts and ends, don't send game results window to users waiting in lobby. Fixes #32 and #46

Author: Ochii

src/channel/channelmanager.ts

@@ -328,11 +328,6 @@ export class ChannelManager {
             return false
         }
 
-        if (currentRoom.isGlobalCountdownInProgress()) {
-            console.warn('user "%s" tried toggle ready status, although it isn\'t in any', user.userName)
-            return false
-        }
-
         const readyStatus: RoomReadyStatus = currentRoom.toggleUserReadyStatus(user)
 
         if (readyStatus == null) {
@@ -394,9 +389,12 @@ export class ChannelManager {
 
         room.stopCountdown()
         room.setStatus(RoomStatus.Ingame)
+        room.setUserIngame(host, true)
 
         room.recurseNonHostUsers((u: User): void => {
+            room.sendRoomStatusTo(u)
             if (room.isUserReady(u) === true) {
+                room.setUserIngame(u, true)
                 room.sendConnectHostTo(u, host)
                 room.sendGuestDataTo(host, u)
             }
@@ -412,6 +410,8 @@ export class ChannelManager {
     private handleUserGameStart(user: User, room: Room): void {
         const host: User = room.host
 
+        room.sendRoomStatusTo(user)
+        room.setUserIngame(user, true)
         room.sendConnectHostTo(user, host)
         room.sendGuestDataTo(host, user)
 

src/packets/in/room/updatesettings.ts

@@ -2,6 +2,8 @@ import { Uint64LE } from 'int64-buffer'
 
 import { InPacketBase } from 'packets/in/packet'
 
+import { RoomStatus } from 'room/room'
+
 /**
  * a host's request to change a room's settings
  * @class InRoomUpdateSettings
@@ -48,7 +50,7 @@ export class InRoomUpdateSettings {
     public weaponRestrictions: number
     // end of flags & 0x2000
     // flags & 0x4000
-    public unk20: number
+    public status: RoomStatus
     // end of flags & 0x4000
     // flags & 0x8000
     public unk21: number
@@ -103,7 +105,7 @@ export class InRoomUpdateSettings {
     public unk39: number
     // end of flags & 0x20000000
     // flags & 0x40000000
-    public unk40: number
+    public isIngame: boolean
     // end of flags & 0x40000000
     // flags & 0x80000000
     public startMoney: number
@@ -185,7 +187,7 @@ export class InRoomUpdateSettings {
             this.weaponRestrictions = inPacket.readUInt8()
         }
         if (lowFlag & 0x4000) {
-            this.unk20 = inPacket.readUInt8()
+            this.status = inPacket.readUInt8()
         }
         if (lowFlag & 0x8000) {
             this.unk21 = inPacket.readUInt8()
@@ -252,7 +254,7 @@ export class InRoomUpdateSettings {
         }
 
         if (lowFlag & 0x40000000) {
-            this.unk40 = inPacket.readUInt8()
+            this.isIngame = inPacket.readUInt8() as unknown as boolean
         }
 
         if (lowFlag & 0x80000000) {

src/packets/out/room/updatesettings.ts

@@ -76,7 +76,7 @@ export class OutRoomUpdateSettings {
             outPacket.writeUInt8(this.settings.weaponRestrictions)
         }
         if (lowFlag & 0x4000) {
-            outPacket.writeUInt8(this.settings.unk20)
+            outPacket.writeUInt8(this.settings.status)
         }
         if (lowFlag & 0x8000) {
             outPacket.writeUInt8(this.settings.unk21)
@@ -143,7 +143,7 @@ export class OutRoomUpdateSettings {
         }
 
         if (lowFlag & 0x40000000) {
-            outPacket.writeUInt8(this.settings.unk40)
+            outPacket.writeUInt8(this.settings.isIngame as unknown as number)
         }
 
         if (lowFlag & 0x80000000) {
@@ -219,7 +219,7 @@ export class OutRoomUpdateSettings {
         if (this.settings.weaponRestrictions != null) {
             lowFlag |= 0x2000
         }
-        if (this.settings.unk20 != null) {
+        if (this.settings.status != null) {
             lowFlag |= 0x4000
         }
         if (this.settings.unk21 != null
@@ -276,7 +276,7 @@ export class OutRoomUpdateSettings {
             lowFlag |= 0x20000000
         }
 
-        if (this.settings.unk40 != null) {
+        if (this.settings.isIngame != null) {
             lowFlag |= 0x40000000
         }
 

src/room/room.ts

@@ -136,8 +136,6 @@ export class Room {
     private emptyRoomCallback: (emptyRoom: Room, channel: Channel) => void
     private parentChannel: Channel
 
-    private status: RoomStatus
-
     private countingDown: boolean
     private countdown: number
 
@@ -154,8 +152,6 @@ export class Room {
 
         this.settings = new RoomSettings(options)
 
-        this.status = RoomStatus.Waiting
-
         this.countingDown = false
         this.countdown = defaultCountdownNum
 
@@ -375,6 +371,26 @@ export class Room {
         return userInfo.ready === RoomReadyStatus.Yes
     }
 
+    /**
+     * is the user ingame?
+     * @param user the target user
+     */
+    public isUserIngame(user: User): boolean {
+        if (this.hasUser(user) === false) {
+            console.warn('isUserIngame: user "%s" not found!', user.userName)
+            return false
+        }
+
+        const userInfo: RoomUser = this.usersInfo.get(user)
+
+        if (userInfo == null) {
+            console.warn('isUserIngame: couldnt get "%s"\'s userinfo', user.userName)
+            return false
+        }
+
+        return userInfo.isIngame
+    }
+
     /**
      * checks if the room's users are ready
      * @returns true if everyone is ready, false if not
@@ -409,6 +425,27 @@ export class Room {
         userInfo.team = newTeam
     }
 
+    /**
+     * set's an user's ingame status
+     * @param user the target user
+     * @param ingame the new ingame status
+     */
+    public setUserIngame(user: User, ingame: boolean): void {
+        if (this.hasUser(user) === false) {
+            console.warn('setUserIngame: user "%s" not found!', user.userName)
+            return
+        }
+
+        const userInfo: RoomUser = this.usersInfo.get(user)
+
+        if (userInfo == null) {
+            console.warn('setUserIngame: couldnt get "%s"\'s userinfo', user.userName)
+            return null
+        }
+
+        userInfo.isIngame = ingame
+    }
+
     /**
      * toggles the user's room ready status
      * @param user the user's object
@@ -465,23 +502,16 @@ export class Room {
      * @returns the room's status
      */
     public getStatus(): RoomStatus {
-        return this.status
+        return this.settings.status
     }
 
     /**
      * set a room's status
      * @param newStatus the new room's status
      */
     public setStatus(newStatus: RoomStatus): void {
-        this.status = newStatus
-    }
-
-    /**
-     * is the countdown request user a host and can it start a global countdown?
-     * @param user the user that requested the countdown
-     */
-    public canCountdown(user: User): boolean {
-        return user === this.host && this.status === RoomStatus.Waiting
+        this.settings.status = newStatus
+        this.settings.isIngame = newStatus === RoomStatus.Ingame
     }
 
     /**
@@ -743,9 +773,9 @@ export class Room {
             this.settings.unk18 = newSettings.unk18
             updatedSet.unk18 = newSettings.unk18
         }
-        if (newSettings.unk20 != null) {
-            this.settings.unk20 = newSettings.unk20
-            updatedSet.unk20 = newSettings.unk20
+        if (newSettings.status != null) {
+            this.settings.status = newSettings.status
+            updatedSet.status = newSettings.status
         }
         if (newSettings.unk21 != null) {
             this.settings.unk21 = newSettings.unk21
@@ -803,9 +833,9 @@ export class Room {
             this.settings.unk39 = newSettings.unk39
             updatedSet.unk39 = newSettings.unk39
         }
-        if (newSettings.unk40 != null) {
-            this.settings.unk40 = newSettings.unk40
-            updatedSet.unk40 = newSettings.unk40
+        if (newSettings.isIngame != null) {
+            this.settings.isIngame = newSettings.isIngame
+            updatedSet.isIngame = newSettings.isIngame
         }
         if (newSettings.unk43 != null) {
             this.settings.unk43 = newSettings.unk43
@@ -961,6 +991,20 @@ export class Room {
         user.socket.send(resultReply)
     }
 
+    /**
+     * send an user its current room's status
+     * @param user the target user
+     */
+    public sendRoomStatusTo(user: User): void {
+        const settings: RoomSettings = new RoomSettings()
+        settings.status = this.settings.status
+        settings.isIngame = this.settings.isIngame
+
+        const statusReply: Buffer =
+            new OutRoomPacket(user.socket).updateSettings(settings)
+        user.socket.send(statusReply)
+    }
+
     /**
      * handle max players setting's update event
      * @param newMaxPlayers the requested new max players number

src/room/roomsettings.ts

@@ -1,4 +1,4 @@
-import { IRoomOptions, RoomGamemode, RoomTeamBalance } from 'room/room'
+import { IRoomOptions, RoomGamemode, RoomStatus, RoomTeamBalance } from 'room/room'
 
 export class RoomSettings {
     public roomName: string
@@ -16,13 +16,15 @@ export class RoomSettings {
     public respawnTime: number
     public teamBalanceType: RoomTeamBalance
     public weaponRestrictions: number
+    public status: RoomStatus
     public hltvEnabled: number
     public mapCycleType: number
     public multiMaps: number[]
     public areBotsEnabled: boolean
     public botDifficulty: number
     public numCtBots: number
     public numTrBots: number
+    public isIngame: boolean
 
     public unk00: number
     public unk01: number
@@ -33,7 +35,6 @@ export class RoomSettings {
     public unk13: number
     public unk17: number
     public unk18: number
-    public unk20: number
     public unk21: number
     public unk23: number
     public unk24: number
@@ -48,7 +49,6 @@ export class RoomSettings {
     public unk37: number
     public unk38: number
     public unk39: number
-    public unk40: number
     public unk43: number
     public unk45: number
 
@@ -72,12 +72,14 @@ export class RoomSettings {
         this.respawnTime = options.respawnTime ? options.respawnTime : 3
         this.teamBalanceType = options.teamBalance ? options.teamBalance : 0
         this.weaponRestrictions = options.weaponRestrictions ? options.weaponRestrictions : 0
+        this.status = RoomStatus.Waiting
         this.hltvEnabled = options.hltvEnabled ? options.hltvEnabled : 0
         this.mapCycleType = 1
         this.multiMaps = []
         this.areBotsEnabled = false
         this.numCtBots = 0
         this.numTrBots = 0
         this.botDifficulty = 0
+        this.isIngame = false
     }
 }

src/room/roomuser.ts

@@ -7,9 +7,11 @@ import { RoomReadyStatus, RoomTeamNum } from 'room/room'
 export class RoomUser {
     public team: RoomTeamNum
     public ready: RoomReadyStatus
+    public isIngame: boolean
 
     constructor(team: RoomTeamNum, ready: RoomReadyStatus) {
         this.team = team
         this.ready = ready
+        this.isIngame = false
     }
 }

src/user/usermanager.ts

@@ -121,8 +121,12 @@ export class UserManager {
         currentRoom.resetIngameUsersReadyStatus()
 
         currentRoom.recurseUsers((u: User): void => {
+            currentRoom.sendRoomStatusTo(u)
             currentRoom.sendRoomUsersReadyStatusTo(u)
-            currentRoom.sendGameEnd(u)
+            if (currentRoom.isUserIngame(u) === true) {
+                currentRoom.sendGameEnd(u)
+                currentRoom.setUserIngame(u, false)
+            }
         })
 
         return true