diff --git a/resources/images/TraitorIcon.png b/resources/images/TraitorIcon.png deleted file mode 100644 index 23f5d252a..000000000 Binary files a/resources/images/TraitorIcon.png and /dev/null differ diff --git a/resources/images/TraitorIcon.svg b/resources/images/TraitorIcon.svg index 49f230962..567be0cd0 100644 --- a/resources/images/TraitorIcon.svg +++ b/resources/images/TraitorIcon.svg @@ -1,5 +1,89 @@ - - - - + + + + + + + + + + + + + + + + diff --git a/src/client/index.html b/src/client/index.html index fff139eb7..12372b1c2 100644 --- a/src/client/index.html +++ b/src/client/index.html @@ -209,26 +209,13 @@
-
-
+
+
-
- - Discord - Join the Discord! - -
+
@@ -331,6 +318,9 @@ > Wiki + + Join the Discord! +
© 2025 diff --git a/src/client/styles/layout/footer.css b/src/client/styles/layout/footer.css index 7064d2281..40d4a1dde 100644 --- a/src/client/styles/layout/footer.css +++ b/src/client/styles/layout/footer.css @@ -20,5 +20,5 @@ .l-footer__col { display: flex; - gap: 10px; + gap: 20px; } diff --git a/src/core/GameRunner.ts b/src/core/GameRunner.ts index 13d8fcc10..c4b3ab3f7 100644 --- a/src/core/GameRunner.ts +++ b/src/core/GameRunner.ts @@ -4,7 +4,6 @@ import { Executor } from "./execution/ExecutionManager"; import { WinCheckExecution } from "./execution/WinCheckExecution"; import { AllPlayers, - BuildableUnit, Game, GameUpdates, NameViewData, @@ -15,7 +14,6 @@ import { PlayerInfo, PlayerProfile, PlayerType, - UnitType, } from "./game/Game"; import { createGame } from "./game/GameImpl"; import { @@ -161,13 +159,7 @@ export class GameRunner { const actions = { canBoat: player.canBoat(tile), canAttack: player.canAttack(tile), - buildableUnits: Object.values(UnitType).map((u) => { - return { - type: u, - canBuild: player.canBuild(u, tile) != false, - cost: this.game.config().unitInfo(u).cost(player), - } as BuildableUnit; - }), + buildableUnits: player.buildableUnits(tile), canSendEmojiAllPlayers: player.canSendEmoji(AllPlayers), } as PlayerActions; diff --git a/src/core/configuration/Config.ts b/src/core/configuration/Config.ts index f53d90aa2..aaed33112 100644 --- a/src/core/configuration/Config.ts +++ b/src/core/configuration/Config.ts @@ -52,6 +52,7 @@ export interface NukeMagnitude { export interface Config { samHittingChance(): number; + samWarheadHittingChance(): number; spawnImmunityDuration(): Tick; serverConfig(): ServerConfig; gameConfig(): GameConfig; @@ -118,9 +119,11 @@ export interface Config { difficultyModifier(difficulty: Difficulty): number; // 0-1 traitorDefenseDebuff(): number; + traitorDuration(): number; nukeMagnitudes(unitType: UnitType): NukeMagnitude; defaultNukeSpeed(): number; nukeDeathFactor(humans: number, tilesOwned: number): number; + structureMinDist(): number; } export interface Theme { diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index 75321154e..2ca999416 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -69,7 +69,7 @@ export abstract class DefaultServerConfig implements ServerConfig { GameMapType.Europe, ].includes(map) ) { - return Math.random() < 0.2 ? 150 : 70; + return Math.random() < 0.2 ? 100 : 50; } // Maps with ~2.5 - ~3.5 mil pixels if ( @@ -80,7 +80,7 @@ export abstract class DefaultServerConfig implements ServerConfig { GameMapType.Asia, ].includes(map) ) { - return Math.random() < 0.2 ? 100 : 50; + return Math.random() < 0.3 ? 50 : 25; } // Maps with ~2 mil pixels if ( @@ -92,7 +92,7 @@ export abstract class DefaultServerConfig implements ServerConfig { GameMapType.FaroeIslands, ].includes(map) ) { - return Math.random() < 0.2 ? 70 : 40; + return Math.random() < 0.3 ? 50 : 25; } // Maps smaller than ~2 mil pixels if ( @@ -102,14 +102,14 @@ export abstract class DefaultServerConfig implements ServerConfig { GameMapType.Pangaea, ].includes(map) ) { - return Math.random() < 0.2 ? 60 : 35; + return Math.random() < 0.5 ? 30 : 15; } // world belongs with the ~2 mils, but these amounts never made sense so I assume the insanity is intended. if (map == GameMapType.World) { - return Math.random() < 0.2 ? 150 : 60; + return Math.random() < 0.2 ? 150 : 50; } // default return for non specified map - return Math.random() < 0.2 ? 85 : 45; + return Math.random() < 0.2 ? 50 : 20; } workerIndex(gameID: GameID): number { return simpleHash(gameID) % this.numWorkers(); @@ -140,8 +140,15 @@ export class DefaultConfig implements Config { return 0.8; } + samWarheadHittingChance(): number { + return 0.5; + } + traitorDefenseDebuff(): number { - return 0.8; + return 0.5; + } + traitorDuration(): number { + return 30 * 10; // 30 seconds } spawnImmunityDuration(): Tick { return 5 * 10; @@ -322,7 +329,7 @@ export class DefaultConfig implements Config { p.type() == PlayerType.Human && this.infiniteGold() ? 0 : Math.min( - 1_500_000 * 3, + 3_000_000, (p.unitsIncludingConstruction(UnitType.SAMLauncher).length + 1) * 1_500_000, @@ -671,4 +678,8 @@ export class DefaultConfig implements Config { nukeDeathFactor(humans: number, tilesOwned: number): number { return (5 * humans) / Math.max(1, tilesOwned); } + + structureMinDist(): number { + return 18; + } } diff --git a/src/core/configuration/DevConfig.ts b/src/core/configuration/DevConfig.ts index 853467814..99e616cc1 100644 --- a/src/core/configuration/DevConfig.ts +++ b/src/core/configuration/DevConfig.ts @@ -24,6 +24,14 @@ export class DevServerConfig extends DefaultServerConfig { return Math.random() < 0.5 ? 2 : 3; } + samWarheadHittingChance(): number { + return 1; + } + + samHittingChance(): number { + return 1; + } + discordRedirectURI(): string { return "http://localhost:3000/auth/callback"; } diff --git a/src/core/execution/BotExecution.ts b/src/core/execution/BotExecution.ts index f7321ef93..f71bd6407 100644 --- a/src/core/execution/BotExecution.ts +++ b/src/core/execution/BotExecution.ts @@ -1,13 +1,7 @@ -import { - Execution, - Game, - Player, - PlayerType, - TerraNullius, -} from "../game/Game"; +import { Execution, Game, Player } from "../game/Game"; import { PseudoRandom } from "../PseudoRandom"; import { simpleHash } from "../Util"; -import { AttackExecution } from "./AttackExecution"; +import { BotBehavior } from "./utils/BotBehavior"; export class BotExecution implements Execution { private active = true; @@ -16,18 +10,20 @@ export class BotExecution implements Execution { private mg: Game; private neighborsTerraNullius = true; + private behavior: BotBehavior | null = null; + constructor(private bot: Player) { this.random = new PseudoRandom(simpleHash(bot.id())); this.attackRate = this.random.nextInt(10, 50); } + activeDuringSpawnPhase(): boolean { return false; } - init(mg: Game, ticks: number) { + init(mg: Game) { this.mg = mg; this.bot.setTargetTroopRatio(0.7); - // this.neighborsTerra = this.bot.neighbors().filter(n => n == this.gs.terraNullius()).length > 0 } tick(ticks: number) { @@ -40,14 +36,15 @@ export class BotExecution implements Execution { return; } - this.bot.incomingAllianceRequests().forEach((ar) => { - if (ar.requestor().isTraitor()) { - ar.reject(); - } else { - ar.accept(); - } - }); + if (this.behavior === null) { + this.behavior = new BotBehavior(this.random, this.mg, this.bot, 1 / 20); + } + this.behavior.handleAllianceRequests(); + this.maybeAttack(); + } + + private maybeAttack() { const traitors = this.bot .neighbors() .filter((n) => n.isPlayer() && n.isTraitor()) as Player[]; @@ -55,56 +52,22 @@ export class BotExecution implements Execution { const toAttack = this.random.randElement(traitors); const odds = this.bot.isFriendly(toAttack) ? 6 : 3; if (this.random.chance(odds)) { - this.sendAttack(toAttack); + this.behavior.sendAttack(toAttack); return; } } if (this.neighborsTerraNullius) { - for (const b of this.bot.borderTiles()) { - for (const n of this.mg.neighbors(b)) { - if (!this.mg.hasOwner(n) && this.mg.isLand(n)) { - this.sendAttack(this.mg.terraNullius()); - return; - } - } + if (this.bot.sharesBorderWith(this.mg.terraNullius())) { + this.behavior.sendAttack(this.mg.terraNullius()); + return; } this.neighborsTerraNullius = false; } - const border = Array.from(this.bot.borderTiles()) - .flatMap((t) => this.mg.neighbors(t)) - .filter((t) => this.mg.hasOwner(t) && this.mg.owner(t) != this.bot); - - if (border.length == 0) { - return; - } - - const toAttack = border[this.random.nextInt(0, border.length)]; - const owner = this.mg.owner(toAttack); - - if (owner.isPlayer()) { - if (this.bot.isFriendly(owner)) { - return; - } - if (owner.type() == PlayerType.FakeHuman) { - if (!this.random.chance(2)) { - return; - } - } - } - this.sendAttack(owner); - } - - sendAttack(toAttack: Player | TerraNullius) { - if (toAttack.isPlayer() && this.bot.isOnSameTeam(toAttack)) return; - this.mg.addExecution( - new AttackExecution( - this.bot.troops() / 20, - this.bot.id(), - toAttack.isPlayer() ? toAttack.id() : null, - ), - ); + const enemy = this.behavior.selectRandomEnemy(); + if (!enemy) return; + this.behavior.sendAttack(enemy); } owner(): Player { diff --git a/src/core/execution/FakeHumanExecution.ts b/src/core/execution/FakeHumanExecution.ts index d0063aa6c..3b336fee7 100644 --- a/src/core/execution/FakeHumanExecution.ts +++ b/src/core/execution/FakeHumanExecution.ts @@ -1,6 +1,5 @@ import { consolex } from "../Consolex"; import { - AllianceRequest, Cell, Difficulty, Execution, @@ -11,35 +10,33 @@ import { PlayerType, Relation, TerrainType, - TerraNullius, Tick, + Unit, UnitType, } from "../game/Game"; -import { manhattanDistFN, TileRef } from "../game/GameMap"; +import { euclDistFN, manhattanDistFN, TileRef } from "../game/GameMap"; import { PseudoRandom } from "../PseudoRandom"; import { GameID } from "../Schemas"; import { calculateBoundingBox, simpleHash } from "../Util"; -import { AllianceRequestReplyExecution } from "./alliance/AllianceRequestReplyExecution"; -import { AttackExecution } from "./AttackExecution"; import { ConstructionExecution } from "./ConstructionExecution"; import { EmojiExecution } from "./EmojiExecution"; import { NukeExecution } from "./NukeExecution"; import { SpawnExecution } from "./SpawnExecution"; import { TransportShipExecution } from "./TransportShipExecution"; import { closestTwoTiles } from "./Util"; +import { BotBehavior } from "./utils/BotBehavior"; export class FakeHumanExecution implements Execution { private firstMove = true; private active = true; private random: PseudoRandom; + private behavior: BotBehavior | null = null; private mg: Game; private player: Player = null; - private enemy: Player | null = null; - - private lastEnemyUpdateTick: number = 0; private lastEmojiSent = new Map(); + private lastNukeSent: [Tick, TileRef][] = []; private embargoMalusApplied = new Set(); constructor( @@ -51,7 +48,7 @@ export class FakeHumanExecution implements Execution { ); } - init(mg: Game, ticks: number) { + init(mg: Game) { this.mg = mg; if (this.random.chance(10)) { // this.isTraitor = true @@ -116,16 +113,23 @@ export class FakeHumanExecution implements Execution { return; } } - if (this.firstMove) { - this.firstMove = false; - this.sendAttack(this.mg.terraNullius()); - return; - } + if (!this.player.isAlive()) { this.active = false; return; } + if (this.behavior === null) { + // Player is unavailable during init() + this.behavior = new BotBehavior(this.random, this.mg, this.player, 1 / 5); + } + + if (this.firstMove) { + this.firstMove = false; + this.behavior.sendAttack(this.mg.terraNullius()); + return; + } + if (ticks % this.random.nextInt(40, 80) != 0) { return; } @@ -138,7 +142,7 @@ export class FakeHumanExecution implements Execution { } this.updateRelationsFromEmbargos(); - this.handleAllianceRequests(); + this.behavior.handleAllianceRequests(); this.handleEnemies(); this.handleUnits(); this.handleEmbargoesToHostileNations(); @@ -164,7 +168,7 @@ export class FakeHumanExecution implements Execution { this.mg.playerBySmallID(this.mg.ownerID(t)), ); if (enemiesWithTN.filter((o) => !o.isPlayer()).length > 0) { - this.sendAttack(this.mg.terraNullius()); + this.behavior.sendAttack(this.mg.terraNullius()); return; } @@ -186,7 +190,7 @@ export class FakeHumanExecution implements Execution { ? enemies[0] : this.random.randElement(enemies); if (this.shouldAttack(toAttack)) { - this.sendAttack(toAttack); + this.behavior.sendAttack(toAttack); } } @@ -223,97 +227,137 @@ export class FakeHumanExecution implements Execution { } handleEnemies() { - if (this.mg.ticks() - this.lastEnemyUpdateTick > 100) { - this.enemy = null; - } - - const target = - this.player - .allies() - .filter((ally) => this.player.relation(ally) == Relation.Friendly) - .filter((ally) => ally.targets().length > 0) - .map((ally) => ({ ally: ally, t: ally.targets()[0] }))[0] ?? null; - - if ( - target != null && - target.t != this.player && - !this.player.isAlliedWith(target.t) - ) { - this.player.updateRelation(target.ally, -20); - this.enemy = target.t; - this.lastEnemyUpdateTick = this.mg.ticks(); - if (target.ally.type() == PlayerType.Human) { - this.mg.addExecution( - new EmojiExecution(this.player.id(), target.ally.id(), "👍"), - ); - } - } - - if (this.enemy == null) { - const mostHated = this.player.allRelationsSorted()[0] ?? null; - if (mostHated != null && mostHated.relation == Relation.Hostile) { - this.enemy = mostHated.player; - this.lastEnemyUpdateTick = this.mg.ticks(); - } - } - - if (this.enemy) { - if (this.player.isFriendly(this.enemy)) { - this.enemy = null; - return; - } - this.maybeSendEmoji(); - this.maybeSendNuke(this.enemy); - if (this.player.sharesBorderWith(this.enemy)) { - this.sendAttack(this.enemy); - } else { - this.maybeSendBoatAttack(this.enemy); - } - return; + this.behavior.assistAllies(); + const enemy = this.behavior.selectEnemy(); + if (!enemy) return; + this.maybeSendEmoji(enemy); + this.maybeSendNuke(enemy); + if (this.player.sharesBorderWith(enemy)) { + this.behavior.sendAttack(enemy); + } else { + this.maybeSendBoatAttack(enemy); } } - private maybeSendEmoji() { - if (this.enemy.type() != PlayerType.Human) return; - const lastSent = this.lastEmojiSent.get(this.enemy) ?? -300; + private maybeSendEmoji(enemy: Player) { + if (enemy.type() != PlayerType.Human) return; + const lastSent = this.lastEmojiSent.get(enemy) ?? -300; if (this.mg.ticks() - lastSent <= 300) return; - this.lastEmojiSent.set(this.enemy, this.mg.ticks()); + this.lastEmojiSent.set(enemy, this.mg.ticks()); this.mg.addExecution( new EmojiExecution( this.player.id(), - this.enemy.id(), + enemy.id(), this.random.randElement(["🤡", "😡"]), ), ); } private maybeSendNuke(other: Player) { + const silos = this.player.units(UnitType.MissileSilo); if ( - this.player.units(UnitType.MissileSilo).length == 0 || + silos.length == 0 || this.player.gold() < this.mg.config().unitInfo(UnitType.AtomBomb).cost(this.player) || + other.type() == PlayerType.Bot || this.player.isOnSameTeam(other) ) { return; } - outer: for (let i = 0; i < 10; i++) { - const tile = this.randTerritoryTile(other); - if (tile == null) { - return; - } + + const structures = other.units( + UnitType.City, + UnitType.DefensePost, + UnitType.MissileSilo, + UnitType.Port, + UnitType.SAMLauncher, + ); + const structureTiles = structures.map((u) => u.tile()); + const randomTiles: TileRef[] = new Array(10); + for (let i = 0; i < randomTiles.length; i++) { + randomTiles[i] = this.randTerritoryTile(other); + } + const allTiles = randomTiles.concat(structureTiles); + + let bestTile = null; + let bestValue = 0; + this.removeOldNukeEvents(); + outer: for (const tile of new Set(allTiles)) { + if (tile == null) continue; for (const t of this.mg.bfs(tile, manhattanDistFN(tile, 15))) { // Make sure we nuke at least 15 tiles in border if (this.mg.owner(t) != other) { continue outer; } } - if (this.player.canBuild(UnitType.AtomBomb, tile)) { - this.mg.addExecution( - new NukeExecution(UnitType.AtomBomb, this.player.id(), tile), - ); - return; + if (!this.player.canBuild(UnitType.AtomBomb, tile)) continue; + const value = this.nukeTileScore(tile, silos, structures); + if (value > bestTile) { + bestTile = tile; + bestValue = value; } } + if (bestTile != null) { + this.sendNuke(bestTile); + } + } + + private removeOldNukeEvents() { + const maxAge = 500; + const tick = this.mg.ticks(); + while ( + this.lastNukeSent.length > 0 && + this.lastNukeSent[0][0] + maxAge < tick + ) { + this.lastNukeSent.shift(); + } + } + + private sendNuke(tile: TileRef) { + const tick = this.mg.ticks(); + this.lastNukeSent.push([tick, tile]); + this.mg.addExecution( + new NukeExecution(UnitType.AtomBomb, this.player.id(), tile), + ); + } + + private nukeTileScore(tile: TileRef, silos: Unit[], targets: Unit[]): number { + // Potential damage in a 25-tile radius + const dist = euclDistFN(tile, 25, false); + let tileValue = targets + .filter((unit) => dist(this.mg, unit.tile())) + .map((unit) => { + switch (unit.type()) { + case UnitType.City: + return 25_000; + case UnitType.DefensePost: + return 5_000; + case UnitType.MissileSilo: + return 50_000; + case UnitType.Port: + return 10_000; + case UnitType.SAMLauncher: + return 5_000; + default: + return 0; + } + }) + .reduce((prev, cur) => prev + cur, 0); + + // Prefer tiles that are closer to a silo + const siloTiles = silos.map((u) => u.tile()); + const { x: closestSilo } = closestTwoTiles(this.mg, siloTiles, [tile]); + const distanceSquared = this.mg.euclideanDistSquared(tile, closestSilo); + const distanceToClosestSilo = Math.sqrt(distanceSquared); + tileValue -= distanceToClosestSilo * 30; + + // Don't target near recent targets + tileValue -= this.lastNukeSent + .filter(([_tick, tile]) => dist(this.mg, tile)) + .map((_) => 1_000_000) + .reduce((prev, cur) => prev + cur, 0); + + return tileValue; } private maybeSendBoatAttack(other: Player) { @@ -473,36 +517,6 @@ export class FakeHumanExecution implements Execution { return this.mg.unitInfo(type).cost(this.player); } - handleAllianceRequests() { - for (const req of this.player.incomingAllianceRequests()) { - if (req.requestor().isTraitor()) { - this.replyToAllianceRequest(req, false); - continue; - } - if (this.player.relation(req.requestor()) < Relation.Neutral) { - this.replyToAllianceRequest(req, false); - continue; - } - const requestorIsMuchLarger = - req.requestor().numTilesOwned() > this.player.numTilesOwned() * 3; - if (!requestorIsMuchLarger && req.requestor().alliances().length >= 3) { - this.replyToAllianceRequest(req, false); - continue; - } - this.replyToAllianceRequest(req, true); - } - } - - private replyToAllianceRequest(req: AllianceRequest, accept: boolean): void { - this.mg.addExecution( - new AllianceRequestReplyExecution( - req.requestor().id(), - this.player.id(), - accept, - ), - ); - } - sendBoatRandomly() { const oceanShore = Array.from(this.player.borderTiles()).filter((t) => this.mg.isOceanShore(t), @@ -554,17 +568,6 @@ export class FakeHumanExecution implements Execution { return null; } - sendAttack(toAttack: Player | TerraNullius) { - if (toAttack.isPlayer() && this.player.isOnSameTeam(toAttack)) return; - this.mg.addExecution( - new AttackExecution( - this.player.troops() / 5, - this.player.id(), - toAttack.isPlayer() ? toAttack.id() : null, - ), - ); - } - private randOceanShoreTile(tile: TileRef, dist: number): TileRef | null { const x = this.mg.x(tile); const y = this.mg.y(tile); diff --git a/src/core/execution/MIRVExecution.ts b/src/core/execution/MIRVExecution.ts index bd0120c22..d2b118c0a 100644 --- a/src/core/execution/MIRVExecution.ts +++ b/src/core/execution/MIRVExecution.ts @@ -170,7 +170,6 @@ export class MirvExecution implements Execution { if (!this.mg.isValidCoord(x, y)) { continue; } - console.log(`got coord ${x}, ${y}`); const tile = this.mg.ref(x, y); if (!this.mg.isLand(tile)) { continue; diff --git a/src/core/execution/MissileSiloExecution.ts b/src/core/execution/MissileSiloExecution.ts index 928b8afdf..fd9bf2111 100644 --- a/src/core/execution/MissileSiloExecution.ts +++ b/src/core/execution/MissileSiloExecution.ts @@ -33,14 +33,15 @@ export class MissileSiloExecution implements Execution { tick(ticks: number): void { if (this.silo == null) { - if (!this.player.canBuild(UnitType.MissileSilo, this.tile)) { + const spawn = this.player.canBuild(UnitType.MissileSilo, this.tile); + if (spawn === false) { consolex.warn( `player ${this.player} cannot build missile silo at ${this.tile}`, ); this.active = false; return; } - this.silo = this.player.buildUnit(UnitType.MissileSilo, 0, this.tile, { + this.silo = this.player.buildUnit(UnitType.MissileSilo, 0, spawn, { cooldownDuration: this.mg.config().SiloCooldown(), }); diff --git a/src/core/execution/SAMLauncherExecution.ts b/src/core/execution/SAMLauncherExecution.ts index e3337f8fd..5e37cf9cd 100644 --- a/src/core/execution/SAMLauncherExecution.ts +++ b/src/core/execution/SAMLauncherExecution.ts @@ -15,19 +15,28 @@ import { SAMMissileExecution } from "./SAMMissileExecution"; export class SAMLauncherExecution implements Execution { private player: Player; private mg: Game; - private sam: Unit; private active: boolean = true; private target: Unit = null; + private warheadTargets: Unit[] = []; - private searchRangeRadius = 75; + private searchRangeRadius = 80; + // As MIRV go very fast we have to detect them very early but we only + // shoot the one targeting very close (MIRVWarheadProtectionRadius) + private MIRVWarheadSearchRadius = 400; + private MIRVWarheadProtectionRadius = 50; private pseudoRandom: PseudoRandom; constructor( private ownerId: PlayerID, private tile: TileRef, - ) {} + private sam: Unit | null = null, + ) { + if (sam != null) { + this.tile = sam.tile(); + } + } init(mg: Game, ticks: number): void { this.mg = mg; @@ -39,6 +48,52 @@ export class SAMLauncherExecution implements Execution { this.player = mg.player(this.ownerId); } + private getSingleTarget(): Unit | null { + const nukes = this.mg + .nearbyUnits(this.sam.tile(), this.searchRangeRadius, [ + UnitType.AtomBomb, + UnitType.HydrogenBomb, + ]) + .filter( + ({ unit }) => + unit.owner() !== this.player && !this.player.isFriendly(unit.owner()), + ); + + return ( + nukes.sort((a, b) => { + const { unit: unitA, distSquared: distA } = a; + const { unit: unitB, distSquared: distB } = b; + + // Prioritize Hydrogen Bombs + if ( + unitA.type() === UnitType.HydrogenBomb && + unitB.type() !== UnitType.HydrogenBomb + ) + return -1; + if ( + unitA.type() !== UnitType.HydrogenBomb && + unitB.type() === UnitType.HydrogenBomb + ) + return 1; + + // If both are the same type, sort by distance (lower `distSquared` means closer) + return distA - distB; + })[0]?.unit ?? null + ); + } + + private isHit(type: UnitType, random: number): boolean { + if (type == UnitType.AtomBomb) { + return true; + } + + if (type == UnitType.MIRVWarhead) { + return random < this.mg.config().samWarheadHittingChance(); + } + + return random < this.mg.config().samHittingChance(); + } + tick(ticks: number): void { if (this.sam == null) { const spawnTile = this.player.canBuild(UnitType.SAMLauncher, this.tile); @@ -64,36 +119,26 @@ export class SAMLauncherExecution implements Execution { this.pseudoRandom = new PseudoRandom(this.sam.id()); } - const nukes = this.mg - .nearbyUnits(this.sam.tile(), this.searchRangeRadius, [ - UnitType.AtomBomb, - UnitType.HydrogenBomb, - ]) + this.warheadTargets = this.mg + .nearbyUnits( + this.sam.tile(), + this.MIRVWarheadSearchRadius, + UnitType.MIRVWarhead, + ) + .map(({ unit }) => unit) .filter( - ({ unit }) => + (unit) => unit.owner() !== this.player && !this.player.isFriendly(unit.owner()), + ) + .filter( + (unit) => + this.mg.manhattanDist(unit.detonationDst(), this.sam.tile()) < + this.MIRVWarheadProtectionRadius, ); - this.target = - nukes.sort((a, b) => { - const { unit: unitA, distSquared: distA } = a; - const { unit: unitB, distSquared: distB } = b; - - // Prioritize Hydrogen Bombs - if ( - unitA.type() === UnitType.HydrogenBomb && - unitB.type() !== UnitType.HydrogenBomb - ) - return -1; - if ( - unitA.type() !== UnitType.HydrogenBomb && - unitB.type() === UnitType.HydrogenBomb - ) - return 1; - - // If both are the same type, sort by distance (lower `distSquared` means closer) - return distA - distB; - })[0]?.unit ?? null; + if (this.warheadTargets.length == 0) { + this.target = this.getSingleTarget(); + } if ( this.sam.isCooldown() && @@ -102,29 +147,46 @@ export class SAMLauncherExecution implements Execution { this.sam.setCooldown(false); } - if (this.target && !this.sam.isCooldown() && !this.target.targetedBySAM()) { + const isSingleTarget = this.target && !this.target.targetedBySAM(); + if ( + (isSingleTarget || this.warheadTargets.length > 0) && + !this.sam.isCooldown() + ) { this.sam.setCooldown(true); + const type = + this.warheadTargets.length > 0 + ? UnitType.MIRVWarhead + : this.target.type(); const random = this.pseudoRandom.next(); - let hit = true; - if (this.target.type() != UnitType.AtomBomb) { - hit = random < this.mg.config().samHittingChance(); - } + const hit = this.isHit(type, random); if (!hit) { this.mg.displayMessage( - `Missile failed to intercept ${this.target.type()}`, + `Missile failed to intercept ${type}`, MessageType.ERROR, this.sam.owner().id(), ); } else { - this.target.setTargetedBySAM(true); - this.mg.addExecution( - new SAMMissileExecution( - this.sam.tile(), - this.sam.owner(), - this.sam, - this.target, - ), - ); + if (this.warheadTargets.length > 0) { + // Message + this.mg.displayMessage( + `${this.warheadTargets.length} MIRV warheads intercepted`, + MessageType.SUCCESS, + this.sam.owner().id(), + ); + // Delete warheads + this.warheadTargets.forEach((u) => u.delete()); + } else { + this.target.setTargetedBySAM(true); + this.mg.addExecution( + new SAMMissileExecution( + this.sam.tile(), + this.sam.owner(), + this.sam, + this.target, + ), + ); + this.warheadTargets = []; + } } } } diff --git a/src/core/execution/utils/BotBehavior.ts b/src/core/execution/utils/BotBehavior.ts new file mode 100644 index 000000000..3c6b6108f --- /dev/null +++ b/src/core/execution/utils/BotBehavior.ts @@ -0,0 +1,140 @@ +import { + AllianceRequest, + Game, + Player, + PlayerType, + Relation, + TerraNullius, + Tick, +} from "../../game/Game"; +import { PseudoRandom } from "../../PseudoRandom"; +import { AttackExecution } from "../AttackExecution"; +import { EmojiExecution } from "../EmojiExecution"; + +export class BotBehavior { + private enemy: Player | null = null; + private enemyUpdated: Tick; + + constructor( + private random: PseudoRandom, + private game: Game, + private player: Player, + private attackRatio: number, + ) {} + + handleAllianceRequests() { + for (const req of this.player.incomingAllianceRequests()) { + if (shouldAcceptAllianceRequest(this.player, req)) { + req.accept(); + } else { + req.reject(); + } + } + } + + private emoji(player: Player, emoji: string) { + if (player.type() !== PlayerType.Human) return; + this.game.addExecution( + new EmojiExecution(this.player.id(), player.id(), emoji), + ); + } + + assistAllies() { + outer: for (const ally of this.player.allies()) { + if (ally.targets().length === 0) continue; + if (this.player.relation(ally) < Relation.Friendly) { + // this.emoji(ally, "🤦"); + continue; + } + for (const target of ally.targets()) { + if (target === this.player) { + // this.emoji(ally, "💀"); + continue; + } + if (this.player.isAlliedWith(target)) { + // this.emoji(ally, "👎"); + continue; + } + // All checks passed, assist them + this.player.updateRelation(ally, -20); + this.enemy = target; + this.enemyUpdated = this.game.ticks(); + this.emoji(ally, "👍"); + break outer; + } + } + } + + selectEnemy(): Player | null { + // Forget old enemies + if (this.game.ticks() - this.enemyUpdated > 100) { + this.enemy = null; + } + + // Prefer neighboring bots + if (this.enemy === null) { + const bots = this.player + .neighbors() + .filter((n) => n.isPlayer() && n.type() === PlayerType.Bot) as Player[]; + if (bots.length > 0) { + const density = (p: Player) => p.troops() / p.numTilesOwned(); + this.enemy = bots.sort((a, b) => density(a) - density(b))[0]; + this.enemyUpdated = this.game.ticks(); + } + } + + // Select the most hated player + if (this.enemy === null) { + const mostHated = this.player.allRelationsSorted()[0] ?? null; + if (mostHated != null && mostHated.relation === Relation.Hostile) { + this.enemy = mostHated.player; + this.enemyUpdated = this.game.ticks(); + } + } + + // Sanity check, don't attack our allies or teammates + if (this.enemy && this.player.isFriendly(this.enemy)) { + this.enemy = null; + } + return this.enemy; + } + + selectRandomEnemy(): Player | TerraNullius | null { + const neighbors = this.player.neighbors(); + for (const neighbor of this.random.shuffleArray(neighbors)) { + if (neighbor.isPlayer()) { + if (this.player.isFriendly(neighbor)) continue; + if (neighbor.type() == PlayerType.FakeHuman) { + if (this.random.chance(2)) { + continue; + } + } + } + return neighbor; + } + return null; + } + + sendAttack(target: Player | TerraNullius) { + if (target.isPlayer() && this.player.isOnSameTeam(target)) return; + const troops = this.player.troops() * this.attackRatio; + if (troops < 1) return; + this.game.addExecution( + new AttackExecution( + troops, + this.player.id(), + target.isPlayer() ? target.id() : null, + ), + ); + } +} + +function shouldAcceptAllianceRequest(player: Player, request: AllianceRequest) { + const notTraitor = !request.requestor().isTraitor(); + const noMalice = player.relation(request.requestor()) >= Relation.Neutral; + const requestorIsMuchLarger = + request.requestor().numTilesOwned() > player.numTilesOwned() * 3; + const notTooManyAlliances = + requestorIsMuchLarger || request.requestor().alliances().length < 3; + return notTraitor && noMalice && notTooManyAlliances; +} diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts index 0b2093e35..07bd4193a 100644 --- a/src/core/game/Game.ts +++ b/src/core/game/Game.ts @@ -315,6 +315,7 @@ export interface Player { // State & Properties isAlive(): boolean; isTraitor(): boolean; + markTraitor(): void; largestClusterBoundingBox: { min: Cell; max: Cell } | null; lastTileChange(): Tick; @@ -348,6 +349,7 @@ export interface Player { // Units units(...types: UnitType[]): Unit[]; unitsIncludingConstruction(type: UnitType): Unit[]; + buildableUnits(tile: TileRef): BuildableUnit[]; canBuild(type: UnitType, targetTile: TileRef): TileRef | false; buildUnit( type: UnitType, diff --git a/src/core/game/GameImpl.ts b/src/core/game/GameImpl.ts index 8a1051fb3..06bcc57ba 100644 --- a/src/core/game/GameImpl.ts +++ b/src/core/game/GameImpl.ts @@ -518,7 +518,7 @@ export class GameImpl implements Game { ); } if (!other.isTraitor()) { - (breaker as PlayerImpl).isTraitor_ = true; + breaker.markTraitor(); } const breakerSet = new Set(breaker.alliances()); diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts index 256147699..837ccfa19 100644 --- a/src/core/game/PlayerImpl.ts +++ b/src/core/game/PlayerImpl.ts @@ -20,6 +20,7 @@ import { AllianceRequest, AllPlayers, Attack, + BuildableUnit, Cell, EmojiMessage, GameMode, @@ -70,7 +71,7 @@ export class PlayerImpl implements Player { private _defensivePosture: "retreat" | "balanced" | "hold" = "balanced"; - isTraitor_ = false; + markedTraitorTick = -1; private embargoes: Set = new Set(); @@ -246,7 +247,7 @@ export class PlayerImpl implements Player { const ns: Set = new Set(); for (const border of this.borderTiles()) { for (const neighbor of this.mg.map().neighbors(border)) { - if (this.mg.map().isLake(neighbor)) { + if (this.mg.map().isLand(neighbor)) { const owner = this.mg.map().ownerID(neighbor); if (owner != this.smallID()) { ns.add( @@ -375,7 +376,14 @@ export class PlayerImpl implements Player { } isTraitor(): boolean { - return this.isTraitor_; + return ( + this.markedTraitorTick >= 0 && + this.mg.ticks() - this.markedTraitorTick < + this.mg.config().traitorDuration() + ); + } + markTraitor(): void { + this.markedTraitorTick = this.mg.ticks(); } createAllianceRequest(recipient: Player): AllianceRequest { @@ -730,7 +738,22 @@ export class PlayerImpl implements Player { return b; } - canBuild(unitType: UnitType, targetTile: TileRef): TileRef | false { + public buildableUnits(tile: TileRef): BuildableUnit[] { + const validTiles = this.validStructureSpawnTiles(tile); + return Object.values(UnitType).map((u) => { + return { + type: u, + canBuild: this.canBuild(u, tile, validTiles) != false, + cost: this.mg.config().unitInfo(u).cost(this), + } as BuildableUnit; + }); + } + + canBuild( + unitType: UnitType, + targetTile: TileRef, + validTiles: TileRef[] | null = null, + ): TileRef | false { // prevent the building of nukes and nuke related buildings if (this.mg.config().disableNukes()) { if ( @@ -762,7 +785,7 @@ export class PlayerImpl implements Player { case UnitType.MIRVWarhead: return targetTile; case UnitType.Port: - return this.portSpawn(targetTile); + return this.portSpawn(targetTile, validTiles); case UnitType.Warship: return this.warshipSpawn(targetTile); case UnitType.Shell: @@ -777,7 +800,7 @@ export class PlayerImpl implements Player { case UnitType.SAMLauncher: case UnitType.City: case UnitType.Construction: - return this.landBasedStructureSpawn(targetTile); + return this.landBasedStructureSpawn(targetTile, validTiles); default: assertNever(unitType); } @@ -803,7 +826,7 @@ export class PlayerImpl implements Player { return spawns[0].tile(); } - portSpawn(tile: TileRef): TileRef | false { + portSpawn(tile: TileRef, validTiles: TileRef[]): TileRef | false { const spawns = Array.from( this.mg.bfs( tile, @@ -815,10 +838,15 @@ export class PlayerImpl implements Player { (a, b) => this.mg.manhattanDist(a, tile) - this.mg.manhattanDist(b, tile), ); - if (spawns.length == 0) { - return false; + const validTileSet = new Set( + validTiles ?? this.validStructureSpawnTiles(tile), + ); + for (const t of spawns) { + if (validTileSet.has(t)) { + return t; + } } - return spawns[0]; + return false; } warshipSpawn(tile: TileRef): TileRef | false { @@ -836,11 +864,54 @@ export class PlayerImpl implements Player { return spawns[0].tile(); } - landBasedStructureSpawn(tile: TileRef): TileRef | false { - if (this.mg.owner(tile) != this) { + landBasedStructureSpawn( + tile: TileRef, + validTiles: TileRef[] | null = null, + ): TileRef | false { + const tiles = validTiles ?? this.validStructureSpawnTiles(tile); + if (tiles.length == 0) { return false; } - return tile; + return tiles[0]; + } + + private validStructureSpawnTiles(tile: TileRef): TileRef[] { + if (this.mg.owner(tile) != this) { + return []; + } + const searchRadius = 15; + const searchRadiusSquared = searchRadius ** 2; + const types = Object.values(UnitType).filter((unitTypeValue) => { + return this.mg.config().unitInfo(unitTypeValue).territoryBound; + }); + + const nearbyUnits = this.mg + .nearbyUnits(tile, searchRadius * 2, types) + .map((u) => u.unit); + const nearbyTiles = this.mg.bfs(tile, (gm, t) => { + return ( + this.mg.euclideanDistSquared(tile, t) < searchRadiusSquared && + gm.ownerID(t) == this.smallID() + ); + }); + const validSet: Set = new Set(nearbyTiles); + + const minDistSquared = this.mg.config().structureMinDist() ** 2; + for (const t of nearbyTiles) { + for (const unit of nearbyUnits) { + if (this.mg.euclideanDistSquared(unit.tile(), t) < minDistSquared) { + validSet.delete(t); + break; + } + } + } + const valid = Array.from(validSet); + valid.sort( + (a, b) => + this.mg.euclideanDistSquared(a, tile) - + this.mg.euclideanDistSquared(b, tile), + ); + return valid; } transportShipSpawn(targetTile: TileRef): TileRef | false { diff --git a/src/core/game/UnitImpl.ts b/src/core/game/UnitImpl.ts index ac5b80fc6..f0dd2796d 100644 --- a/src/core/game/UnitImpl.ts +++ b/src/core/game/UnitImpl.ts @@ -141,7 +141,7 @@ export class UnitImpl implements Unit { this._active = false; this.mg.addUpdate(this.toUpdate()); this.mg.removeUnit(this); - if (displayMessage) { + if (displayMessage && this.type() != UnitType.MIRVWarhead) { this.mg.displayMessage( `Your ${this.type()} was destroyed`, MessageType.ERROR, diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index 3e9258e03..91beb160a 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -81,25 +81,25 @@ export class MapPlaylist { // Big Maps are those larger than ~2.5 mil pixels case PlaylistType.BigMaps: return { - Europe: 3, - NorthAmerica: 2, + Europe: 2, + NorthAmerica: 1, Africa: 2, Britannia: 1, GatewayToTheAtlantic: 2, - Australia: 1, - Iceland: 1, - SouthAmerica: 3, + Australia: 2, + Iceland: 2, + SouthAmerica: 1, KnownWorld: 2, }; case PlaylistType.SmallMaps: return { - World: 1, + World: 4, Mena: 2, Pangaea: 1, Asia: 1, Mars: 1, - BetweenTwoSeas: 3, - Japan: 3, + BetweenTwoSeas: 2, + Japan: 2, BlackSea: 1, FaroeIslands: 2, }; diff --git a/tests/SAM.test.ts b/tests/SAM.test.ts index 4f63f9274..b3600310b 100644 --- a/tests/SAM.test.ts +++ b/tests/SAM.test.ts @@ -1,4 +1,4 @@ -import { NukeExecution } from "../src/core/execution/NukeExecution"; +import { SAMLauncherExecution } from "../src/core/execution/SAMLauncherExecution"; import { SpawnExecution } from "../src/core/execution/SpawnExecution"; import { Game, @@ -7,32 +7,13 @@ import { PlayerType, UnitType, } from "../src/core/game/Game"; -import { TileRef } from "../src/core/game/GameMap"; import { setup } from "./util/Setup"; -import { constructionExecution } from "./util/utils"; +import { constructionExecution, executeTicks } from "./util/utils"; let game: Game; let attacker: Player; let defender: Player; -function attackerBuildsNuke( - source: TileRef, - target: TileRef, - initialize = true, -) { - game.addExecution( - new NukeExecution(UnitType.AtomBomb, attacker.id(), target, source), - ); - if (initialize) { - game.executeNextTick(); - game.executeNextTick(); - } -} - -function defenderBuildsSam(x: number, y: number) { - constructionExecution(game, defender.id(), x, y, UnitType.SAMLauncher); -} - describe("SAM", () => { beforeEach(async () => { game = await setup("Plains", { infiniteGold: true, instantBuild: true }); @@ -69,62 +50,56 @@ describe("SAM", () => { }); test("one sam should take down one nuke", async () => { - defenderBuildsSam(1, 1); - attackerBuildsNuke(game.ref(7, 7), game.ref(1, 1)); - expect(attacker.units(UnitType.AtomBomb)).toHaveLength(1); + const sam = defender.buildUnit(UnitType.SAMLauncher, 0, game.ref(1, 1)); + game.addExecution(new SAMLauncherExecution(defender.id(), null, sam)); + attacker.buildUnit(UnitType.AtomBomb, 0, game.ref(1, 1)); + + executeTicks(game, 3); - game.executeNextTick(); - game.executeNextTick(); expect(attacker.units(UnitType.AtomBomb)).toHaveLength(0); }); test("sam should only get one nuke at a time", async () => { - defenderBuildsSam(1, 1); - attackerBuildsNuke(game.ref(7, 7), game.ref(1, 1), false); - attackerBuildsNuke(game.ref(7, 7), game.ref(1, 1)); + const sam = defender.buildUnit(UnitType.SAMLauncher, 0, game.ref(1, 1)); + game.addExecution(new SAMLauncherExecution(defender.id(), null, sam)); + attacker.buildUnit(UnitType.AtomBomb, 0, game.ref(2, 1)); + attacker.buildUnit(UnitType.AtomBomb, 0, game.ref(1, 2)); expect(attacker.units(UnitType.AtomBomb)).toHaveLength(2); - game.executeNextTick(); - game.executeNextTick(); + executeTicks(game, 3); + expect(attacker.units(UnitType.AtomBomb)).toHaveLength(1); }); test("sam should cooldown as long as configured", async () => { - defenderBuildsSam(1, 1); - expect(defender.units(UnitType.SAMLauncher)[0].isCooldown()).toBeFalsy(); - attackerBuildsNuke(game.ref(7, 7), game.ref(1, 1)); - expect(attacker.units(UnitType.AtomBomb)).toHaveLength(1); + const sam = defender.buildUnit(UnitType.SAMLauncher, 0, game.ref(1, 1)); + game.addExecution(new SAMLauncherExecution(defender.id(), null, sam)); + expect(sam.isCooldown()).toBeFalsy(); + const nuke = attacker.buildUnit(UnitType.AtomBomb, 0, game.ref(1, 2)); - game.executeNextTick(); - game.executeNextTick(); - expect(attacker.units(UnitType.AtomBomb)).toHaveLength(0); + executeTicks(game, 3); + expect(nuke.isActive()).toBeFalsy(); for (let i = 0; i < game.config().SAMCooldown() - 2; i++) { game.executeNextTick(); - expect(defender.units(UnitType.SAMLauncher)[0].isCooldown()).toBeTruthy(); + expect(sam.isCooldown()).toBeTruthy(); } - game.executeNextTick(); - expect(defender.units(UnitType.SAMLauncher)[0].isCooldown()).toBeFalsy(); + executeTicks(game, 2); + + expect(sam.isCooldown()).toBeFalsy(); }); test("two sams should not target twice same nuke", async () => { - defenderBuildsSam(1, 1); - defenderBuildsSam(1, 2); - attackerBuildsNuke(game.ref(7, 7), game.ref(1, 1)); + const sam1 = defender.buildUnit(UnitType.SAMLauncher, 0, game.ref(1, 1)); + game.addExecution(new SAMLauncherExecution(defender.id(), null, sam1)); + const sam2 = defender.buildUnit(UnitType.SAMLauncher, 0, game.ref(1, 2)); + game.addExecution(new SAMLauncherExecution(defender.id(), null, sam2)); + const nuke = attacker.buildUnit(UnitType.AtomBomb, 0, game.ref(2, 2)); - expect(defender.units(UnitType.SAMLauncher)).toHaveLength(2); - expect(attacker.units(UnitType.AtomBomb)).toHaveLength(1); + executeTicks(game, 3); - game.executeNextTick(); - game.executeNextTick(); - - expect(attacker.units(UnitType.AtomBomb)).toHaveLength(0); - const sams = defender.units(UnitType.SAMLauncher); - // Only one sam must have shot - expect( - (sams[0].isCooldown() && !sams[1].isCooldown()) || - (sams[1].isCooldown() && !sams[0].isCooldown()), - ).toBe(true); + expect(nuke.isActive()).toBeFalsy(); + expect([sam1, sam2].filter((s) => s.isCooldown())).toHaveLength(1); }); }); diff --git a/tests/util/utils.ts b/tests/util/utils.ts index 34210b9d8..aa1b7a05d 100644 --- a/tests/util/utils.ts +++ b/tests/util/utils.ts @@ -28,3 +28,9 @@ export function constructionExecution( game.executeNextTick(); } } + +export function executeTicks(game: Game, numTicks: number): void { + for (let i = 0; i < numTicks; i++) { + game.executeNextTick(); + } +}