Fix source files accordingly to prettier

Grohden · Oct 8, 2019 · a91a0ad · a91a0ad
1 parent f074dcf
commit a91a0ad
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 90 deletions.
diff --git a/client/src/Game.ts b/client/src/Game.ts
@@ -8,14 +8,20 @@ import {
   SocketEvents,
   TPowerUpInfo,
   TPowerUpType
-} from 'commons'
-import Phaser from 'phaser'
-import { ANIMATIONS, ASSETS, BOMB_TIME, MAIN_TILES, MAPS } from './assets'
-import { GamePhysicsSprite, GameScene, GameSprite, TPlayerGameObject, TPowerUpGameObject } from './alias'
-import { GroupManager } from './GroupManager'
-import Socket = SocketIOClient.Socket
+} from "commons";
+import Phaser from "phaser";
+import { ANIMATIONS, ASSETS, BOMB_TIME, MAIN_TILES, MAPS } from "./assets";
+import {
+  GamePhysicsSprite,
+  GameScene,
+  GameSprite,
+  TPlayerGameObject,
+  TPowerUpGameObject
+} from "./alias";
+import { GroupManager } from "./GroupManager";
+import Socket = SocketIOClient.Socket;
 
-const debug = false
+const debug = false;
 
 type ExplosionCache = Array<{ sprite: GameSprite; key: string }>;
 type BombMap = {
@@ -57,7 +63,7 @@ function gridUnitToPixel(value: number, baseGridSize: number) {
 }
 
 function makeKey({ x, y }: SimpleCoordinates) {
-  return `${ x }-${ y }`;
+  return `${x}-${y}`;
 }
 
 function findPlayerMapPosition(coords: SimpleCoordinates): SimpleCoordinates {
@@ -86,7 +92,6 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     };
   } = {};
 
-
   const makeDefaultTileMap = (key: string, imageName: string): SceneMap => {
     const map = currentScene.make.tilemap({
       key,
@@ -154,7 +159,6 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     }
   };
 
-
   const makeMaps = () => {
     // Background
     backgroundMap = makeDefaultTileMap(MAPS.BACKGROUND, MAIN_TILES);
@@ -182,16 +186,16 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
         }
       },
       scene: {
-        preload: function (this: GameScene) {
+        preload: function(this: GameScene) {
           currentScene = this;
           preload();
         },
-        create: function (this: GameScene) {
+        create: function(this: GameScene) {
           currentScene = this;
           create(state);
           gameConfigs.onStart();
         },
-        update: function (this: GameScene) {
+        update: function(this: GameScene) {
           currentScene = this;
           update();
         }
@@ -325,15 +329,15 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     });
 
     socket.on(
-        SocketEvents.PlayerStatusUpdate,
+      SocketEvents.PlayerStatusUpdate,
       (status: PlayerStatus & { id: string }) => {
         const registry = playerRegistry[status.id];
 
         if (registry) {
           registry.status = status;
 
           if (status.id === playerId) {
-            gameConfigs.onStatusUpdate(status)
+            gameConfigs.onStatusUpdate(status);
           }
         }
       }
@@ -347,12 +351,9 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
       placePowerUpAt(info);
     });
 
-    socket.on(
-      SocketEvents.WallDestroyed,
-      ({ x, y }: SimpleCoordinates) => {
-        breakableMap.map.removeTileAt(x, y);
-      }
-    );
+    socket.on(SocketEvents.WallDestroyed, ({ x, y }: SimpleCoordinates) => {
+      breakableMap.map.removeTileAt(x, y);
+    });
   };
 
   const create = (state: BackendState & { id: string }) => {
@@ -430,7 +431,12 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     return breakableMap.map.hasTileAt(gridX, gridY);
   };
 
