Display alliance timer in player panel #805

tnhnblgl · 2025-05-18T15:55:33Z

Description:

Below Traitor: , There will be Alliance Status. And will display timer, after timer ends will show Alliance Expired. Also this Alliance Status will only show if player had alliance.

Please complete the following:

I have added screenshots for all UI updates
I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced
I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors

Please put your Discord username so you can be contacted if a bug or regression is found:

dovg

coderabbitai · 2025-05-18T15:55:41Z

"""

Walkthrough

This update introduces alliance time remaining display to the player panel. It adds a new translation key, extends the player panel UI to show the alliance expiry countdown, enhances game logic to include alliance creation tick in player interactions, and updates the player interaction interface with an optional alliance creation tick property.

Changes

File(s)	Change Summary
resources/lang/en.json	Added `"alliance_time_remaining"` key with value `"Time Remaining"` to the `"player_panel"` section.
src/client/graphics/layers/PlayerPanel.ts	Extended PlayerPanel to track and render alliance expiry time; added reactive state property and duration formatter.
src/core/GameRunner.ts	Modified `playerActions` to include `allianceCreatedAtTick` in interaction data if an alliance exists.
src/core/game/Game.ts	Added optional `allianceCreatedAtTick?: Tick` property to `PlayerInteraction` interface.

Sequence Diagram(s)

sequenceDiagram
    participant UI as PlayerPanel
    participant GameRunner
    participant Game as Game Logic

    UI->>GameRunner: Request playerActions for tile
    GameRunner->>Game: Check interaction and alliance status
    Game-->>GameRunner: Return interaction data (with allianceCreatedAtTick if applicable)
    GameRunner-->>UI: Return interaction data
    UI->>UI: Calculate remaining alliance time
    UI->>UI: Render alliance time remaining in panel

Suggested reviewers

evanpelle

Poem

🐇⏳
A tick, a tock, the alliance clock,
Time remaining now we unlock.
Minutes and seconds, clear to see,
In the panel, it’s shown with glee.
Rabbits cheer, the time’s in sight,
Alliance countdown shining bright! 🌟🐰
"""

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 ESLint

If the error stems from missing dependencies, add them to the package.json file. For unrecoverable errors (e.g., due to private dependencies), disable the tool in the CodeRabbit configuration.

npm warn config production Use --omit=dev instead.
npm error Exit handler never called!
npm error This is an error with npm itself. Please report this error at:
npm error https://github.com/npm/cli/issues
npm error A complete log of this run can be found in: /.npm/_logs/2025-05-19T21_23_39_114Z-debug-0.log

Note

⚡️ AI Code Reviews for VS Code, Cursor, Windsurf

CodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback.
Learn more here.

Note

⚡️ Faster reviews with caching

CodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 16th. To opt out, configure Review - Disable Cache at either the organization or repository level. If you prefer to disable all data retention across your organization, simply turn off the Data Retention setting under your Organization Settings.
Enjoy the performance boost—your workflow just got faster.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 11dce0a and a6cddea.

📒 Files selected for processing (1)

