Merge branch 'main' into testaskin

Author: ryanbarlow97

CODEOWNERS

@@ -1,4 +1,4 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-* @openfrontio/review-approver
+* @openfrontio/maintainer
 resources/lang @openfrontio/translation-approver
-resources/lang/en.json @openfrontio/review-approver
+resources/lang/en.json @openfrontio/maintainer

package-lock.json

@@ -11,7 +11,7 @@
     "dev:prod": "cross-env GAME_ENV=dev API_DOMAIN=api.openfront.io concurrently \"npm run start:client\" \"npm run start:server-dev\"",
     "docs:map-generator": "cd map-generator && go doc -cmd -u -all",
     "tunnel": "npm run build-prod && npm run start:server",
-    "test": "vitest run",
+    "test": "vitest run && vitest run tests/server",
     "perf": "npx tsx tests/perf/*.ts",
     "test:coverage": "vitest run --coverage",
     "format": "prettier --ignore-unknown --write .",
@@ -75,7 +75,7 @@
     "prettier-plugin-organize-imports": "^4.1.0",
     "prettier-plugin-sh": "^0.17.4",
     "protobufjs": "^7.5.3",
-    "sinon": "^21.0.0",
+    "sinon": "^21.0.1",
     "sinon-chai": "^4.0.0",
     "tailwindcss": "^4.1.18",
     "tsconfig-paths": "^4.2.0",

package.json