-  const addExplosionSprite = ({ pixX, pixY, gridX, gridY }: {
+  const addExplosionSprite = ({
+    pixX,
+    pixY,
+    gridX,
+    gridY
+  }: {
     pixX: number;
     pixY: number;
     gridX: number;
@@ -455,12 +461,12 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     const { tileWidth, tileHeight } = GameDimensions;
 
     if (hasBombAt({ x: gridX, y: gridY })) {
-      console.log(`Found a bomb at ${ gridX } - ${ gridY }, delegated to it`);
+      console.log(`Found a bomb at ${gridX} - ${gridY}, delegated to it`);
       // Let the next bomb deal with things
       explodeBombAt(gridX, gridY);
       return true;
     } else if (hasExplosionAt({ x: gridX, y: gridY })) {
-      console.log(`Found a explosion at ${ gridX } - ${ gridY }, stopping`);
+      console.log(`Found a explosion at ${gridX} - ${gridY}, stopping`);
       return true;
     } else if (hasAnyWallAt(gridX, gridY)) {
       // No Explosions at walls
@@ -714,5 +720,5 @@ export function BombGame(socket: Socket, gameConfigs: BombGameConfigs) {
     );
   };
 
-  return { startGame }
+  return { startGame };
 }
diff --git a/client/src/GroupManager.ts b/client/src/GroupManager.ts
@@ -31,12 +31,8 @@ export class GroupManager {
   onPlayerExploded(onCollision: (id: string) => unknown) {
     const { players, explosions } = this;
 
-    this.provider().physics.add.collider(
-      players,
-      explosions,
-      (player) => onCollision(
-        (player as TPlayerGameObject).id!
-      )
+    this.provider().physics.add.collider(players, explosions, player =>
+      onCollision((player as TPlayerGameObject).id!)
     );
 
     return this;
@@ -45,17 +41,13 @@ export class GroupManager {
   onPlayerPowerUpCatch(
     onCollision: (
       player: TPlayerGameObject,
-      powerUp: TPowerUpGameObject,
+      powerUp: TPowerUpGameObject
     ) => unknown
   ) {
     const { players, powerUps } = this;
 
-    this.provider().physics.add.collider(
-      players, powerUps,
-      (player, powerUp) => onCollision(
-        (player as TPlayerGameObject),
-        (powerUp as TPowerUpGameObject)
-      )
+    this.provider().physics.add.collider(players, powerUps, (player, powerUp) =>
+      onCollision(player as TPlayerGameObject, powerUp as TPowerUpGameObject)
     );
 
     return this;
@@ -69,10 +61,7 @@ export class GroupManager {
     return this;
   }
 
-  addPlayer(
-    playerSprite: TPlayerGameObject,
-    id: string
-  ) {
+  addPlayer(playerSprite: TPlayerGameObject, id: string) {
     playerSprite.id = id;
     this.players.add(playerSprite);
   }
@@ -85,10 +74,7 @@ export class GroupManager {
     this.bombs.add(bombSprite);
   }
 
-  addPowerUp(
-    powerUpSprite: TPowerUpGameObject,
-    type: TPowerUpType
-  ) {
+  addPowerUp(powerUpSprite: TPowerUpGameObject, type: TPowerUpType) {
     powerUpSprite.powerUpType = type;
     this.powerUps.add(powerUpSprite);
   }
@@ -112,5 +98,4 @@ export class GroupManager {
       (child as GameSprite).anims.play(key, true);
     }
   }
-
-}
+}
diff --git a/client/src/alias.ts b/client/src/alias.ts
@@ -1,16 +1,16 @@
 import Phaser from "phaser";
 import { Omit, TPowerUpType } from "commons/index";
 
-export type SpriteGroup =  Phaser.GameObjects.Group;
+export type SpriteGroup = Phaser.GameObjects.Group;
 export type GameObject = Phaser.GameObjects.GameObject;
 export type GameSprite = Phaser.GameObjects.Sprite;
 export type GamePhysicsSprite = Phaser.Physics.Arcade.Sprite;
 export type GameScene = Phaser.Scene;
 export type PhaserSet<T> = Phaser.Structs.Set<T>;
 
-export type TypedSpriteGroup<T> = Omit<SpriteGroup, 'children'> & {
+export type TypedSpriteGroup<T> = Omit<SpriteGroup, "children"> & {
   children: PhaserSet<T>;
 };
 
-export type TPlayerGameObject = GameObject & { id?: string }
-export type TPowerUpGameObject = GameObject & { powerUpType?: TPowerUpType }
+export type TPlayerGameObject = GameObject & { id?: string };
+export type TPowerUpGameObject = GameObject & { powerUpType?: TPowerUpType };
diff --git a/client/src/client.ts b/client/src/client.ts
@@ -2,50 +2,46 @@ import io from "socket.io-client";
 import { BombGame } from "./Game";
 import { PlayerStatus } from "commons";
 
-(function () {
-    function startGame() {
-        try {
-            const socket = io();
-            BombGame(socket, {
-                parent: 'game-container',
-                onDeath: showDeathMessage,
-                onStart: () => setState("state-playing"),
-                onStatusUpdate: onStatusUpdate
-            }).startGame();
-        } catch (e) {
-            console.error(e);
-        }
+(function() {
+  function startGame() {
+    try {
+      const socket = io();
+      BombGame(socket, {
+        parent: "game-container",
+        onDeath: showDeathMessage,
+        onStart: () => setState("state-playing"),
+        onStatusUpdate: onStatusUpdate
+      }).startGame();
+    } catch (e) {
+      console.error(e);
     }
+  }
 
-    function showDeathMessage() {
-        setState("state-died");
-    }
+  function showDeathMessage() {
+    setState("state-died");
+  }
 
-    function setState(state: "state-waiting" | "state-died" | "state-playing") {
-        document.body.className = "";
-        document.body.classList.add(state);
-    }
+  function setState(state: "state-waiting" | "state-died" | "state-playing") {
+    document.body.className = "";
+    document.body.classList.add(state);
+  }
 
-    function onStatusUpdate(status: PlayerStatus) {
-        const bombCount = <HTMLElement>(
-            document.getElementById("bomb-count")
-        );
-        const bombRange = <HTMLElement>(
-            document.getElementById("bomb-range")
-        );
+  function onStatusUpdate(status: PlayerStatus) {
+    const bombCount = <HTMLElement>document.getElementById("bomb-count");
+    const bombRange = <HTMLElement>document.getElementById("bomb-range");
 
-        bombCount.innerHTML = status.maxBombCount + '';
-        bombRange.innerHTML = status.bombRange + '';
-    }
+    bombCount.innerHTML = status.maxBombCount + "";
+    bombRange.innerHTML = status.bombRange + "";
+  }
 
-    window.onload = function () {
-        const startGameButton = <HTMLButtonElement>(
-            document.getElementById("start-button")
-        );
+  window.onload = function() {
+    const startGameButton = <HTMLButtonElement>(
+      document.getElementById("start-button")
+    );
 
-        startGameButton.onclick = function () {
-            setState("state-waiting");
-            startGame();
-        };
+    startGameButton.onclick = function() {
+      setState("state-waiting");
+      startGame();
     };
+  };
 })();