- ${modalHeader({
- title: translateText("clan_modal.title"),
- onBack: () => this.close(),
- ariaLabel: translateText("common.back"),
- })}
- ${this.renderLoadingSpinner()}
-
- `;
+ return this.renderLoadingSpinner();
}
if (this.view === "my-requests") {
@@ -181,6 +259,7 @@ export class ClanModal extends BaseModal {
this.selectedClan = null;
this.selectedClanTag = "";
this.myRole = null;
+ this.detailCache = null;
this.view = "list";
this.loadMyClans();
}}
@@ -273,6 +352,7 @@ export class ClanModal extends BaseModal {
this.selectedClan = null;
this.selectedClanTag = "";
this.myRole = null;
+ this.detailCache = null;
this.view = "list";
this.loadMyClans();
}}
@@ -289,30 +369,20 @@ export class ClanModal extends BaseModal {
>`;
}
- // List view (tabs + my clans / browse)
+ // List view (my clans / browse) — header + tabs are rendered by o-modal
return html`
-
+
${hasRequests ? this.renderPendingRequestsButton() : ""}
${this.myClans.map(
(clan) => html`
diff --git a/src/client/ClientGameRunner.ts b/src/client/ClientGameRunner.ts
index 7fd16a306..51f29e6fd 100644
--- a/src/client/ClientGameRunner.ts
+++ b/src/client/ClientGameRunner.ts
@@ -13,7 +13,12 @@ import {
import { createPartialGameRecord, findClosestBy, replacer } from "../core/Util";
import { ServerConfig } from "../core/configuration/Config";
import { getGameLogicConfig } from "../core/configuration/ConfigLoader";
-import { BuildableUnit, Structures, UnitType } from "../core/game/Game";
+import {
+ BuildableUnit,
+ PlayerType,
+ Structures,
+ UnitType,
+} from "../core/game/Game";
import { TileRef } from "../core/game/GameMap";
import { GameMapLoader } from "../core/game/GameMapLoader";
import {
@@ -34,6 +39,7 @@ import {
DoBreakAllianceEvent,
DoGroundAttackEvent,
DoRequestAllianceEvent,
+ DoRetaliateAttackEvent,
InputHandler,
MouseMoveEvent,
MouseUpEvent,
@@ -237,7 +243,7 @@ async function createClientGame(
userSettings,
lobbyConfig.gameRecord !== undefined,
);
- let gameMap: TerrainMapData | null = null;
+ let gameMap: TerrainMapData;
if (terrainLoad) {
gameMap = await terrainLoad;
@@ -391,6 +397,10 @@ export class ClientGameRunner {
DoGroundAttackEvent,
this.doGroundAttackUnderCursor.bind(this),
);
+ this.eventBus.on(
+ DoRetaliateAttackEvent,
+ this.doRetaliateAttackMostRecent.bind(this),
+ );
this.eventBus.on(
DoRequestAllianceEvent,
this.doRequestAllianceUnderCursor.bind(this),
@@ -783,6 +793,41 @@ export class ClientGameRunner {
});
}
+ private doRetaliateAttackMostRecent(): void {
+ if (!this.isActive || this.gameView.inSpawnPhase()) {
+ return;
+ }
+
+ if (this.myPlayer === null) {
+ if (!this.clientID) return;
+ const myPlayer = this.gameView.playerByClientID(this.clientID);
+ if (myPlayer === null) return;
+ this.myPlayer = myPlayer;
+ }
+
+ const incomingAttacks = this.myPlayer.incomingAttacks().filter((a) => {
+ const t = (
+ this.gameView.playerBySmallID(a.attackerID) as PlayerView
+ ).type();
+ return t !== PlayerType.Bot;
+ });
+
+ if (incomingAttacks.length === 0) return;
+
+ const mostRecentAttack = incomingAttacks[incomingAttacks.length - 1];
+
+ const attacker = this.gameView.playerBySmallID(
+ mostRecentAttack.attackerID,
+ ) as PlayerView;
+ if (!attacker) return;
+
+ const counterTroops = Math.min(
+ mostRecentAttack.troops,
+ this.renderer.uiState.attackRatio * this.myPlayer.troops(),
+ );
+ this.eventBus.emit(new SendAttackIntentEvent(attacker.id(), counterTroops));
+ }
+
private doRequestAllianceUnderCursor(): void {
const tile = this.getTileUnderCursor();
if (tile === null) return;
diff --git a/src/client/FlagInput.ts b/src/client/FlagInput.ts
index 423c8608a..ce7790508 100644
--- a/src/client/FlagInput.ts
+++ b/src/client/FlagInput.ts
@@ -73,7 +73,7 @@ export class FlagInput extends LitElement {
return html`
@@ -128,19 +128,19 @@ export class GameModeSelector extends LitElement {
${this.renderSmallActionCard(
translateText("main.create"),
this.openHostLobby,
- "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-lobby-card-hover)]",
+ "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-action-card-hover)]",
)}
${!crazyGamesSDK.isOnCrazyGames()
? this.renderSmallActionCard(
translateText("mode_selector.ranked_title"),
this.openRankedMenu,
- "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-lobby-card-hover)]",
+ "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-action-card-hover)]",
)
: html`
`}
${this.renderSmallActionCard(
translateText("main.join"),
this.openJoinLobby,
- "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-lobby-card-hover)]",
+ "bg-surface hover:brightness-[1.08] active:brightness-[0.95] hover:scale-105 hover:shadow-[var(--shadow-action-card-hover)]",
)}
- ${modalHeader({
- titleContent: html`
-
-
- ${translateText("leaderboard_modal.title")}
-
- ${this.activeTab === "clans" ? dateRange : ""}
- ${this.activeTab === "players" ? refreshTime : ""}
-
- `,
- onBack: () => this.close(),
- ariaLabel: translateText("common.close"),
- })}
-
-
-
) =>
- this.handleTabChange(event.detail)}
- >
-
-
- ,
- ) => this.handleClanDateRangeChange(event)}
- >
-
-
-