From 874a8927b782e92e62308d132cea304cc57b7a35 Mon Sep 17 00:00:00 2001
From: q8gazy <q8gazy@gmail.com>
Date: Sun, 9 Feb 2025 08:25:13 +0300
Subject: [PATCH 1/7] Add footer with navigation links and copyright

---
 src/client/index.html | 67 ++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/src/client/index.html b/src/client/index.html
index 672d4b307..054cfab15 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -77,11 +77,13 @@
   </head>
 
   <body
-    class="h-full overflow-hidden select-none font-sans min-h-screen bg-opacity-0 bg-cover bg-center bg-fixed transition-opacity duration-300 ease-in-out"
+    class="h-full select-none font-sans min-h-screen bg-opacity-0 bg-cover bg-center bg-fixed transition-opacity duration-300 ease-in-out flex flex-col"
   >
     <!-- Main container with responsive padding -->
     <!-- Logo section remains the same -->
-    <div class="container mx-auto px-4 sm:px-6 lg:px-8 py-4 sm:py-6 lg:py-8">
+    <div
+      class="container mx-auto px-4 sm:px-6 lg:px-8 py-4 sm:py-6 lg:py-8 flex-grow"
+    >
       <img
         src="../../resources/images/OpenFrontLogo.svg"
         alt="OpenFront.io"
@@ -130,36 +132,6 @@
           Single Player
         </button>
       </div>
-
-      <!-- Links section -->
-      <div class="flex justify-center mt-4">
-        <a
-          href="https://discord.gg/k22YrnAzGp"
-          id="discord-link"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="flex items-center justify-center px-6 py-2 bg-blue-200 hover:bg-blue-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 transition duration-300 ease-in-out mx-2"
-        >
-          <img
-            src="../../resources/images/DiscordIcon.svg"
-            alt="Discord"
-            class="w-12 h-12"
-          />
-        </a>
-        <a
-          href="https://youtu.be/jvHEvbko3uw?si=znspkP84P76B1w5I"
-          id="yt-link"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="flex items-center justify-center px-2 py-0 bg-blue-200 hover:bg-blue-200 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 transition duration-300 ease-in-out mx-2"
-        >
-          <img
-            src="../../resources/images/QuestionMarkIcon.svg"
-            alt="Question Mark"
-            class="mt-4 w-20 h-20"
-          />
-        </a>
-      </div>
     </div>
 
     <!-- Game components -->
@@ -200,6 +172,37 @@
       </div>
     </div>
 
+    <!-- Footer section -->
+    <div class="w-full bg-gray-900/80 backdrop-blur-md py-4">
+      <div
+        class="max-w-7xl mx-auto px-4 flex justify-between items-center text-white sm:flex-row flex-col sm:gap-0 gap-4"
+      >
+        <div class="flex sm:flex-row flex-col sm:gap-8 gap-2">
+          <a
+            href="https://youtu.be/jvHEvbko3uw?si=znspkP84P76B1w5I"
+            class="text-white/70 hover:text-white transition-colors duration-300"
+            target="_blank"
+            >How to Play</a
+          >
+          <a
+            href="https://discord.gg/k22YrnAzGp"
+            class="text-white/70 hover:text-white transition-colors duration-300"
+            target="_blank"
+            >Discord</a
+          >
+        </div>
+        <div class="text-white/70">
+          © 2025
+          <a
+            href="https://github.com/openfrontio/OpenFrontIO"
+            class="hover:text-white transition-colors duration-300"
+            target="_blank"
+            >OpenFront.io</a
+          >.
+        </div>
+      </div>
+    </div>
+
     <!-- Scripts -->
     <script>
       // Remove preload class after everything is loaded

From 92485997f0f48f7b481d2f2c3a65142bcb86305a Mon Sep 17 00:00:00 2001
From: RealJosephStalin <you@example.com>
Date: Sun, 9 Feb 2025 22:46:02 -0500
Subject: [PATCH 2/7] more permissive usernames

---
 src/core/validations/username.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/validations/username.ts b/src/core/validations/username.ts
index 531defe68..88a2c1011 100644
--- a/src/core/validations/username.ts
+++ b/src/core/validations/username.ts
@@ -11,9 +11,9 @@ const matcher = new RegExpMatcher({
 });
 
 export const MIN_USERNAME_LENGTH = 3;
