From 245384b16313f85e30e0f3d2b3542801bfd4eea6 Mon Sep 17 00:00:00 2001
From: Aotumuri <aotumuri.yt@gmail.com>
Date: Sun, 6 Apr 2025 09:22:39 +0900
Subject: [PATCH] update json

---
 resources/QuickChat.json                | 48 +++++++++++++++++++++++--
 src/client/graphics/layers/ChatModal.ts | 28 ++++++++-------
 src/client/styles/modal/chat.css        |  9 +++++
 3 files changed, 69 insertions(+), 16 deletions(-)

diff --git a/resources/QuickChat.json b/resources/QuickChat.json
index 2853a5fc5..eed049948 100644
--- a/resources/QuickChat.json
+++ b/resources/QuickChat.json
@@ -5,11 +5,25 @@
       "text": "Please give me troops!",
       "requiresPlayer": false
     },
-    { "key": "gold", "text": "Please give me golds!", "requiresPlayer": false },
+    {
+      "key": "gold",
+      "text": "Please give me golds!",
+      "requiresPlayer": false
+    },
     {
       "key": "no_attack",
       "text": "Please don't attack me!",
       "requiresPlayer": false
+    },
+    {
+      "key": "sorry_attack",
+      "text": "Sorry, I didn’t mean to attack.",
+      "requiresPlayer": false
+    },
+    {
+      "key": "alliance",
+      "text": "Alliance?",
+      "requiresPlayer": false
     }
   ],
   "attack": [
@@ -23,9 +37,37 @@
     }
   ],
   "defend": [
-    { "key": "defend", "text": "Defend [P1]!", "requiresPlayer": true }
+    {
+      "key": "defend",
+      "text": "Defend [P1]!",
+      "requiresPlayer": true
+    },
+    {
+      "key": "dont_attack",
+      "text": "Don’t attack [P1]!",
+      "requiresPlayer": true
+    },
+    {
+      "key": "ally",
+      "text": "[P1] is my ally!",
+      "requiresPlayer": true
+    }
+  ],
+  "greet": [
+    { "key": "hello", "text": "Hello!", "requiresPlayer": false },
+    { "key": "good_luck", "text": "Good luck!", "requiresPlayer": false },
+    { "key": "have_fun", "text": "Have fun!", "requiresPlayer": false },
+    { "key": "gg", "text": "GG!", "requiresPlayer": false },
+    {
+      "key": "nice_to_meet",
+      "text": "Nice to meet you!",
+      "requiresPlayer": false
+    },
+    { "key": "well_played", "text": "Well played!", "requiresPlayer": false },
+    { "key": "hi_again", "text": "Hi again!", "requiresPlayer": false },
+    { "key": "bye", "text": "Bye!", "requiresPlayer": false },
+    { "key": "thanks", "text": "Thanks!", "requiresPlayer": false }
   ],
-  "greet": [{ "key": "hello", "text": "Hello!", "requiresPlayer": false }],
   "misc": [
     { "key": "go", "text": "Let’s go!", "requiresPlayer": false },
     { "key": "strategy", "text": "Nice strategy!", "requiresPlayer": false },
diff --git a/src/client/graphics/layers/ChatModal.ts b/src/client/graphics/layers/ChatModal.ts
index cbc0e8ec4..03ee70515 100644
--- a/src/client/graphics/layers/ChatModal.ts
+++ b/src/client/graphics/layers/ChatModal.ts
@@ -119,19 +119,21 @@ export class ChatModal extends LitElement {
             ? html`
                 <div class="chat-column">
                   <div class="column-title">Phrase</div>
-                  ${this.getPhrasesForCategory(this.selectedCategory).map(
-                    (phrase) => html`
-                      <button
-                        class="chat-option-button ${this.selectedPhraseText ===
-                        phrase.text
-                          ? "selected"
-                          : ""}"
-                        @click=${() => this.selectPhrase(phrase)}
-                      >
-                        ${this.renderPhrasePreview(phrase)}
-                      </button>
-                    `,
-                  )}
+                  <div class="phrase-scroll-area">
+                    ${this.getPhrasesForCategory(this.selectedCategory).map(
+                      (phrase) => html`
+                        <button
+                          class="chat-option-button ${this
+                            .selectedPhraseText === phrase.text
+                            ? "selected"
+                            : ""}"
+                          @click=${() => this.selectPhrase(phrase)}
+                        >
+                          ${this.renderPhrasePreview(phrase)}
+                        </button>
+                      `,
+                    )}
+                  </div>
                 </div>
               `
             : null}
diff --git a/src/client/styles/modal/chat.css b/src/client/styles/modal/chat.css
index 8cefdcf46..8db122000 100644
--- a/src/client/styles/modal/chat.css
+++ b/src/client/styles/modal/chat.css
@@ -83,3 +83,12 @@
   gap: 6px;
   padding-right: 4px;
 }
+
+.phrase-scroll-area {
+  max-height: 234px;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding-right: 4px;
+}