From a21181c0591ee7e951f177d1eeed5372c8a97295 Mon Sep 17 00:00:00 2001
From: NewHappyRabbit <31893343+NewHappyRabbit@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:08:41 +0200
Subject: [PATCH] Added a button to focus the player that sent an alliance
 request. Increased bots name color brightness

---
 src/client/graphics/layers/EventsDisplay.ts | 16 ++++++++++++++--
 src/core/configuration/PastelThemeDark.ts   |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts
index c2b2e15b2..59fb911d8 100644
--- a/src/client/graphics/layers/EventsDisplay.ts
+++ b/src/client/graphics/layers/EventsDisplay.ts
@@ -25,6 +25,7 @@ import { unsafeHTML } from "lit/directives/unsafe-html.js";
 import { onlyImages, sanitize } from "../../../core/Util";
 import { GameView, PlayerView } from "../../../core/game/GameView";
 import { renderTroops } from "../../Utils";
+import { GoToPlayerEvent } from "./Leaderboard";
 
 interface Event {
   description: string;
@@ -33,6 +34,7 @@ interface Event {
     text: string;
     className: string;
     action: () => void;
+    preventClose?: boolean;
   }[];
   type: MessageType;
   highlight?: boolean;
@@ -169,6 +171,12 @@ export class EventsDisplay extends LitElement implements Layer {
     this.addEvent({
       description: `${requestor.name()} requests an alliance!`,
       buttons: [
+        {
+          text: "Focus",
+          className: "btn-gray",
+          action: () => this.eventBus.emit(new GoToPlayerEvent(requestor)),
+          preventClose: true,
+        },
         {
           text: "Accept",
           className: "btn",
@@ -447,10 +455,14 @@ export class EventsDisplay extends LitElement implements Layer {
                                     class="inline-block px-3 py-1 text-white rounded text-sm cursor-pointer transition-colors duration-300
                             ${btn.className.includes("btn-info")
                                       ? "bg-blue-500 hover:bg-blue-600"
-                                      : "bg-green-600 hover:bg-green-700"}"
+                                      : btn.className.includes("btn-gray")
+                                        ? "bg-gray-500 hover:bg-gray-600"
+                                        : "bg-green-600 hover:bg-green-700"}"
                                     @click=${() => {
                                       btn.action();
-                                      this.removeEvent(index);
+                                      if (!btn.preventClose) {
+                                        this.removeEvent(index);
+                                      }
                                       this.requestUpdate();
                                     }}
                                   >
diff --git a/src/core/configuration/PastelThemeDark.ts b/src/core/configuration/PastelThemeDark.ts
index 84d308db5..b30734e84 100644
--- a/src/core/configuration/PastelThemeDark.ts
+++ b/src/core/configuration/PastelThemeDark.ts
@@ -253,7 +253,7 @@ export const pastelThemeDark = new (class implements Theme {
   }
 
   textColor(playerInfo: PlayerInfo): string {
-    return playerInfo.playerType == PlayerType.Human ? "#ffffff" : "#dbdbdb";
+    return playerInfo.playerType == PlayerType.Human ? "#ffffff" : "#e6e6e6";
   }
 
   borderColor(playerInfo: PlayerInfo): Colord {