halftheopposite#43 bullets are now visible for all players

Tillt14 · Dec 5, 2022 · bda6580 · bda6580
1 parent 05d4a91
commit bda6580
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 33 deletions.
diff --git a/packages/client/src/game/Game.ts b/packages/client/src/game/Game.ts
@@ -422,22 +422,22 @@ export class Game {
 
         this.me.lastShootAt = Date.now();
 
-        this.bulletsManager.addOrCreate(
-            {
-                x: bulletX,
-                y: bulletY,
-                radius: Constants.BULLET_SIZE,
-                rotation: this.me.rotation,
-                active: true,
-                fromX: bulletX,
-                fromY: bulletY,
-                playerId: this.me.playerId,
-                team: this.me.team,
-                color: this.me.color,
-                shotAt: this.me.lastShootAt,
-            },
-            this.particlesContainer,
-        );
+        // this.bulletsManager.addOrCreate(
+        //     {
+        //         x: bulletX,
+        //         y: bulletY,
+        //         radius: Constants.BULLET_SIZE,
+        //         rotation: this.me.rotation,
+        //         active: true,
+        //         fromX: bulletX,
+        //         fromY: bulletY,
+        //         playerId: this.me.playerId,
+        //         team: this.me.team,
+        //         color: this.me.color,
+        //         shotAt: this.me.lastShootAt,
+        //     },
+        //     this.particlesContainer,
+        // );
         this.onActionSend({
             type: 'shoot',
             ts: Date.now(),
@@ -678,9 +678,9 @@ export class Game {
 
     // COLYSEUS: Bullets
     bulletAdd = (bulletId: string, attributes: Models.BulletJSON) => {
-        if ((this.me && this.me.playerId === attributes.playerId) || !attributes.active) {
-            return;
-        }
+        // if ((this.me && this.me.playerId === attributes.playerId) || !attributes.active) {
+        //     return;
+        // }
 
         this.bulletsManager.addOrCreate(attributes, this.particlesContainer);
     };

diff --git a/packages/client/src/game/utils/inputs.ts b/packages/client/src/game/utils/inputs.ts
@@ -16,13 +16,15 @@ export class Inputs {
         window.addEventListener('keyup', this.handleKeyUp);
         window.document.addEventListener('mousedown', this.handleMouseDown);
         window.document.addEventListener('mouseup', this.handleMouseUp);
+        window.document.addEventListener('contextmenu', this.handleMouseUp);
     };
 
     public stop = () => {
         window.removeEventListener('keydown', this.handleKeyDown);
         window.removeEventListener('keyup', this.handleKeyUp);
         window.document.removeEventListener('mousedown', this.handleMouseDown);
         window.document.removeEventListener('mouseup', this.handleMouseUp);
+        window.document.removeEventListener('contextmenu', this.handleContextMenu);
     };
 
     private handleKeyDown = (event: any) => {
@@ -106,4 +108,10 @@ export class Inputs {
 
         this.shoot = false;
     };
+
+    private handleContextMenu = (event: any) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+    };
 }
diff --git a/packages/server/src/states/GameState.ts b/packages/server/src/states/GameState.ts
@@ -298,23 +298,23 @@ export class GameState extends Schema {
         const bulletY = player.y + Math.sin(angle) * Constants.PLAYER_WEAPON_SIZE;
 
         // Recycle bullets if some are unused to prevent instantiating too many
-        const index = this.bullets.findIndex((bullet) => !bullet.active);
-        if (index === -1) {
+        // const index = this.bullets.findIndex((bullet) => !bullet.active);
+        // if (index === -1) {
             this.bullets.push(
                 new Bullet(id, player.team, bulletX, bulletY, Constants.BULLET_SIZE, angle, player.color, Date.now()),
             );
-        } else {
-            this.bullets[index].reset(
-                id,
-                player.team,
-                bulletX,
-                bulletY,
-                Constants.BULLET_SIZE,
-                angle,
-                player.color,
-                Date.now(),
-            );
-        }
+        // } else {
+        //     this.bullets[index].reset(
+        //         id,
+        //         player.team,
+        //         bulletX,
+        //         bulletY,
+        //         Constants.BULLET_SIZE,
+        //         angle,
+        //         player.color,
+        //         Date.now(),
+        //     );
+        // }
     }
 
     private playerUpdateKills(playerId: string) {