Fix ship collission when placing new ships

Scalaptia · Mar 18, 2024 · f0f5b2d · f0f5b2d
1 parent b2048f9
commit f0f5b2d
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/components/board.ts b/src/components/board.ts
@@ -16,29 +16,41 @@ export const createBoard = (width: number, height: number): Gameboard => {
             this.ships.push(ship);
 
             if (vertical) {
+                // Check wall collision
                 if (y + ship.length > this.boardGrid.length) {
                     this.ships.pop();
                     return false;
                 }
+
+                // Check ship collision
                 for (let i = 0; i < ship.length; i++) {
                     if (this.boardGrid[y + i][x].ship) {
                         this.ships.pop();
                         return false;
                     }
+                }
 
+                // Add ship to board
+                for (let i = 0; i < ship.length; i++) {
                     this.boardGrid[y + i][x].ship = ship;
                 }
             } else {
+                // Check wall collision
                 if (x + ship.length > this.boardGrid[0].length) {
                     this.ships.pop();
                     return false;
                 }
+
+                // Check ship collision
                 for (let i = 0; i < ship.length; i++) {
                     if (this.boardGrid[y][x + i].ship) {
                         this.ships.pop();
                         return false;
                     }
+                }
 
+                // Add ship to board
+                for (let i = 0; i < ship.length; i++) {
                     this.boardGrid[y][x + i].ship = ship;
                 }
             }