Formatting and such

Author: JornC

easter/src/controllers/GameController.ts

@@ -1,7 +1,11 @@
 import type { Map } from "ol";
 import { HexGrid, GridConfig } from "../game/grid/HexGrid";
 import { GameLogic } from "../game/state/GameState";
-import { LOCALITIES, LocalityConfig, GAME_OF_LIFE_CONFIG } from "../config/levels";
+import {
+  LOCALITIES,
+  LocalityConfig,
+  GAME_OF_LIFE_CONFIG,
+} from "../config/levels";
 import { GamePanel, GameType } from "../game/ui/GamePanel";
 import { ProgressManager } from "../game/state/Progress";
 import { GameOfLifeLogic } from "../game/state/GameOfLifeState";
@@ -49,7 +53,7 @@ export class GameController {
       () => this.clearLife(),
       () => this.toggleLife(),
       (pattern: PatternName) => this.selectPattern(pattern),
-      this.currentGameType
+      this.currentGameType,
     );
 
     // Start with Game of Life by default
@@ -98,7 +102,7 @@ export class GameController {
     };
 
     this.grid = new HexGrid(this.map, gridConfig, this.gameLogic, () =>
-      this.handleGameOver()
+      this.handleGameOver(),
     );
   }
 
@@ -183,7 +187,7 @@ export class GameController {
     this.gameLogic = new GameLogic(
       level.rings,
       level.minePercentage,
-      levelIndex + 1
+      levelIndex + 1,
     );
 
     const gridConfig: GridConfig = {
@@ -195,7 +199,7 @@ export class GameController {
 
     // Create new grid with new game logic
     this.grid = new HexGrid(this.map, gridConfig, this.gameLogic, () =>
-      this.handleGameOver()
+      this.handleGameOver(),
     );
 
     // Update UI

easter/src/game/grid/GameOfLifeGrid.ts

@@ -8,7 +8,13 @@ import {
   stringToCoord,
 } from "../state/GameOfLifeState";
 
-export type PatternName = "glider" | "diagonal" | "hexagon" | "triangle" | "line" | "spark";
+export type PatternName =
+  | "glider"
+  | "diagonal"
+  | "hexagon"
+  | "triangle"
+  | "line"
+  | "spark";
 
 export const PATTERNS: Record<PatternName, Coordinate[]> = {
   glider: [
@@ -25,32 +31,57 @@ export const PATTERNS: Record<PatternName, Coordinate[]> = {
   ],
   diagonal: [
     // Diagonal stripe (10 cells)
-    { q: -2, r: 2 }, { q: -1, r: 1 }, { q: 0, r: 0 }, { q: 1, r: -1 }, { q: 2, r: -2 },
-    { q: -1, r: 2 }, { q: 0, r: 1 }, { q: 1, r: 0 }, { q: 2, r: -1 }, { q: 3, r: -2 },
+    { q: -2, r: 2 },
+    { q: -1, r: 1 },
+    { q: 0, r: 0 },
+    { q: 1, r: -1 },
+    { q: 2, r: -2 },
+    { q: -1, r: 2 },
+    { q: 0, r: 1 },
+    { q: 1, r: 0 },
+    { q: 2, r: -1 },
+    { q: 3, r: -2 },
   ],
   hexagon: [
     // Hexagon ring (6 cells)
-    { q: 1, r: 0 }, { q: 0, r: 1 }, { q: -1, r: 1 },
-    { q: -1, r: 0 }, { q: 0, r: -1 }, { q: 1, r: -1 },
+    { q: 1, r: 0 },
+    { q: 0, r: 1 },
+    { q: -1, r: 1 },
+    { q: -1, r: 0 },
+    { q: 0, r: -1 },
+    { q: 1, r: -1 },
   ],
   triangle: [
     // Filled triangle (10 cells)
     { q: 0, r: 0 },
-    { q: -1, r: 1 }, { q: 0, r: 1 },
-    { q: -2, r: 2 }, { q: -1, r: 2 }, { q: 0, r: 2 },
-    { q: -3, r: 3 }, { q: -2, r: 3 }, { q: -1, r: 3 }, { q: 0, r: 3 },
+    { q: -1, r: 1 },
+    { q: 0, r: 1 },
+    { q: -2, r: 2 },
+    { q: -1, r: 2 },
+    { q: 0, r: 2 },
+    { q: -3, r: 3 },
+    { q: -2, r: 3 },
+    { q: -1, r: 3 },
+    { q: 0, r: 3 },
   ],
   line: [
     // Straight line (6 cells)
-    { q: -2, r: 0 }, { q: -1, r: 0 }, { q: 0, r: 0 },
-    { q: 1, r: 0 }, { q: 2, r: 0 }, { q: 3, r: 0 },
+    { q: -2, r: 0 },
+    { q: -1, r: 0 },
+    { q: 0, r: 0 },
+    { q: 1, r: 0 },
+    { q: 2, r: 0 },
+    { q: 3, r: 0 },
   ],
   spark: [
     // Sparse pattern - each cell has ~2-3 neighbors
     { q: 0, r: 0 },
-    { q: 2, r: 0 }, { q: -2, r: 0 },
-    { q: 1, r: 1 }, { q: -1, r: -1 },
-    { q: 1, r: -1 }, { q: -1, r: 1 },
+    { q: 2, r: 0 },
+    { q: -2, r: 0 },
+    { q: 1, r: 1 },
+    { q: -1, r: -1 },
+    { q: 1, r: -1 },
+    { q: -1, r: 1 },
   ],
 };
 
@@ -84,7 +115,11 @@ export class GameOfLifeGrid {
   private drawMode: boolean = true; // true = draw alive, false = erase
   private selectedPattern: PatternName = "glider";
 
-  constructor(map: OLMap, config: GameOfLifeGridConfig, gameLogic: GameOfLifeLogic) {
+  constructor(
+    map: OLMap,
+    config: GameOfLifeGridConfig,
+    gameLogic: GameOfLifeLogic,
+  ) {
     this.map = map;
     this.config = config;
     this.gameLogic = gameLogic;

easter/src/game/state/GameOfLifeState.ts

@@ -42,7 +42,7 @@ export class GameOfLifeLogic {
 
   private countAliveNeighbors(coord: Coordinate): number {
     return this.getNeighbors(coord).filter((n) =>
-      this.aliveCells.has(coordToString(n))
+      this.aliveCells.has(coordToString(n)),
     ).length;
   }
 
@@ -158,11 +158,15 @@ export class GameOfLifeLogic {
   private addCellsInRadius(
     center: Coordinate,
     radius: number,
-    cells: Set<string>
+    cells: Set<string>,
   ): void {
     // Add all cells within 'radius' rings of center
     for (let q = -radius; q <= radius; q++) {
-      for (let r = Math.max(-radius, -q - radius); r <= Math.min(radius, -q + radius); r++) {
+      for (
+        let r = Math.max(-radius, -q - radius);
+        r <= Math.min(radius, -q + radius);
+        r++
+      ) {
         const coord = { q: center.q + q, r: center.r + r };
         cells.add(coordToString(coord));
       }

easter/src/game/ui/GamePanel.ts

@@ -28,7 +28,7 @@ export class GamePanel {
     onClear: () => void,
     onTogglePlay: () => void,
     onSelectPattern: (pattern: PatternName) => void,
-    currentGame: GameType = "life"
+    currentGame: GameType = "life",
   ) {
     this.onExit = onExit;
     this.numLevels = numLevels;
@@ -273,7 +273,7 @@ export class GamePanel {
     if (!this.playButton) return;
     this.playButton.textContent = this.isPlaying ? "Pause" : "Play";
     this.playButton.style.cssText = this.getButtonStyle(
-      this.isPlaying ? "#ff9800" : "#4CAF50"
+      this.isPlaying ? "#ff9800" : "#4CAF50",
     );
   }
 
@@ -301,7 +301,7 @@ export class GamePanel {
           ? level === this.currentLevel
             ? "#3392e0"
             : "#84bff0"
-          : "#cccccc"
+          : "#cccccc",
       );
 
       button.dataset.level = level.toString();
@@ -334,7 +334,11 @@ export class GamePanel {
       const buttonLevel = parseInt(button.dataset.level || "1");
       const isUnlocked = button.dataset.unlocked === "true";
       button.style.cssText = this.getButtonStyle(
-        isUnlocked ? (buttonLevel === level ? "#3392e0" : "#84bff0") : "#cccccc"
+        isUnlocked
+          ? buttonLevel === level
+            ? "#3392e0"
+            : "#84bff0"
+          : "#cccccc",
       );
     });
   }