Merge remote-tracking branch 'origin' into meta3AI

src/client/graphics/layers/NameLayer.ts

@@ -4,6 +4,7 @@ import crownIcon from "../../../../resources/images/CrownIcon.svg";
 import embargoIcon from "../../../../resources/images/EmbargoIcon.svg";
 import nukeRedIcon from "../../../../resources/images/NukeIconRed.svg";
 import nukeWhiteIcon from "../../../../resources/images/NukeIconWhite.svg";
+import shieldIcon from "../../../../resources/images/ShieldIconBlack.svg";
 import targetIcon from "../../../../resources/images/TargetIcon.svg";
 import traitorIcon from "../../../../resources/images/TraitorIcon.svg";
 import { PseudoRandom } from "../../../core/PseudoRandom";
@@ -11,7 +12,7 @@ import { ClientID } from "../../../core/Schemas";
 import { Theme } from "../../../core/configuration/Config";
 import { AllPlayers, Cell, nukeTypes } from "../../../core/game/Game";
 import { GameView, PlayerView } from "../../../core/game/GameView";
-import { createCanvas, renderTroops } from "../../Utils";
+import { createCanvas, renderNumber, renderTroops } from "../../Utils";
 import { TransformHandler } from "../TransformHandler";
 import { Layer } from "./Layer";
 
@@ -44,6 +45,7 @@ export class NameLayer implements Layer {
   private embargoIconImage: HTMLImageElement;
   private nukeWhiteIconImage: HTMLImageElement;
   private nukeRedIconImage: HTMLImageElement;
+  private shieldIconImage: HTMLImageElement;
   private container: HTMLDivElement;
   private myPlayer: PlayerView | null = null;
   private firstPlace: PlayerView | null = null;
@@ -70,6 +72,8 @@ export class NameLayer implements Layer {
     this.nukeWhiteIconImage.src = nukeWhiteIcon;
     this.nukeRedIconImage = new Image();
     this.nukeRedIconImage.src = nukeRedIcon;
+    this.shieldIconImage = new Image();
+    this.shieldIconImage.src = shieldIcon;
   }
 
   resizeCanvas() {
@@ -210,6 +214,19 @@ export class NameLayer implements Layer {
     troopsDiv.style.marginTop = "-5%";
     element.appendChild(troopsDiv);
 
+    const shieldDiv = document.createElement("div");
+    shieldDiv.classList.add("player-shield");
+    shieldDiv.style.zIndex = "3";
+    shieldDiv.style.marginTop = "-5%";
+    shieldDiv.style.display = "flex";
+    shieldDiv.style.alignItems = "center";
+    shieldDiv.style.gap = "0px";
+    shieldDiv.innerHTML = `
+      <img src="${this.shieldIconImage.src}" style="width: 16px; height: 16px;" />
+      <span style="color: black; font-size: 10px; margin-top: -2px;">0</span>
+    `;
+    element.appendChild(shieldDiv);
+
     // Start off invisible so it doesn't flash at 0,0
     element.style.display = "none";
 
@@ -274,6 +291,24 @@ export class NameLayer implements Layer {
     troopsDiv.style.color = render.fontColor;
     troopsDiv.textContent = renderTroops(render.player.troops());
 
+    const density = renderNumber(
+      render.player.troops() / render.player.numTilesOwned(),
+    );
+    const shieldDiv = render.element.querySelector(
+      ".player-shield",
+    ) as HTMLDivElement;
+    const shieldImg = shieldDiv.querySelector("img");
+    const shieldNumber = shieldDiv.querySelector("span");
+    if (shieldImg) {
+      shieldImg.style.width = `${render.fontSize * 0.8}px`;
+      shieldImg.style.height = `${render.fontSize * 0.8}px`;
+    }
+    if (shieldNumber) {
+      shieldNumber.style.fontSize = `${render.fontSize * 0.6}px`;
+      shieldNumber.style.marginTop = `${-render.fontSize * 0.1}px`;
+      shieldNumber.textContent = density;
+    }
+
     // Handle icons
     const iconsDiv = render.element.querySelector(
       ".player-icons",

src/client/graphics/layers/UnitLayer.ts

@@ -425,7 +425,13 @@ export class UnitLayer implements Layer {
     let alternateViewColor = null;
 
     if (this.alternateView) {
-      const rel = this.relationship(unit);
+      let rel = this.relationship(unit);
+      if (unit.type() == UnitType.TradeShip && unit.dstPortId() != null) {
+        const target = this.game.unit(unit.dstPortId())?.owner();
+        if (this.game.myPlayer() != null && this.game.myPlayer() == target) {
+          rel = Relationship.Self;
+        }
+      }
       switch (rel) {
         case Relationship.Self:
           alternateViewColor = this.theme.selfColor();

src/core/execution/ShellExecution.ts

@@ -1,12 +1,11 @@
-import { consolex } from "../Consolex";
 import { Execution, Game, Player, Unit, UnitType } from "../game/Game";
 import { TileRef } from "../game/GameMap";
-import { PathFindResultType } from "../pathfinding/AStar";
-import { PathFinder } from "../pathfinding/PathFinding";
+import { AirPathFinder } from "../pathfinding/PathFinding";
+import { PseudoRandom } from "../PseudoRandom";
 
 export class ShellExecution implements Execution {
   private active = true;
-  private pathFinder: PathFinder;
+  private pathFinder: AirPathFinder;
   private shell: Unit;
   private mg: Game;
   private destroyAtTick: number = -1;
@@ -19,7 +18,7 @@ export class ShellExecution implements Execution {
   ) {}
 
   init(mg: Game, ticks: number): void {
-    this.pathFinder = PathFinder.Mini(mg, 2000, 10);
+    this.pathFinder = new AirPathFinder(mg, new PseudoRandom(mg.ticks()));
     this.mg = mg;
   }
 
@@ -49,24 +48,14 @@ export class ShellExecution implements Execution {
       const result = this.pathFinder.nextTile(
         this.shell.tile(),
         this.target.tile(),
-        3,
       );
-      switch (result.type) {
-        case PathFindResultType.Completed:
-          this.active = false;
-          this.target.modifyHealth(-this.effectOnTarget());
-          this.shell.delete(false);
-          return;
-        case PathFindResultType.NextTile:
-          this.shell.move(result.tile);
-          break;
-        case PathFindResultType.Pending:
-          return;
-        case PathFindResultType.PathNotFound:
-          consolex.log(`Shell ${this.shell} could not find target`);
-          this.active = false;
-          this.shell.delete(false);
-          return;
+      if (result === true) {
+        this.active = false;
+        this.target.modifyHealth(-this.effectOnTarget());
+        this.shell.delete(false);
+        return;
+      } else {
+        this.shell.move(result);
       }
     }
   }