-export const MAX_USERNAME_LENGTH = 20;
+export const MAX_USERNAME_LENGTH = 27;
 
-const validPattern = /^[a-zA-Z0-9_\[\] ]+$/;
+const validPattern = /^[a-zA-Z0-9_\[\] 🐈🍀]+$/;
 
 const shadowNames = [
   "NicePeopleOnly",
@@ -61,7 +61,7 @@ export function validateUsername(username: string): {
   if (!validPattern.test(username)) {
     return {
       isValid: false,
-      error: "Username can only contain letters, numbers, and underscores.",
+      error: "Username can only contain letters, numbers, spaces, underscores, and [square brackets].",
     };
   }
 
@@ -71,7 +71,7 @@ export function validateUsername(username: string): {
 
 export function sanitizeUsername(str: string): string {
   const sanitized = str
-    .replace(/[^a-zA-Z0-9]/g, "")
+    .replace(/[^a-zA-Z0-9_\[\] 🐈🍀]/g, "")
     .slice(0, MAX_USERNAME_LENGTH);
   return sanitized.padEnd(MIN_USERNAME_LENGTH, "x");
 }

From 34007a824810c8c1c4706bfe9670b0117e43c35b Mon Sep 17 00:00:00 2001
From: Evan <evanpelle@gmail.com>
Date: Sun, 9 Feb 2025 20:52:44 -0800
Subject: [PATCH 3/7] make ocean a bit darker

---
 src/core/configuration/PastelTheme.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/configuration/PastelTheme.ts b/src/core/configuration/PastelTheme.ts
index 0c30a57b9..813687911 100644
--- a/src/core/configuration/PastelTheme.ts
+++ b/src/core/configuration/PastelTheme.ts
@@ -19,7 +19,7 @@ export const pastelTheme = new (class implements Theme {
     colord({ r: 125, g: 255, b: 75 }), // Warmer tint
     colord({ r: 115, g: 250, b: 68 }), // Cooler tint
   ];
-  private water = colord({ r: 75, g: 142, b: 190 });
+  private water = colord({ r: 70, g: 132, b: 180 });
   private shorelineWater = colord({ r: 100, g: 143, b: 255 });
 
   private territoryColors: Colord[] = [
@@ -167,11 +167,11 @@ export const pastelTheme = new (class implements Theme {
         if (gm.isShoreline(tile) && gm.isWater(tile)) {
           return this.shorelineWater;
         }
-        if (gm.magnitude(tile) < 7) {
+        if (gm.magnitude(tile) < 10) {
           return colord({
-            r: Math.max(w.r - 7 + mag, 0),
-            g: Math.max(w.g - 7 + mag, 0),
-            b: Math.max(w.b - 7 + mag, 0),
+            r: Math.max(w.r - 10 + mag, 0),
+            g: Math.max(w.g - 10 + mag, 0),
+            b: Math.max(w.b - 10 + mag, 0),
           });
         }
         return this.water;

From 67b9c869cf50e7c104fc168b3884f06e7a9d38ac Mon Sep 17 00:00:00 2001
From: Evan <evanpelle@gmail.com>
Date: Sun, 9 Feb 2025 20:56:12 -0800
Subject: [PATCH 4/7] don't pause territory drawing on drag

---
 src/client/graphics/layers/TerritoryLayer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/graphics/layers/TerritoryLayer.ts b/src/client/graphics/layers/TerritoryLayer.ts
index 31c1139ac..d22698b64 100644
--- a/src/client/graphics/layers/TerritoryLayer.ts
+++ b/src/client/graphics/layers/TerritoryLayer.ts
@@ -123,7 +123,8 @@ export class TerritoryLayer implements Layer {
       this.alternativeView = e.alternateView;
     });
     this.eventBus.on(DragEvent, (e) => {
-      this.lastDragTime = Date.now();
+      // TODO: consider re-enabling this on mobile or low end devices for smoother dragging.
+      // this.lastDragTime = Date.now();
     });
     this.redraw();
   }

From f339a06233f7bd2f451c2fb9426c8bae5ec432ad Mon Sep 17 00:00:00 2001
From: PilkeySEK <156579268+PilkeySEK@users.noreply.github.com>
Date: Mon, 10 Feb 2025 15:38:58 +0100
Subject: [PATCH 5/7] Add a total of 5 emojis

---
 src/client/graphics/layers/EmojiTable.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/client/graphics/layers/EmojiTable.ts b/src/client/graphics/layers/EmojiTable.ts
index 1a1b4752a..89ecd4863 100644
--- a/src/client/graphics/layers/EmojiTable.ts
+++ b/src/client/graphics/layers/EmojiTable.ts
@@ -5,11 +5,12 @@ const emojiTable: string[][] = [
   ["😀", "😱", "🤡", "😡", "🥺"],
   ["😈", "👏", "🥉", "🥈", "🥇"],
   ["🤙", "🥰", "😇", "😊", "🔥"],
-  ["💪", "🏳️", "💀", "😭", "🤦‍♂️"],
-  ["😎", "👎", "👍", "🥱", "💔"],
-  ["❤️", "💰", "🤝", "🖕", "💥"],
-  ["🆘", "🕊️", "➡️", "⬅️", "↙️"],
-  ["↖️", "↗️", "⬆️", "↘️", "⬇️"],
+  ["💪", "🏳️", "💀", "😭", "🫡"],
+  ["🤦‍♂️", "👎", "👍", "🥱", "💔"],
+  ["😎", "❤️", "💰", "🤝", "🖕"],
+  ["💥", "🆘", "🕊️", "➡️", "⬅️"],
+  ["↙️", "↖️", "↗️", "⬆️", "↘️"],
+  ["⬇️", "❓", "⏳", "☢️", "⚠️"]
 ];
 
 @customElement("emoji-table")

From 39908531f99005c188fd0b94f4422695f2b5ee71 Mon Sep 17 00:00:00 2001
From: PilkeySEK <156579268+PilkeySEK@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:45:00 +0100
Subject: [PATCH 6/7] Traitor: true/false -> yes/no

---
 src/client/graphics/layers/PlayerPanel.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/graphics/layers/PlayerPanel.ts b/src/client/graphics/layers/PlayerPanel.ts
index 7d7f8c1b4..dbbd59f86 100644
--- a/src/client/graphics/layers/PlayerPanel.ts
+++ b/src/client/graphics/layers/PlayerPanel.ts
@@ -182,7 +182,7 @@ export class PlayerPanel extends LitElement implements Layer {
             <div class="flex flex-col gap-1">
               <div class="text-white text-opacity-80 text-sm px-2">Traitor</div>
               <div class="bg-opacity-50 bg-gray-700 rounded p-2 text-white">
-                ${other.isTraitor()}
+                ${other.isTraitor() ? "yes" : "no"}
               </div>
             </div>
 

From 9349d9b8aeaddff89274ff7f9552165b1460389e Mon Sep 17 00:00:00 2001
From: Evan <evanpelle@gmail.com>
Date: Mon, 10 Feb 2025 11:08:35 -0800
Subject: [PATCH 7/7] bugfix: deduct gold from player when start construction

---
 src/core/execution/ConstructionExecution.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/core/execution/ConstructionExecution.ts b/src/core/execution/ConstructionExecution.ts
index 0e5ff2048..1b44b35d2 100644
--- a/src/core/execution/ConstructionExecution.ts
+++ b/src/core/execution/ConstructionExecution.ts
@@ -26,6 +26,8 @@ export class ConstructionExecution implements Execution {
 
   private ticksUntilComplete: Tick;
 
+  private cost: number;
+
   constructor(
     private ownerId: PlayerID,
     private tile: TileRef,
@@ -56,6 +58,8 @@ export class ConstructionExecution implements Execution {
         0,
         spawnTile
       );
+      this.cost = this.mg.unitInfo(this.constructionType).cost(this.player);
+      this.player.removeGold(this.cost);
       this.construction.setConstructionType(this.constructionType);
       this.ticksUntilComplete = info.constructionDuration;
       return;
@@ -69,6 +73,8 @@ export class ConstructionExecution implements Execution {
     if (this.ticksUntilComplete == 0) {
       this.player = this.construction.owner();
       this.construction.delete(false);
+      // refund the cost so player has the gold to build the unit
+      this.player.addGold(this.cost);
       this.completeConstruction();
       this.active = false;
       return;
