Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into urquhart-routes

index.html

@@ -8159,7 +8159,7 @@
     <script src="modules/ui/stylePresets.js?v=1.96.00"></script>
 
     <script src="modules/ui/general.js?v=1.96.00"></script>
-    <script src="modules/ui/options.js?v=1.97.11"></script>
+    <script src="modules/ui/options.js?v=1.97.14"></script>
     <script src="main.js?v=1.97.11"></script>
 
     <script defer src="modules/relief-icons.js"></script>
@@ -8191,7 +8191,7 @@
     <script defer src="modules/ui/burgs-overview.js?v=1.97.00"></script>
     <script defer src="modules/ui/routes-overview.js"></script>
     <script defer src="modules/ui/rivers-overview.js"></script>
-    <script defer src="modules/ui/military-overview.js?v=1.96.07"></script>
+    <script defer src="modules/ui/military-overview.js?v=1.97.15"></script>
     <script defer src="modules/ui/regiments-overview.js?v=1.89.20"></script>
     <script defer src="modules/ui/markers-overview.js?v=1.89.38"></script>
     <script defer src="modules/ui/regiment-editor.js?v=1.97.14"></script>

modules/dynamic/supporters.js

@@ -546,4 +546,32 @@ Noah Morris
 Phil Karecki
 Matthew Jarocki
 Lucius Licinius Lucullus
-Andrew Haney`;
+Andrew Haney
+Noah Morris
+Phil Karecki
+Matthew Jarocki
+Lucius Licinius Lucullus
+Andrew Haney
+Jesse Luke
+Lord_Luce
+Neko no Maigo
+Hossyboy 
+Yasui Masatake
+Jesse Roy
+Remain
+Douglas Rector
+J Clark
+Raine Logan
+Matty Ice
+DieMuetze
+Dan Popoli
+Marwyn
+Kederalia
+Whyse Wytch
+Elliyevee
+James Miller
+Pirate Fish
+David Leitner
+Vyritecht
+emre
+Don't mail me`;

modules/ui/military-overview.js

@@ -55,7 +55,9 @@ function overviewMilitary() {
     for (const u of options.military) {
       const label = capitalize(u.name.replace(/_/g, " "));
       insert(
-        `<div data-tip="State ${u.name} units number. Click to sort" class="sortable removable" data-sortby="${u.name}">${label}&nbsp;</div>`
+        `<div data-tip="State ${
+          u.name
+        } units number. Click to sort" class="sortable removable" data-sortby="${u.name.toLowerCase()}">${label}&nbsp;</div>`
       );
     }
     header.querySelectorAll(".removable").forEach(function (e) {
@@ -77,7 +79,7 @@ function overviewMilitary() {
       const total = options.military.reduce((s, u) => s + getForces(u) * u.crew, 0);
       const rate = (total / population) * 100;
 
-      const sortData = options.military.map(u => `data-${u.name}="${getForces(u)}"`).join(" ");
+      const sortData = options.military.map(u => `data-${u.name.toLowerCase()}="${getForces(u)}"`).join(" ");
       const lineData = options.military
         .map(u => `<div data-type="${u.name}" data-tip="State ${u.name} units number">${getForces(u)}</div>`)
         .join(" ");
@@ -469,7 +471,7 @@ function overviewMilitary() {
     body.querySelectorAll(":scope > div").forEach(function (el) {
       data += el.dataset.id + ",";
       data += el.dataset.state + ",";
-      data += units.map(u => el.dataset[u]).join(",") + ",";
+      data += units.map(u => el.dataset[u.toLowerCase()]).join(",") + ",";
       data += el.dataset.total + ",";
       data += el.dataset.population + ",";
       data += rn(el.dataset.rate, 2) + "%,";

modules/ui/options.js

@@ -76,7 +76,7 @@ document
 
 // show popup with a list of Patreon supportes (updated manually)
 async function showSupporters() {
-  const {supporters} = await import("../dynamic/supporters.js?v=1.93.08");
+  const {supporters} = await import("../dynamic/supporters.js?v=1.97.14");
   const list = supporters.split("\n").sort();
   const columns = window.innerWidth < 800 ? 2 : 5;