feat: do not render apple on edge (#6)

thisdot · Mar 20, 2023 · c15e705 · c15e705
1 parent 64728a2
commit c15e705
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,4 +42,4 @@ testem.log
 Thumbs.db
 
 # Firebase
-./firebase
+.firebase/
diff --git a/src/app/game/game.service.ts b/src/app/game/game.service.ts
@@ -160,15 +160,28 @@ export class GameService {
     });
   }
 
-  private randomCoordinates(): Coordinates {
+  private randomCoordinates(avoidEdges?: boolean): Coordinates {
+    let xMin = 0;
+    let yMin = 0;
+    let xMax = this.gridSize?.width - 1 ?? 9;
+    let yMax = this.gridSize.height - 1 ?? 9;
+
+    if (avoidEdges) {
+      xMin++;
+      yMin++;
+      xMax--;
+      yMax--;
+    }
+    const x = Math.floor(Math.random() * (xMax - xMin + 1)) + xMin;
+    const y = Math.floor(Math.random() * (yMax - yMin + 1)) + yMin;
     return {
-      x: Math.floor(Math.random() * (this.gridSize?.width ?? 0)),
-      y: Math.floor(Math.random() * (this.gridSize?.height ?? 0)),
+      x,
+      y,
     };
   }
 
   private randomFoodCoordinates(): Coordinates {
-    const randomCoordinates = this.randomCoordinates();
+    const randomCoordinates = this.randomCoordinates(true);
     return this.snake.segments.some((segment) =>
       GameUtils.arePointsEqual(randomCoordinates, segment),
     )