tiles now have lake or ocean method

src/client/ClientGame.ts

@@ -7,6 +7,7 @@ import {GameRenderer} from "./graphics/GameRenderer";
 import {InputHandler, MouseUpEvent, ZoomEvent, DragEvent, MouseDownEvent} from "./InputHandler"
 import {ClientID, ClientIntentMessageSchema, ClientJoinMessageSchema, ClientLeaveMessageSchema, ClientMessageSchema, GameID, Intent, ServerMessage, ServerMessageSchema, ServerSyncMessage, Turn} from "../core/Schemas";
 import {TerrainMap} from "../core/TerrainMapLoader";
+import {bfs, manhattanDist} from "../core/Util";
 
 
 
@@ -189,10 +190,17 @@ export class ClientGame {
         const owner = tile.owner()
         const targetID = owner.isPlayer() ? owner.id() : null
         if (tile.owner() != this.myPlayer && tile.isLand()) {
+            // const ocean = Array.from(bfs(tile, 4))
+            //     .filter(t => t.isOcean)
+            //     .sort((a, b) => manhattanDist(tile.cell(), a.cell()) - manhattanDist(tile.cell(), b.cell()))
+            // if (ocean.length > 0) {
+            //     this.sendBoatAttackIntent(targetID, cell, this.config.player().boatAttackAmount(this.myPlayer, owner))
+            //     return
+            // }
+
             if (this.myPlayer.sharesBorderWith(tile.owner())) {
                 this.sendAttackIntent(targetID, cell, this.config.player().attackAmount(this.myPlayer, owner))
             } else if (owner.isPlayer()) {
-                // TODO verify on ocean
                 console.log('going to send boat')
                 this.sendBoatAttackIntent(targetID, cell, this.config.player().boatAttackAmount(this.myPlayer, owner))
             }

src/client/graphics/GameRenderer.ts

@@ -3,7 +3,7 @@ import {Cell, Game, PlayerEvent, Tile, TileEvent, Player, Execution, BoatEvent}
 import {Theme} from "../../core/configuration/Config";
 import {DragEvent, ZoomEvent} from "../InputHandler";
 import {NameRenderer} from "./NameRenderer";
-import {manhattanDist} from "../../core/Util";
+import {bfs, manhattanDist} from "../../core/Util";
 import {PseudoRandom} from "../../core/PseudoRandom";
 
 
@@ -146,30 +146,14 @@ export class GameRenderer {
 	}
 
 	boatEvent(event: BoatEvent) {
-		this.bfs(event.oldTile, 2).forEach(t => this.paintTerritory(t))
+		bfs(event.oldTile, 2).forEach(t => this.paintTerritory(t))
 		if (event.boat.isActive()) {
-			this.bfs(event.boat.tile(), 2).forEach(t => this.paintCell(t.cell(), this.theme.borderColor(event.boat.owner().id())))
-			this.bfs(event.boat.tile(), 1).forEach(t => this.paintCell(t.cell(), this.theme.territoryColor(event.boat.owner().id())))
+			bfs(event.boat.tile(), 2).forEach(t => this.paintCell(t.cell(), this.theme.borderColor(event.boat.owner().id())))
+			bfs(event.boat.tile(), 1).forEach(t => this.paintCell(t.cell(), this.theme.territoryColor(event.boat.owner().id())))
 
 		}
 	}
 
-	private bfs(tile: Tile, dist: number): Set<Tile> {
-		const seen = new Set<Tile>
-		const q: Tile[] = []
-		q.push(tile)
-		while (q.length > 0) {
-			const curr = q.pop()
-			seen.add(curr)
-			for (const n of curr.neighbors()) {
-				if (!seen.has(n) && manhattanDist(tile.cell(), n.cell()) <= dist) {
-					q.push(n)
-				}
-			}
-		}
-		return seen
-	}
-
 	resize(width: number, height: number): void {
 		this.canvas.width = Math.ceil(width / window.devicePixelRatio);
 		this.canvas.height = Math.ceil(height / window.devicePixelRatio);

src/client/graphics/NameBoxCalculator.ts

@@ -74,7 +74,7 @@ export function createGrid(game: Game, player: Player, boundingBox: {min: Point;
             const cell = new Cell(x * scalingFactor, y * scalingFactor);
             if (game.isOnMap(cell)) {
                 const tile = game.tile(cell);
-                grid[x - scaledBoundingBox.min.x][y - scaledBoundingBox.min.y] = tile.owner() === player; // TODO: okay if lake
+                grid[x - scaledBoundingBox.min.x][y - scaledBoundingBox.min.y] = tile.isLake() || tile.owner() === player; // TODO: okay if lake
             }
         }
     }