Skip to content

Remove lakes from the game 🌊 #4214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanpelle merged 1 commit into from
Jun 10, 2026
Merged

Remove lakes from the game 🌊 #4214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/client/hud/NameBoxCalculator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export function createGrid(
if (game.isOnMap(cell)) {
const tile = game.ref(cell.x, cell.y);
grid[x - scaledBoundingBox.min.x][y - scaledBoundingBox.min.y] =
game.isLake(tile) ||
game.isShore(tile) ||
(game.isOcean(tile) && game.magnitude(tile) < 10) ||
game.owner(tile) === player ||
Expand Down
3 changes: 1 addition & 2 deletions src/client/theme/PastelTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ export class PastelTheme implements Theme {
return this.shore;
}
switch (gm.terrainType(tile)) {
case TerrainType.Ocean:
case TerrainType.Lake: {
case TerrainType.Ocean: {
const w = this.water.rgba;
if (gm.isShoreline(tile) && gm.isWater(tile)) {
return this.shorelineWater;
Expand Down
3 changes: 1 addition & 2 deletions src/client/theme/PastelThemeDark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ export class PastelThemeDark extends PastelTheme {
return this.darkShore;
}
switch (gm.terrainType(tile)) {
case TerrainType.Ocean:
case TerrainType.Lake: {
case TerrainType.Ocean: {
const w = this.darkWater.rgba;
if (gm.isShoreline(tile) && gm.isWater(tile)) {
return this.darkShorelineWater;
Expand Down
3 changes: 0 additions & 3 deletions src/client/view/GameView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,9 +1057,6 @@ export class GameView implements GameMap {
isWater(ref: TileRef): boolean {
return this._map.isWater(ref);
}
isLake(ref: TileRef): boolean {
return this._map.isLake(ref);
}
isShore(ref: TileRef): boolean {
return this._map.isShore(ref);
}
Expand Down
1 change: 0 additions & 1 deletion src/core/game/Game.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ export enum TerrainType {
Plains,
Highland,
Mountain,
Lake,
Ocean,
}

Expand Down
3 changes: 0 additions & 3 deletions src/core/game/GameImpl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,9 +1149,6 @@ export class GameImpl implements Game {
isWater(ref: TileRef): boolean {
return this._map.isWater(ref);
}
isLake(ref: TileRef): boolean {
return this._map.isLake(ref);
}
isShore(ref: TileRef): boolean {
return this._map.isShore(ref);
}
Expand Down
7 changes: 1 addition & 6 deletions src/core/game/GameMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export interface GameMap {
isBorder(ref: TileRef): boolean;
neighbors(ref: TileRef): TileRef[];
isWater(ref: TileRef): boolean;
isLake(ref: TileRef): boolean;
isShore(ref: TileRef): boolean;
cost(ref: TileRef): number;
terrainType(ref: TileRef): TerrainType;
Expand Down Expand Up @@ -311,10 +310,6 @@ export class GameMapImpl implements GameMap {
return !this.isLand(ref);
}

isLake(ref: TileRef): boolean {
return !this.isLand(ref) && !this.isOcean(ref);
}

isShore(ref: TileRef): boolean {
return this.isLand(ref) && this.isShoreline(ref);
}
Expand All @@ -332,7 +327,7 @@ export class GameMapImpl implements GameMap {
if (magnitude < 20) return TerrainType.Highland;
return TerrainType.Mountain;
}
return this.isOcean(ref) ? TerrainType.Ocean : TerrainType.Lake;
return TerrainType.Ocean;
}

neighbors(ref: TileRef): TileRef[] {
Expand Down
Loading