@@ -759,17 +759,12 @@ export class ClientGameRunner {
   private sendBoatAttackIntent(tile: TileRef) {
     if (!this.myPlayer) return;
 
-    this.myPlayer.bestTransportShipSpawn(tile).then((spawn: number | false) => {
-      if (this.myPlayer === null) throw new Error("not initialized");
-      this.eventBus.emit(
-        new SendBoatAttackIntentEvent(
-          this.gameView.owner(tile).id(),
-          tile,
-          this.myPlayer.troops() * this.renderer.uiState.attackRatio,
-          spawn === false ? null : spawn,
-        ),
-      );
-    });
+    this.eventBus.emit(
+      new SendBoatAttackIntentEvent(
+        tile,
+        this.myPlayer.troops() * this.renderer.uiState.attackRatio,
+      ),
+    );
   }
 
   private canAutoBoat(actions: PlayerActions, tile: TileRef): boolean {

src/client/ClientGameRunner.ts

@@ -75,13 +75,13 @@ export class LanguageModal extends BaseModal {
                   />
                   <div class="flex flex-col items-start min-w-0">
                     <span
-                      class="text-sm font-bold uppercase tracking-wider truncate w-full text-left ${isActive
+                      class="text-sm font-bold uppercase tracking-wider whitespace-normal break-words w-full text-left ${isActive
                         ? "text-white"
                         : "text-gray-200 group-hover:text-white"}"
                       >${lang.native}</span
                     >
                     <span
-                      class="text-xs text-white/40 uppercase tracking-widest group-hover:text-white/60 transition-colors truncate w-full text-left"
+                      class="text-xs text-white/40 uppercase tracking-widest group-hover:text-white/60 transition-colors whitespace-normal break-words w-full text-left"
                       >${lang.en}</span
                     >
                   </div>

src/client/LanguageModal.ts

@@ -589,12 +589,8 @@ class Client {
     const onHashUpdate = () => {
       // Reset the UI to its initial state
       this.joinModal?.close();
-      if (this.gameStop !== null) {
-        this.handleLeaveLobby();
-      }
 
-      // Attempt to join lobby
-      this.handleUrl();
+      onJoinChanged();
     };
 
     const onPopState = () => {
@@ -628,10 +624,19 @@ class Client {
       }
     };
 
+    const onJoinChanged = () => {
+      if (this.gameStop !== null) {
+        this.handleLeaveLobby();
+      }
+
+      // Attempt to join lobby
+      this.handleUrl();
+    };
+
     // Handle browser navigation & manual hash edits
     window.addEventListener("popstate", onPopState);
     window.addEventListener("hashchange", onHashUpdate);
-    window.addEventListener("join-changed", onHashUpdate);
+    window.addEventListener("join-changed", onJoinChanged);
 
     function updateSliderProgress(slider: HTMLInputElement) {
       const percent =

src/client/Main.ts

@@ -33,7 +33,7 @@ export class NewsModal extends BaseModal {
             [&_h1]:text-2xl [&_h1]:font-bold [&_h1]:mb-4 [&_h1]:text-white [&_h1]:border-b [&_h1]:border-white/10 [&_h1]:pb-2
             [&_h2]:text-xl [&_h2]:font-bold [&_h2]:mt-6 [&_h2]:mb-3 [&_h2]:text-blue-200
             [&_h3]:text-lg [&_h3]:font-semibold [&_h3]:mt-4 [&_h3]:mb-2 [&_h3]:text-blue-100
-            [&_ul]:pl-5 [&_ul]:list-disc [&_ul]:space-y-1
+            [&_ul]:pl-5 [&_ul]:my-3 [&_ul]:list-disc [&_ul]:space-y-1
             [&_li]:text-gray-300 [&_li]:leading-relaxed
             [&_p]:text-gray-300 [&_p]:mb-3 [&_strong]:text-white [&_strong]:font-bold
             scrollbar-thin scrollbar-thumb-white/20 scrollbar-track-transparent"

src/client/NewsModal.ts

@@ -81,10 +81,8 @@ export class SendAttackIntentEvent implements GameEvent {
 
 export class SendBoatAttackIntentEvent implements GameEvent {
   constructor(
-    public readonly targetID: PlayerID | null,
     public readonly dst: TileRef,
     public readonly troops: number,
-    public readonly src: TileRef | null = null,
   ) {}
 }
 
@@ -498,10 +496,8 @@ export class Transport {
     this.sendIntent({
       type: "boat",
       clientID: this.lobbyConfig.clientID,
-      targetID: event.targetID,
       troops: event.troops,
       dst: event.dst,
-      src: event.src,
     });
   }
 

src/client/Transport.ts

@@ -201,8 +201,7 @@ export class ControlPanel extends LitElement implements Layer {
               <span>
                 (${renderTroops(
                   (this.game?.myPlayer()?.troops() ?? 0) * this.attackRatio,
-                )}
-                )
+                )})
               </span>
             </span>
           </label>

src/client/graphics/layers/ControlPanel.ts

@@ -116,14 +116,25 @@ export class DynamicUILayer implements Layer {
   }
 
   onBombEvent(unit: UnitView) {
-    if (this.createdThisTick(unit) && this.isOwnedByPlayer(unit)) {
+    const myPlayer = this.game.myPlayer();
+    if (!myPlayer) {
+      return;
+    }
+    if (
+      this.createdThisTick(unit) &&
+      (unit.owner() === myPlayer || unit.owner().isOnSameTeam(myPlayer))
+    ) {
       const target = new NukeTelegraph(this.transformHandler, this.game, unit);
       this.uiElements.push(target);
     }
   }
 
   onTransportShipEvent(unit: UnitView) {
-    if (this.createdThisTick(unit) && this.isOwnedByPlayer(unit)) {
+    const myPlayer = this.game.myPlayer();
+    if (!myPlayer) {
+      return;
+    }
+    if (this.createdThisTick(unit) && unit.owner() === myPlayer) {
       const target = new NavalTarget(this.transformHandler, this.game, unit);
       this.uiElements.push(target);
     }
@@ -146,11 +157,6 @@ export class DynamicUILayer implements Layer {
     }
   }
 
-  private isOwnedByPlayer(unit: UnitView): boolean {
-    const my = this.game.myPlayer();
-    return my !== null && unit.owner() === my;
-  }
-
   private createdThisTick(unit: UnitView): boolean {
     return unit.createdAt() === this.game.ticks();
   }