feat: initial work on clicking on players to spectate them; fix: remo…

…ve debug message
HasangerGames · Aug 7, 2023 · 1e69334 · 1e69334
1 parent 83f5685
commit 1e69334
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/client/src/scripts/packets/receiving/updatePacket.ts b/client/src/scripts/packets/receiving/updatePacket.ts
@@ -229,7 +229,6 @@ export class UpdatePacket extends ReceivingPacket {
                 if (!game.objects.has(id)) {
                     switch (type.category) {
                         case ObjectCategory.Player: {
-                            console.log(`new player created with id ${id}, active player id = ${game.activePlayer.id}`);
                             object = new Player(game, scene, type as ObjectType<ObjectCategory.Player>, id);
                             break;
                         }

diff --git a/client/src/scripts/packets/sending/spectatePacket.ts b/client/src/scripts/packets/sending/spectatePacket.ts
@@ -8,14 +8,17 @@ export class SpectatePacket extends SendingPacket {
     override readonly allocBytes = 2;
     override readonly type = PacketType.Spectate;
     readonly spectateAction: SpectateActions;
+    readonly playerID?: number;
 
-    constructor(player: PlayerManager, spectateAction: SpectateActions) {
+    constructor(player: PlayerManager, spectateAction: SpectateActions, playerID?: number) {
         super(player);
         this.spectateAction = spectateAction;
+        this.playerID = playerID;
     }
 
     override serialize(stream: SuroiBitStream): void {
         super.serialize(stream);
         stream.writeBits(this.spectateAction, SPECTATE_ACTIONS_BITS);
+        if (this.playerID !== undefined) stream.writeObjectID(this.playerID);
     }
 }
diff --git a/client/src/scripts/ui.ts b/client/src/scripts/ui.ts
@@ -30,8 +30,7 @@ $((): void => {
         $("#spectating-msg").show();
 
         // Gas message
-        $("#gas-msg-info").text("Toxic gas is advancing! Move to the safe zone");
-        $("#gas-msg-info").css("color", "cyan");
+        $("#gas-msg-info").text("Toxic gas is advancing! Move to the safe zone").css("color", "cyan");
         $("#gas-msg").show();
 
         $("#weapon-ammo-container").show();

diff --git a/common/src/constants.ts b/common/src/constants.ts
@@ -66,6 +66,7 @@ export enum SpectateActions {
     BeginSpectating,
     SpectatePrevious,
     SpectateNext,
+    SpectateSpecific,
     Report
 }
 

diff --git a/server/src/packets/receiving/spectatePacket.ts b/server/src/packets/receiving/spectatePacket.ts
@@ -46,6 +46,13 @@ export class SpectatePacket extends ReceivingPacket {
                     player.spectate(game.spectatablePlayers[index]);
                 }
                 break;
+            case SpectateActions.SpectateSpecific: {
+                const playerID = stream.readObjectID();
+                if (playerID > 0 && playerID < game.spectatablePlayers.length) {
+                    player.spectate(game.spectatablePlayers[playerID]);
+                }
+                break;
+            }
             case SpectateActions.Report: {
                 if (!fs.existsSync("reports")) fs.mkdirSync("reports");
                 const reportID = randomUUID();