src/client/graphics/layers/PlayerPanel.ts (3 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

src/client/graphics/layers/PlayerPanel.ts

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

tnhnblgl · 2025-05-18T16:02:00Z

If it's possible, can be deployed to subdomain

VariableVince · 2025-05-18T16:29:15Z

If this is added, the Instructions (helpModal.ts) should actually be updated as well after. At least the images for Player Info Panel and the description. So that it's not outdated too soon again.

Just submitted another PR for PlayerPanel by the way, could cause a conflict: #804

tnhnblgl · 2025-05-18T16:36:45Z

@VariableVince wrote this in mobile so I can't deploy.

About conflict, I would appreciate your help on that. But if mine pr get accepted first, then I'll try to integrate.

VariableVince · 2025-05-18T17:00:43Z

@tnhnblgl about the conflict. Thanks. I'm quite new to git and github, so you may be better suited for it indeed. But i can help with the needed changes of course

src/client/graphics/layers/PlayerPanel.ts

resources/lang/en.json

VariableVince · 2025-05-18T21:21:48Z

My PR on this file was just merged, fyi.

Btw if you want to become a member of the Dev server, you can use the invite in the readme

tnhnblgl · 2025-05-19T05:07:42Z

@VariableVince thanks for that, really needed

evanpelle

Thanks!

evanpelle · 2025-05-19T20:52:15Z

Looks like prettier is failing

tnhnblgl · 2025-05-19T21:23:46Z

@evanpelle Sorry, done!

tnhnblgl added 4 commits May 18, 2025 18:06

Update Game.ts

27094c3

Update GameRunner.ts

f689eae

Update PlayerPanel.ts

5755ccf

Update en.json

5cb0d5d

tnhnblgl requested a review from a team as a code owner May 18, 2025 15:55

tnhnblgl requested a review from evanpelle May 18, 2025 15:55

github-project-automation bot added this to OpenFront Release Management May 18, 2025

github-project-automation bot moved this to Triage in OpenFront Release Management May 18, 2025

evanpelle reviewed May 18, 2025

View reviewed changes

src/client/graphics/layers/PlayerPanel.ts Outdated Show resolved Hide resolved

src/client/graphics/layers/PlayerPanel.ts Outdated Show resolved Hide resolved

resources/lang/en.json Outdated Show resolved Hide resolved

tnhnblgl added 4 commits May 18, 2025 23:47

Update PlayerPanel.ts

2fd2350

Update en.json

19b43b5

Update PlayerPanel.ts

5920e59

Merge branch 'main' into alliance-timer

5803d73

tnhnblgl requested a review from evanpelle May 18, 2025 20:58

Update PlayerPanel.ts

1b960bd

evanpelle approved these changes May 19, 2025

View reviewed changes

github-project-automation bot moved this from Triage to Final Review in OpenFront Release Management May 19, 2025

tnhnblgl added 2 commits May 20, 2025 00:03

Prettier

11dce0a

Prettier

a6cddea

evanpelle merged commit ca66656 into openfrontio:main May 19, 2025
6 checks passed

github-project-automation bot moved this from Final Review to Complete in OpenFront Release Management May 19, 2025

scottanderson added this to the v23 milestone May 21, 2025

scottanderson added the Feature - Frontend An entirely new feature, or changes to existing feature. User facing. label May 25, 2025

scottanderson assigned tnhnblgl May 25, 2025

coderabbitai bot mentioned this pull request May 26, 2025

Proper alliance timer naming #886

Merged

3 tasks

coderabbitai bot mentioned this pull request Jun 5, 2025

Show alliances on the PlayerPanel #1053

Merged

5 tasks

coderabbitai bot mentioned this pull request Jul 1, 2025

allow alliance extension Fixes #491 #1314

Merged

5 tasks

coderabbitai bot mentioned this pull request Aug 2, 2025

Add alliance timer #1687

Open

5 tasks

coderabbitai bot mentioned this pull request Aug 22, 2025

added the ability to see players Flag inside the player panel with full flag name. #1892

Merged

4 tasks

This was referenced Sep 5, 2025

Redesign Player info overlay #2000

Merged

Improve player panel #2047

Closed

coderabbitai bot mentioned this pull request Sep 15, 2025

Improve player panel #2060

Open

4 tasks

coderabbitai bot mentioned this pull request Sep 23, 2025

Implement SendTroopsModal #2072

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Display alliance timer in player panel #805

Display alliance timer in player panel #805

Uh oh!

tnhnblgl commented May 18, 2025 •

edited

Loading

Uh oh!

coderabbitai bot commented May 18, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

tnhnblgl commented May 18, 2025

Uh oh!

VariableVince commented May 18, 2025 •

edited

Loading

Uh oh!

tnhnblgl commented May 18, 2025

Uh oh!

VariableVince commented May 18, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VariableVince commented May 18, 2025 •

edited

Loading

Uh oh!

tnhnblgl commented May 19, 2025

Uh oh!

evanpelle left a comment

Uh oh!

evanpelle commented May 19, 2025

Uh oh!

tnhnblgl commented May 19, 2025

Uh oh!

Uh oh!

Uh oh!

Display alliance timer in player panel #805

Display alliance timer in player panel #805

Uh oh!

Conversation

tnhnblgl commented May 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description:

Please complete the following:

Please put your Discord username so you can be contacted if a bug or regression is found:

Uh oh!

coderabbitai bot commented May 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Suggested reviewers

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

tnhnblgl commented May 18, 2025

Uh oh!

VariableVince commented May 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tnhnblgl commented May 18, 2025

Uh oh!

VariableVince commented May 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

VariableVince commented May 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tnhnblgl commented May 19, 2025

Uh oh!

evanpelle left a comment

Choose a reason for hiding this comment

Uh oh!

evanpelle commented May 19, 2025

Uh oh!

tnhnblgl commented May 19, 2025

Uh oh!

Uh oh!

Uh oh!

tnhnblgl commented May 18, 2025 •

edited

Loading

coderabbitai bot commented May 18, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)

VariableVince commented May 18, 2025 •

edited

Loading

VariableVince commented May 18, 2025 •

edited

Loading

VariableVince commented May 18, 2025 •

edited

Loading