From 51c47a18d2b9f7554d6a93502e6e94b114803f58 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Mon, 10 Feb 2025 01:39:21 +0100
Subject: [PATCH] fix: external icons - battle screen

---
 index.html                  |  2 +-
 modules/ui/battle-screen.js | 12 +++++++++---
 versioning.js               |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 3f46c748..90f7299c 100644
--- a/index.html
+++ b/index.html
@@ -8151,7 +8151,7 @@
     <script defer src="modules/ui/regiments-overview.js?v=1.107.0"></script>
     <script defer src="modules/ui/markers-overview.js?v=1.107.0"></script>
     <script defer src="modules/ui/regiment-editor.js?v=1.107.0"></script>
-    <script defer src="modules/ui/battle-screen.js?v=1.99.00"></script>
+    <script defer src="modules/ui/battle-screen.js?v=1.107.2"></script>
     <script defer src="modules/ui/emblems-editor.js?v=1.99.00"></script>
     <script defer src="modules/ui/markers-editor.js?v=1.107.0"></script>
     <script defer src="modules/ui/3d.js?v=1.99.00"></script>
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index f2e47452..b12ceea4 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -131,7 +131,9 @@ class Battle {
 
     for (const u of options.military) {
       const label = capitalize(u.name.replace(/_/g, " "));
-      headers += `<th data-tip="${label}">${u.icon}</th>`;
+      const isExternal = u.icon.startsWith("http");
+      const iconHTML = isExternal ? `<img src="${u.icon}" width="15" height="15">` : u.icon;
+      headers += `<th data-tip="${label}">${iconHTML}</th>`;
     }
 
     headers += "<th data-tip='Total military''>Total</th></tr></thead>";
@@ -145,9 +147,13 @@ class Battle {
     const state = pack.states[regiment.state];
     const distance = (Math.hypot(this.y - regiment.by, this.x - regiment.bx) * distanceScale) | 0; // distance between regiment and its base
     const color = state.color[0] === "#" ? state.color : "#999";
+
+    const isExternal = regiment.icon.startsWith("http");
+    const iconHtml = isExternal
+      ? `<image href="${regiment.icon}" x="0.1em" y="0.1em" width="1.2em" height="1.2em"></image>`
+      : `<text x="50%" y="1em" style="text-anchor: middle">${regiment.icon}</text>`;
     const icon = `<svg width="1.4em" height="1.4em" style="margin-bottom: -.6em; stroke: #333">
-      <rect x="0" y="0" width="100%" height="100%" fill="${color}"></rect>
-      <text x="0" y="1.04em" style="">${regiment.icon}</text></svg>`;
+      <rect x="0" y="0" width="100%" height="100%" fill="${color}"></rect>${iconHtml}</svg>`;
     const body = `<tbody id="battle${state.i}-${regiment.i}">`;
 
     let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment" data-tip="${
diff --git a/versioning.js b/versioning.js
index fe152d4e..1453308f 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.107.1";
+const VERSION = "1.107.2";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {