Merge pull request #100 from d3n0x8/scrollAttackRatio

add shift + scroll command in HelpModal hotkeys table

src/core/execution/EmbargoExecution.ts

@@ -0,0 +1,44 @@
+import { consolex } from "../Consolex";
+import { Execution, Game, Player, PlayerID } from "../game/Game";
+
+export class EmbargoExecution implements Execution {
+  private active = true;
+
+  constructor(
+    private player: Player,
+    private targetID: PlayerID,
+    private readonly action: "start" | "stop",
+  ) {}
+
+  init(mg: Game, _: number): void {
+    if (!mg.hasPlayer(this.player.id())) {
+      console.warn(`EmbargoExecution: sender ${this.player.id()} not found`);
+      this.active = false;
+      return;
+    }
+    if (!mg.hasPlayer(this.targetID)) {
+      console.warn(`EmbargoExecution recipient ${this.targetID} not found`);
+      this.active = false;
+      return;
+    }
+  }
+
+  tick(_: number): void {
+    if (this.action == "start") this.player.addEmbargo(this.targetID);
+    else this.player.stopEmbargo(this.targetID);
+
+    this.active = false;
+  }
+
+  owner(): Player {
+    return null;
+  }
+
+  isActive(): boolean {
+    return this.active;
+  }
+
+  activeDuringSpawnPhase(): boolean {
+    return false;
+  }
+}

src/core/execution/ExecutionManager.ts

@@ -34,6 +34,7 @@ import { SetTargetTroopRatioExecution } from "./SetTargetTroopRatioExecution";
 import { ConstructionExecution } from "./ConstructionExecution";
 import { fixProfaneUsername, isProfaneUsername } from "../validations/username";
 import { NoOpExecution } from "./NoOpExecution";
+import { EmbargoExecution } from "./EmbargoExecution";
 
 export class Executor {
   // private random = new PseudoRandom(999)
@@ -53,6 +54,7 @@ export class Executor {
   }
 
   createExec(intent: Intent): Execution {
+    let player: Player;
     if (intent.type != "spawn") {
       if (!this.mg.hasPlayer(intent.playerID)) {
         console.warn(
@@ -60,7 +62,7 @@ export class Executor {
         );
         return new NoOpExecution();
       }
-      const player = this.mg.player(intent.playerID);
+      player = this.mg.player(intent.playerID);
       if (player.clientID() != intent.clientID) {
         console.warn(
           `intent ${intent.type} has incorrect clientID ${intent.clientID} for player ${player.name()} with clientID ${player.clientID()}`,
@@ -68,6 +70,7 @@ export class Executor {
         return new NoOpExecution();
       }
     }
+
     switch (intent.type) {
       case "attack": {
         return new AttackExecution(
@@ -124,6 +127,8 @@ export class Executor {
         );
       case "troop_ratio":
         return new SetTargetTroopRatioExecution(intent.playerID, intent.ratio);
+      case "embargo":
+        return new EmbargoExecution(player, intent.targetID, intent.action);
       case "build_unit":
         return new ConstructionExecution(
           intent.playerID,

src/core/execution/PortExecution.ts

@@ -69,22 +69,20 @@ export class PortExecution implements Execution {
       return;
     }
 
-    const alliedPorts = this.player()
-      .alliances()
-      .map((a) => a.other(this.player()))
+    const tradingPartnersPorts = this.player()
+      .tradingPartners()
       .flatMap((p) => p.units(UnitType.Port));
-    const alliedPortsSet = new Set(alliedPorts);
+    const tradingPartnersPortsSet = new Set(tradingPartnersPorts);
 
-    const allyConnections = new Set(
+    const tradingPartnersConnections = new Set(
       Array.from(this.portPaths.keys()).map((p) => p.owner()),
     );
-    allyConnections;
 
-    for (const port of alliedPorts) {
-      if (allyConnections.has(port.owner())) {
+    for (const port of tradingPartnersPorts) {
+      if (tradingPartnersConnections.has(port.owner())) {
         continue;
       }
-      allyConnections.add(port.owner());
+      tradingPartnersConnections.add(port.owner());
       if (this.computingPaths.has(port)) {
         const aStar = this.computingPaths.get(port);
         switch (aStar.compute()) {
@@ -114,7 +112,7 @@ export class PortExecution implements Execution {
     }
 
     for (const port of this.portPaths.keys()) {
-      if (!port.isActive() || !alliedPortsSet.has(port)) {
+      if (!port.isActive() || !tradingPartnersPortsSet.has(port)) {
         this.portPaths.delete(port);
         this.computingPaths.delete(port);
       }

src/core/execution/TradeShipExecution.ts

@@ -27,7 +27,7 @@ export class TradeShipExecution implements Execution {
   constructor(
     private _owner: PlayerID,
     private srcPort: Unit,
-    private dstPort: Unit,
+    private _dstPort: Unit,
     private pathFinder: PathFinder,
     // don't modify
     private path: TileRef[],
@@ -49,7 +49,12 @@ export class TradeShipExecution implements Execution {
         this.active = false;
         return;
       }
-      this.tradeShip = this.origOwner.buildUnit(UnitType.TradeShip, 0, spawn);
+      this.tradeShip = this.origOwner.buildUnit(
+        UnitType.TradeShip,
+        0,
+        spawn,
+        this._dstPort,
+      );
     }
 
     if (!this.tradeShip.isActive()) {
@@ -64,8 +69,8 @@ export class TradeShipExecution implements Execution {
 
     if (
       !this.wasCaptured &&
-      (!this.dstPort.isActive() ||
-        !this.tradeShip.owner().isAlliedWith(this.dstPort.owner()))
+      (!this._dstPort.isActive() ||
+        !this.tradeShip.owner().canTrade(this._dstPort.owner()))
     ) {
       this.tradeShip.delete(false);
       this.active = false;
@@ -122,17 +127,17 @@ export class TradeShipExecution implements Execution {
       const gold = this.mg
         .config()
         .tradeShipGold(
-          this.mg.manhattanDist(this.srcPort.tile(), this.dstPort.tile()),
+          this.mg.manhattanDist(this.srcPort.tile(), this._dstPort.tile()),
         );
       this.srcPort.owner().addGold(gold);
-      this.dstPort.owner().addGold(gold);
+      this._dstPort.owner().addGold(gold);
       this.mg.displayMessage(
         `Received ${renderNumber(gold)} gold from trade with ${this.srcPort.owner().displayName()}`,
         MessageType.SUCCESS,
-        this.dstPort.owner().id(),
+        this._dstPort.owner().id(),
       );
       this.mg.displayMessage(
-        `Received ${renderNumber(gold)} gold from trade with ${this.dstPort.owner().displayName()}`,
+        `Received ${renderNumber(gold)} gold from trade with ${this._dstPort.owner().displayName()}`,
         MessageType.SUCCESS,
         this.srcPort.owner().id(),
       );
@@ -154,4 +159,8 @@ export class TradeShipExecution implements Execution {
   activeDuringSpawnPhase(): boolean {
     return false;
   }
+
+  dstPort(): TileRef {
+    return this._dstPort.tile();
+  }
 }

src/core/execution/WarshipExecution.ts

@@ -78,7 +78,11 @@ export class WarshipExecution implements Execution {
       .filter((u) => u.owner() != this.warship.owner())
       .filter((u) => u != this.warship)
       .filter((u) => !u.owner().isAlliedWith(this.warship.owner()))
-      .filter((u) => !this.alreadySentShell.has(u));
+      .filter((u) => !this.alreadySentShell.has(u))
+      .filter(
+        (u) =>
+          u.type() != UnitType.TradeShip || u.dstPort().owner() != this.owner(),
+      );
 
     this.target =
       ships.sort((a, b) => {