Skip to content

feat (alliance cooldown) Add alliance request cooldown to main dial #4974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Luke-Dawes wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

feat (alliance cooldown) Add alliance request cooldown to main dial #4974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f0a6bd1
Add alliance request to main dial
Luke-Dawes Aug 12, 2026
efcdb73
fix unwanted changes
Luke-Dawes Aug 12, 2026
4ffca98
Formatting
Luke-Dawes Aug 12, 2026
7920d22
Fixed code rabbit issues
Luke-Dawes Aug 12, 2026
a6597a0
added early return if nothing changed
Luke-Dawes Aug 12, 2026
98dc90f
removed early exit for the non-square aspect ratio check, allowing th…
Luke-Dawes Aug 12, 2026
3c444fa
added Tests for core cooldown contract
Luke-Dawes Aug 12, 2026
a2b43e5
added text to translations and fixed race conditions
Luke-Dawes Aug 17, 2026
0cc6e56
reordered en.json for alphabetical order
Luke-Dawes Aug 17, 2026
d236d0f
use renderDuration instead of translate text to render numbers.
Luke-Dawes Aug 20, 2026
05e4337
fixed spelling mistake
Luke-Dawes Aug 27, 2026
2f9b9c1
fix claude code requests.
Luke-Dawes Aug 27, 2026
c0c32f6
remove a line for prettier
Luke-Dawes Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 174 additions & 63 deletions src/client/hud/layers/RadialMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { EventBus, GameEvent } from "../../../core/EventBus";
import { Controller } from "../../Controller";
import { CloseViewEvent } from "../../InputHandler";
import { PlaySoundEffectEvent } from "../../sound/Sounds";
import { getSvgAspectRatio, translateText } from "../../Utils";
import { getSvgAspectRatio, renderDuration, translateText } from "../../Utils";
import {
CenterButtonElement,
COLORS,
MenuElement,
MenuElementParams,
TooltipKey,
Expand Down Expand Up @@ -332,10 +333,19 @@ export class RadialMenu implements Controller {
.attr("d", arc)
.attr("fill", (d) => {
const disabled = this.params === null || d.data.disabled(this.params);
const color = disabled
? this.config.disabledColor
: (resolveColor(d.data, this.params) ?? "#1e3a5f");
const opacity = disabled ? 0.4 : 0.82;

const isAllianceCooldown =
d.data.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;

const color = isAllianceCooldown
? COLORS.allianceTimeLeft
: disabled
? this.config.disabledColor
: (resolveColor(d.data, this.params) ?? "#1e3a5f");

const opacity = isAllianceCooldown ? 0.82 : disabled ? 0.4 : 0.82;

if (d.data.id === this.selectedItemId && this.currentLevel > level) {
return color;
Expand All @@ -349,9 +359,17 @@ export class RadialMenu implements Controller {
? "not-allowed"
: "pointer",
)
.style("opacity", (d) =>
this.params === null || d.data.disabled(this.params) ? 0.5 : 1,
)

.style("opacity", (d) => {
const disabled = this.params === null || d.data.disabled(this.params);
const isAllianceCooldown =
d.data.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;
//to remove the fade down change 0.85 to 1
return isAllianceCooldown ? 0.85 : disabled ? 0.5 : 1;
})

.style(
"transition",
`filter ${this.config.menuTransitionDuration / 2}ms, fill ${this.config.menuTransitionDuration / 2}ms`,
Expand Down Expand Up @@ -419,11 +437,25 @@ export class RadialMenu implements Controller {
) {
path.attr("filter", "url(#glow)");

const color =
this.params === null || d.data.disabled(this.params)
const isAllianceCooldown =
d.data.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;
const color = isAllianceCooldown
? COLORS.allianceTimeLeft
: this.params === null || d.data.disabled(this.params)
? this.config.disabledColor
: (resolveColor(d.data, this.params) ?? "#1e3a5f");
path.attr("fill", color);

const opacity = isAllianceCooldown
? 0.82
: this.params === null || d.data.disabled(this.params)
? 0.4
: 0.82;
path.attr(
"fill",
d3.color(color)?.copy({ opacity: opacity })?.toString() ?? color,
);
}
});

Expand Down Expand Up @@ -484,10 +516,16 @@ export class RadialMenu implements Controller {
)
return;
path.style("filter", null);
const color = disabled
? this.config.disabledColor
: (resolveColor(d.data, this.params) ?? "#333333");
const opacity = disabled ? 0.4 : 0.82;
const isAllianceCooldown =
d.data.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;
const color = isAllianceCooldown
? COLORS.allianceTimeLeft
: disabled
? this.config.disabledColor
: (resolveColor(d.data, this.params) ?? "#333333");
const opacity = isAllianceCooldown ? 0.82 : disabled ? 0.4 : 0.82;

if (d.data.timerFraction) {
path.attr("fill", `url(#timer-gradient-${d.data.id})`);
Expand Down Expand Up @@ -596,6 +634,15 @@ export class RadialMenu implements Controller {
const contentId = d.data.id;
const content = d3.select(`g[data-id="${contentId}"]`);
const disabled = this.isItemDisabled(d.data);
const isAllianceCooldown =
d.data.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;

content.attr(
"data-cooldown-active",
isAllianceCooldown ? "true" : "false",
);

if (d.data.renderType && this.params) {
const stateKey = this.getStateKeyByType(
Expand Down Expand Up @@ -627,7 +674,7 @@ export class RadialMenu implements Controller {
.attr("fill", "white")
.attr("font-size", d.data.fontSize ?? "12px")
.attr("font-family", "Arial, sans-serif")
.style("opacity", disabled ? 0.5 : 1)
.style("opacity", isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1)
.text(d.data.text);
} else {
const imgSel = content
Expand All @@ -637,38 +684,45 @@ export class RadialMenu implements Controller {
.attr("height", this.config.iconSize)
.attr("x", arc.centroid(d)[0] - this.config.iconSize / 2)
.attr("y", arc.centroid(d)[1] - this.config.iconSize / 2)
.attr("opacity", disabled ? 0.5 : 1);
.attr("opacity", isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1);

getSvgAspectRatio(d.data.icon!).then((aspect) => {
if (!aspect || aspect === 1) return;

let width = this.config.iconSize;
let height = this.config.iconSize;
const biggerLength = Math.round(width * aspect);
if (aspect > 1) {
width = biggerLength;
} else {
height = biggerLength;

if (aspect !== null && aspect !== 1) {
const biggerLength = Math.round(width * aspect);

if (aspect > 1) {
width = biggerLength;
} else {
height = biggerLength;
}
}

imgSel
.attr("width", width)
.attr("height", height)
.attr("x", arc.centroid(d)[0] - width / 2)
.attr("y", arc.centroid(d)[1] - height / 2);
.attr(
"y",
isAllianceCooldown ? 42 : arc.centroid(d)[1] - height / 2,
);
});
Comment thread
Luke-Dawes marked this conversation as resolved.

if (this.params && d.data.cooldown?.(this.params)) {
const cooldown = Math.ceil(d.data.cooldown?.(this.params));

content
.append("text")
.attr("class", `cooldown-text`)
.text(cooldown + "s")
.text(renderDuration(cooldown))
.attr("fill", "white")
.attr("opacity", disabled ? 0.5 : 1)
.attr("font-size", "14px")
.attr("opacity", isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1)
.attr("font-size", "20px")
.attr("font-weight", "bold")
.attr("x", arc.centroid(d)[0] - this.config.iconSize / 4)
.attr("text-anchor", "middle")
.attr("x", arc.centroid(d)[0])
.attr("y", arc.centroid(d)[1] + this.config.iconSize / 2 + 7);
}
}
Expand Down Expand Up @@ -1119,20 +1173,25 @@ export class RadialMenu implements Controller {
this.menuPaths.forEach((path, itemId) => {
const item = this.findMenuItem(itemId);
if (item) {
const isAllianceCooldown =
item.id === "ally_request" &&
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;
const disabled = this.isItemDisabled(item);
const color = disabled
? this.config.disabledColor
: (resolveColor(item, this.params) ?? "#333333");
const opacity = disabled ? 0.4 : 0.82;

const color = isAllianceCooldown
? COLORS.allianceTimeLeft
: disabled
? this.config.disabledColor
: (resolveColor(item, this.params) ?? "#333333");
const opacity = isAllianceCooldown ? 0.82 : disabled ? 0.4 : 0.82;
// Update path appearance (skip fill for timer items — gradient handles it)
if (!item.timerFraction) {
path.attr(
"fill",
d3.color(color)?.copy({ opacity: opacity })?.toString() ?? color,
);
}
path.style("opacity", disabled ? 0.5 : 1);
path.style("opacity", isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1);
path.style("cursor", disabled ? "not-allowed" : "pointer");

// Update icon/text appearance using the same logic as renderIconsAndText
Expand All @@ -1144,27 +1203,58 @@ export class RadialMenu implements Controller {
// Update text opacity
const textElement = icon.select("text");
if (!textElement.empty()) {
textElement.style("opacity", disabled ? 0.5 : 1);
textElement.style(
"opacity",
isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1,
);
}

// Update image opacity
// Update image opacity and position
const imageElement = icon.select("image");
if (!imageElement.empty()) {
imageElement.attr("opacity", disabled ? 0.5 : 1);
const height = parseFloat(imageElement.attr("height") ?? "0");
const cy = parseFloat(icon.attr("data-cy") ?? "0");

imageElement.attr("y", isAllianceCooldown ? 42 : cy - height / 2);

imageElement.attr(
"opacity",
isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1,
);
}

// Update cooldown text if applicable
const cooldownElement = icon.select(".cooldown-text");
if (this.params && !cooldownElement.empty() && item.cooldown) {
if (this.params && item.cooldown) {
const cooldown = Math.ceil(item.cooldown(this.params));
let cooldownText = icon.select<SVGTextElement>(".cooldown-text");

if (cooldown <= 0) {
cooldownElement.remove();
cooldownText.remove();
} else {
cooldownElement.text(cooldown + "s");
if (cooldownText.empty()) {
const cx = parseFloat(icon.attr("data-cx") ?? "0");
const cy = parseFloat(icon.attr("data-cy") ?? "0");

cooldownText = icon
.append("text")
.attr("class", "cooldown-text")
.attr("fill", "white")
.attr("font-size", "20px")
.attr("font-weight", "bold")
.attr("text-anchor", "middle")
.attr("x", cx)
.attr("y", cy + this.config.iconSize / 2 + 7);
}

cooldownText
.text(renderDuration(cooldown))
.attr(
"opacity",
isAllianceCooldown ? 0.82 : disabled ? 0.5 : 1,
);
}
}
}

// Update timer gradient
this.maybeUpdateTimerGradient(item, color, opacity);
}
Expand All @@ -1191,29 +1281,39 @@ export class RadialMenu implements Controller {
);
const prevState = icon.attr("data-prev-state");

if (stateKey && stateKey === prevState) {
// State unchanged, skip re-render to preserve animations
} else {
const cx = parseFloat(icon.attr("data-cx") || "0");
const cy = parseFloat(icon.attr("data-cy") || "0");
const cooldownActive =
(this.params?.playerActions?.interaction
?.allianceRequestCooldownRemaining ?? 0) > 0;

if (stateKey) {
icon.attr("data-prev-state", stateKey);
} else {
icon.selectAll("*").remove();
}
const previousCooldownActive = icon.attr("data-cooldown-active") === "true";

this.renderAllyExtendIcon(
icon.node()! as SVGGElement,
cx,
cy,
this.config.iconSize,
disabled,
this.params,
item.icon,
true,
);
const cooldownChanged = cooldownActive !== previousCooldownActive;

const stateChanged = stateKey !== prevState;

if (!cooldownChanged && !stateChanged) {
return;
}

icon.attr("data-cooldown-active", cooldownActive ? "true" : "false");

const cx = parseFloat(icon.attr("data-cx") || "0");
const cy = parseFloat(icon.attr("data-cy") || "0");

if (stateKey) {
icon.attr("data-prev-state", stateKey);
// State unchanged, skip re-render to preserve animations
}
this.renderAllyExtendIcon(
icon.node()! as SVGGElement,
cx,
cy,
this.config.iconSize,
disabled,
this.params,
item.icon,
true,
);
}

private maybeUpdateTimerGradient(
Expand Down Expand Up @@ -1279,6 +1379,11 @@ export class RadialMenu implements Controller {
icon?: string,
update?: boolean,
): void {
const generation =
Number(content.getAttribute("data-render-generation") ?? "0") + 1;

content.setAttribute("data-render-generation", generation.toString());

if (update) {
while (content.firstChild) content.removeChild(content.firstChild);
}
Expand All @@ -1292,6 +1397,12 @@ export class RadialMenu implements Controller {
const iconUrl = icon ?? "";

getSvgAspectRatio(iconUrl).then((ratio) => {
if (
Number(content.getAttribute("data-render-generation")) !== generation
) {
return;
}

const width = smallSize * (ratio ?? 1);
const gap = 2;
const totalWidth = width * 2 + gap;
Expand Down
3 changes: 3 additions & 0 deletions src/client/hud/layers/RadialMenuElements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export const COLORS = {
boat: "#2a82c9",
disabled: "#94a3b8",
ally: "#4ade80",
allianceTimeLeft: "#0891b2",
breakAlly: "#dc2626",
breakAllyNoDebuff: "#d97706",
delete: "#ef4444",
Expand Down Expand Up @@ -218,6 +219,8 @@ const allyRequestElement: MenuElement = {
name: "request",
disabled: (params: MenuElementParams) =>
!params.playerActions?.interaction?.canSendAllianceRequest,
cooldown: (params: MenuElementParams) =>
params.playerActions?.interaction?.allianceRequestCooldownRemaining ?? 0,
displayed: (params: MenuElementParams) =>
!params.playerActions?.interaction?.canBreakAlliance,
color: COLORS.ally,
Expand Down
Loading
Loading