mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 09:20:47 +00:00
Improve Notification Panel (#3913)
Resolves #3910 ## Description: - Split the events HUD into two components: a new **`<actionable-events>`** that owns alliance prompts (request / renew) and a slimmed-down **`<events-display>`** for everything else. - Reworked `<events-display>` into two visual tiers: dim/scrolling tier 2 on top (trade results, unit losses, donations, alliance status), prominent tier 1 anchored at the bottom (inbound nukes, naval invasion, attack requests, alliance broken, conquered player, chat). Tier 2 caps at the 4 newest entries; events expire after 8s. - Added a transient **+gold pip** above the gold pill in `<control-panel>`, animated with a small fade-in. Fires for trade ships, trains, donations, and conquest. Trade-ship and train arrivals are removed from the events scroll since they're surfaced here instead. - New `MessageType.NUKE_DETONATED` and a server-side emission in `NukeExecution.detonate` — once an inbound nuke lands or gets intercepted, the inbound warning vanishes and a "detonated" entry takes its place. - `displayMessage` gained optional `unitID` and `focusPlayerID` params so events can link to a unit or a player. Unit captures and destructions now navigate to the unit's last tile when clicked; donations navigate to the other player. - ActionableEvents card width matches `<events-display>`; cards persist until the user clicks Accept/Reject/Renew/Ignore or the server-side request timeout expires. - Removed the in-events category filter UI and the gold-amount banner — `<events-display>` is now a lightweight log that hides entirely when empty. <img width="570" height="444" alt="Screenshot 2026-05-21 at 1 42 30 PM" src="https://github.com/user-attachments/assets/f103efb3-0e11-4b72-a11b-91ff6896177c" /> <img width="430" height="296" alt="Screenshot 2026-05-21 at 1 41 34 PM" src="https://github.com/user-attachments/assets/ae58475a-b252-4aa6-9ce5-99dea7575ce3" /> ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: evan
This commit is contained in:
+9
-9
@@ -21,10 +21,10 @@ vi.mock("lit/directives/unsafe-html.js", () => ({
|
||||
UnsafeHTMLDirective: class {},
|
||||
}));
|
||||
|
||||
import { EventsDisplay } from "../../../../src/client/hud/layers/EventsDisplay";
|
||||
import { ActionableEvents } from "../../../../src/client/hud/layers/ActionableEvents";
|
||||
import { MessageType } from "../../../../src/core/game/Game";
|
||||
|
||||
describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
describe("ActionableEvents - alliance renewal cleanup (allianceID based)", () => {
|
||||
function makeRenewal(
|
||||
allianceID: number,
|
||||
focusID: number,
|
||||
@@ -40,7 +40,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
}
|
||||
|
||||
test("removes ONLY renewal events for the broken alliance", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceAB = 1;
|
||||
const allianceAC = 2;
|
||||
@@ -67,7 +67,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("does NOT remove renewals just because the same player is involved", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceAB = 10;
|
||||
const allianceAC = 11;
|
||||
@@ -86,7 +86,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("breaking one alliance does not affect renewals between other players", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceAB = 100;
|
||||
const allianceCD = 200;
|
||||
@@ -105,7 +105,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("onAllianceExtensionEvent removes renewal when playerID matches myPlayer", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceID = 42;
|
||||
const mySmallID = 7;
|
||||
@@ -127,7 +127,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("onAllianceExtensionEvent keeps renewal when playerID does not match myPlayer", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceID = 42;
|
||||
const mySmallID = 7;
|
||||
@@ -150,7 +150,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("onAllianceExtensionEvent keeps renewal when myPlayer is null", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
const allianceID = 42;
|
||||
|
||||
@@ -171,7 +171,7 @@ describe("EventsDisplay - alliance renewal cleanup (allianceID based)", () => {
|
||||
});
|
||||
|
||||
test("does not affect non-RENEW_ALLIANCE events", () => {
|
||||
const display = new EventsDisplay();
|
||||
const display = new ActionableEvents();
|
||||
|
||||
(display as any).events = [
|
||||
{
|
||||
Reference in New Issue
Block a user