Skip to content

[small-fix 20 lines] Add FFA collusion warning #4107

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

Open
a-happy-goose wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[small-fix 20 lines] Add FFA collusion warning #4107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions resources/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,7 @@
"heads_up_message": {
"choose_spawn": "Choose a starting location",
"random_spawn": "Random spawn is enabled. Selecting starting location for you...",
"ffa_collusion": "Pre-game agreement (collusion) is not allowed in FFA",
"singleplayer_game_paused": "Game paused",
"multiplayer_game_paused": "Game paused by Lobby Creator",
"pvp_immunity_active": "PVP immunity active for {seconds}s",
Expand Down
19 changes: 18 additions & 1 deletion src/client/hud/layers/HeadsUpMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { LitElement, html } from "lit";
import { customElement, state } from "lit/decorators.js";
import { GameType } from "../../../core/game/Game";
import { GameMode, GameType } from "../../../core/game/Game";
import { GameUpdateType } from "../../../core/game/GameUpdates";
import { GameView } from "../../../core/game/GameView";
import { Controller } from "../../Controller";
Expand Down Expand Up @@ -182,6 +182,23 @@ export class HeadsUpMessage extends LitElement implements Controller {
</div>
`
: null}
${this.game.inSpawnPhase() &&
Copy link
Copy Markdown
Collaborator

@evanpelle evanpelle Jun 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should add a close button and only show this to a player once.

this.game.config().gameConfig().gameMode === GameMode.FFA
Comment thread
a-happy-goose marked this conversation as resolved.
? html`
<div
class="fixed top-[25%] left-1/2 -translate-x-1/2 z-[799]
inline-flex items-center justify-center min-h-8 lg:min-h-10
w-fit max-w-[90vw]
bg-amber-500/70 rounded-md lg:rounded-lg
backdrop-blur-xs text-white text-md lg:text-xl px-3 lg:px-4 py-1
text-center break-words"
style="word-wrap: break-word; hyphens: auto;"
@contextmenu=${(e: MouseEvent) => e.preventDefault()}
>
${translateText("heads_up_message.ffa_collusion")}
</div>
`
: null}
</div>
`;
}
Expand Down
Loading