From 465f578135057bfee4f956ef821259a997d1e6c9 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Thu, 23 Apr 2020 11:56:09 +0000
Subject: [PATCH 01/38] Added elevation profile for routes and rivers

---
 index.html                      |   7 ++
 modules/ui/elevation-profile.js | 162 ++++++++++++++++++++++++++++++++
 modules/ui/rivers-editor.js     |  10 ++
 modules/ui/routes-editor.js     |  10 ++
 4 files changed, 189 insertions(+)
 create mode 100644 modules/ui/elevation-profile.js

diff --git a/index.html b/index.html
index 7117c6c0d..b2950fc00 100644
--- a/index.html
+++ b/index.html
@@ -2122,11 +2122,16 @@
 
       <button id="riverEditStyle" data-tip="Edit style for all rivers in Style Editor" class="icon-brush"></button>
       <button id="riverLength" data-tip="River length in selected units">0</button>
+      <button id="riverElevationProfile" data-tip="Show the elevation profile for the river" class="icon-chart-area"></button>
       <button id="riverNew" data-tip="Create new river clicking on map" class="icon-map-pin"></button>
       <button id="riverLegend" data-tip="Edit free text notes (legend) for the river" class="icon-edit"></button>
       <button id="riverRemove" data-tip="Remove river. Shortcut: Delete" class="icon-trash"></button>
     </div>
 
+    <div id="elevationProfile" class="dialog" style="display: none" width="100%">
+      <div id="elevationGraph" data-tip="Elevation profile"></div>
+    </div>
+
     <div id="routeEditor" class="dialog" style="display: none">
       <button id="routeGroupsShow" data-tip="Show the group selection" class="icon-tags"></button>
       <div id="routeGroupsSelection" style="display: none">
@@ -2139,6 +2144,7 @@
 
       <button id="routeEditStyle" data-tip="Edit route group style in Style Editor" class="icon-brush"></button>
       <button id="routeLength" data-tip="Route length in selected units">0</button>
+      <button id="routeElevationProfile" data-tip="Show the elevation profile for the route" class="icon-chart-area"></button>
       <button id="routeSplit" data-tip="Click on a control point to split the route" class="icon-unlink"></button>
       <button id="routeLegend" data-tip="Edit free text notes (legend) for the route" class="icon-edit"></button>
       <button id="routeNew" data-tip="Create new route clicking on map" class="icon-map-pin"></button>
@@ -3542,6 +3548,7 @@
   <script defer src="modules/ui/biomes-editor.js"></script>
   <script defer src="modules/ui/cultures-editor.js"></script>
   <script defer src="modules/ui/namesbase-editor.js"></script>
+  <script defer src="modules/ui/elevation-profile.js"></script>
   <script defer src="modules/ui/routes-editor.js"></script>
   <script defer src="modules/ui/lakes-editor.js"></script>
   <script defer src="modules/ui/coastline-editor.js"></script>
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
new file mode 100644
index 000000000..de19378fc
--- /dev/null
+++ b/modules/ui/elevation-profile.js
@@ -0,0 +1,162 @@
+"use strict";
+
+function showEPForRoute(node) {
+  const points = [];
+  var prevB=0, i=0, j=0, b=0, ma=0, mi=100, h=0;
+  debug.select("#controlPoints").selectAll("circle").each(function() {
+    i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
+    points.push(i);
+  });
+
+  const routeLen = node.getTotalLength() * distanceScaleInput.value;
+
+  showElevationProfile(points, routeLen, false);
+}
+
+function showEPForRiver(node) {
+  const points = [];
+  var prevB=0, i=0, j=0, b=0, ma=0, mi=100, h=0;
+  debug.select("#controlPoints").selectAll("circle").each(function() {
+    i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
+    points.push(i);
+  });
+
+  const riverLen = (node.getTotalLength() / 2) * distanceScaleInput.value;
+
+  showElevationProfile(points, riverLen, true);
+}
+
+function resizeElevationProfile() {
+}
+
+function closeElevationProfile() {
+  modules.elevation = false;
+}
+
+function showElevationProfile(data, routeLen, isRiver) {
+// data is an array of cell indexes, routeLen is the distance, isRiver should be true for rivers, false otherwise
+  document.getElementById("elevationGraph").innerHTML = "";
+
+  $("#elevationProfile").dialog({
+    title: "Elevation profile", resizable: false,
+    width: window.width,
+    close: closeElevationProfile,
+    position: {my: "left top", at: "left+20 bottom-240", of: window, collision: "fit"}
+  });
+
+  // Azgaar asked if we can prevent river graphs from showing rivers as flowing uphill
+  var slope = 0;
+  if (isRiver) {
+    if (pack.cells.h[data[0]] < pack.cells.h[data[data.length-1]]) {
+      slope = 1; // up-hill
+    } else if (pack.cells.h[data[0]] > pack.cells.h[data[data.length-1]]) {
+      slope = -1; // down-hill 
+    }
+  }
+
+  const points = [];
+  var prevB=0, prevH=-1, i=0, j=0, cell=0, b=0, ma=0, mi=100, h=0;
+  for (var i=0; i<data.length; i++) {
+    cell = data[i];
+
+    h = pack.cells.h[cell];
+    if (h < 20) h = 20;
+
+    // check for river up-hill
+    if (prevH != -1) {
+      if (isRiver) {
+        if (slope == 1 && h < prevH) h = prevH;
+        else if (slope == 0 && h != prevH) h = prevH;
+        else if (slope == -1 && h > prevH) h = prevH;
+      }
+    }
+    prevH = h;
+    // river up-hill checks stop here
+
+    mi = Math.min(mi, h);
+    ma = Math.max(ma, h);
+
+    b = pack.cells.burg[cell];
+    if (b == prevB) b = 0;
+    else prevB = b;
+    points.push({x:j, y:h, b:b});
+    j++;
+  }
+
+  const heightDiff = ma-mi+1;
+
+
+//  const w = document.getElementById("elevationProfile").clientWidth - 32;
+  const w = window.innerWidth-280;
+  h = 100;
+
+  const xOffset = 100;
+  const yOffset = 80;
+
+  var chart = d3.select("#elevationGraph").append("svg").attr("width", w+200).attr("height", h+yOffset).attr("id", "elevationGraph");
+  // arrow-head definition
+  chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z");
+
+  // main graph line
+  var lineFunc = d3.line()
+    .x(function(d) { return d.x * w / points.length + xOffset})
+    .y(function(d) { return h-d.y + yOffset });
+
+  chart.append("path").attr("d", lineFunc(points)).attr("stroke", "purple").attr("fill", "none").attr("id", "elevationLine");
+
+  // y-axis labels for starting and ending heights
+  chart.append("text").attr("id", "epy0").attr("x", xOffset-10).attr("y", h-points[0].y + yOffset).attr("text-anchor", "end");
+  document.getElementById("epy0").innerHTML = getHeight(points[0].y);
+  chart.append("text").attr("id", "epy1").attr("x", w+100).attr("y", h-points[points.length-1].y + yOffset).attr("text-anchor", "start");
+  document.getElementById("epy1").innerHTML = getHeight(points[points.length-1].y);
+
+  // y-axis labels for minimum and maximum heights (if not too close to start/end heights)
+  if (Math.abs(ma - points[0].y) > 3 && Math.abs(ma - points[points.length-1].y) > 3) {
+    chart.append("text").attr("id", "epy2").attr("x", xOffset-10).attr("y", h-ma + yOffset).attr("text-anchor", "end");
+    document.getElementById("epy2").innerHTML = getHeight(ma);
+  }
+  if (Math.abs(mi - points[0].y) > 3 && Math.abs(mi - points[points.length-1].y) > 3) {
+    chart.append("text").attr("id", "epy3").attr("x", xOffset-10).attr("y", h-mi + yOffset).attr("text-anchor", "end");
+    document.getElementById("epy3").innerHTML = getHeight(mi);
+  }
+  
+  // x-axis label for start, quarter, halfway and three-quarter, and end
+  chart.append("text").attr("id", "epx1").attr("x", xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
+  chart.append("text").attr("id", "epx2").attr("x", w / 4 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
+  chart.append("text").attr("id", "epx3").attr("x", w / 2 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
+  chart.append("text").attr("id", "epx4").attr("x", w / 4*3 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
+  chart.append("text").attr("id", "epx5").attr("x", w + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
+  document.getElementById("epx1").innerHTML = "0 " + distanceUnitInput.value;
+  document.getElementById("epx2").innerHTML = rn(routeLen / 4) + " " + distanceUnitInput.value;
+  document.getElementById("epx3").innerHTML = rn(routeLen / 2) + " " + distanceUnitInput.value;
+  document.getElementById("epx4").innerHTML = rn(routeLen / 4*3) + " " + distanceUnitInput.value;
+  document.getElementById("epx5").innerHTML = rn(routeLen) + " " + distanceUnitInput.value;
+
+  chart.append("path").attr("id", "epx11").attr("d", "M" + (xOffset).toString() + ",0L" + (xOffset).toString() +"," + (h+yOffset-15).toString()).attr("stroke", "lightgray").attr("stroke-width", "1");
+  chart.append("path").attr("id", "epx12").attr("d", "M" + (w / 4 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 4 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
+  chart.append("path").attr("id", "epx13").attr("d", "M" + (w / 2 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 2 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
+  chart.append("path").attr("id", "epx14").attr("d", "M" + (w / 4*3 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 4*3 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
+  chart.append("path").attr("id", "epx15").attr("d", "M" + (w + xOffset).toString() + ",0L" + (w + xOffset).toString() +"," + (h+yOffset-15).toString()).attr("stroke", "lightgray").attr("stroke-width", "1");
+
+  // draw city labels - try to avoid putting labels over one another
+  var y1 = 0;
+  var add = 15;
+  points.forEach(function(p) {
+    if (p.b > 0) {
+      var x1 = p.x * w / points.length + xOffset;
+      y1+=add;
+      if (y1 >= yOffset) { y1 = add; }
+      var d1 = 0;
+
+      // burg name
+      chart.append("text").attr("id", "ep" + p.b).attr("x", x1).attr("y", y1).attr("text-anchor", "middle");
+      document.getElementById("ep" + p.b).innerHTML = pack.burgs[p.b].name;
+
+      // arrow from burg name to graph line
+      chart.append("path").attr("id", "eparrow" + p.b).attr("d", "M" + x1.toString() + "," + (y1).toString() + "L" + x1.toString() + "," + parseInt(h-p.y-3+yOffset).toString()).attr("stroke", "black").attr("stroke-width", "1").attr("marker-end", "url(#arrowhead)");
+    }
+  });
+
+
+}
+
diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js
index 157c0dcd7..855519765 100644
--- a/modules/ui/rivers-editor.js
+++ b/modules/ui/rivers-editor.js
@@ -33,6 +33,7 @@ function editRiver(id) {
   document.getElementById("riverWidthHide").addEventListener("click", hideRiverWidth);
   document.getElementById("riverWidthInput").addEventListener("input", changeWidth);
   document.getElementById("riverIncrement").addEventListener("input", changeIncrement);
+  document.getElementById("riverElevationProfile").addEventListener("click", showElevationProfile);
   
   document.getElementById("riverEditStyle").addEventListener("click", () => editStyle("rivers"));
   document.getElementById("riverNew").addEventListener("click", toggleRiverCreationMode);
@@ -94,6 +95,10 @@ function editRiver(id) {
     const [d, length] = Rivers.getPath(points, +riverWidthInput.value, +riverIncrement.value);
     elSelected.attr("d", d);
     updateRiverLength(length);
+
+    if (modules.elevation) {
+      showEPForRiver(elSelected.node());
+    }
   }
 
   function updateRiverLength(l = elSelected.node().getTotalLength() / 2) {
@@ -176,6 +181,11 @@ function editRiver(id) {
     if (r) r.name = riverName.value = Names.getBase(rand(nameBases.length-1));
   }
 
+  function showElevationProfile() {
+    modules.elevation = true;
+    showEPForRiver(node);
+  }
+
   function showRiverWidth() {
     document.querySelectorAll("#riverEditor > button").forEach(el => el.style.display = "none");
     document.getElementById("riverWidthSection").style.display = "inline-block";
diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js
index b1f30c67a..98974f299 100644
--- a/modules/ui/routes-editor.js
+++ b/modules/ui/routes-editor.js
@@ -30,6 +30,7 @@ function editRoute(onClick) {
   document.getElementById("routeGroupName").addEventListener("change", createNewGroup);
   document.getElementById("routeGroupRemove").addEventListener("click", removeRouteGroup);
   document.getElementById("routeGroupsHide").addEventListener("click", hideGroupSection);
+  document.getElementById("routeElevationProfile").addEventListener("click", showElevationProfile);
 
   document.getElementById("routeEditStyle").addEventListener("click", editGroupStyle);
   document.getElementById("routeSplit").addEventListener("click", toggleRouteSplitMode);
@@ -101,6 +102,15 @@ function editRoute(onClick) {
     elSelected.attr("d", round(lineGen(points)));
     const l = elSelected.node().getTotalLength();
     routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;    
+ 
+    if (modules.elevation) {
+      showEPForRoute(elSelected.node());
+    }
+  }
+
+  function showElevationProfile() {
+    modules.elevation = true;
+    showEPForRoute(node);
   }
 
   function showGroupSection() {

From 72d124d95d2ea790ada8d7e4aa8528322620a680 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 23 Apr 2020 19:44:32 +0300
Subject: [PATCH 02/38] v1.4.01

---
 icons.css                       |   3 +-
 index.css                       |  31 +---
 index.html                      |  69 +++++++--
 libs/jquery-ui.min.js           |   2 +-
 libs/lineclip.js                | 102 +++++++++++++
 main.js                         | 153 ++++++++------------
 modules/burgs-and-states.js     |  18 +--
 modules/military-generator.js   |  25 ++--
 modules/ocean-layers.js         |   6 +-
 modules/save-and-load.js        |  52 ++++++-
 modules/ui/battle-screen.js     |  50 +++++++
 modules/ui/biomes-editor.js     |   2 +
 modules/ui/burg-editor.js       |  30 +++-
 modules/ui/editors.js           |  40 ++++++
 modules/ui/general.js           |   2 +
 modules/ui/heightmap-editor.js  |   2 +-
 modules/ui/ice-editor.js        | 105 ++++++++++++++
 modules/ui/layers.js            |  93 ++++++++----
 modules/ui/markers-editor.js    | 246 ++------------------------------
 modules/ui/military-overview.js |  27 ++--
 modules/ui/regiment-editor.js   | 104 ++++++++------
 modules/ui/style.js             |  20 +--
 modules/ui/tools.js             |   9 +-
 modules/utils.js                |  11 +-
 run_php_server.bat              |   3 +
 upload.php                      |   6 +
 26 files changed, 713 insertions(+), 498 deletions(-)
 create mode 100644 libs/lineclip.js
 create mode 100644 modules/ui/battle-screen.js
 create mode 100644 modules/ui/ice-editor.js
 create mode 100644 run_php_server.bat
 create mode 100644 upload.php

diff --git a/icons.css b/icons.css
index b3c0e0748..45c212bc5 100644
--- a/icons.css
+++ b/icons.css
@@ -263,4 +263,5 @@
   margin-left: 1px;
   width: .6em;
   font-family: monospace;
-}
\ No newline at end of file
+}
+.icon-die:before {content:'🎲';}
\ No newline at end of file
diff --git a/index.css b/index.css
index ffe0ca044..1d538f859 100644
--- a/index.css
+++ b/index.css
@@ -60,13 +60,6 @@ textarea {
 	pointer-events: none;
 }
 
-#preview {
-	position: absolute;
-	bottom: 1em;
-	left: 1em;
-	cursor: pointer;
-}
-
 #pickerContainer {
 	position: absolute;
 	z-index: 100;
@@ -101,7 +94,7 @@ button, select, a, .pointer {
 	fill-rule: evenodd;
 }
 
-#lakes, #coastline, #armies {
+#lakes, #coastline, #armies, #ice {
 	cursor: pointer;
 }
 
@@ -1151,6 +1144,7 @@ div.slider .ui-slider-handle {
 
 .table {
 	max-height: 75vh;
+	max-width: 75vw;
 	overflow-x: hidden;
 	overflow-y: auto;
 }
@@ -1657,7 +1651,6 @@ rect.fillRect {
 
 #militaryOptionsTable input {
 	width: 9em;
-	padding-left: 3px;
 	border: 1px solid #d4d4d4;
 }
 
@@ -1760,24 +1753,6 @@ div.textual span, .textual legend {
 	vertical-align: top;
 }
 
-#markerIconTable {
-	font-size: 1.6em;
-	cursor: pointer;
-}
-
-#markerIconTable td:hover {
-	transition: .1s;
-	color: #3c3ca9;
-}
-
-#markerIconTable td:active {
-	transform: translate(0px, 1px);
-}
-
-#markerIconTable td.selected {
-	outline: 1px solid #9b9b9b;
-}
-
 .highlighted {
 	outline-width: 2px;
 	outline-style: dashed;
@@ -2025,7 +2000,7 @@ svg.button {
 	left: 50%;
 	top: 50%;
 	transform: translate(-50%, -50%);
-	max-width: 21em;
+	max-width: 22em;
 	background-color: #fff;
 	padding: 1.2em;
 	border: solid 1px #000;
diff --git a/index.html b/index.html
index 7117c6c0d..c3b0d294e 100644
--- a/index.html
+++ b/index.html
@@ -34,11 +34,11 @@
     #loading-text span:nth-child(3), #mapOverlay > span:nth-child(3) {animation-delay: 2s;}
     @keyframes blink {0% {opacity: 0;} 20% {opacity: 1;} 100% {opacity: .1;}}
   </style>
-  <link rel="preload" href="index.css?version=1.3" as="style">
-  <link rel="preload" href="icons.css?version=1.3" as="style">
+  <link rel="preload" href="index.css?version=1.4" as="style">
+  <link rel="preload" href="icons.css?version=1.4" as="style">
   <link rel="preload" href="libs/jquery-ui.css" as="style">
-  <link rel="stylesheet" href="index.css?version=1.3">
-  <link rel="stylesheet" href="icons.css?version=1.3">
+  <link rel="stylesheet" href="index.css?version=1.4">
+  <link rel="stylesheet" href="icons.css?version=1.4">
   <link rel="stylesheet" href="libs/jquery-ui.css">
 
 </head>
@@ -899,7 +899,7 @@
   <div id="loading">
     <div id="titleName"><t data-t="titleName">Azgaar's</t></div>
     <div id="title"><t data-t="title">Fantasy Map Generator</t></div>
-    <div id="version"><t data-t="version">v. </t>1.3</div>
+    <div id="version"><t data-t="version">v. </t>1.4</div>
     <p id="loading-text"><t data-t="loading">LOADING</t><span>.</span><span>.</span><span>.</span></p>
   </div>
 
@@ -960,6 +960,7 @@
           <li id="toggleRoutes"data-tip="Trade routes: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: U" onclick="toggleRoutes(event)">Ro<u>u</u>tes</li>
           <li id="toggleTemp" data-tip="Temperature map: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: T" class="buttonoff" onclick="toggleTemp(event)"><u>T</u>emperature</li>
           <li id="togglePopulation" data-tip="Population map: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: N" class="buttonoff" onclick="togglePopulation(event)">Populatio<u>n</u></li>
+          <li id="toggleIce" data-tip="Icebergs and glaciers: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: J" class="buttonoff" onclick="toggleIce(event)">Ice</li>
           <li id="togglePrec" data-tip="Precipitation map: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: A" class="buttonoff" onclick="togglePrec(event)">Precipit<u>a</u>tion</li>
           <li id="toggleLabels" data-tip="Labels: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: L" onclick="toggleLabels(event)"><u>L</u>abels</li>
           <li id="toggleIcons" data-tip="Burg icons: click to toggle, drag to raise or lower the layer. Ctrl + click to edit layer style. Shortcut: I" onclick="toggleIcons(event)"><u>I</u>cons</li>
@@ -1002,6 +1003,7 @@
           <option value="fogging">Fogging</option>
           <option value="gridOverlay">Grid</option>
           <option value="terrs">Heightmap</option>
+          <option value="ice">Ice</option>
           <option value="labels">Labels</option>
           <option value="lakes">Lakes</option>
           <option value="landmass">Landmass</option>
@@ -1022,7 +1024,6 @@
           <option value="texture">Texture</option>
           <option value="compass">Wind Rose</option>
           <option value="zones">Zones</option>
-          <option value="seaIce">Ice</option>
         </select>
         <!-- <button id="restoreStyle" data-tip="Click to restore default style for all elements" class="icon-ccw styleButton" onclick="askToRestoreDefaultStyle()"></button> -->
 
@@ -1857,6 +1858,7 @@
           <button id="regenerateProvinces" data-tip="Click to regenerate provinces. States will remain as they are">Provinces</button>
           <button id="regenerateReligions" data-tip="Click to regenerate religions">Religions</button>
           <button id="regenerateMilitary" data-tip="Click to recalculate military forces based on current military options">Military</button>
+          <button id="regenerateIce" data-tip="Click to icebergs and glaciers">Ice</button>
           <button id="regenerateMarkers" data-tip="Click to regenerate markers. Hold Ctrl and click to set markers number multiplier">Markers</button>
           <button id="regenerateZones" data-tip="Click to regenerate zones. Hold Ctrl and click to set zones number multiplier">Zones</button>
         </div>
@@ -2160,6 +2162,14 @@
       <button id="lakeLegend" data-tip="Edit free text notes (legend) for the lake" class="icon-edit"></button>
     </div>
 
+    <div id="iceEditor" class="dialog" style="display: none">
+      <button id="iceEditStyle" data-tip="Edit style in Style Editor" class="icon-brush"></button>
+      <button id="iceRandomize" data-tip="Randomize Iceberd shape" class="icon-shuffle"></button>
+      <input id="iceSize" data-tip="Change Iceberg size" type="range" min=".05" max="1" step=".01">
+      <button id="iceNew" data-tip="Add an Iceberg (click on map)" class="icon-plus"></button>
+      <button id="iceRemove" data-tip="Remove the element. Shortcut: Delete" class="icon-trash"></button>
+    </div>
+
     <div id="coastlineEditor" class="dialog" style="display: none">
       <button id="coastlineGroupsShow" data-tip="Show the group selection" class="icon-tags"></button>
       <div id="coastlineGroupsSelection" style="display: none">
@@ -2373,15 +2383,13 @@
       <button id="markerIcon" data-tip="Change marker icon and edit positioning" class="icon-star"></button>
       <div id="markerIconSection" style="display: none">
         <i data-tip="Change marker icon size" class="icon-resize-full"></i>
-        <input id="markerIconSize" data-tip="Change marker icon size" type="range" min=10 max=30 step=.5 value=22 style="width:12em">
+        <input id="markerIconSize" data-tip="Change marker icon size" type="range" min=5 max=30 step=.5 value=22 style="width:12em"><br>
+        <i data-tip="Marker Icon" class="icon-info"></i>
+        <button id="markerIconSelect" data-tip="Click to select icon"></button>
         <i data-tip="Change marker horizontal shift" class="icon-resize-horizontal"></i>
         <input id="markerIconShiftX" data-tip="Change icon horizontal shift" type="number" value=50 style="width:3em">
         <i data-tip="Change marker vertical shift" class="icon-resize-vertical"></i>
         <input id="markerIconShiftY" data-tip="Change vertical shift" type="number" min=0 max=100 value=50 style="width:3em">
-        <span data-tip="Paste custom unicode symbol to use as icon">Paste here:</span>
-        <input id="markerIconCustom" data-tip="Paste custom unicode symbol to use as icon" style="width:3em">
-        <table id="markerIconTable"></table>
-        <div style="font-style: italic; color: darkgrey;">Emojis look different in different browsers. Visit <a href="https://emojipedia.org/" rel="noopener" target="_blank">Emojipedia</a> to check and find more</div>
       </div>
 
       <button id="markerStyle" data-tip="Change marker size and colors" class="icon-brush"></button>
@@ -2421,6 +2429,7 @@
       </div>
 
       <div id="regimentBottom">
+        <button id="regimentAttack" data-tip="Attack other regiment" class="icon-target"></button>
         <button id="regimentAdd" data-tip="Create new regiment or fleet" class="icon-user-plus"></button>
         <button id="regimentSplit" data-tip="Split regiment into 2 separate ones" class="icon-half"></button>
         <button id="regimentAttach" data-tip="Attach regiment to another one (include this regiment to another one)" class="icon-attach"></button>
@@ -2430,6 +2439,22 @@
       </div>
     </div>
 
+    <div id="battleScreen" class="dialog" style="display: none">
+      <div id="battleBody">
+        <div style="font-size:1.2em; font-weight: bold"><div style="width: 1.2em; display: inline-block">⚔</div><span>Attackers</span></div>
+        <table id="battleAttackers" style="padding: .2em .6em .2em .6em; border: 1px solid #ccc; margin: .0 0 .4em 0"><thead><tr></tr></thead><tbody></tbody></table>
+        <div style="font-size:1.2em; font-weight: bold"><div style="width: 1.2em; display: inline-block">🛡</div><span>Defenders</span></div>
+        <table id="battleDefenders" style="padding: .2em .6em .2em .6em; border: 1px solid #ccc; margin: .0 0 .4em 0"><thead><tr></tr></thead><tbody></tbody></table>
+      </div>
+
+      <div id="battleBottom">
+        <button id="battleRoll" data-tip="Roll dice to randomize sides power and battle phase" class="icon-die"></button>
+        <button id="battleNext" data-tip="Calculate and apply phase results" class="icon-play"></button>
+        <button id="battleApply" data-tip="Apply battle results" class="icon-check"></button>
+        <button id="battleCancel" data-tip="Cancel battle results and restore initial troop value" class="icon-cancel"></button>
+      </div>
+    </div>
+
     <div id="brushesPanel" class="dialog stable" style="display: none">
       <div id="brushesButtons" style="display: inline-block">
         <button id="brushRaise" data-tip="Raise brush: increase height of cells in radius by Power value">
@@ -2839,7 +2864,7 @@
     <div id="diplomacyEditor" class="dialog stable" style="display: none">
       <div id="diplomacyHeader" class="header">
         <div style="left:.2em" data-tip="Click to sort by state name" class="sortable alphabetically" data-sortby="name">State&nbsp;</div>
-        <div style="left:12.4em" data-tip="Click to sort by diplomatical relations" class="sortable alphabetically" data-sortby="relations">Relations&nbsp;</div>
+        <div style="left:13.4em" data-tip="Click to sort by diplomatical relations" class="sortable alphabetically" data-sortby="relations">Relations&nbsp;</div>
       </div>
 
 	    <div id="diplomacyBodySection" class="table"></div>
@@ -3329,10 +3354,12 @@
       <table id="militaryOptionsTable">
         <thead>
           <tr>
-            <th data-tip="Unit name. If name is changed for existing unit, old unit will be replaced">Military unit</th>
+            <th data-tip="Unit icon">Icon</th>
+            <th data-tip="Unit name. If name is changed for existing unit, old unit will be replaced">Unit name</th>
             <th data-tip="Conscription percentage for rural population">Rural %</th>
             <th data-tip="Conscription percentage for urban population">Urban %</th>
-            <th data-tip="Average number of people in crew">Crew</th>
+            <th data-tip="Average number of people in crew (used for total personnel calculation)">Crew</th>
+            <th data-tip="Unit military power (used for battle simulation)">Power</th>
             <th data-tip="Unit type to apply special rules on forces recalculation">Type</th>
             <th data-tip="Check if unit is separate and can be stacked only with units of the same type">Sep.</th>
           </tr>
@@ -3382,6 +3409,15 @@
       <p><b>Burg:</b> <span id="infoBurg">n/a</span></p>
     </div>
 
+    <div id="iconSelector" style="display: none" class="dialog">
+      <table id="iconTable" class="table pointer" style="font-size: 2em; text-align: center"></table>
+      <div style="font-style: italic; font-size: 1.2em; margin: .4em 0 0 .4em">
+        <span>Select from the list or paste a Unicode character here: </span>
+        <input id="iconInput" style="width: 2em">
+        <span>. See <a href="https://emojipedia.org" target="_blank">Emojipedia</a> for reference</span>
+      </div>
+    </div>
+
     <div id="options3d" class="dialog stable" style="display: none">
 
       <div id="options3dMesh" style="display: none">
@@ -3523,6 +3559,7 @@
   <script src="modules/religions-generator.js"></script>
   <script src="modules/military-generator.js"></script>
   <script src="libs/polylabel.min.js"></script>
+  <script src="libs/lineclip.js"></script>
   <script src="libs/jquery-ui.min.js"></script>
   <script src="libs/seedrandom.min.js"></script>
   <script src="modules/ui/layers.js"></script>
@@ -3532,7 +3569,7 @@
   <script defer src="modules/ui/style.js"></script>
   <script defer src="modules/ui/measurers.js"></script>
   <script defer src="modules/save-and-load.js"></script>
-  <script defer src="main.js?version=1.0"></script>
+  <script defer src="main.js?version=1.4"></script>
   <script defer src="modules/relief-icons.js"></script>
   <script defer src="modules/ui/tools.js"></script>
   <script defer src="modules/ui/world-configurator.js"></script>
@@ -3543,6 +3580,7 @@
   <script defer src="modules/ui/cultures-editor.js"></script>
   <script defer src="modules/ui/namesbase-editor.js"></script>
   <script defer src="modules/ui/routes-editor.js"></script>
+  <script defer src="modules/ui/ice-editor.js"></script>
   <script defer src="modules/ui/lakes-editor.js"></script>
   <script defer src="modules/ui/coastline-editor.js"></script>
   <script defer src="modules/ui/labels-editor.js"></script>
@@ -3560,6 +3598,7 @@
   <script defer src="modules/ui/military-overview.js"></script>
   <script defer src="modules/ui/regiments-overview.js"></script>
   <script defer src="modules/ui/regiment-editor.js"></script>
+  <script defer src="modules/ui/battle-screen.js"></script>
   <script defer src="modules/ui/editors.js"></script>
   <script defer src="modules/ui/3d.js"></script>
   <script defer src="libs/quantize.min.js"></script>
diff --git a/libs/jquery-ui.min.js b/libs/jquery-ui.min.js
index 6b762cb0b..5099cd13b 100644
--- a/libs/jquery-ui.min.js
+++ b/libs/jquery-ui.min.js
@@ -1 +1 @@
-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}t.ui=t.ui||{},t.ui.version="1.12.1";var i=0,s=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,n,o=s.call(arguments,1),a=0,r=o.length;r>a;a++)for(i in o[a])n=o[a][i],o[a].hasOwnProperty(i)&&void 0!==n&&(e[i]=t.isPlainObject(n)?t.isPlainObject(e[i])?t.widget.extend({},e[i],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,i){var n=i.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=s.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new i(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,l=t(this),h=l.outerWidth(),c=l.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=h+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),T=e(k.my,l.outerWidth(),l.outerHeight());"right"===n.my[0]?D.left-=h:"center"===n.my[0]&&(D.left-=h/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:h,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:l})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-h,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:l,left:D.left,top:D.top,width:h,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,l,h=i.nodeName.toLowerCase();return"area"===h?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(h)?(r=!i.disabled,r&&(l=t(i).closest("fieldset")[0],l&&(r=!l.disabled))):r="a"===h?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var n=!1;t(document).on("mouseup",function(){n=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!n){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),n=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,n=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}});var o=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var l=n[s]("widget");t.data(l[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(l[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var a=i.options.classes[n]||"";a=t.trim(a.replace(o,"")),s[n]=(a+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"#dialogs",autoOpen:!0,buttons:[],closeOnEscape:!0,draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarCollapse=t("<button data-tip='Minimize / maximize' type='button'>_</button>").appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarCollapse,"ui-dialog-titlebar-collapse"),this._on(this.uiDialogTitlebarCollapse,{click:function(t){t.preventDefault(),$(this.element[0]).toggle()}}),this.uiDialogTitlebarClose=t("<button data-tip='Close' type='button'>✕</button>").appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),l=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(l>=0?"+":"")+l,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog});
\ No newline at end of file
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}t.ui=t.ui||{},t.ui.version="1.12.1";var i=0,s=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,n,o=s.call(arguments,1),a=0,r=o.length;r>a;a++)for(i in o[a])n=o[a][i],o[a].hasOwnProperty(i)&&void 0!==n&&(e[i]=t.isPlainObject(n)?t.isPlainObject(e[i])?t.widget.extend({},e[i],n):t.widget.extend({},n):n);return e},t.widget.bridge=function(e,i){var n=i.prototype.widgetFullName||e;t.fn[e]=function(o){var a="string"==typeof o,r=s.call(arguments,1),l=this;return a?this.length||"instance"!==o?this.each(function(){var i,s=t.data(this,n);return"instance"===o?(l=s,!1):s?t.isFunction(s[o])&&"_"!==o.charAt(0)?(i=s[o].apply(s,r),i!==s&&void 0!==i?(l=i&&i.jquery?l.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+o+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+o+"'")}):l=void 0:(r.length&&(o=t.widget.extend.apply(null,[o].concat(r))),this.each(function(){var e=t.data(this,n);e?(e.option(o||{}),e._init&&e._init()):t.data(this,n,new i(o,this))})),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,l=t(this),h=l.outerWidth(),c=l.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=h+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),T=e(k.my,l.outerWidth(),l.outerHeight());"right"===n.my[0]?D.left-=h:"center"===n.my[0]&&(D.left-=h/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:h,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:l})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-h,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:l,left:D.left,top:D.top,width:h,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,l,h=i.nodeName.toLowerCase();return"area"===h?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(h)?(r=!i.disabled,r&&(l=t(i).closest("fieldset")[0],l&&(r=!l.disabled))):r="a"===h?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var n=!1;t(document).on("mouseup",function(){n=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!n){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,o="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!o&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),n=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,n=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:a.maxHeight?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}});var o=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var l=n[s]("widget");t.data(l[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(l[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var a=i.options.classes[n]||"";a=t.trim(a.replace(o,"")),s[n]=(a+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"#dialogs",autoOpen:!0,buttons:[],closeOnEscape:!0,draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarCollapse=t("<button data-tip='Minimize / maximize' type='button'>_</button>").appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarCollapse,"ui-dialog-titlebar-collapse"),this._on(this.uiDialogTitlebarCollapse,{click:function(t){t.preventDefault(),$(this.element[0]).toggle()}}),this.uiDialogTitlebarClose=t("<button data-tip='Close' type='button'>✕</button>").appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),l=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(l>=0?"+":"")+l,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog});
\ No newline at end of file
diff --git a/libs/lineclip.js b/libs/lineclip.js
new file mode 100644
index 000000000..31a55d28c
--- /dev/null
+++ b/libs/lineclip.js
@@ -0,0 +1,102 @@
+'use strict';
+// lineclip by mourner, https://github.com/mapbox/lineclip
+// Cohen-Sutherland line clippign algorithm, adapted to efficiently
+// handle polylines rather than just segments
+function lineclip(points, bbox, result) {
+    var len = points.length,
+        codeA = bitCode(points[0], bbox),
+        part = [],
+        i, a, b, codeB, lastCode;
+    if (!result) result = [];
+
+    for (i = 1; i < len; i++) {
+        a = points[i - 1];
+        b = points[i];
+        codeB = lastCode = bitCode(b, bbox);
+
+        while (true) {
+            if (!(codeA | codeB)) { // accept
+                part.push(a);
+
+                if (codeB !== lastCode) { // segment went outside
+                    part.push(b);
+                    if (i < len - 1) { // start a new line
+                        result.push(part);
+                        part = [];
+                    }
+                } else if (i === len - 1) {
+                    part.push(b);
+                }
+                break;
+
+            } else if (codeA & codeB) { // trivial reject
+                break;
+            } else if (codeA) { // a outside, intersect with clip edge
+                a = intersect(a, b, codeA, bbox);
+                codeA = bitCode(a, bbox);
+            } else { // b outside
+                b = intersect(a, b, codeB, bbox);
+                codeB = bitCode(b, bbox);
+            }
+        }
+        codeA = lastCode;
+    }
+
+    if (part.length) result.push(part);
+
+    return result;
+}
+
+// Sutherland-Hodgeman polygon clipping algorithm
+function polygonclip(points, bbox, secure = false) {
+    var result, edge, prev, prevInside, inter, i, p, inside;
+
+    // clip against each side of the clip rectangle
+    for (edge = 1; edge <= 8; edge *= 2) {
+        result = [];
+        prev = points[points.length - 1];
+        prevInside = !(bitCode(prev, bbox) & edge);
+
+        for (i = 0; i < points.length; i++) {
+            p = points[i];
+            inside = !(bitCode(p, bbox) & edge);
+            inter = inside !== prevInside; // segment goes through the clip window
+
+            if (secure && inter && inside && i) result.push(points[i-1]); // add previous point in secure mode (to get a correct d3 curve)
+            if (inter) result.push(intersect(prev, p, edge, bbox)); // add an intersection point
+            if (inside) result.push(p); // add a point if it's inside
+            else if (secure && prevInside) result.push(p); // // add an outside point if in secure mode (to get a correct d3 curve)
+
+            prev = p;
+            prevInside = inside;
+        }
+        points = result;
+        if (!points.length) break;
+    }
+    return result;
+}
+
+// intersect a segment against one of the 4 lines that make up the bbox
+function intersect(a, b, edge, bbox) {
+    return edge & 8 ? [a[0] + (b[0] - a[0]) * (bbox[3] - a[1]) / (b[1] - a[1]), bbox[3]] : // top
+        edge & 4 ? [a[0] + (b[0] - a[0]) * (bbox[1] - a[1]) / (b[1] - a[1]), bbox[1]] : // bottom
+        edge & 2 ? [bbox[2], a[1] + (b[1] - a[1]) * (bbox[2] - a[0]) / (b[0] - a[0])] : // right
+        edge & 1 ? [bbox[0], a[1] + (b[1] - a[1]) * (bbox[0] - a[0]) / (b[0] - a[0])] : null; // left
+}
+
+// bit code reflects the point position relative to the bbox:
+//         left  mid  right
+//    top  1001  1000  1010
+//    mid  0001  0000  0010
+// bottom  0101  0100  0110
+function bitCode(p, bbox) {
+    var code = 0;
+
+    if (p[0] < bbox[0]) code |= 1; // left
+    else if (p[0] > bbox[2]) code |= 2; // right
+
+    if (p[1] < bbox[1]) code |= 4; // bottom
+    else if (p[1] > bbox[3]) code |= 8; // top
+
+    return code;
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index 71fa053e5..0626e5b7c 100644
--- a/main.js
+++ b/main.js
@@ -7,7 +7,7 @@
 // See also https://github.com/Azgaar/Fantasy-Map-Generator/issues/153
 
 "use strict";
-const version = "1.3"; // generator version
+const version = "1.4"; // generator version
 document.title += " v" + version;
 
 // if map version is not stored, clear localStorage and show a message
@@ -52,6 +52,7 @@ let trails = routes.append("g").attr("id", "trails");
 let searoutes = routes.append("g").attr("id", "searoutes");
 let temperature = viewbox.append("g").attr("id", "temperature");
 let coastline = viewbox.append("g").attr("id", "coastline");
+let ice = viewbox.append("g").attr("id", "ice").style("display", "none");
 let prec = viewbox.append("g").attr("id", "prec").style("display", "none");
 let population = viewbox.append("g").attr("id", "population");
 let labels = viewbox.append("g").attr("id", "labels");
@@ -220,7 +221,7 @@ function focusOn() {
   const url = new URL(window.location.href);
   const params = url.searchParams;
 
-  if (params.get("from") === "MFCG") {
+  if (params.get("from") === "MFCG" && document.referrer) {
     if (params.get("seed").length === 13) {
       // show back burg from MFCG
       params.set("burg", params.get("seed").slice(-4));
@@ -313,12 +314,12 @@ function applyDefaultBiomesSystem() {
   const iconsDensity = [0,3,2,120,120,120,120,150,150,100,5,0,150];
   const icons = [{},{dune:3, cactus:6, deadTree:1},{dune:9, deadTree:1},{acacia:1, grass:9},{grass:1},{acacia:8, palm:1},{deciduous:1},{acacia:5, palm:3, deciduous:1, swamp:1},{deciduous:6, swamp:1},{conifer:1},{grass:1},{},{swamp:1}];
   const cost = [10,200,150,60,50,70,70,80,90,200,1000,5000,150]; // biome movement cost
-  const biomesMartix = [ // hot ↔ cold; dry ↕ wet
-    new Uint8Array([1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]),
-    new Uint8Array([3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,9,9,9,9,9,10,10]),
+  const biomesMartix = [ // hot ↔ cold [>19°C; <-4°C]; dry ↕ wet
+    new Uint8Array([1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,10]),
+    new Uint8Array([3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,9,9,9,9,10,10,10]),
     new Uint8Array([5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,9,9,9,9,9,10,10,10]),
     new Uint8Array([5,6,6,6,6,6,6,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,10,10,10]),
-    new Uint8Array([7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,10,10,10])
+    new Uint8Array([7,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,10,10])
   ];
 
   // parse icons weighted array into a simple array
@@ -527,7 +528,7 @@ function generate() {
     elevateLakes();
     Rivers.generate();
     defineBiomes();
-    //drawSeaIce();
+    drawIce();
 
     rankCells();
     Cultures.generate();
@@ -701,8 +702,9 @@ function openNearSeaLakes() {
 // define map size and position based on template and random factor
 function defineMapSize() {
   const [size, latitude] = getSizeAndLatitude();
-  if (!locked("mapSize")) mapSizeOutput.value = mapSizeInput.value = size;
-  if (!locked("latitude")) latitudeOutput.value = latitudeInput.value = latitude;
+  const randomize = new URL(window.location.href).searchParams.get("options") === "default"; // ignore stored options
+  if (randomize || !locked("mapSize")) mapSizeOutput.value = mapSizeInput.value = size;
+  if (randomize || !locked("latitude")) latitudeOutput.value = latitudeInput.value = latitude;
 
   function getSizeAndLatitude() {
     const template = document.getElementById("templateInput").value; // heightmap template
@@ -963,7 +965,7 @@ function drawCoastline() {
     let vchain = connectVertices(start, type);
     if (features[f].type === "lake") relax(vchain, 1.2);
     used[f] = 1;
-    let points = vchain.map(v => vertices.p[v]);
+    let points = clipPoly(vchain.map(v => vertices.p[v]), 1);
     const area = d3.polygonArea(points); // area with lakes/islands
     if (area > 0 && features[f].type === "lake") {
       points = points.reverse();
@@ -1056,7 +1058,6 @@ function reMarkFeatures() {
     const start = queue[0]; // first cell
     cells.f[start] = i; // assign feature number
     const land = cells.h[start] >= 20;
-    //const frozen = !land && temp[cells.g[start]] < -5; // check if water is frozen
     let border = false; // true if feature touches map border
     let cellNumber = 1; // to count cells number in a feature
 
@@ -1075,7 +1076,6 @@ function reMarkFeatures() {
           else if (!cells.t[q] && cells.t[e] === 1) cells.t[q] = 2;
         }
         if (!cells.f[e] && land === eLand) {
-          //if (!land && frozen !== temp[cells.g[e]] < -5) return;
           queue.push(e);
           cells.f[e] = i;
           cellNumber++;
@@ -1137,28 +1137,32 @@ function elevateLakes() {
 // assign biome id for each cell
 function defineBiomes() {
   console.time("defineBiomes");
-  const cells = pack.cells, f = pack.features;
+  const cells = pack.cells, f = pack.features, temp = grid.cells.temp, prec = grid.cells.prec;
   cells.biome = new Uint8Array(cells.i.length); // biomes array
 
   for (const i of cells.i) {
-    if (f[cells.f[i]].group === "freshwater") cells.h[i] = 19; // de-elevate lakes
-    const temp = grid.cells.temp[cells.g[i]]; // temperature
+    if (f[cells.f[i]].group === "freshwater") cells.h[i] = 19; // de-elevate lakes; here to save some resources
+    const t = temp[cells.g[i]]; // cell temperature
+    const h = cells.h[i]; // cell height
+    const m = h < 20 ? 0 : calculateMoisture(i); // cell moisture
+    cells.biome[i] = getBiomeId(m, t, h);
+  }
 
-    if (cells.h[i] < 20 && temp > -6) continue; // liquid water cells have biome 0
-    let moist = grid.cells.prec[cells.g[i]];
+  function calculateMoisture(i) {
+    let moist = prec[cells.g[i]];
     if (cells.r[i]) moist += Math.max(cells.fl[i] / 20, 2);
-    const n = cells.c[i].filter(isLand).map(c => grid.cells.prec[cells.g[c]]).concat([moist]);
-    moist = rn(4 + d3.mean(n));
-    cells.biome[i] = getBiomeId(moist, temp, cells.h[i]);
+    const n = cells.c[i].filter(isLand).map(c => prec[cells.g[c]]).concat([moist]);
+    return rn(4 + d3.mean(n));
   }
 
   console.timeEnd("defineBiomes");
 }
 
+// assign biome id to a cell
 function getBiomeId(moisture, temperature, height) {
   if (temperature < -5) return 11; // permafrost biome, including sea ice
-  if (height < 20) return 0; // liquid water cells have marine biome
-  if (moisture > 40 && height < 25 || moisture > 24 && height > 24) return 12; // wetland biome
+  if (height < 20) return 0; // marine biome: liquid water cells
+  if (moisture > 40 && temperature > -2 && (height < 25 || moisture > 24 && height > 24)) return 12; // wetland biome
   const m = Math.min(moisture / 5 | 0, 4); // moisture band from 0 to 4
   const t = Math.min(Math.max(20 - temperature, 0), 25); // temparature band from 0 to 25
   return biomesData.biomesMartix[m][t];
@@ -1211,20 +1215,15 @@ function addMarkers(number = 1) {
   void function addVolcanoes() {
     let mounts = Array.from(cells.i).filter(i => cells.h[i] > 70).sort((a, b) => cells.h[b] - cells.h[a]);
     let count = mounts.length < 10 ? 0 : Math.ceil(mounts.length / 300 * number);
-    if (count) addMarker("volcano", "🌋", 52, 52, 17.5);
+    if (count) addMarker("volcano", "🌋", 52, 50, 13);
 
     while (count && mounts.length) {
       const cell = mounts.splice(biased(0, mounts.length-1, 5), 1);
       const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-      markers.append("use").attr("id", id).attr("data-cell", cell)
-        .attr("xlink:href", "#marker_volcano").attr("data-id", "#marker_volcano")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-      const height = getFriendlyHeight([x, y]);
+      const id = appendMarker(cell, "volcano");
       const proper = Names.getCulture(cells.culture[cell]);
       const name = P(.3) ? "Mount " + proper : Math.random() > .3 ? proper + " Volcano" : proper;
-      notes.push({id, name, legend:`Active volcano. Height: ${height}`});
+      notes.push({id, name, legend:`Active volcano. Height: ${getFriendlyHeight([x, y])}`});
       count--;
     }
   }()
@@ -1232,17 +1231,11 @@ function addMarkers(number = 1) {
   void function addHotSprings() {
     let springs = Array.from(cells.i).filter(i => cells.h[i] > 50).sort((a, b) => cells.h[b]-cells.h[a]);
     let count = springs.length < 30 ? 0 : Math.ceil(springs.length / 1000 * number);
-    if (count) addMarker("hot_springs", "♨", 50, 50, 19.5);
+    if (count) addMarker("hot_springs", "♨️", 50, 52, 12.5);
 
     while (count && springs.length) {
       const cell = springs.splice(biased(1, springs.length-1, 3), 1);
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_hot_springs").attr("data-id", "#marker_hot_springs")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "hot_springs");
       const proper = Names.getCulture(cells.culture[cell]);
       const temp = convertTemperature(gauss(30,15,20,100));
       notes.push({id, name: proper + " Hot Springs", legend:`A hot springs area. Temperature: ${temp}`});
@@ -1255,17 +1248,12 @@ function addMarkers(number = 1) {
     let count = !hills.length ? 0 : Math.ceil(hills.length / 7 * number);
     if (!count) return;
 
-    addMarker("mine", "⚒", 50, 50, 20);
+    addMarker("mine", "⛏️", 48, 50, 13.5);
     const resources = {"salt":5, "gold":2, "silver":4, "copper":2, "iron":3, "lead":1, "tin":1};
 
     while (count && hills.length) {
       const cell = hills.splice(Math.floor(Math.random() * hills.length), 1);
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_mine").attr("data-id", "#marker_mine")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
+      const id = appendMarker(cell, "mine");
       const resource = rw(resources);
       const burg = pack.burgs[cells.burg[cell]];
       const name = `${burg.name} — ${resource} mining town`;
@@ -1285,17 +1273,11 @@ function addMarkers(number = 1) {
       .sort((a, b) => (cells.road[b] + cells.fl[b] / 10) - (cells.road[a] + cells.fl[a] / 10));
 
     let count = !bridges.length ? 0 : Math.ceil(bridges.length / 12 * number);
-    if (count) addMarker("bridge", "🌉", 50, 50, 16.5);
+    if (count) addMarker("bridge", "🌉", 50, 50, 14);
 
     while (count && bridges.length) {
       const cell = bridges.splice(0, 1);
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_bridge").attr("data-id", "#marker_bridge")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "bridge");
       const burg = pack.burgs[cells.burg[cell]];
       const river = pack.rivers.find(r => r.i === pack.cells.r[cell]);
       const riverName = river ? `${river.name} ${river.type}` : "river";
@@ -1310,7 +1292,7 @@ function addMarkers(number = 1) {
     let taverns = Array.from(cells.i).filter(i => cells.crossroad[i] && cells.h[i] >= 20 && cells.road[i] > maxRoad);
     if (!taverns.length) return;
     const count = Math.ceil(4 * number);
-    addMarker("inn", "🍻", 50, 50, 17.5);
+    addMarker("inn", "🍻", 50, 50, 14.5);
 
     const color = ["Dark", "Light", "Bright", "Golden", "White", "Black", "Red", "Pink", "Purple", "Blue", "Green", "Yellow", "Amber", "Orange", "Brown", "Grey"];
     const animal = ["Antelope", "Ape", "Badger", "Bear", "Beaver", "Bison", "Boar", "Buffalo", "Cat", "Crane", "Crocodile", "Crow", "Deer", "Dog", "Eagle", "Elk", "Fox", "Goat", "Goose", "Hare", "Hawk", "Heron", "Horse", "Hyena", "Ibis", "Jackal", "Jaguar", "Lark", "Leopard", "Lion", "Mantis", "Marten", "Moose", "Mule", "Narwhal", "Owl", "Panther", "Rat", "Raven", "Rook", "Scorpion", "Shark", "Sheep", "Snake", "Spider", "Swan", "Tiger", "Turtle", "Wolf", "Wolverine", "Camel", "Falcon", "Hound", "Ox"];
@@ -1318,14 +1300,7 @@ function addMarkers(number = 1) {
 
     for (let i=0; i < taverns.length && i < count; i++) {
       const cell = taverns.splice(Math.floor(Math.random() * taverns.length), 1);
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_inn").attr("data-id", "#marker_inn")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "inn");
       const type = P(.3) ? "inn" : "tavern";
       const name = P(.5) ? ra(color) + " " + ra(animal) : P(.6) ? ra(adj) + " " + ra(animal) : ra(adj) + " " + capitalize(type);
       notes.push({id, name: "The " + name, legend:`A big and famous roadside ${type}`});
@@ -1340,14 +1315,7 @@ function addMarkers(number = 1) {
 
     for (let i=0; i < lighthouses.length && i < count; i++) {
       const cell = lighthouses[i][0], vertex = lighthouses[i][1];
-      const x = pack.vertices.p[vertex][0], y = pack.vertices.p[vertex][1];
-      const id = getNextId("markerElement");
-
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_lighthouse").attr("data-id", "#marker_lighthouse")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "lighthouse");
       const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
       notes.push({id, name: getAdjective(proper) + " Lighthouse" + name, legend:`A lighthouse to keep the navigation safe`});
     }
@@ -1360,14 +1328,7 @@ function addMarkers(number = 1) {
 
     for (let i=0; i < waterfalls.length && i < count; i++) {
       const cell = waterfalls[i];
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_waterfall").attr("data-id", "#marker_waterfall")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "waterfall");
       const proper = cells.burg[cell] ? pack.burgs[cells.burg[cell]].name : Names.getCulture(cells.culture[cell]);
       notes.push({id, name: getAdjective(proper) + " Waterfall" + name, legend:`An extremely beautiful waterfall`});
     }
@@ -1376,17 +1337,11 @@ function addMarkers(number = 1) {
   void function addBattlefields() {
     let battlefields = Array.from(cells.i).filter(i => cells.state[i] && cells.pop[i] > 2 && cells.h[i] < 50 && cells.h[i] > 25);
     let count = battlefields.length < 100 ? 0 : Math.ceil(battlefields.length / 500 * number);
-    if (count) addMarker("battlefield", "⚔", 50, 50, 20);
+    if (count) addMarker("battlefield", "⚔️", 50, 52, 12);
 
     while (count && battlefields.length) {
       const cell = battlefields.splice(Math.floor(Math.random() * battlefields.length), 1);
-      const x = cells.p[cell][0], y = cells.p[cell][1];
-      const id = getNextId("markerElement");
-      markers.append("use").attr("id", id)
-        .attr("xlink:href", "#marker_battlefield").attr("data-id", "#marker_battlefield")
-        .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
-        .attr("data-size", 1).attr("width", 30).attr("height", 30);
-
+      const id = appendMarker(cell, "battlefield");
       const campaign = ra(states[cells.state[cell]].campaigns);
       const date = generateDate(campaign.start, campaign.end);
       const name = Names.getCulture(cells.culture[cell]) + " Battlefield";
@@ -1407,6 +1362,19 @@ function addMarkers(number = 1) {
       .attr("font-size", size+"px").attr("dominant-baseline", "central").text(icon);
   }
 
+  function appendMarker(cell, type) {
+    const x = cells.p[cell][0], y = cells.p[cell][1];
+    const id = getNextId("markerElement");
+    const name = "#marker_" + type;
+
+    markers.append("use").attr("id", id)
+      .attr("xlink:href", name).attr("data-id", name)
+      .attr("data-x", x).attr("data-y", y).attr("x", x - 15).attr("y", y - 30)
+      .attr("data-size", 1).attr("width", 30).attr("height", 30);
+
+    return id;
+  }
+
   console.timeEnd("addMarkers");
 }
 
@@ -1593,14 +1561,11 @@ function addZones(number = 1) {
   }
 
   function addEruption() {
-    const volcanoes = [];
-    markers.selectAll("use[data-id='#marker_volcano']").each(function() {
-      volcanoes.push(this.dataset.cell);
-    });
-    if (!volcanoes.length) return;
+    const volcano = document.getElementById("markers").querySelector("use[data-id='#marker_volcano']");
+    if (!volcano) return;
 
-    const cell = +ra(volcanoes);
-    const id = markers.select("use[data-cell='"+cell+"']").attr("id");
+    const x = +volcano.dataset.x, y = +volcano.dataset.y, cell = findCell(x, y);
+    const id = volcano.id;
     const note = notes.filter(n => n.id === id);
 
     if (note[0]) note[0].legend = note[0].legend.replace("Active volcano", "Erupting volcano");
@@ -1613,7 +1578,7 @@ function addZones(number = 1) {
       cellsArray.push(q);
       if (cellsArray.length > power) break;
       cells.c[q].forEach(e => {
-        if (used[e]) return;
+        if (used[e] || cells.h[e] < 20) return;
         used[e] = 1;
         queue.push(e);
       });
diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index 96765b8c0..8b77bdbca 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -187,7 +187,7 @@
       } else b.port = 0;
 
       // define burg population (keep urbanization at about 10% rate)
-      b.population = rn(Math.max((cells.s[i] + cells.road[i]) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3);
+      b.population = rn(Math.max((cells.s[i] + cells.road[i] / 2) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3);
       if (b.capital) b.population = rn(b.population * 1.3, 3); // increase capital population
 
       if (b.port) {
@@ -420,7 +420,7 @@
             const passableLake = features[cells.f[c]].type === "lake" && features[cells.f[c]].cells < maxLake;
             if (cells.b[c] || (cells.state[c] !== state && !passableLake)) {hull.add(cells.v[q][d]); return;}
             const nC = cells.c[c].filter(n => cells.state[n] === state);
-            const intersected = intersect(nQ, nC).length
+            const intersected = common(nQ, nC).length
             if (hull.size > 20 && !intersected && !passableLake) {hull.add(cells.v[q][d]); return;}
             if (used[c]) return;
             used[c] = 1;
@@ -810,7 +810,7 @@
     });
 
     const monarchy = ["Duchy", "Grand Duchy", "Principality", "Kingdom", "Empire"]; // per expansionism tier
-    const republic = {Republic:70, Federation:2, Oligarchy:2, Tetrarchy:1, Triumvirate:1, Diarchy:1, "Trade Company":3}; // weighted random
+    const republic = {Republic:75, Federation:4, Oligarchy:2, Tetrarchy:1, Triumvirate:1, Diarchy:1, "Trade Company":4, Junta:1}; // weighted random
     const union = {Union:3, League:4, Confederation:1, "United Kingdom":1, "United Republic":1, "United Provinces":2, Commonwealth:1, Heptarchy:1}; // weighted random
 
     for (const s of states) {
@@ -870,11 +870,13 @@
       if (s.form === "Union") return rw(union);
 
       if (s.form === "Theocracy") {
-        // default name is "Theocracy", some culture bases have special names
-        if ([0, 1, 2, 3, 4, 6, 8, 9, 13, 15, 20].includes(base)) return "Diocese"; // Euporean
-        if ([7, 5].includes(base)) return "Eparchy"; // Greek, Ruthenian
-        if ([21, 16].includes(base)) return "Imamah"; // Nigerian, Turkish
-        if ([18, 17, 28].includes(base)) return "Caliphate"; // Arabic, Berber, Swahili
+        // default name is "Theocracy"
+        if (P(.5) && [0, 1, 2, 3, 4, 6, 8, 9, 13, 15, 20].includes(base)) return "Diocese"; // Euporean
+        if (P(.9) && [7, 5].includes(base)) return "Eparchy"; // Greek, Ruthenian
+        if (P(.9) && [21, 16].includes(base)) return "Imamah"; // Nigerian, Turkish
+        if (P(.8) && [18, 17, 28].includes(base)) return "Caliphate"; // Arabic, Berber, Swahili
+        if (P(.02)) return "Thearchy"; // "Thearchy" in very rare case
+        if (P(.05)) return "See"; // "See" in rare case
         return "Theocracy";
       }
     }
diff --git a/modules/military-generator.js b/modules/military-generator.js
index 594bd8280..e6dc44b13 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -208,11 +208,11 @@
 
   const getDefaultOptions = function() {
     return [
-      {name:"infantry", rural:.25, urban:.2, crew:1, type:"melee", separate:0},
-      {name:"archers", rural:.12, urban:.2, crew:1, type:"ranged", separate:0},
-      {name:"cavalry", rural:.12, urban:.03, crew:3, type:"mounted", separate:0},
-      {name:"artillery", rural:0, urban:.03, crew:8, type:"machinery", separate:0},
-      {name:"fleet", rural:0, urban:.015, crew:100, type:"naval", separate:1}
+      {icon: "⚔️", name:"infantry",  rural:.25,  urban:.2,   crew:1,   power:1,  type:"melee",     separate:0},
+      {icon: "🏹", name:"archers",   rural:.12,  urban:.2,   crew:1,   power:1,  type:"ranged",    separate:0},
+      {icon: "🐴", name:"cavalry",   rural:.12,  urban:.03,  crew:3,   power:4,  type:"mounted",   separate:0},
+      {icon: "💣", name:"artillery", rural:0,    urban:.03,  crew:8,   power:12, type:"machinery", separate:0},
+      {icon: "🌊", name:"fleet",     rural:0,    urban:.015, crew:100, power:50, type:"naval",     separate:1}
     ];
   }
 
@@ -271,16 +271,11 @@
   // get default regiment emblem
   const getEmblem = function(r) {
     if (r.n) return "🌊";
-    if (!Object.values(r.u).length) return "🛡️";
-    const mainUnit = Object.entries(r.u).sort((a,b) => b[1]-a[1])[0][0];
-    const type = options.military.find(u => u.name === mainUnit).type;
-    if (type === "ranged") return "🏹";
-    if (type === "mounted") return "🐴";
-    if (type === "machinery") return "💣";
-    if (type === "armored") return "🐢";
-    if (type === "aviation") return "🦅";
-    if (type === "magical") return "🔮";
-    else return "⚔️";
+    if (!Object.values(r.u).length) return "🔰"; // regiment without troops
+    if (cells.burg[r.cell] && pack.burgs[cells.burg[r.cell]].capital) return "👑"; // "Royal" regiment based in capital
+    const mainUnit = Object.entries(r.u).sort((a,b) => b[1]-a[1])[0][0]; // unit with more troops in regiment
+    const unit = options.military.find(u => u.name === mainUnit);
+    return unit.icon;
   }
 
   const generateNote = function(r, s) {
diff --git a/modules/ocean-layers.js b/modules/ocean-layers.js
index 795141471..94a18fd2b 100644
--- a/modules/ocean-layers.js
+++ b/modules/ocean-layers.js
@@ -11,6 +11,7 @@
     if (outline === "none") return;
     console.time("drawOceanLayers");
 
+    lineGen.curve(d3.curveBasisClosed);
     cells = grid.cells, pointsN = grid.cells.i.length, vertices = grid.vertices;
     const limits = outline === "random" ? randomizeOutline() : outline.split(",").map(s => +s);
     markupOcean(limits);
@@ -29,7 +30,8 @@
       const chain = connectVertices(start, t); // vertices chain to form a path
       const relaxation = 1 + t * -2; // select only n-th point
       const relaxed = chain.filter((v, i) => i % relaxation === 0 || vertices.c[v].some(c => c >= pointsN));
-      if (relaxed.length >= 3) chains.push([t, relaxed.map(v => vertices.p[v])]);
+      const points = clipPoly(relaxed.map(v => vertices.p[v]), 1);
+      if (relaxed.length >= 3) chains.push([t, points]);
     }
 
     for (const t of limits) {
@@ -57,8 +59,8 @@
     return limits;
   }
 
+  // Define grid ocean cells type based on distance form land
   function markupOcean(limits) {
-    // Define ocean cells type based on distance form land
     for (let t = -2; t >= limits[0]-1; t--) {
       for (let i = 0; i < pointsN; i++) {
         if (cells.t[i] !== t+1) continue;
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 5e769fdd5..a725b5a9d 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -296,6 +296,33 @@ async function saveMap() {
   window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000);
 }
 
+// Send .map file to server [test function]
+async function sendToURL(URL = "http://localhost:8000/upload.php") {
+  if (customization) {tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error"); return;}
+  closeDialogs("#alert");
+
+  const blob = await getMapData();
+  const xhr = new XMLHttpRequest();
+  xhr.open("POST", URL, true);
+  //xhr.setRequestHeader("Content-Type", "blob"); // set request header
+  xhr.onload = e => console.log("onload", e.responseText);
+  xhr.onreadystatechange = () => {if (xhr.readyState === 4 && xhr.status === 200) tip(`File is sent to cloud storage`, true, "success", 7000);}
+  xhr.send(blob);
+}
+
+// Load .map file from server [test function]
+async function loadFromCloud() {
+  ldb.get("lastMap", blob => {
+    if (blob) {
+      loadMapPrompt(blob);
+    } else {
+      tip("No map stored. Save map to storage first", true, "error", 2000);
+      console.error("No map stored");
+    }
+  });
+  uploadMap(blob);
+}
+
 function saveGeoJSON_Cells() {
   let data = "{ \"type\": \"FeatureCollection\", \"features\": [\n";
   const cells = pack.cells, v = pack.vertices;
@@ -617,6 +644,7 @@ function parseLoadedData(data) {
       texture = viewbox.select("#texture");
       terrs = viewbox.select("#terrs");
       biomes = viewbox.select("#biomes");
+      ice = viewbox.select("#ice");
       cells = viewbox.select("#cells");
       gridOverlay = viewbox.select("#gridOverlay");
       coordinates = viewbox.select("#coordinates");
@@ -953,12 +981,34 @@ function parseLoadedData(data) {
         Military.generate();
       }
 
-      if (version < 1.35) {
+      if (version < 1.4) {
         // v 1.35 added dry lakes
         if (!lakes.select("#dry").size()) {
           lakes.append("g").attr("id", "dry");
           lakes.select("#dry").attr("opacity", 1).attr("fill", "#c9bfa7").attr("stroke", "#8e816f").attr("stroke-width", .7).attr("filter", null);
         }
+
+        // v 1.4 added ice layer
+        ice = viewbox.insert("g", "#coastline").attr("id", "ice").style("display", "none");
+        ice.attr("opacity", null).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
+        drawIce();
+
+        // v 1.4 added icon and power attributes for units
+        for (const unit of options.military) {
+          if (!unit.icon) unit.icon = getUnitIcon(unit.type);
+          if (!unit.power) unit.power = unit.crew;
+        }
+
+        function getUnitIcon(type) {
+          if (type === "naval") return "🌊";
+          if (type === "ranged") return "🏹";
+          if (type === "mounted") return "🐴";
+          if (type === "machinery") return "💣";
+          if (type === "armored") return "🐢";
+          if (type === "aviation") return "🦅";
+          if (type === "magical") return "🔮";
+          else return "⚔️";
+        }
       }
 
     }()
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
new file mode 100644
index 000000000..8f2627d13
--- /dev/null
+++ b/modules/ui/battle-screen.js
@@ -0,0 +1,50 @@
+"use strict";
+function showBattleScreen(attacker, defender) {
+  if (customization) return;
+  closeDialogs(".stable");
+
+  const battle = {name:"Battle", attackers:[attacker], defenders:[defender]};
+  const battleAttackers = document.getElementById("battleAttackers");
+  const battleDefenders = document.getElementById("battleDefenders");
+  addHeaders();
+  addRegiment(battleAttackers, attacker);
+  addRegiment(battleDefenders, defender);
+
+  $("#battleScreen").dialog({
+    title: battle.name, resizable: false, width: fitContent(), close: closeBattleScreen,
+    position: {my: "center", at: "center", of: "#map"}
+  });
+
+  if (modules.showBattleScreen) return;
+  modules.showBattleScreen = true;
+
+  // add listeners
+  //document.getElementById("regimentNameRestore").addEventListener("click", restoreName);
+
+  function addHeaders() {
+    document.getElementById("battleScreen").querySelectorAll("th").forEach(el => el.remove());
+    const attackers = battleAttackers.querySelector("tr");
+    const defenders = battleDefenders.querySelector("tr");
+    let headers = "<th></th>";
+
+    for (const u of options.military) {
+      const label = capitalize(u.name.replace(/_/g, ' '));
+      headers += `<th data-tip="${label}">${u.icon}</th>`;
+    }
+
+    headers += "<th>Total</th>";
+    attackers.insertAdjacentHTML("beforebegin", headers);
+    defenders.insertAdjacentHTML("beforebegin", headers);
+  }
+
+  function addRegiment(div, regiment) {
+    const reg = document.createElement("div");
+    reg.innerHTML = regiment.name;
+    div.append(reg);
+  }
+
+  function closeBattleScreen() {
+
+  }
+
+}
\ No newline at end of file
diff --git a/modules/ui/biomes-editor.js b/modules/ui/biomes-editor.js
index 07d25364d..9d8ef4fce 100644
--- a/modules/ui/biomes-editor.js
+++ b/modules/ui/biomes-editor.js
@@ -215,6 +215,8 @@ function editBiomes() {
 
   function addCustomBiome() {
     const b = biomesData, i = biomesData.i.length;
+    if (i > 254) {tip("Maximum number of biomes reached (255), data cleansing is required", false, "error"); return;}
+
     b.i.push(i);
     b.color.push(getRandomColor());
     b.habitability.push(50);
diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index aa6410918..f58dee118 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -294,13 +294,14 @@ function editBurg(id) {
 
     function openMFCG(seed) {
       if (!seed && burg.MFCGlink) {openURL(burg.MFCGlink); return;}
+      const cells = pack.cells;
       const name = elSelected.text();
       const size = Math.max(Math.min(rn(burg.population), 65), 6);
   
       const s = burg.MFCG || defSeed;
       const cell = burg.cell;
-      const hub = +pack.cells.road[cell] > 50;
-      const river = pack.cells.r[cell] ? 1 : 0;
+      const hub = +cells.road[cell] > 50;
+      const river = cells.r[cell] ? 1 : 0;
   
       const coast = +burg.port;
       const citadel = +burg.citadel;
@@ -309,8 +310,31 @@ function editBurg(id) {
       const temple = +burg.temple;
       const shanty = +burg.shanty;
 
+      const sea = coast && cells.haven[burg.cell] ? getSeaDirections(burg.cell) : "";
+      function getSeaDirections(i) {
+        const p1 = cells.p[i];
+        const p2 = cells.p[cells.haven[i]];
+        let deg = Math.atan2(p2[1] - p1[1], p2[0] - p1[0]) * 180 / Math.PI - 90;
+        if (deg < 0) deg += 360;
+        let norm = rn(normalize(deg, 0, 360) * 8) / 4;
+        if (norm === 2) norm = 0;
+        return "sea="+norm;
+        // debug.selectAll("*").remove();
+        // pack.burgs.filter(b => b.port).forEach(b => {
+        //   var p1 = pack.cells.p[b.cell];
+        //   var p2 = pack.cells.p[pack.cells.haven[b.cell]];
+        //   var deg = Math.atan2(p2[1] - p1[1], p2[0] - p1[0]) * 180 / Math.PI - 90;
+        //   if (deg < 0) deg += 360;
+        //   var norm = rn(normalize(deg, 0, 360) * 8) / 4;
+        //   if (norm === 2) norm = 0;
+        //   debug.append("line").attr("x1", p1[0]).attr("y1", p1[1]).attr("x2", p2[0]).attr("y2", p2[1]).attr("stroke", "red").attr("stroke-width", .2);
+        //   debug.append("circle").attr("cx", b.x).attr("cy", b.y).attr("r", .4);
+        //   debug.append("text").attr("x", b.x+1).attr("y", b.y).attr("font-size", 2).text(rn(norm, 2));
+        // });
+      }
+
       const site = "http://fantasycities.watabou.ru/";
-      const url = `${site}?name=${name}&size=${size}&seed=${s}&hub=${hub}&random=0&continuous=0&river=${river}&coast=${coast}&citadel=${citadel}&plaza=${plaza}&temple=${temple}&walls=${walls}&shantytown=${shanty}`;
+      const url = `${site}?name=${name}&size=${size}&seed=${s}&hub=${hub}&random=0&continuous=0&river=${river}&coast=${coast}&citadel=${citadel}&plaza=${plaza}&temple=${temple}&walls=${walls}&shantytown=${shanty}${sea}`;
       openURL(url);
     }
   }
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index a14cbd124..2d65bdbf0 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -26,6 +26,7 @@ function clicked() {
   else if (el.tagName === "tspan" && grand.parentNode.parentNode.id === "labels") editLabel();
   else if (grand.id === "burgLabels") editBurg();
   else if (grand.id === "burgIcons") editBurg();
+  else if (parent.id === "ice") editIce();
   else if (parent.id === "terrain") editReliefIcon();
   else if (parent.id === "markers") editMarker();
   else if (grand.id === "coastline") editCoastline();
@@ -581,4 +582,43 @@ function highlightElement(element) {
   let y = box.y + box.height / 2;
   if (tr[1]) y += tr[1];
   if (scale >= 2) zoomTo(x, y, scale, 1600);
+}
+
+function selectIcon(initial, callback) {
+  if (!callback) return;
+  $("#iconSelector").dialog();
+
+  const table = document.getElementById("iconTable");
+  const input = document.getElementById("iconInput");
+  input.value = initial;
+
+  if (!table.innerHTML) {
+    const icons = ["⚔️","🏹","🐴","💣","🌊","🎯","⚓","🔮","📯","⚒️","🛡️","👑","⚜️",
+      "☠️","🎆","🗡️","🔪","⛏️","🔥","🩸","💧","🐾","🎪","🏰","🏯","⛓️","❤️","💘","💜","📜","🔔",
+      "🔱","💎","🌈","🌠","✨","💥","☀️","🌙","⚡","❄️","♨️","🎲","🚨","🌉","🗻","🌋","🧱",
+      "⚖️","✂️","🎵","👗","🎻","🎨","🎭","⛲","💉","📖","📕","🎁","💍","⏳","🕸️","⚗️","☣️","☢️",
+      "🔰","🎖️","🚩","🏳️","🏴","💪","✊","👊","🤜","🤝","🙏","🧙","🧙‍♀️","💂","🤴","🧛","🧟","🧞","🧝","👼",
+      "👻","👺","👹","🦄","🐲","🐉","🐎","🦓","🐺","🦊","🐱","🐈","🦁","🐯","🐅","🐆","🐕","🦌","🐵","🐒","🦍",
+      "🦅","🕊️","🐓","🦇","🦜","🐦","🦉","🐮","🐄","🐂","🐃","🐷","🐖","🐗","🐏","🐑","🐐","🐫","🦒","🐘","🦏","🐭","🐁","🐀",
+      "🐹","🐰","🐇","🦔","🐸","🐊","🐢","🦎","🐍","🐳","🐬","🦈","🐠","🐙","🦑","🐌","🦋","🐜","🐝","🐞","🦗","🕷️","🦂","🦀",
+      "🌳","🌲","🎄","🌴","🍂","🍁","🌵","☘️","🍀","🌿","🌱","🌾","🍄","🌽","🌸","🌹","🌻",
+      "🍒","🍏","🍇","🍉","🍅","🍓","🥔","🥕","🥩","🍗","🍞","🍻","🍺","🍲","🍷"
+    ];
+
+    let row = "";
+    for (let i=0; i < icons.length; i++) {
+      if (i%17 === 0) row = table.insertRow(i/17|0);
+      const cell = row.insertCell(i%17);
+      cell.innerHTML = icons[i];
+    }
+  }
+
+  table.onclick = e => {if (e.target.tagName === "TD") {input.value = e.target.innerHTML; callback(input.value)}};
+  table.onmouseover = e => {if (e.target.tagName === "TD") tip(`Click to select ${e.target.innerHTML} icon`)};
+
+  $("#iconSelector").dialog({width: fitContent(), title: "Select Icon",
+  buttons: {
+    Apply: function() {callback(input.value||"⠀"); $(this).dialog("close")},
+    Close: function() {callback(initial); $(this).dialog("close")}}
+  });
 }
\ No newline at end of file
diff --git a/modules/ui/general.js b/modules/ui/general.js
index 8dfb044dc..449d7798e 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -106,6 +106,7 @@ function showMapTooltip(point, e, i, g) {
   if (group === "lakes" && !land) {tip(`${capitalize(subgroup)} lake. Click to edit`); return;}
   if (group === "coastline") {tip("Click to edit the coastline"); return;}
   if (group === "zones") {tip(path[path.length-8].dataset.description); return;}
+  if (group === "ice") {tip("Click to edit the Ice"); return;}
 
   // covering elements
   if (layerIsOn("togglePrec") && land) tip("Annual Precipitation: "+ getFriendlyPrecipitation(i)); else
@@ -403,6 +404,7 @@ document.addEventListener("keyup", event => {
   else if (key === 85) toggleRoutes(); // "U" to toggle Routes layer
   else if (key === 84) toggleTemp(); // "T" to toggle Temperature layer
   else if (key === 78) togglePopulation(); // "N" to toggle Population layer
+  else if (key === 74) toggleIce(); // "J" to toggle Ice layer
   else if (key === 65) togglePrec(); // "A" to toggle Precipitation layer
   else if (key === 76) toggleLabels(); // "L" to toggle Labels layer
   else if (key === 73) toggleIcons(); // "I" to toggle Icons layer
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 0c93d7f23..7f3a9bfd2 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -965,7 +965,7 @@ function editHeightmap() {
     closeDialogs("#imageConverter");
 
     $("#imageConverter").dialog({
-      title: "Image Converter", minHeight: "auto", width: "19.5em", resizable: false,
+      title: "Image Converter", maxHeight: svgHeight*.75, minHeight: "auto", width: "19.5em", resizable: false,
       position: {my: "right top", at: "right-10 top+10", of: "svg"},
       beforeClose: closeImageConverter
     });
diff --git a/modules/ui/ice-editor.js b/modules/ui/ice-editor.js
new file mode 100644
index 000000000..f6648f48f
--- /dev/null
+++ b/modules/ui/ice-editor.js
@@ -0,0 +1,105 @@
+"use strict";
+function editIce() {
+  if (customization) return;
+  closeDialogs(".stable");
+  if (!layerIsOn("toggleIce")) toggleIce();
+
+  elSelected = d3.select(d3.event.target);
+  const type = elSelected.attr("type") ? "Glacier" : "Iceberg";
+  document.getElementById("iceRandomize").style.display = type === "Glacier" ? "none" : "inline-block";
+  document.getElementById("iceSize").style.display = type === "Glacier" ? "none" : "inline-block";
+  if (type === "Iceberg") document.getElementById("iceSize").value = +elSelected.attr("size");
+  ice.selectAll("*").classed("draggable", true).call(d3.drag().on("drag", dragElement));
+
+  $("#iceEditor").dialog({
+    title: "Edit "+type, resizable: false,
+    position: {my: "center top+60", at: "top", of: d3.event, collision: "fit"},
+    close: closeEditor
+  });
+
+  if (modules.editIce) return;
+  modules.editIce = true;
+
+  // add listeners
+  document.getElementById("iceEditStyle").addEventListener("click", () => editStyle("ice"));
+  document.getElementById("iceRandomize").addEventListener("click", randomizeShape);
+  document.getElementById("iceSize").addEventListener("input", changeSize);
+  document.getElementById("iceNew").addEventListener("click", toggleAdd);
+  document.getElementById("iceRemove").addEventListener("click", removeIce);
+
+  function randomizeShape() {
+    const c = grid.points[+elSelected.attr("cell")];
+    const s = +elSelected.attr("size");
+    const i = ra(grid.cells.i), cn = grid.points[i];
+    const poly = getGridPolygon(i).map(p => [p[0]-cn[0], p[1]-cn[1]]);
+    const points = poly.map(p => [rn(c[0] + p[0] * s, 2), rn(c[1] + p[1] * s, 2)]);
+    elSelected.attr("points", points);
+  }
+
+  function changeSize() {
+    const c = grid.points[+elSelected.attr("cell")];
+    const s = +elSelected.attr("size");
+    const flat = elSelected.attr("points").split(",").map(el => +el);
+    const pairs = [];
+    while (flat.length) pairs.push(flat.splice(0,2));
+    const poly = pairs.map(p => [(p[0]-c[0]) / s, (p[1]-c[1]) / s]);
+    const size = +this.value;
+    const points = poly.map(p => [rn(c[0] + p[0] * size, 2), rn(c[1] + p[1] * size, 2)]);
+    elSelected.attr("points", points).attr("size", size);
+  }
+
+  function toggleAdd() {
+    document.getElementById("iceNew").classList.toggle("pressed");
+    if (document.getElementById("iceNew").classList.contains("pressed")) {
+      viewbox.style("cursor", "crosshair").on("click", addIcebergOnClick);
+      tip("Click on map to create an iceberg. Hold Shift to add multiple", true);
+    } else {
+      clearMainTip();
+      viewbox.on("click", clicked).style("cursor", "default");
+    }
+  }
+
+  function addIcebergOnClick() {
+    const point = d3.mouse(this);
+    const i = findGridCell(point[0], point[1]);
+    const c = grid.points[i];
+    const s = +document.getElementById("iceSize").value;
+
+    const points = getGridPolygon(i).map(p => [(p[0] + (c[0]-p[0]) / s)|0, (p[1] + (c[1]-p[1]) / s)|0]);
+    const iceberg = ice.append("polygon").attr("points", points).attr("cell", i).attr("size", s);
+    iceberg.call(d3.drag().on("drag", dragElement));
+    if (d3.event.shiftKey === false) toggleAdd();
+  }
+
+  function removeIce() {
+    const type = elSelected.attr("type") ? "Glacier" : "Iceberg";
+    alertMessage.innerHTML = `Are you sure you want to remove the ${type}?`;
+    $("#alert").dialog({resizable: false, title: "Remove "+type,
+      buttons: {
+        Remove: function() {
+          $(this).dialog("close");
+          elSelected.remove();
+          $("#iceEditor").dialog("close");
+        },
+        Cancel: function() {$(this).dialog("close");}
+      }
+    });
+  }
+
+  function dragElement() {
+    const tr = parseTransform(this.getAttribute("transform"));
+    const dx = +tr[0] - d3.event.x, dy = +tr[1] - d3.event.y;
+
+    d3.event.on("drag", function() {
+      const x = d3.event.x, y = d3.event.y;
+      this.setAttribute("transform", `translate(${(dx+x)},${(dy+y)})`);
+    });
+  }
+
+  function closeEditor() {
+    ice.selectAll("*").classed("draggable", false).call(d3.drag().on("drag", null));
+    clearMainTip();
+    iceNew.classList.remove("pressed");
+    unselect();
+  }
+}
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index d7a3faed9..9be802b0d 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -32,10 +32,10 @@ function getDefaultPresets() {
     "cultural": ["toggleBorders", "toggleCultures", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "religions": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleReligions", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "provinces": ["toggleBorders", "toggleIcons", "toggleProvinces", "toggleRivers", "toggleScaleBar"],
-    "biomes": ["toggleBiomes", "toggleRivers", "toggleScaleBar"],
+    "biomes": ["toggleBiomes", "toggleIce", "toggleRivers", "toggleScaleBar"],
     "heightmap": ["toggleHeight", "toggleRivers"],
     "physical": ["toggleCoordinates", "toggleHeight", "toggleRivers", "toggleScaleBar"],
-    "poi": ["toggleBorders", "toggleHeight", "toggleIcons", "toggleMarkers", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
+    "poi": ["toggleBorders", "toggleHeight", "toggleIce", "toggleIcons", "toggleMarkers", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "military": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleMilitary", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
     "landmass": ["toggleScaleBar"]
   }
@@ -345,7 +345,7 @@ function drawBiomes() {
     const edgeVerticle = cells.v[i].find(v => vertices.c[v].some(i => cells.biome[i] !== b));
     const chain = connectVertices(edgeVerticle, b);
     if (chain.length < 3) continue;
-    const points = chain.map(v => vertices.p[v]);
+    const points = clipPoly(chain.map(v => vertices.p[v]), 1);
     paths[b] += "M" + points.join("L") + "Z";
   }
 
@@ -456,38 +456,77 @@ function drawCells() {
   cells.append("path").attr("d", path);
 }
 
-function drawSeaIce() {
-  const seaIce = viewbox.append("g").attr("id", "seaIce").attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("filter", "url(#dropShadow05)");//.attr("opacity", .8);
-  for (const i of grid.cells.i) {
-    const t = grid.cells.temp[i] ;
-    if (t > 2) continue;
-    if (t > -5 && grid.cells.h[i] >= 20) continue;
-    if (t < -5) drawpolygon(i);
-    if (P(normalize(t, -5.5, 2.5))) continue; // t[-5; 2]
-    const size = t < -14 ? 0 : t > -6 ? (7 + t) / 10 : (15 + t) / 100; // [0; 1], where 0 = full size, 1 = zero size
-    resizePolygon(i, rn(size * (.2 + rand() * .9), 2));
+function toggleIce() {
+  if (!layerIsOn("toggleIce")) {
+    turnButtonOn("toggleIce");
+    $('#ice').fadeIn();
+    if (event && isCtrlClick(event)) editStyle("ice");
+  } else {
+    if (event && isCtrlClick(event)) {editStyle("ice"); return;}
+    $('#ice').fadeOut();
+    turnButtonOff("toggleIce");
   }
+}
 
-  // -9: .06
-  // -8: .07
-  // -7: .08
-  // -6: .09
+function drawIce() {
+  const cells = grid.cells, vertices = grid.vertices, n = cells.i.length, temp = cells.temp, h = cells.h;
+  const used = new Uint8Array(cells.i.length);
+  Math.seedrandom(seed);
 
-  // -5: .2
-  // -4: .3
-  // -3: .4
-  // -2: .5
-  // -1: .6
-  //  0: .7
+  const shieldMin = -6; // min temp to form ice shield (glacier)
+  const icebergMax = 2; // max temp to form an iceberg
 
-  function drawpolygon(i) {
-    seaIce.append("polygon").attr("points", getGridPolygon(i));
+  for (const i of grid.cells.i) {
+    const t = temp[i];
+    if (t > icebergMax) continue; // too warm: no ice
+    if (t > shieldMin && h[i] >= 20) continue; // non-glacier land: no ice
+
+    if (t <= shieldMin) {
+      // very cold: ice shield
+      if (used[i]) continue; // already rendered
+      const onborder = cells.c[i].some(n => temp[n] > shieldMin);
+      if (!onborder) continue; // need to start from onborder cell
+      const vertex = cells.v[i].find(v => vertices.c[v].some(i => temp[i] > shieldMin));
+      const chain = connectVertices(vertex);
+      if (chain.length < 3) continue;
+      const points = clipPoly(chain.map(v => vertices.p[v]));
+      ice.append("polygon").attr("points", points).attr("type", "iceShield");
+      continue;
+    }
+
+    // mildly cold: iceberd
+    if (P(normalize(t, -7, 2.5))) continue; // t[-5; 2] cold: skip some cells
+    if (grid.features[cells.f[i]].type === "lake") continue; // lake: no icebers
+    let size = (6.5 + t) / 10; // iceberg size: 0 = full size, 1 = zero size
+    if (cells.t[i] === -1) size *= 1.3; // coasline: smaller icebers
+    size = Math.min(size * (.4 + rand() * 1.2), .95); // randomize iceberd size
+    resizePolygon(i, size);
   }
 
   function resizePolygon(i, s) {
     const c = grid.points[i];
-    const points = getGridPolygon(i).map(p => [p[0] + (c[0]-p[0]) * s, p[1] + (c[1]-p[1]) * s]);
-    seaIce.append("polygon").attr("points", points);
+    const points = getGridPolygon(i).map(p => [(p[0] + (c[0]-p[0]) * s)|0, (p[1] + (c[1]-p[1]) * s)|0]);
+    ice.append("polygon").attr("points", points).attr("cell", i).attr("size", rn(1-s, 2));
+  }
+
+  // connect vertices to chain
+  function connectVertices(start) {
+    const chain = []; // vertices chain to form a path
+    for (let i=0, current = start; i === 0 || current !== start && i < 20000; i++) {
+      const prev = last(chain); // previous vertex in chain
+      chain.push(current); // add current vertex to sequence
+      const c = vertices.c[current]; // cells adjacent to vertex
+      c.filter(c => temp[c] <= shieldMin).forEach(c => used[c] = 1);
+      const c0 = c[0] >= n || temp[c[0]] > shieldMin;
+      const c1 = c[1] >= n || temp[c[1]] > shieldMin;
+      const c2 = c[2] >= n || temp[c[2]] > shieldMin;
+      const v = vertices.v[current]; // neighboring vertices
+      if (v[0] !== prev && c0 !== c1) current = v[0];
+      else if (v[1] !== prev && c1 !== c2) current = v[1];
+      else if (v[2] !== prev && c0 !== c2) current = v[2];
+      if (current === chain[chain.length - 1]) {console.error("Next vertex is not found"); break;}
+    }
+    return chain;
   }
 }
 
diff --git a/modules/ui/markers-editor.js b/modules/ui/markers-editor.js
index 884c531ec..f7cd33dd3 100644
--- a/modules/ui/markers-editor.js
+++ b/modules/ui/markers-editor.js
@@ -27,7 +27,7 @@ function editMarker() {
   document.getElementById("markerIconSize").addEventListener("input", changeIconSize);
   document.getElementById("markerIconShiftX").addEventListener("input", changeIconShiftX);
   document.getElementById("markerIconShiftY").addEventListener("input", changeIconShiftY);
-  document.getElementById("markerIconCustom").addEventListener("input", applyCustomUnicodeIcon);
+  document.getElementById("markerIconSelect").addEventListener("click", selectMarkerIcon);
 
   document.getElementById("markerStyle").addEventListener("click", toggleStyleSection);
   document.getElementById("markerSize").addEventListener("input", changeMarkerSize);
@@ -73,13 +73,7 @@ function editMarker() {
     markerIconFill.value = icon.attr("fill");
 
     markerToggleBubble.className = symbol.select("circle").attr("opacity") === "0" ? "icon-info" : "icon-info-circled";
-
-    const table = document.getElementById("markerIconTable");
-    let selected = table.getElementsByClassName("selected");
-    if (selected.length) selected[0].removeAttribute("class");
-    selected = document.querySelectorAll("#markerIcon" + icon.text().codePointAt());
-    if (selected.length) selected[0].className = "selected";
-    markerIconCustom.value = selected.length ? "" : icon.text();
+    markerIconSelect.innerHTML = icon.text();
   }
 
   function toggleGroupSection() {
@@ -162,242 +156,20 @@ function editMarker() {
     if (markerIconSection.style.display === "inline-block") {
       markerEditor.querySelectorAll("button:not(#markerIcon)").forEach(b => b.style.display = "inline-block");
       markerIconSection.style.display = "none";
+      markerIconSelect.style.display = "none";
     } else {
       markerEditor.querySelectorAll("button:not(#markerIcon)").forEach(b => b.style.display = "none");
       markerIconSection.style.display = "inline-block";
-      if (!markerIconTable.innerHTML) drawIconsList();
-    }
-  }
-
-  function drawIconsList() {
-    const icons = [
-        // emoticons in FF:
-        ["2693", "⚓", "Anchor"],
-        ["26EA", "⛪", "Church"],
-        ["1F3EF", "🏯", "Japanese Castle"],
-        ["1F3F0", "🏰", "Castle"],
-        ["1F5FC", "🗼", "Tower"],
-        ["1F3E0", "🏠", "House"],
-        ["1F3AA", "🎪", "Tent"],
-        ["1F3E8", "🏨", "Hotel"],
-        ["1F4B0", "💰", "Money bag"],
-        ["1F6A8", "🚨", "Revolving Light"],
-        ["1F309", "🌉", "Bridge at Night"],
-        ["1F5FB", "🗻", "Mountain"],
-        ["1F30B", "🌋", "Volcano"],
-        ["270A", "✊", "Raised Fist"],
-        ["1F44A", "👊", "Oncoming Fist"],
-        ["1F4AA", "💪", "Flexed Biceps"],
-        ["1F47C", "👼", "Baby Angel"],
-        ["1F40E", "🐎", "Horse"],
-        ["1F434", "🐴", "Horse Face"],
-        ["1F42E", "🐮", "Cow"],
-        ["1F43A", "🐺", "Wolf Face"],
-        ["1F435", "🐵", "Monkey face"],
-        ["1F437", "🐷", "Pig face"],
-        ["1F414", "🐔", "Chicken"],
-        ["1F411", "🐑", "Ewe"],
-        ["1F42B", "🐫", "Camel"],
-        ["1F418", "🐘", "Elephant"],
-        ["1F422", "🐢", "Turtle"],
-        ["1F40C", "🐌", "Snail"],
-        ["1F40D", "🐍", "Snake"],
-        ["1F41D", "🐝", "Honeybee"],
-        ["1F41C", "🐜", "Ant"],
-        ["1F41B", "🐛", "Bug"],
-        ["1F426", "🐦", "Bird"],
-        ["1F438", "🐸", "Frog Face"],
-        ["1F433", "🐳", "Whale"],
-        ["1F42C", "🐬", "Dolphin"],
-        ["1F420", "🐟", "Fish"],
-        ["1F480", "💀", "Skull"],
-        ["1F432", "🐲", "Dragon Head"],
-        ["1F479", "👹", "Ogre"],
-        ["1F47A", "👺", "Goblin"],
-        ["1F47B", "👻", "Ghost"],
-        ["1F47E", "👾", "Alien"],
-        ["1F383", "🎃", "Jack-O-Lantern"],
-        ["1F384", "🎄", "Christmas Tree"],
-        ["1F334", "🌴", "Palm"],
-        ["1F335", "🌵", "Cactus"],
-        ["2618", "☘️", "Shamrock"],
-        ["1F340", "🍀", "Four Leaf Clover"],
-        ["1F341", "🍁", "Maple Leaf"],
-        ["1F33F", "🌿", "Herb"],
-        ["1F33E", "🌾", "Sheaf"],
-        ["1F344", "🍄", "Mushroom"],
-        ["1F374", "🍴", "Fork and knife"],
-        ["1F372", "🍲", "Food"],
-        ["1F35E", "🍞", "Bread"],
-        ["1F357", "🍗", "Poultry leg"],
-        ["1F347", "🍇", "Grapes"],
-        ["1F34F", "🍏", "Apple"],
-        ["1F352", "🍒", "Cherries"],
-        ["1F36F", "🍯", "Honey pot"],
-        ["1F37A", "🍺", "Beer"],
-        ["1F37B", "🍻", "Beers"],
-        ["1F377", "🍷", "Wine glass"],
-        ["1F3BB", "🎻", "Violin"],
-        ["1F3B8", "🎸", "Guitar"],
-        ["1F52A", "🔪", "Knife"],
-        ["1F52B", "🔫", "Pistol"],
-        ["1F4A3", "💣", "Bomb"],
-        ["1F4A5", "💥", "Collision"],
-        ["1F4A8", "💨", "Dashing away"],
-        ["1F301", "🌁", "Foggy"],
-        ["2744", "❄️", "Snowflake"],
-        ["26A1", "⚡", "Electricity"],
-        ["1F320", "🌠", "Shooting star"],
-        ["1F319", "🌙", "Crescent moon"],
-        ["1F525", "🔥", "Fire"],
-        ["1F4A7", "💧", "Droplet"],
-        ["1F30A", "🌊", "Wave"],
-        ["23F0", "⏰", "Alarm Clock"],
-        ["231B", "⌛", "Hourglass"],
-        ["1F3C6", "🏆", "Goblet"],
-        ["26F2", "⛲", "Fountain"],
-        ["26F5", "⛵", "Sailboat"],
-        ["26FA", "⛺", "Campfire"],
-        ["2764", "❤", "Red Heart"],
-        ["1F498", "💘", "Heart With Arrow"],
-        ["1F489", "💉", "Syringe"],
-        ["1F4D5", "📕", "Closed Book"],
-        ["1F4D6", "📚", "Books"],
-        ["1F381", "🎁", "Wrapped Gift"],
-        ["1F3AF", "🎯", "Archery"],
-        ["1F52E", "🔮", "Magic ball"],
-        ["1F3AD", "🎭", "Performing arts"],
-        ["1F3A8", "🎨", "Artist palette"],
-        ["1F457", "👗", "Dress"],
-        ["1F392", "🎒", "Backpack"],
-        ["1F451", "👑", "Crown"],
-        ["1F48D", "💍", "Ring"],
-        ["1F48E", "💎", "Gem"],
-        ["1F514", "🔔", "Bell"],
-        ["1F3B2", "🎲", "Die"],
-        // black and white icons in FF:
-        ["26A0", "⚠", "Alert"],
-        ["2317", "⌗", "Hash"],
-        ["2318", "⌘", "POI"],
-        ["2307", "⌇", "Wavy"],
-        ["27F1", "⟱", "Downwards Quadruple"],
-        ["21E6", "⇦", "Left arrow"],
-        ["21E7", "⇧", "Top arrow"],
-        ["21E8", "⇨", "Right arrow"],
-        ["21E9", "⇩", "Left arrow"],
-        ["21F6", "⇶", "Three arrows"],
-        ["2699", "⚙", "Gear"],
-        ["269B", "⚛", "Atom"],
-        ["2680", "⚀", "Die1"],
-        ["2681", "⚁", "Die2"],
-        ["2682", "⚂", "Die3"],
-        ["2683", "⚃", "Die4"],
-        ["2684", "⚄", "Die5"],
-        ["2685", "⚅", "Die6"],
-        ["26B4", "⚴", "Pallas"],
-        ["26B5", "⚵", "Juno"],
-        ["26B6", "⚶", "Vesta"],
-        ["26B7", "⚷", "Chiron"],
-        ["26B8", "⚸", "Lilith"],
-        ["263F", "☿", "Mercury"],
-        ["2640", "♀", "Venus"],
-        ["2641", "♁", "Earth"],
-        ["2642", "♂", "Mars"],
-        ["2643", "♃", "Jupiter"],
-        ["2644", "♄", "Saturn"],
-        ["2645", "♅", "Uranus"],
-        ["2646", "♆", "Neptune"],
-        ["2647", "♇", "Pluto"],
-        ["26B3", "⚳", "Ceres"],
-        ["2654", "♔", "Chess king"],
-        ["2655", "♕", "Chess queen"],
-        ["2656", "♖", "Chess rook"],
-        ["2657", "♗", "Chess bishop"],
-        ["2658", "♘", "Chess knight"],
-        ["2659", "♙", "Chess pawn"],
-        ["2660", "♠", "Spade"],
-        ["2663", "♣", "Club"],
-        ["2665", "♥", "Heart"],
-        ["2666", "♦", "Diamond"],
-        ["2698", "⚘", "Flower"],
-        ["2625", "☥", "Ankh"],
-        ["2626", "☦", "Orthodox"],
-        ["2627", "☧", "Chi Rho"],
-        ["2628", "☨", "Lorraine"],
-        ["2629", "☩", "Jerusalem"],
-        ["2670", "♰", "Syriac cross"],
-        ["2020", "†", "Dagger"],
-        ["262A", "☪", "Muslim"],
-        ["262D", "☭", "Soviet"],
-        ["262E", "☮", "Peace"],
-        ["262F", "☯", "Yin yang"],
-        ["26A4", "⚤", "Heterosexuality"],
-        ["26A2", "⚢", "Female homosexuality"],
-        ["26A3", "⚣", "Male homosexuality"],
-        ["26A5", "⚥", "Male and female"],
-        ["26AD", "⚭", "Rings"],
-        ["2690", "⚐", "White flag"],
-        ["2691", "⚑", "Black flag"],
-        ["263C", "☼", "Sun"],
-        ["263E", "☾", "Moon"],
-        ["2668", "♨", "Hot springs"],
-        ["2600", "☀", "Black sun"],
-        ["2601", "☁", "Cloud"],
-        ["2602", "☂", "Umbrella"],
-        ["2603", "☃", "Snowman"],
-        ["2604", "☄", "Comet"],
-        ["2605", "★", "Black star"],
-        ["2606", "☆", "White star"],
-        ["269D", "⚝", "Outlined star"],
-        ["2618", "☘", "Shamrock"],
-        ["21AF", "↯", "Lightning"],
-        ["269C", "⚜", "FleurDeLis"],
-        ["2622", "☢", "Radiation"],
-        ["2623", "☣", "Biohazard"],
-        ["2620", "☠", "Skull"],
-        ["2638", "☸", "Dharma"],
-        ["2624", "☤", "Caduceus"],
-        ["2695", "⚕", "Aeculapius staff"],
-        ["269A", "⚚", "Hermes staff"],
-        ["2697", "⚗", "Alembic"],
-        ["266B", "♫", "Music"],
-        ["2702", "✂", "Scissors"],
-        ["2696", "⚖", "Scales"],
-        ["2692", "⚒", "Hammer and pick"],
-        ["2694", "⚔", "Swords"]
-      ];
-
-    const table = document.getElementById("markerIconTable");
-    table.addEventListener("click", selectIcon, false);
-    table.addEventListener("mouseover", hoverIcon, false);
-    let row = "";
-
-    for (let i=0; i < icons.length; i++) {
-      if (i%16 === 0) row = table.insertRow(0);
-      const cell = row.insertCell(0);
-      const icon = String.fromCodePoint(parseInt(icons[i][0], 16));
-      cell.innerHTML = icon;
-      cell.id = "markerIcon" + icon.codePointAt();
-      cell.dataset.desc = icons[i][2];
+      markerIconSelect.style.display = "inline-block";
     }
   }
 
-  function selectIcon(e) {
-    if (e.target !== e.currentTarget) {
-      const table = document.getElementById("markerIconTable");
-      const selected = table.getElementsByClassName("selected");
-      if (selected.length) selected[0].removeAttribute("class");
-      e.target.className = "selected";
+  function selectMarkerIcon() {
+    selectIcon(this.innerHTML, v => {
+      this.innerHTML = v;
       const id = elSelected.attr("data-id");
-      const icon = e.target.innerHTML;
-      d3.select("#defs-markers").select(id).select("text").text(icon);
-    }
-    e.stopPropagation();
-  }
-
-  function hoverIcon(e) {
-    if (e.target !== e.currentTarget) tip(e.target.innerHTML + " " + e.target.dataset.desc);
-    e.stopPropagation();
+      d3.select("#defs-markers").select(id).select("text").text(v);
+    });
   }
 
   function changeIconSize() {
diff --git a/modules/ui/military-overview.js b/modules/ui/military-overview.js
index 7a0dd5e41..b720486f0 100644
--- a/modules/ui/military-overview.js
+++ b/modules/ui/military-overview.js
@@ -183,7 +183,7 @@ function overviewMilitary() {
       position: {my: "center", at: "center", of: "svg"},
       buttons: {
         Apply: applyMilitaryOptions,
-        Add: () => addUnitLine({name: "custom"+militaryOptionsTable.rows.length, rural: .2, urban: .5, crew: 1, type: "melee"}),
+        Add: () => addUnitLine({icon: "🛡️", name: "custom"+militaryOptionsTable.rows.length, rural: .2, urban: .5, crew: 1, power: 1, type: "melee"}),
         Restore: restoreDefaultUnits,
         Cancel: function() {$(this).dialog("close");}
       }, open: function() {
@@ -200,19 +200,20 @@ function overviewMilitary() {
     }
 
     function addUnitLine(u) {
-      const row = `<tr>
+      const row = document.createElement("tr");
+      row.innerHTML = `<td><button type="button" data-tip="Click to select unit icon">${u.icon||" "}</button></td>
         <td><input data-tip="Type unit name. If name is changed for existing unit, old unit will be replaced" value="${u.name}"></td>
         <td><input data-tip="Enter conscription percentage for rural population" type="number" min=0 max=100 step=.01 value="${u.rural}"></td>
         <td><input data-tip="Enter conscription percentage for urban population" type="number" min=0 max=100 step=.01 value="${u.urban}"></td>
-        <td><input data-tip="Enter average number of people in crew" type="number" min=1 step=1 value="${u.crew}"></td>
+        <td><input data-tip="Enter average number of people in crew (used for total personnel calculation)" type="number" min=1 step=1 value="${u.crew}"></td>
+        <td><input data-tip="Enter military power (used for battle simulation)" type="number" min=0 step=.1 value="${u.power}"></td>
         <td><select data-tip="Select unit type to apply special rules on forces recalculation">${types.map(t => `<option ${u.type === t ? "selected" : ""} value="${t}">${t}</option>`).join(" ")}</select></td>
         <td data-tip="Check if unit is separate and can be stacked only with units of the same type">
           <input id="${u.name}Separate" type="checkbox" class="checkbox" ${u.separate ? "checked" : ""}>
-          <label for="${u.name}Separate" class="checkbox-label"></label>
-        </td>
-        <td data-tip="Remove the unit"><span data-tip="Remove unit type" class="icon-trash-empty pointer" onclick="this.parentElement.parentElement.remove();"></span></td>
-      </tr>`;
-      table.insertAdjacentHTML("beforeend", row);
+          <label for="${u.name}Separate" class="checkbox-label"></label></td>
+        <td data-tip="Remove the unit"><span data-tip="Remove unit type" class="icon-trash-empty pointer" onclick="this.parentElement.parentElement.remove();"></span></td>`;
+      row.querySelector("button").addEventListener("click", function(e) {selectIcon(this.innerHTML, v => this.innerHTML = v)});
+      table.appendChild(row);
     }
 
     function restoreDefaultUnits() {
@@ -230,8 +231,14 @@ function overviewMilitary() {
 
       $("#militaryOptions").dialog("close");
       options.military = unitLines.map((r, i) => {
-        const [name, rural, urban, crew, type, separate] = Array.from(r.querySelectorAll("input, select")).map(d => d.type === "checkbox" ? d.checked : d.value);
-        return {name:names[i], rural:+rural||0, urban:+urban||0, crew:+crew||0, type, separate:+separate||0};
+        const [icon, name, rural, urban, crew, power, type, separate] = Array.from(r.querySelectorAll("input, select, button")).map(d => {
+          let value = d.value;
+          if (d.type === "number") value = +d.value || 0;
+          if (d.type === "checkbox") value = +d.checked || 0;
+          if (d.type === "button") value = d.innerHTML || "⠀";
+          return value;
+        });
+        return {icon, name:names[i], rural, urban, crew, power, type, separate};
       });
       localStorage.setItem("military", JSON.stringify(options.military));
       Military.generate();
diff --git a/modules/ui/regiment-editor.js b/modules/ui/regiment-editor.js
index 4eaac873a..d4a4f1487 100644
--- a/modules/ui/regiment-editor.js
+++ b/modules/ui/regiment-editor.js
@@ -14,8 +14,7 @@ function editRegiment(selector) {
 
   $("#regimentEditor").dialog({
     title: "Edit Regiment", resizable: false, close: closeEditor,
-    position: {my: "left top", at: "left+10 top+10", of: "#map"},
-    close: closeEditor
+    position: {my: "left top", at: "left+10 top+10", of: "#map"}
   });
 
   if (modules.editRegiment) return;
@@ -27,6 +26,7 @@ function editRegiment(selector) {
   document.getElementById("regimentName").addEventListener("change", changeName);
   document.getElementById("regimentEmblem").addEventListener("input", changeEmblem);
   document.getElementById("regimentEmblemSelect").addEventListener("click", selectEmblem);
+  document.getElementById("regimentAttack").addEventListener("click", toggleAttack);
   document.getElementById("regimentRegenerateLegend").addEventListener("click", regenerateLegend);
   document.getElementById("regimentLegend").addEventListener("click", editLegend);
   document.getElementById("regimentSplit").addEventListener("click", splitRegiment);
@@ -92,50 +92,15 @@ function editRegiment(selector) {
     elSelected.dataset.name = reg.name = document.getElementById("regimentName").value = name;
   }
 
+  function selectEmblem() {
+    selectIcon(regimentEmblem.value, v => {regimentEmblem.value = v; changeEmblem()});
+  }
+
   function changeEmblem() {
     const emblem = document.getElementById("regimentEmblem").value;
     regiment().icon = elSelected.querySelector(".regimentIcon").innerHTML = emblem;
   }
 
-  function selectEmblem() {
-    const emblems = ["⚔️","🏹","🐴","💣","🌊","🎯","⚓","🔮","📯","🛡️","👑",
-      "☠️","🎆","🗡️","⛏️","🔥","🐾","🎪","🏰","⚜️","⛓️","❤️","📜","🔱","🌈","🌠","💥","☀️","🍀",
-      "🔰","🕸️","⚗️","☣️","☢️","🎖️","⚕️","☸️","✡️","🚩","🏳️","🏴","🌈","💪","✊","👊","🤜","🤝","🙏","🧙","💂","🤴","🧛","🧟","🧞","🧝",
-      "🦄","🐲","🐉","🐎","🦓","🐺","🦊","🐱","🐈","🦁","🐯","🐅","🐆","🐕","🦌","🐵","🐒","🦍",
-      "🦅","🕊️","🐓","🦇","🐦","🦉","🐮","🐄","🐂","🐃","🐷","🐖","🐗","🐏","🐑","🐐","🐫","🦒","🐘","🦏",
-      "🐭","🐁","🐀","🐹","🐰","🐇","🦔","🐸","🐊","🐢","🦎","🐍","🐳","🐬","🦈","🐙","🦑","🐌","🦋","🐜","🐝","🐞","🦗","🕷️","🦂","🦀"];
-
-    alertMessage.innerHTML = "";
-    const container = document.createElement("div");
-    container.style.userSelect = "none";
-    container.style.cursor = "pointer";
-    container.style.fontSize = "2em";
-    container.style.width = "47vw";
-    container.innerHTML = emblems.map(i => `<span>${i}</span>`).join("");
-    container.addEventListener("mouseover", e => showTip(e), false);
-    container.addEventListener("click", e => clickEmblem(e), false);
-    alertMessage.appendChild(container);
-
-    $("#alert").dialog({
-      resizable: false, width: fitContent(), title: "Select emblem",
-      buttons: {
-        Emojipedia: function() {openURL("https://emojipedia.org/");},
-        Close: function() {$(this).dialog("close");}
-    }
-    });
-
-    function showTip(e) {
-      if (e.target.tagName !== "SPAN") return;
-      tip(`Click to select ${e.target.innerHTML} emblem`);
-    }
-
-    function clickEmblem(e) {
-      if (e.target.tagName !== "SPAN") return;
-      document.getElementById("regimentEmblem").value = e.target.innerHTML;
-      changeEmblem();
-    }
-  }
-
   function changeUnit() {
     const u = this.dataset.u;
     const reg = regiment();
@@ -200,6 +165,60 @@ function editRegiment(selector) {
     toggleAdd();
   }
 
+  function toggleAttack() {
+    document.getElementById("regimentAttack").classList.toggle("pressed");
+    if (document.getElementById("regimentAttack").classList.contains("pressed")) {
+      viewbox.style("cursor", "crosshair").on("click", attackRegimentOnClick);
+      tip("Click on another regiment to initiate battle", true);
+      armies.selectAll(":scope > g").classed("draggable", false);
+    } else {
+      clearMainTip();
+      armies.selectAll(":scope > g").classed("draggable", true);
+      viewbox.on("click", clicked).style("cursor", "default");
+    }
+  }
+
+  function attackRegimentOnClick() {
+    const target = d3.event.target, regSelected = target.parentElement, army = regSelected.parentElement;
+    const oldState = +elSelected.dataset.state, newState = +regSelected.dataset.state;
+
+    if (army.parentElement.id !== "armies") {tip("Please click on a regiment to attack", false, "error"); return;}
+    if (regSelected === elSelected) {tip("Regiment cannot attack itself", false, "error"); return;}
+    if (oldState === newState) {tip("Cannot attack fraternal regiment", false, "error"); return;}
+
+    const attacker = regiment();
+    const defender = pack.states[regSelected.dataset.state].military.find(r => r.i == regSelected.dataset.id);
+    if (!attacker.a || !defender.a) {tip("Regiment has no troops to battle", false, "error"); return;}
+
+    // move attacked to defender
+    const duration = Math.hypot(attacker.x - defender.x, attacker.y - defender.y) * 6;
+    const x = attacker.x = defender.x;
+    const y = attacker.y = defender.y + 8;
+
+    const size = +armies.attr("box-size");
+    const w = attacker.n ? size * 4 : size * 6;
+    const h = size * 2;
+    const x1 = x => rn(x - w / 2, 2);
+    const y1 = y => rn(y - size, 2);
+
+    const move = d3.transition().duration(duration).ease(d3.easeSinInOut);
+    const attack = d3.transition().delay(duration).duration(800).ease(d3.easeSinInOut).on("end", () => showBattleScreen(attacker, defender));
+
+    d3.select(elSelected.querySelector("rect")).transition(move).attr("x", x1(x)).attr("y", y1(y));
+    d3.select(elSelected.querySelector("text")).transition(move).attr("x", x).attr("y", y);
+    d3.select(elSelected.querySelectorAll("rect")[1]).transition(move).attr("x", x1(x)-h).attr("y", y1(y));
+    d3.select(elSelected.querySelector(".regimentIcon")).transition(move).attr("x", x1(x)-size).attr("y", y);
+
+    // battle icon
+    svg.append("text").attr("x", window.innerWidth/2).attr("y", window.innerHeight/2)
+      .text("⚔️").attr("font-size", 0).attr("opacity", 1)
+      .style("dominant-baseline", "central").style("text-anchor", "middle")
+      .transition(attack).attr("font-size", 1000).attr("opacity", 0).remove();
+
+    tip("", false);
+    $("#regimentEditor").dialog("close");
+  }
+
   function toggleAttach() {
     document.getElementById("regimentAttach").classList.toggle("pressed");
     if (document.getElementById("regimentAttach").classList.contains("pressed")) {
@@ -289,7 +308,7 @@ function editRegiment(selector) {
     const x1 = x => rn(x - w / 2, 2);
     const y1 = y => rn(y - size, 2);
 
-    const baseRect = this.querySelectorAll("rect")[0];
+    const baseRect = this.querySelector("rect");
     const text = this.querySelector("text");
     const iconRect = this.querySelectorAll("rect")[1];
     const icon = this.querySelector(".regimentIcon");
@@ -330,6 +349,7 @@ function editRegiment(selector) {
     armies.selectAll("g>g").call(d3.drag().on("drag", null));
     viewbox.selectAll("g#regimentBase").remove();
     document.getElementById("regimentAdd").classList.remove("pressed");
+    document.getElementById("regimentAttack").classList.remove("pressed");
     document.getElementById("regimentAttach").classList.remove("pressed");
     restoreDefaultEvents();
     elSelected = null;
diff --git a/modules/ui/style.js b/modules/ui/style.js
index 88f2f16d9..6550c541b 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -52,13 +52,13 @@ function selectStyleElement() {
   if (sel == "ocean") el = oceanLayers.select("rect");
 
   // fill
-  if (sel === "rivers" || sel === "lakes" || sel === "landmass" || sel === "prec" || sel === "fogging") {
+  if (sel === "rivers" || sel === "lakes" || sel === "landmass" || sel === "prec" || sel === "ice" || sel === "fogging") {
     styleFill.style.display = "block";
     styleFillInput.value = styleFillOutput.value = el.attr("fill");
   }
 
   // stroke color and width
-  if (sel === "armies" ||sel === "routes" || sel === "lakes" || sel === "borders" || sel === "cults" || sel === "cells" || sel === "gridOverlay" || sel === "coastline" || sel === "prec" || sel === "icons" || sel === "coordinates"|| sel === "zones") {
+  if (sel === "armies" ||sel === "routes" || sel === "lakes" || sel === "borders" || sel === "cults" || sel === "cells" || sel === "gridOverlay" || sel === "coastline" || sel === "prec" || sel === "ice" || sel === "icons" || sel === "coordinates"|| sel === "zones") {
     styleStroke.style.display = "block";
     styleStrokeInput.value = styleStrokeOutput.value = el.attr("stroke");
     styleStrokeWidth.style.display = "block";
@@ -623,8 +623,8 @@ styleArmiesSize.addEventListener("input", function() {
 // request a URL to image to be used as a texture
 function textureProvideURL() {
   alertMessage.innerHTML = `Provide an image URL to be used as a texture:
-                            <input id="textureURL" type="url" style="width: 24em" placeholder="http://www.example.com/image.jpg" oninput="fetchTextureURL(this.value)">
-                            <div style="border: 1px solid darkgrey; height: 144px; margin-top: 2px"><canvas id="preview" width="256px" height="144px"></canvas></div>`;
+    <input id="textureURL" type="url" style="width: 100%" placeholder="http://www.example.com/image.jpg" oninput="fetchTextureURL(this.value)">
+    <canvas id="texturePreview" width="256px" height="144px"></canvas>`;
   $("#alert").dialog({resizable: false, title: "Load custom texture", width: "26em",
     buttons: {
       Apply: function() {
@@ -662,7 +662,7 @@ function fetchTextureURL(url) {
   console.log("Provided URL is", url);
   const img = new Image();
   img.onload = function () {
-    const canvas = document.getElementById("preview");
+    const canvas = document.getElementById("texturePreview");
     const ctx = canvas.getContext("2d");
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
@@ -697,22 +697,22 @@ function applyStyleOnLoad() {
 
 function addDefaulsStyles() {
   if (!localStorage.getItem("styleClean")) {
-    const clean = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0,"data-width":null,"stroke-width":0},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":null},"#oceanLayers":{"filter":"","layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"","mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const clean = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0,"data-width":null,"stroke-width":0},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":null},"#oceanLayers":{"filter":"","layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"","mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
     localStorage.setItem("styleClean", clean);
   }
 
   if (!localStorage.getItem("styleGloom")) {
-    const gloom = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":"","mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":"","mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":"url(#dropShadow)"},"#statesHalo":{"opacity":1,"data-width":10.2,"stroke-width":10.2},"#provs":{"opacity":0.5,"filter":""},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern3)"},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":""},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const gloom = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":"","mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":"","mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":"url(#dropShadow)"},"#statesHalo":{"opacity":1,"data-width":10.2,"stroke-width":10.2},"#provs":{"opacity":0.5,"filter":""},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern3)"},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":""},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
     localStorage.setItem("styleGloom", gloom);
   }
 
   if (!localStorage.getItem("styleAncient")) {
-    const ancient = `{"#map":{"background-color":"#000000","filter":"url(#filter-sepia)","data-filter":"sepia"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.05,"opacity":0.8,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eee9d7","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#5d97bb"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.8,"stroke":"#2e1607","stroke-width":1.23,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.8,"stroke":"#331809","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":""},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":"url(#blur5)","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#a7a01f"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern1)"},"#terrs":{"opacity":null,"scheme":"light","terracing":0,"skip":0,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":8,"font-size":8,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#54251d","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#463124","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const ancient = `{"#map":{"background-color":"#000000","filter":"url(#filter-sepia)","data-filter":"sepia"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.05,"opacity":0.8,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eee9d7","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#5d97bb"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.8,"stroke":"#2e1607","stroke-width":1.23,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.8,"stroke":"#331809","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":""},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":"url(#blur5)","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#a7a01f"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern1)"},"#terrs":{"opacity":null,"scheme":"light","terracing":0,"skip":0,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":8,"font-size":8,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#54251d","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#463124","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
     localStorage.setItem("styleAncient", ancient);
   }
 
   if (!localStorage.getItem("styleMonochrome")) {
-    const monochrome = `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":""},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":0},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const monochrome = `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":""},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":0},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
     localStorage.setItem("styleMonochrome", monochrome);
   }
 }
@@ -722,6 +722,7 @@ function applyDefaultStyle() {
   armies.attr("opacity", 1).attr("fill-opacity", 1).attr("font-size", 6).attr("box-size", 3).attr("stroke", "#000").attr("stroke-width", .3);
 
   biomes.attr("opacity", null).attr("filter", null).attr("mask", null);
+  ice.attr("opacity", 1).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
   stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null);
   provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .2).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt").attr("filter", null);
   cells.attr("opacity", null).attr("stroke", "#808080").attr("stroke-width", .1).attr("filter", null).attr("mask", null);
@@ -928,6 +929,7 @@ function addStylePreset() {
       "#statesHalo":["opacity", "data-width", "stroke-width"],
       "#provs":["opacity", "filter"],
       "#temperature":["opacity", "font-size", "fill", "fill-opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter"],
+      "#ice":["opacity", "fill", "stroke", "stroke-width", "filter"],
       "#texture":["opacity", "filter", "mask"],
       "#textureImage":["x", "y"],
       "#zones":["opacity", "stroke", "stroke-width", "stroke-dasharray", "stroke-linecap", "filter", "mask"],
diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index a7ac34f65..20b649775 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -65,6 +65,7 @@ function processFeatureRegeneration(event, button) {
   if (button === "regenerateProvinces") regenerateProvinces(); else
   if (button === "regenerateReligions") regenerateReligions(); else
   if (button === "regenerateMilitary") regenerateMilitary(); else
+  if (button === "regenerateIce") regenerateIce(); else
   if (button === "regenerateMarkers") regenerateMarkers(event); else
   if (button === "regenerateZones") regenerateZones(event);
 }
@@ -86,7 +87,7 @@ function recalculatePopulation() {
     if (!b.i || b.removed) return;
     const i = b.cell;
 
-    b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i]) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3);
+    b.population = rn(Math.max((pack.cells.s[i] + pack.cells.road[i] / 2) / 8 + b.i / 1000 + i % 100 / 1000, .1), 3);
     if (b.capital) b.population = b.population * 1.3; // increase capital population
     if (b.port) b.population = b.population * 1.3; // increase port population
     b.population = rn(b.population * gauss(2,3,.6,20,3), 3);
@@ -249,6 +250,12 @@ function regenerateMilitary() {
   if (document.getElementById("militaryOverviewRefresh").offsetParent) militaryOverviewRefresh.click();
 }
 
+function regenerateIce() {
+  if (!layerIsOn("toggleIce")) toggleIce();
+  ice.selectAll("*").remove();
+  drawIce();
+}
+
 function regenerateMarkers(event) {
   if (isCtrlClick(event)) prompt("Please provide markers number multiplier", {default:1, step:.01, min:0, max:100}, v => addNumberOfMarkers(v));
   else addNumberOfMarkers(gauss(1, .5, .3, 5, 2));
diff --git a/modules/utils.js b/modules/utils.js
index 89acad24f..afcdd5ea3 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -370,11 +370,16 @@ function biased(min, max, ex) {
 }
 
 // return array of values common for both array a and array b
-function intersect(a, b) {
+function common(a, b) {
   const setB = new Set(b);
   return [...new Set(a)].filter(a => setB.has(a));
 }
 
+// clip polygon by graph bbox
+function clipPoly(points, secure = false) {
+  return polygonclip(points, [0, 0, graphWidth, graphHeight], secure);
+}
+
 // check if char is vowel
 function vowel(c) {
   return "aeiouy".includes(c);
@@ -610,5 +615,5 @@ void function() {
   cancel.addEventListener("click", () => prompt.style.display = "none");
 }()
 
-// localStorageDB
-!function(){function e(t,o){return n?void(n.transaction("s").objectStore("s").get(t).onsuccess=function(e){var t=e.target.result&&e.target.result.v||null;o(t)}):void setTimeout(function(){e(t,o)},100)}var t=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB;if(!t)return void console.error("indexDB not supported");var n,o={k:"",v:""},r=t.open("d2",1);r.onsuccess=function(e){n=this.result},r.onerror=function(e){console.error("indexedDB request error"),console.log(e)},r.onupgradeneeded=function(e){n=null;var t=e.target.result.createObjectStore("s",{keyPath:"k"});t.transaction.oncomplete=function(e){n=e.target.db}},window.ldb={get:e,set:function(e,t){o.k=e,o.v=t,n.transaction("s","readwrite").objectStore("s").put(o)}}}();
\ No newline at end of file
+// indexedDB; ldb object
+!function(){function e(t,o){return n?void(n.transaction("s").objectStore("s").get(t).onsuccess=function(e){var t=e.target.result&&e.target.result.v||null;o(t)}):void setTimeout(function(){e(t,o)},100)}var t=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB;if(!t)return void console.error("indexedDB not supported");var n,o={k:"",v:""},r=t.open("d2",1);r.onsuccess=function(e){n=this.result},r.onerror=function(e){console.error("indexedDB request error"),console.log(e)},r.onupgradeneeded=function(e){n=null;var t=e.target.result.createObjectStore("s",{keyPath:"k"});t.transaction.oncomplete=function(e){n=e.target.db}},window.ldb={get:e,set:function(e,t){o.k=e,o.v=t,n.transaction("s","readwrite").objectStore("s").put(o)}}}();
\ No newline at end of file
diff --git a/run_php_server.bat b/run_php_server.bat
new file mode 100644
index 000000000..fe11833eb
--- /dev/null
+++ b/run_php_server.bat
@@ -0,0 +1,3 @@
+start chrome.exe http://localhost:8000/
+@echo off
+php -S localhost:8000
\ No newline at end of file
diff --git a/upload.php b/upload.php
new file mode 100644
index 000000000..7cf942bc7
--- /dev/null
+++ b/upload.php
@@ -0,0 +1,6 @@
+<?php
+header("Content-type: text/plain");
+echo "received:";
+var_dump(file_get_contents('php://input'));
+print_r($_POST);
+?>
\ No newline at end of file

From cf8c21c94d463839d6f94257129dd5a8f7638eb8 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 23 Apr 2020 21:31:51 +0300
Subject: [PATCH 03/38] v1.4.02

---
 modules/ui/battle-screen.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 8f2627d13..368476393 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -38,9 +38,12 @@ function showBattleScreen(attacker, defender) {
   }
 
   function addRegiment(div, regiment) {
-    const reg = document.createElement("div");
-    reg.innerHTML = regiment.name;
-    div.append(reg);
+    let line = `<tr><th>${regiment.name}</th>`;
+    for (const u of options.military) {
+      line += `<th>${regiment.u[u.name]||0}</th>`;
+    }
+    line += `<th>${regiment.a||0}</th></tr>`;
+    div.querySelector("tbody").insertAdjacentHTML("beforebegin", line);
   }
 
   function closeBattleScreen() {

From a2b93f1396b79a9bfc0b173e49962e5db075d436 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 26 Apr 2020 20:30:07 +0300
Subject: [PATCH 04/38] v1.4.03

---
 index.css                       | 24 ++++-----
 index.html                      | 35 ++++++-------
 libs/lineclip.js                | 11 ++--
 libs/three.min.js               |  2 +-
 main.js                         |  2 +
 modules/burgs-and-states.js     |  2 +-
 modules/names-generator.js      | 91 ++++++++++++++++++---------------
 modules/ocean-layers.js         | 15 ++++--
 modules/save-and-load.js        |  5 +-
 modules/ui/elevation-profile.js | 18 ++-----
 modules/ui/general.js           | 12 +++--
 modules/ui/layers.js            |  2 +-
 modules/ui/namesbase-editor.js  | 14 +----
 modules/ui/options.js           | 17 ++----
 modules/ui/states-editor.js     |  8 ++-
 modules/utils.js                |  6 +--
 16 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/index.css b/index.css
index 1d538f859..a2b315c75 100644
--- a/index.css
+++ b/index.css
@@ -326,13 +326,13 @@ div.tab > button#optionsHide {
 .tab {
 	overflow: hidden;
 	border-bottom: 1px solid #5d4651;
-	height: 2.3em;
+	height: 2.2em;
 }
 
 #options p {
 	font-style: italic;
 	font-weight: bold;
-	margin-bottom: 0;
+	margin: .8em 0 0 0;
 }
 
 #aboutContent {
@@ -346,6 +346,7 @@ div.tab > button#optionsHide {
 #aboutContent a {
 	color: #1d1b1c;
 	font-weight: bold;
+	text-decoration: underline;
 }
 
 #optionsContent span {
@@ -572,10 +573,9 @@ input[type="color"]::-webkit-color-swatch-wrapper {
 }
 
 .tab > button.options {
-	/* width: 23.25%; */
 	width: 18.6%;
 	height: 100%;
-	padding: 7px 0px;
+	padding: 6px 0px;
 }
 
 button.options {
@@ -943,18 +943,18 @@ body button.noicon {
 }
 
 .drag-trigger {
-	border-left: 12px solid transparent;
-	border-right: 12px solid #916e7f;
-	border-top: 12px solid transparent;
+	border-left: 1em solid transparent;
+	border-right: 1em solid #000;
+	border-top: 1em solid transparent;
 	position: absolute;
-	right: 0;
-	top: 100%;
-	margin-top: -12px;
+	right: -1px;
+	bottom: -1px;
+	opacity: .3;
 }
 
 .drag-trigger:hover {
 	cursor: move;
-	border-right-color: #5e4fa2;
+	opacity: .6;
 }
 
 .tint {
@@ -1684,7 +1684,7 @@ ul.share-buttons li {
 }
 
 ul.share-buttons img {
-	width: 18px;
+	width: 2em;
 }
 
 input[type="checkbox"] {
diff --git a/index.html b/index.html
index c0618b868..a1eb751e3 100644
--- a/index.html
+++ b/index.html
@@ -1912,22 +1912,21 @@
 
       <div id="aboutContent" class="tabcontent">
         <p><a href="https://github.com/Azgaar/Fantasy-Map-Generator" target="_blank">Fantasy Map Generator</a> is a free <a href="https://github.com/Azgaar/Fantasy-Map-Generator/blob/master/LICENSE" target="_blank">open source</a> tool which procedurally generates fantasy maps. You may use auto-generated maps as they are, edit them or even create a new map from scratch. Check out the <a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Quick-Start-Tutorial" target="_blank">quick start tutorial</a>, <a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Q&A" target="_blank">Q&A</a> and <a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Hotkeys" target="_blank">hotkeys</a> for guidance.</p>
-        <p>Join our <a href='https://discordapp.com/invite/X7E84HU' target='_blank'>Discord server</a> and <a href="https://www.reddit.com/r/FantasyMapGenerator/" target="_blank">Reddit community</a> to ask questions, get help and share created maps. You may support the project on <a href='https://www.patreon.com/azgaar' target='_blank'>Patreon</a>.</p>
-        <p>The project is under active development. Creator and main maintainer: Azgaar. For older versions see the <a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog" target="_blank">changelog</a>. To track the development progress see the <a href="https://trello.com/b/7x832DG4/fantasy-map-generator" target="_blank">devboard</a>. Please report bugs <a href="https://github.com/Azgaar/Fantasy-Map-Generator/issues" target="_blank">here</a>. You can also contact me directly via <a href="mailto:azgaar.fmg@yandex.by" target="_blank">email</a>.</p>
-        <p>Special thanks to all supporters on Patreon! <i data-tip="Click to see supporters names" class="collapsible icon-down-open pointer"></i></p>
-        <p style="display:none">Patreon Supporters: Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards,
-          Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore,
-          Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott,
-          Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun,
-          Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan),
-          Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI,
-          Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren,
-          Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie,
-          Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220,
-          Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton,
-          FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill,
-          PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, 
-          Ben Craigie, Alex Smolin and many others!</p>
+        <p>Join our <a href='https://discordapp.com/invite/X7E84HU' target='_blank'>Discord server</a> and <a href="https://www.reddit.com/r/FantasyMapGenerator/" target="_blank">Reddit community</a> to ask questions, get help and share maps.</p>
+        <p>The project is under active development. Creator and main maintainer: Azgaar. To track the development progress see the <a href="https://trello.com/b/7x832DG4/fantasy-map-generator" target="_blank">devboard</a>. For older versions see the <a href="https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog" target="_blank">changelog</a>. Please report bugs <a href="https://github.com/Azgaar/Fantasy-Map-Generator/issues" target="_blank">here</a>. You can also contact me directly via <a href="mailto:azgaar.fmg@yandex.by" target="_blank">email</a>.</p>
+        <div style="background-color: #e85b46; padding: .4em; width: max-content; margin: .6em auto 0 auto; border: 1px solid #943838">
+          <a href="https://www.patreon.com/azgaar" target="_blank" style="color: white; text-decoration: none; font-family: sans-serif">
+            <div>
+              <div style="width: .8em; display: inline-block; padding: 0 .2em; fill: white">
+                <svg viewBox="0 0 569 546">
+                  <circle cx="362.589996" cy="204.589996" data-fill="1" id="Oval" r="204.589996"></circle>
+                  <rect data-fill="2" height="545.799988" id="Rectangle" width="100" x="0" y="0"></rect>
+                </svg>
+              </div>SUPPORT ON PATREON
+            </div>
+          </a>
+        </div>
+        <p>Special thanks to <a data-tip="Click to see list of supporters" onclick="showSupporters()">all supporters</a> on Patreon!</p>
 
         <ul class="share-buttons">
           <li><a href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fazgaar.github.io%2FFantasy-Map-Generator%2F&quote=" data-tip="Share on Facebook" target="_blank"><img alt="Share on Facebook" src="images/Facebook.png" /></a></li>
@@ -3004,9 +3003,7 @@
           <input id="namesbaseMin" data-tip="Recommended minimum name length" type="number" min=2 max=100>
           <input id="namesbaseMax" data-tip="Recommended maximum name length" type="number" min=2 value=10>
           <span>Double: </span>
-          <input id="namesbaseDouble" data-tip="Populate with letters that can used twice in a row" autocorrect="off" spellcheck="false" style="width:5em">
-          <span>Multi: </span>
-          <input id="namesbaseMulti" data-tip="Multi-word names rate. 1 - allow all multi-word names, 0 - all names should spelled as a single word" type="number" min=0 max=1 step=.1 value=0 style="width:3.6em">
+          <input id="namesbaseDouble" data-tip="Populate with letters that can used twice in a row (geminates)" autocorrect="off" spellcheck="false" style="width:10em">
         </div>
         <fieldset>
           <legend>Generated examples: </legend>
diff --git a/libs/lineclip.js b/libs/lineclip.js
index 31a55d28c..b43da33bb 100644
--- a/libs/lineclip.js
+++ b/libs/lineclip.js
@@ -48,13 +48,13 @@ function lineclip(points, bbox, result) {
 }
 
 // Sutherland-Hodgeman polygon clipping algorithm
-function polygonclip(points, bbox, secure = false) {
+function polygonclip(points, bbox, secure = 0) {
     var result, edge, prev, prevInside, inter, i, p, inside;
 
     // clip against each side of the clip rectangle
     for (edge = 1; edge <= 8; edge *= 2) {
         result = [];
-        prev = points[points.length - 1];
+        prev = points[points.length-1];
         prevInside = !(bitCode(prev, bbox) & edge);
 
         for (i = 0; i < points.length; i++) {
@@ -62,10 +62,10 @@ function polygonclip(points, bbox, secure = false) {
             inside = !(bitCode(p, bbox) & edge);
             inter = inside !== prevInside; // segment goes through the clip window
 
-            if (secure && inter && inside && i) result.push(points[i-1]); // add previous point in secure mode (to get a correct d3 curve)
-            if (inter) result.push(intersect(prev, p, edge, bbox)); // add an intersection point
+            const pi = intersect(prev, p, edge, bbox);
+            if (inter) result.push(pi); // add an intersection point
+            if (secure && inter) result.push(pi, pi); // add additional intersection points to secure correct d3 curve
             if (inside) result.push(p); // add a point if it's inside
-            else if (secure && prevInside) result.push(p); // // add an outside point if in secure mode (to get a correct d3 curve)
 
             prev = p;
             prevInside = inside;
@@ -73,6 +73,7 @@ function polygonclip(points, bbox, secure = false) {
         points = result;
         if (!points.length) break;
     }
+    //result.forEach(p => debug.append("circle").attr("cx", p[0]).attr("cy", p[1]).attr("r", .6).attr("fill", "red"));
     return result;
 }
 
diff --git a/libs/three.min.js b/libs/three.min.js
index 6dc8ad262..0652e62b0 100644
--- a/libs/three.min.js
+++ b/libs/three.min.js
@@ -88,7 +88,7 @@ var t=a.getRenderTarget();return{isWebGL2:c.isWebGL2,shaderID:h,precision:m,inst
 emissiveMap:!!b.emissiveMap,emissiveMapEncoding:d(b.emissiveMap,a.gammaInput),bumpMap:!!b.bumpMap,normalMap:!!b.normalMap,objectSpaceNormalMap:1===b.normalMapType,tangentSpaceNormalMap:0===b.normalMapType,clearcoatNormalMap:!!b.clearcoatNormalMap,displacementMap:!!b.displacementMap,roughnessMap:!!b.roughnessMap,metalnessMap:!!b.metalnessMap,specularMap:!!b.specularMap,alphaMap:!!b.alphaMap,gradientMap:!!b.gradientMap,sheen:!!b.sheen,combine:b.combine,vertexTangents:b.normalMap&&b.vertexTangents,vertexColors:b.vertexColors,
 vertexUvs:!!b.map||!!b.bumpMap||!!b.normalMap||!!b.specularMap||!!b.alphaMap||!!b.emissiveMap||!!b.roughnessMap||!!b.metalnessMap||!!b.clearcoatNormalMap,fog:!!q,useFog:b.fog,fogExp2:q&&q.isFogExp2,flatShading:b.flatShading,sizeAttenuation:b.sizeAttenuation,logarithmicDepthBuffer:c.logarithmicDepthBuffer,skinning:b.skinning&&0<l,maxBones:l,useVertexTexture:c.floatVertexTextures,morphTargets:b.morphTargets,morphNormals:b.morphNormals,maxMorphTargets:a.maxMorphTargets,maxMorphNormals:a.maxMorphNormals,
 numDirLights:e.directional.length,numPointLights:e.point.length,numSpotLights:e.spot.length,numRectAreaLights:e.rectArea.length,numHemiLights:e.hemi.length,numDirLightShadows:e.directionalShadowMap.length,numPointLightShadows:e.pointShadowMap.length,numSpotLightShadows:e.spotShadowMap.length,numClippingPlanes:u,numClipIntersection:k,dithering:b.dithering,shadowMapEnabled:a.shadowMap.enabled&&0<g.length,shadowMapType:a.shadowMap.type,toneMapping:b.toneMapped?a.toneMapping:0,physicallyCorrectLights:a.physicallyCorrectLights,
-premultipliedAlpha:b.premultipliedAlpha,alphaTest:b.alphaTest,doubleSided:2===b.side,flipSided:1===b.side,depthPacking:void 0!==b.depthPacking?b.depthPacking:!1}};this.getProgramCode=function(b,c){var d=[];c.shaderID?d.push(c.shaderID):(d.push(b.fragmentShader),d.push(b.vertexShader));if(void 0!==b.defines)for(var e in b.defines)d.push(e),d.push(b.defines[e]);for(e=0;e<g.length;e++)d.push(c[g[e]]);d.push(b.onBeforeCompile.toString());d.push(a.gammaOutput);d.push(a.gammaFactor);return d.join()};this.acquireProgram=
+premultipliedAlpha:b.premultipliedAlpha,alphaTest:b.alphaTest,doubleSided:2===b.side,flipSided:1===b.side,depthPacking:void 0!==b.depthPacking?b.depthPacking:!1}};this.getProgramCode=function(b,c){var d=[];c.shaderID?d.push(c.shaderID):(d.push(b.fragmentShader),d.push(b.vertexShader));if(void 0!==b.defines)for(var e in b.defines)d.push(e),d.push(b.defines[e]);for(e=0;e<g.length;e++)d.push(c[g[e]]);d.push(b.onBeforeCompile.toString());d.push(a.gammaOutput);d.push(a.gammaFactor);return d.join("")};this.acquireProgram=
 function(c,d,f,g){for(var h,l=0,m=e.length;l<m;l++){var q=e[l];if(q.code===g){h=q;++h.usedTimes;break}}void 0===h&&(h=new Wj(a,b,g,c,d,f),e.push(h));return h};this.releaseProgram=function(a){if(0===--a.usedTimes){var b=e.indexOf(a);e[b]=e[e.length-1];e.pop();a.destroy()}};this.programs=e}function Zj(){var a=new WeakMap;return{get:function(b){var c=a.get(b);void 0===c&&(c={},a.set(b,c));return c},remove:function(b){a.delete(b)},update:function(b,c,d){a.get(b)[c]=d},dispose:function(){a=new WeakMap}}}
 function ak(a,b){return a.groupOrder!==b.groupOrder?a.groupOrder-b.groupOrder:a.renderOrder!==b.renderOrder?a.renderOrder-b.renderOrder:a.program!==b.program?a.program.id-b.program.id:a.material.id!==b.material.id?a.material.id-b.material.id:a.z!==b.z?a.z-b.z:a.id-b.id}function bk(a,b){return a.groupOrder!==b.groupOrder?a.groupOrder-b.groupOrder:a.renderOrder!==b.renderOrder?a.renderOrder-b.renderOrder:a.z!==b.z?b.z-a.z:a.id-b.id}function Hh(){function a(a,d,e,m,q,u){var g=b[c];void 0===g?(g={id:a.id,
 object:a,geometry:d,material:e,program:e.program||f,groupOrder:m,renderOrder:a.renderOrder,z:q,group:u},b[c]=g):(g.id=a.id,g.object=a,g.geometry=d,g.material=e,g.program=e.program||f,g.groupOrder=m,g.renderOrder=a.renderOrder,g.z=q,g.group=u);c++;return g}var b=[],c=0,d=[],e=[],f={id:-1};return{opaque:d,transparent:e,init:function(){c=0;d.length=0;e.length=0},push:function(b,c,f,m,q,u){b=a(b,c,f,m,q,u);(!0===f.transparent?e:d).push(b)},unshift:function(b,c,f,m,q,u){b=a(b,c,f,m,q,u);(!0===f.transparent?
diff --git a/main.js b/main.js
index 0626e5b7c..6803f2cc1 100644
--- a/main.js
+++ b/main.js
@@ -952,6 +952,8 @@ function drawCoastline() {
   const waterMask = defs.select("#water");
   lineGen.curve(d3.curveBasisClosed);
 
+  zoom.translateExtent([[-200, -200],[graphWidth+200, graphHeight+200]]);
+
   for (const i of cells.i) {
     const startFromEdge = !i && cells.h[i] >= 20;
     if (!startFromEdge && cells.t[i] !== -1 && cells.t[i] !== 1) continue; // non-edge cell
diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index 8b77bdbca..95637a24d 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -691,7 +691,7 @@
 
         const naval = states[f].type === "Naval" && states[t].type === "Naval" && cells.f[states[f].center] !== cells.f[states[t].center];
         const neib = naval ? false : states[f].neighbors.includes(t);
-        const neibOfNeib = naval || neib ? false : states[f].neighbors.map(n => states[n].neighbors).join().includes(t);
+        const neibOfNeib = naval || neib ? false : states[f].neighbors.map(n => states[n].neighbors).join("").includes(t);
 
         let status = naval ? rw(navals) : neib ? rw(neibs) : neibOfNeib ? rw(neibsOfNeibs) : rw(far);
 
diff --git a/modules/names-generator.js b/modules/names-generator.js
index 8a950260c..987760110 100644
--- a/modules/names-generator.js
+++ b/modules/names-generator.js
@@ -8,25 +8,41 @@
 
   // calculate Markov chain for a namesbase
   const calculateChain = function(string) {
-    const chain = [];
-    const d = string.toLowerCase().replace(/,/g, " ");
-
-    for (let i = -1, str = ""; i < d.length - 2; i += str.length, str = "") {
-      let v = 0, f = " ";
-
-      for (let c=i+1; str.length < 5; c++) {
-        if (d[c] === undefined) break;
-        str += d[c];
-        if (str === " ") break;
-        if (d[c] !== "o" && d[c] !== "e" && vowel(d[c]) && d[c+1] === d[c]) break;
-        if (d[c+2] === " ") {str += d[c+1]; break;}
-        if (vowel(d[c])) v++;
-        if (v && vowel(d[c+2])) break;
-      }
+    const chain = [], array = string.split(",");
+
+    for (const n of array) {
+      let name = n.trim().toLowerCase();
+      const basic = !(/[^\u0000-\u007f]/.test(name)); // basic chars and English rules can be applied
+
+      // split word into pseudo-syllables
+      for (let i=-1, syllable = ""; i < name.length; i += (syllable.length||1), syllable = "") {
+        let prev = name[i] || ""; // pre-onset letter
+        let v = 0; // 0 if no vowels in syllable
+
+        for (let c=i+1; name[c] && syllable.length < 5; c++) {
+          const that = name[c], next = name[c+1]; // next char
+          syllable += that;
+          if (syllable === " " || syllable === "-") break; // syllable starts with space or hyphen
+          if (!next || next === " " || next === "-") break; // no need to check
+
+          if (vowel(that)) v = 1; // check if letter is vowel
+
+          // do not split some diphthongs
+          if (that === "y" && next === "e") continue; // 'ye'
+          if (basic) { // English-like
+            if (that === "o" && next === "o") continue; // 'oo'
+            if (that === "e" && next === "e") continue; // 'ee'
+            if (that === "a" && next === "e") continue; // 'ae'
+            if (that === "c" && next === "h") continue; // 'ch'
+          }
+
+          if (vowel(that) === next) break; // two same vowels in a row
+          if (v && vowel(name[c+2])) break; // syllable has vowel and additional vowel is expected soon
+        }
 
-      if (i >= 0) f = d[i];
-      if (chain[f] === undefined) chain[f] = [];
-      chain[f].push(str);
+        if (chain[prev] === undefined) chain[prev] = [];
+        chain[prev].push(syllable);
+      }
     }
 
     return chain;
@@ -39,12 +55,12 @@
   const clearChains = () => chains = [];
 
   // generate name using Markov's chain
-  const getBase = function(base, min, max, dupl, multi) {
+  const getBase = function(base, min, max, dupl) {
     if (base === undefined) {console.error("Please define a base"); return;}
     if (!chains[base]) updateChain(base);
 
     const data = chains[base];
-    if (!data || data[" "] === undefined) {
+    if (!data || data[""] === undefined) {
       tip("Namesbase " + base + " is incorrect. Please check in namesbase editor", false, "error");
       console.error("Namebase " + base + " is incorrect!");
       return "ERROR";
@@ -53,31 +69,26 @@
     if (!min) min = nameBases[base].min;
     if (!max) max = nameBases[base].max;
     if (dupl !== "") dupl = nameBases[base].d;
-    if (!multi) multi = nameBases[base].m;
 
-    let v = data[" "], cur = v[rand(v.length-1)], w = "";
-    for (let i=0; i < 21; i++) {
-      if (cur === " " && Math.random() > multi) {
-        if (w.length < min) {cur = ""; w = ""; v = data[" "];} else break;
+    let v = data[""], cur = ra(v), w = "";
+    for (let i=0; i < 20; i++) {
+      if (cur === "") { // end of word
+        if (w.length < min) {cur = ""; w = ""; v = data[""];} else break;
       } else {
-        if ((w+cur).length > max) {
+        if (w.length + cur.length > max) { // word too long
           if (w.length < min) w += cur;
           break;
-        } else if (cur === " " && w.length+1 < min) {
-          cur = "";
-          v = data[" "];
-        } else {
-          v = data[cur.slice(-1)] || data[" "];
-        }
+        } else v = data[last(cur)] || data[""];
       }
 
       w += cur;
-      cur = v[rand(v.length - 1)];
+      cur = ra(v);
     }
 
     // parse word to get a final name
     const l = last(w); // last letter
-    if (l === "'" || l === " ") w = w.slice(0,-1); // not allow apostrophe and space at the end
+    if (l === "'" || l === " " || l === "-") w = w.slice(0,-1); // not allow some characters at the end
+    const basic = !(/[^\u0000-\u007f]/.test(w)); // true if word has only basic characters
 
     let name = [...w].reduce(function(r, c, i, d) {
       if (c === d[i+1] && !dupl.includes(c)) return r; // duplication is not allowed
@@ -86,8 +97,8 @@
       if (r.slice(-1) === " ") return r + c.toUpperCase(); // capitalize letter after space
       if (r.slice(-1) === "-") return r + c.toUpperCase(); // capitalize letter after hyphen
       if (c === "a" && d[i+1] === "e") return r; // "ae" => "e"
-      if (i+1 < d.length && !vowel(c) && !vowel(d[i-1]) && !vowel(d[i+1])) return r; // remove consonant between 2 consonants
-      if (i+2 < d.length && c === d[i+1] && c === d[i+2]) return r; // remove tree same letters in a row
+      if (basic && i+1 < d.length && !vowel(c) && !vowel(d[i-1]) && !vowel(d[i+1])) return r; // remove consonant between 2 consonants
+      if (i+2 < d.length && c === d[i+1] && c === d[i+2]) return r; // remove three same letters in a row
       return r + c;
     }, "");
 
@@ -95,7 +106,7 @@
     if (name.split(" ").some(part => part.length < 2)) name = name.split(" ").map((p,i) => i ? p.toLowerCase() : p).join("");
 
     if (name.length < 2) {
-      console.error("Name is too short! Random name to be selected");
+      console.error("Name is too short! Random name will be selected");
       name = ra(nameBases[base].b.split(","));
     }
 
@@ -103,10 +114,10 @@
   }
 
   // generate name for culture
-  const getCulture = function(culture, min, max, dupl, multi) {
+  const getCulture = function(culture, min, max, dupl) {
     if (culture === undefined) {console.error("Please define a culture"); return;}
     const base = pack.cultures[culture].base;
-    return getBase(base, min, max, dupl, multi);
+    return getBase(base, min, max, dupl);
   }
 
   // generate short name for culture
@@ -206,7 +217,7 @@
   }
 
   const getNameBases = function() {
-    // name, min length, max length, letters to allow duplication, multi-word name rate
+    // name, min length, max length, letters to allow duplication, multi-word name rate [deprecated]
     return [
       // real-world bases by Azgaar:
       {name: "German", i: 0, min: 5, max: 12, d: "lt", m: 0, b: "Achern,Aichhalden,Aitern,Albbruck,Alpirsbach,Altensteig,Althengstett,Appenweier,Auggen,Wildbad,Badenen,Badenweiler,Baiersbronn,Ballrechten,Bellingen,Berghaupten,Bernau,Biberach,Biederbach,Binzen,Birkendorf,Birkenfeld,Bischweier,Blumberg,Bollen,Bollschweil,Bonndorf,Bosingen,Braunlingen,Breisach,Breisgau,Breitnau,Brigachtal,Buchenbach,Buggingen,Buhl,Buhlertal,Calw,Dachsberg,Dobel,Donaueschingen,Dornhan,Dornstetten,Dottingen,Dunningen,Durbach,Durrheim,Ebhausen,Ebringen,Efringen,Egenhausen,Ehrenkirchen,Ehrsberg,Eimeldingen,Eisenbach,Elzach,Elztal,Emmendingen,Endingen,Engelsbrand,Enz,Enzklosterle,Eschbronn,Ettenheim,Ettlingen,Feldberg,Fischerbach,Fischingen,Fluorn,Forbach,Freiamt,Freiburg,Freudenstadt,Friedenweiler,Friesenheim,Frohnd,Furtwangen,Gaggenau,Geisingen,Gengenbach,Gernsbach,Glatt,Glatten,Glottertal,Gorwihl,Gottenheim,Grafenhausen,Grenzach,Griesbach,Gutach,Gutenbach,Hag,Haiterbach,Hardt,Harmersbach,Hasel,Haslach,Hausach,Hausen,Hausern,Heitersheim,Herbolzheim,Herrenalb,Herrischried,Hinterzarten,Hochenschwand,Hofen,Hofstetten,Hohberg,Horb,Horben,Hornberg,Hufingen,Ibach,Ihringen,Inzlingen,Kandern,Kappel,Kappelrodeck,Karlsbad,Karlsruhe,Kehl,Keltern,Kippenheim,Kirchzarten,Konigsfeld,Krozingen,Kuppenheim,Kussaberg,Lahr,Lauchringen,Lauf,Laufenburg,Lautenbach,Lauterbach,Lenzkirch,Liebenzell,Loffenau,Loffingen,Lorrach,Lossburg,Mahlberg,Malsburg,Malsch,March,Marxzell,Marzell,Maulburg,Monchweiler,Muhlenbach,Mullheim,Munstertal,Murg,Nagold,Neubulach,Neuenburg,Neuhausen,Neuried,Neuweiler,Niedereschach,Nordrach,Oberharmersbach,Oberkirch,Oberndorf,Oberbach,Oberried,Oberwolfach,Offenburg,Ohlsbach,Oppenau,Ortenberg,otigheim,Ottenhofen,Ottersweier,Peterstal,Pfaffenweiler,Pfalzgrafenweiler,Pforzheim,Rastatt,Renchen,Rheinau,Rheinfelden,Rheinmunster,Rickenbach,Rippoldsau,Rohrdorf,Rottweil,Rummingen,Rust,Sackingen,Sasbach,Sasbachwalden,Schallbach,Schallstadt,Schapbach,Schenkenzell,Schiltach,Schliengen,Schluchsee,Schomberg,Schonach,Schonau,Schonenberg,Schonwald,Schopfheim,Schopfloch,Schramberg,Schuttertal,Schwenningen,Schworstadt,Seebach,Seelbach,Seewald,Sexau,Simmersfeld,Simonswald,Sinzheim,Solden,Staufen,Stegen,Steinach,Steinen,Steinmauern,Straubenhardt,Stuhlingen,Sulz,Sulzburg,Teinach,Tiefenbronn,Tiengen,Titisee,Todtmoos,Todtnau,Todtnauberg,Triberg,Tunau,Tuningen,uhlingen,Unterkirnach,Reichenbach,Utzenfeld,Villingen,Villingendorf,Vogtsburg,Vohrenbach,Waldachtal,Waldbronn,Waldkirch,Waldshut,Wehr,Weil,Weilheim,Weisenbach,Wembach,Wieden,Wiesental,Wildberg,Winzeln,Wittlingen,Wittnau,Wolfach,Wutach,Wutoschingen,Wyhlen,Zavelstein"},
diff --git a/modules/ocean-layers.js b/modules/ocean-layers.js
index 94a18fd2b..7751b376f 100644
--- a/modules/ocean-layers.js
+++ b/modules/ocean-layers.js
@@ -28,16 +28,21 @@
       if (!start) continue;
       used[i] = 1;
       const chain = connectVertices(start, t); // vertices chain to form a path
-      const relaxation = 1 + t * -2; // select only n-th point
-      const relaxed = chain.filter((v, i) => i % relaxation === 0 || vertices.c[v].some(c => c >= pointsN));
+      if (chain.length < 4) continue;
+      const relax = 1 + t * -2; // select only n-th point
+      const relaxed = chain.filter((v, i) => !(i%relax) || vertices.c[v].some(c => c >= pointsN));
+      if (relaxed.length < 4) continue;
       const points = clipPoly(relaxed.map(v => vertices.p[v]), 1);
-      if (relaxed.length >= 3) chains.push([t, points]);
+      const inside = d3.polygonContains(points, grid.points[i]);
+      chains.push([t, points, inside]);
     }
 
+    const bbox = `M0,0h${graphWidth}v${graphHeight}h${-graphWidth}Z`;
     for (const t of limits) {
-      const path = chains.filter(c => c[0] === t).map(c => round(lineGen(c[1]))).join();
+      const layer = chains.filter(c => c[0] === t);
+      let path = layer.map(c => round(lineGen(c[1]))).join("");
+      if (layer.every(c => !c[2])) path = bbox + path; // add outer ring if all segments are outside (works not for all cases)
       if (path) oceanLayers.append("path").attr("d", path).attr("fill", "#ecf2f9").style("opacity", opacity);
-      // For each layer there should outer ring. If no, layer will be upside down. Need to fix it in the future
     }
 
     // find eligible cell vertex to start path detection
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index a725b5a9d..68f2450f0 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -326,6 +326,7 @@ async function loadFromCloud() {
 function saveGeoJSON_Cells() {
   let data = "{ \"type\": \"FeatureCollection\", \"features\": [\n";
   const cells = pack.cells, v = pack.vertices;
+  const getPopulation = i => {const [r, u] = getCellPopulation(i); return rn(r+u)};
 
   cells.i.forEach(i => {
     data += "{\n   \"type\": \"Feature\",\n   \"geometry\": { \"type\": \"Polygon\", \"coordinates\": [[";
@@ -340,13 +341,13 @@ function saveGeoJSON_Cells() {
     data += "["+x+","+y+"]";
     data += "]] },\n   \"properties\": {\n";
 
-    let height = parseInt(getFriendlyHeight([cells.p[i][0],cells.p[i][1]]));
+    const height = parseInt(getFriendlyHeight([cells.p[i][0],cells.p[i][1]]));
 
     data += "      \"id\": \""+i+"\",\n";
     data += "      \"height\": \""+height+"\",\n";
     data += "      \"biome\": \""+cells.biome[i]+"\",\n";
     data += "      \"type\": \""+pack.features[cells.f[i]].type+"\",\n";
-    data += "      \"population\": \""+getFriendlyPopulation(i)+"\",\n";
+    data += "      \"population\": \""+getPopulation(i)+"\",\n";
     data += "      \"state\": \""+cells.state[i]+"\",\n";
     data += "      \"province\": \""+cells.province[i]+"\",\n";
     data += "      \"culture\": \""+cells.culture[i]+"\",\n";
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index de19378fc..7f18a688d 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -2,45 +2,35 @@
 
 function showEPForRoute(node) {
   const points = [];
-  var prevB=0, i=0, j=0, b=0, ma=0, mi=100, h=0;
   debug.select("#controlPoints").selectAll("circle").each(function() {
-    i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
+    const i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
     points.push(i);
   });
 
   const routeLen = node.getTotalLength() * distanceScaleInput.value;
-
   showElevationProfile(points, routeLen, false);
 }
 
 function showEPForRiver(node) {
   const points = [];
-  var prevB=0, i=0, j=0, b=0, ma=0, mi=100, h=0;
   debug.select("#controlPoints").selectAll("circle").each(function() {
-    i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
+    const i = findCell(this.getAttribute("cx"), this.getAttribute("cy"));
     points.push(i);
   });
 
   const riverLen = (node.getTotalLength() / 2) * distanceScaleInput.value;
-
   showElevationProfile(points, riverLen, true);
 }
 
 function resizeElevationProfile() {
 }
 
-function closeElevationProfile() {
-  modules.elevation = false;
-}
-
 function showElevationProfile(data, routeLen, isRiver) {
-// data is an array of cell indexes, routeLen is the distance, isRiver should be true for rivers, false otherwise
+  // data is an array of cell indexes, routeLen is the distance, isRiver should be true for rivers, false otherwise
   document.getElementById("elevationGraph").innerHTML = "";
 
   $("#elevationProfile").dialog({
-    title: "Elevation profile", resizable: false,
-    width: window.width,
-    close: closeElevationProfile,
+    title: "Elevation profile", resizable: false, width: window.width,
     position: {my: "left top", at: "left+20 bottom-240", of: window, collision: "fit"}
   });
 
diff --git a/modules/ui/general.js b/modules/ui/general.js
index 449d7798e..9833618ba 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -223,16 +223,20 @@ function getRiverInfo(id) {
   return r ? `${r.name} ${r.type} (${id})` : "n/a";
 }
 
+function getCellPopulation(i) {
+  const rural = pack.cells.pop[i] * populationRate.value;
+  const urban = pack.cells.burg[i] ? pack.burgs[pack.cells.burg[i]].population * populationRate.value * urbanization.value : 0;
+  return [rural, urban];
+}
+
 // get user-friendly (real-world) population value from map data
 function getFriendlyPopulation(i) {
-  const rural = pack.cells.pop[i] * populationRate.value;
-  const urban = pack.cells.burg[i] ? pack.burgs[pack.cells.burg[i]].population * populationRate.value * urbanization.value : 0;  
+  const [rural, urban] = getCellPopulation(i);
   return `${si(rural+urban)} (${si(rural)} rural, urban ${si(urban)})`;
 }
 
 function getPopulationTip(i) {
-  const rural = pack.cells.pop[i] * populationRate.value;
-  const urban = pack.cells.burg[i] ? pack.burgs[pack.cells.burg[i]].population * populationRate.value * urbanization.value : 0;  
+  const [rural, urban] = getCellPopulation(i);
   return `Cell population: ${si(rural+urban)}; Rural: ${si(rural)}; Urban: ${si(urban)}`;
 }
 
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 9be802b0d..deb78f835 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -260,7 +260,7 @@ function drawTemp() {
   temperature.append("path").attr("d", `M0,0 h${svgWidth} v${svgHeight} h${-svgWidth} Z`).attr("fill", scheme(1 - (min - tMin) / delta)).attr("stroke", "none");
 
   for (const t of isolines) {
-    const path = chains.filter(c => c[0] === t).map(c => round(lineGen(c[1]))).join();
+    const path = chains.filter(c => c[0] === t).map(c => round(lineGen(c[1]))).join("");
     if (!path) continue;
     const fill = scheme(1 - (t - tMin) / delta), stroke = d3.color(fill).darker(.2);
     temperature.append("path").attr("d", path).attr("fill", fill).attr("stroke", stroke);
diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js
index 26a727496..baf0acb5a 100644
--- a/modules/ui/namesbase-editor.js
+++ b/modules/ui/namesbase-editor.js
@@ -16,7 +16,6 @@ function editNamesbase() {
   document.getElementById("namesbaseMin").addEventListener("input", updateBaseMin);
   document.getElementById("namesbaseMax").addEventListener("input", updateBaseMax);
   document.getElementById("namesbaseDouble").addEventListener("input", updateBaseDublication);
-  document.getElementById("namesbaseMulti").addEventListener("input", updateBaseMiltiwordRate);
   document.getElementById("namesbaseAdd").addEventListener("click", namesbaseAdd);
   document.getElementById("namesbaseAnalize").addEventListener("click", analizeNamesbase);
   document.getElementById("namesbaseDefault").addEventListener("click", namesbaseRestoreDefault);
@@ -46,7 +45,6 @@ function editNamesbase() {
     document.getElementById("namesbaseMin").value = nameBases[base].min;
     document.getElementById("namesbaseMax").value = nameBases[base].max;
     document.getElementById("namesbaseDouble").value = nameBases[base].d;
-    document.getElementById("namesbaseMulti").value = nameBases[base].m;
     updateExamples();
   }
 
@@ -67,10 +65,9 @@ function editNamesbase() {
 
   function updateNamesData() {
     const base = +document.getElementById("namesbaseSelect").value;
-    const b = document.getElementById("namesbaseTextarea").value.replace(/ /g, "");
+    const b = document.getElementById("namesbaseTextarea").value;
     if (b.split(",").length < 3) {
-      tip("The names data provided is not correct", false, "error");
-      document.getElementById("namesbaseTextarea").value = nameBases[base].b;
+      tip("The names data provided is too short of incorrect", false, "error");
       return;
     }
     nameBases[base].b = b;
@@ -101,12 +98,6 @@ function editNamesbase() {
     nameBases[base].d = this.value;
   }
 
-  function updateBaseMiltiwordRate() {
-    if (isNaN(+this.value) || +this.value < 0 || +this.value > 1) {tip("Please provide a number within [0-1] range", false, "error"); return;}
-    const base = +document.getElementById("namesbaseSelect").value;
-    nameBases[base].m = +this.value;
-  }
-
   function analizeNamesbase() {
     const string = document.getElementById("namesbaseTextarea").value;
     if (!string) {tip("Names data field should not be empty", false, "error"); return;}
@@ -174,7 +165,6 @@ function editNamesbase() {
     document.getElementById("namesbaseMin").value = 5;
     document.getElementById("namesbaseMax").value = 12;
     document.getElementById("namesbaseDouble").value = "";
-    document.getElementById("namesbaseMulti").value = 0;
     document.getElementById("namesbaseExamples").innerHTML = "Please provide names data";
   }
 
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 11fdb653f..6af46b0af 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -69,18 +69,11 @@ document.getElementById("options").querySelector("div.tab").addEventListener("cl
   if (id === "aboutTab") aboutContent.style.display = "block";
 });
 
-document.getElementById("options").querySelectorAll("i.collapsible").forEach(el => el.addEventListener("click", collapse));
-function collapse(e) {
-  const trigger = e.target;
-  const section = trigger.parentElement.nextElementSibling;
-
-  if (section.style.display === "none") {
-    section.style.display = "block";
-    trigger.classList.replace("icon-down-open", "icon-up-open");
-  } else {
-    section.style.display = "none";
-    trigger.classList.replace("icon-up-open", "icon-down-open");
-  }
+// show popup with a list of Patreon supportes (updated manually, to be replaced with API call)
+function showSupporters() {
+  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords";
+  alertMessage.innerHTML = "<ul style='column-count: 3; column-gap: 2em'>" + supporters.split(", ").sort().map(n => `<li>${n}</li>`).join("") + "</ul>";
+  $("#alert").dialog({resizable: false, title: "Patreon Supporters", width: "30vw", position: {my: "center", at: "center", of: "svg"}});
 }
 
 // Option listeners
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index 78a7fb144..f344d8215 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -184,7 +184,7 @@ function editStates() {
     path.transition().duration(dur).attrTween("stroke-dasharray", function() {return t => i(t)});
   }
 
-  function stateHighlightOff(event) {
+  function stateHighlightOff() {
     debug.selectAll(".highlight").each(function() {
       d3.select(this).transition().duration(1000).attr("opacity", 0).remove();
     });
@@ -201,6 +201,12 @@ function editStates() {
       statesBody.select("#state-gap"+state).attr("stroke", fill);
       const halo = d3.color(fill) ? d3.color(fill).darker().hex() : "#666666";
       statesHalo.select("#state-border"+state).attr("stroke", halo);
+
+      // recolor regiments
+      const solidColor = fill[0] === "#" ? fill : "#999";
+      const darkerColor = d3.color(solidColor).darker().hex();
+      armies.select("#army"+state).attr("fill", solidColor);
+      armies.select("#army"+state).selectAll("g > rect:nth-of-type(2)").attr("fill", darkerColor);
     }
 
     openPicker(currentFill, callback);
diff --git a/modules/utils.js b/modules/utils.js
index afcdd5ea3..d979e4565 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -376,13 +376,13 @@ function common(a, b) {
 }
 
 // clip polygon by graph bbox
-function clipPoly(points, secure = false) {
+function clipPoly(points, secure = 0) {
   return polygonclip(points, [0, 0, graphWidth, graphHeight], secure);
 }
 
-// check if char is vowel
+// check if char is vowel or can serve as vowel
 function vowel(c) {
-  return "aeiouy".includes(c);
+  return `aeiouyɑ'əøɛœæɶɒɨɪɔɐʊɤɯаоиеёэыуюяàèìòùỳẁȁȅȉȍȕáéíóúýẃőűâêîôûŷŵäëïöüÿẅãẽĩõũỹąęįǫųāēīōūȳăĕĭŏŭǎěǐǒǔȧėȯẏẇạẹịọụỵẉḛḭṵṳ`.includes(c);
 }
 
 // remove vowels from the end of the string

From 8152ccbe9c1ce0a66f83eac1918edc723f1debc8 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 26 Apr 2020 21:12:54 +0300
Subject: [PATCH 05/38] v1.4.04

---
 index.html                     |  5 +++--
 main.js                        |  2 --
 modules/ui/coastline-editor.js |  2 +-
 modules/ui/options.js          | 13 ++++++++-----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index a1eb751e3..38ade5c20 100644
--- a/index.html
+++ b/index.html
@@ -1797,7 +1797,8 @@
               <input data-tip="Maximal possible zoom level (should be > 1)" id="zoomExtentMax" class="paired" type="number" min=1 max=50 value=20>
             </td>
             <td>
-              <i data-tip="Restore default [1, 20] zoom extent" id="zoomExtentDefault" class="icon-ccw"></i>
+              <i data-tip="Restore default zoom extent (1, 20)" id="zoomExtentDefault" class="icon-ccw"></i>
+              <i data-tip="Allow to drag map beyond canvas borders" id="translateExtent" data-on=0 class="icon-hand-paper-o"></i>
             </td>
           </tr>
 
@@ -2186,7 +2187,7 @@
       </div>
 
       <button id="coastlineEditStyle" data-tip="Edit coastline group style in Style Editor" class="icon-brush"></button>
-      <button id="coastlineArea" data-tip="Lake area in selected units">0</button>
+      <button id="coastlineArea" data-tip="Landmass area in selected units">0</button>
     </div>
 
     <div id="reliefEditor" class="dialog" style="display: none">
diff --git a/main.js b/main.js
index 6803f2cc1..0626e5b7c 100644
--- a/main.js
+++ b/main.js
@@ -952,8 +952,6 @@ function drawCoastline() {
   const waterMask = defs.select("#water");
   lineGen.curve(d3.curveBasisClosed);
 
-  zoom.translateExtent([[-200, -200],[graphWidth+200, graphHeight+200]]);
-
   for (const i of cells.i) {
     const startFromEdge = !i && cells.h[i] >= 20;
     if (!startFromEdge && cells.t[i] !== -1 && cells.t[i] !== 1) continue; // non-edge cell
diff --git a/modules/ui/coastline-editor.js b/modules/ui/coastline-editor.js
index 428db5cee..b1c357a9f 100644
--- a/modules/ui/coastline-editor.js
+++ b/modules/ui/coastline-editor.js
@@ -61,7 +61,7 @@ function editCoastline(node = d3.event.target) {
     lineGen.curve(d3.curveBasisClosed);
     const f = +elSelected.attr("data-f");
     const vertices = pack.features[f].vertices;
-    const points = vertices.map(v => pack.vertices.p[v]);
+    const points = clipPoly(vertices.map(v => pack.vertices.p[v]), 1);
     const d = round(lineGen(points));
     elSelected.attr("d", d);
     defs.select("mask#land > path#land_"+f).attr("d", d); // update land mask
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 6af46b0af..906914ad8 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -118,6 +118,7 @@ optionsContent.addEventListener("click", function(event) {
   else if (id === "optionsMapHistory") showSeedHistoryDialog();
   else if (id === "optionsCopySeed") copyMapURL();
   else if (id === "zoomExtentDefault") restoreDefaultZoomExtent();
+  else if (id === "translateExtent") toggleTranslateExtent(event.target);
 });
 
 function mapSizeInputChange() {
@@ -138,7 +139,6 @@ function changeMapSize() {
   landmass.select("rect").attr("x", 0).attr("y", 0).attr("width", maxWidth).attr("height", maxHeight);
   oceanPattern.select("rect").attr("x", 0).attr("y", 0).attr("width", maxWidth).attr("height", maxHeight);
   oceanLayers.select("rect").attr("x", 0).attr("y", 0).attr("width", maxWidth).attr("height", maxHeight);
-  //defs.select("#mapClip > rect").attr("width", maxWidth).attr("height", maxHeight);
 
   fitScaleBar();
   if (window.fitLegendBox) fitLegendBox();
@@ -152,10 +152,7 @@ function applyMapSize() {
   svgWidth = Math.min(graphWidth, window.innerWidth);
   svgHeight = Math.min(graphHeight, window.innerHeight);
   svg.attr("width", svgWidth).attr("height", svgHeight);
-  zoom.translateExtent([[0, 0],[graphWidth, graphHeight]]).scaleExtent([zoomMin, zoomMax]).scaleTo(svg, zoomMin);
-  //viewbox.attr("transform", null).attr("clip-path", "url(#mapClip)");
-  //defs.append("clipPath").attr("id", "mapClip").append("rect").attr("x", 0).attr("y", 0).attr("width", graphWidth).attr("height", graphHeight);
-  //zoom.translateExtent([[-svgWidth*.2, -graphHeight*.2], [svgWidth*1.2, graphHeight*1.2]]);
+  zoom.translateExtent([[0, 0], [graphWidth, graphHeight]]).scaleExtent([zoomMin, zoomMax]).scaleTo(svg, zoomMin);
 }
 
 function toggleFullscreen() {
@@ -171,6 +168,12 @@ function toggleFullscreen() {
   changeMapSize();
 }
 
+function toggleTranslateExtent(el) {
+  const on = el.dataset.on = +!(+el.dataset.on);
+  if (on) zoom.translateExtent([[-graphWidth/2, -graphHeight/2], [graphWidth*1.5, graphHeight*1.5]]);
+  else zoom.translateExtent([[0, 0], [graphWidth, graphHeight]]);
+}
+
 function generateMapWithSeed() {
   if (optionsSeed.value == seed) {
     tip("The current map already has this seed", false, "error");

From 5304306044e8a5171d024e9fa6a0e25e391965f7 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Wed, 29 Apr 2020 00:02:05 +0300
Subject: [PATCH 06/38] v1.4.05

---
 icons.css                       |  10 +-
 index.css                       |  19 ++++
 index.html                      |  30 +++--
 libs/publicstorage.js           | 188 ++++++++++++++++++++++++++++++++
 modules/save-and-load.js        |  10 +-
 modules/ui/battle-screen.js     |  55 +++++++++-
 modules/ui/elevation-profile.js |  12 +-
 modules/ui/regiment-editor.js   |   2 +-
 8 files changed, 300 insertions(+), 26 deletions(-)
 create mode 100644 libs/publicstorage.js

diff --git a/icons.css b/icons.css
index 45c212bc5..5ef9555d3 100644
--- a/icons.css
+++ b/icons.css
@@ -264,4 +264,12 @@
   width: .6em;
   font-family: monospace;
 }
-.icon-die:before {content:'🎲';}
\ No newline at end of file
+.icon-die:before {content:'🎲';}
+
+.icon-button-plus:before {content:'➕'; padding-right: .4em;}
+.icon-button-die:before {content:'🎲'; padding-right: .4em;}
+.icon-button-power:before {content:'💪'; padding-right: .6em;}
+.icon-button-skirmish:before {content:'🎯'; padding-right: .4em;}
+.icon-button-melee:before {content:'🗡'; padding-right: .4em;}
+.icon-button-pursue:before {content:'🐎'; padding-right: .4em;}
+.icon-button-retreat:before {content:'🏳️'; padding-right: .4em;}
diff --git a/index.css b/index.css
index a2b315c75..c1cbe4ed1 100644
--- a/index.css
+++ b/index.css
@@ -942,6 +942,25 @@ body button.noicon {
 	stroke: #2c0808;
 }
 
+#battleBody > table {
+	padding: .2em .6em .2em .6em;
+	border: 1px solid #ccc;
+	margin: 0 0 .4em 0;
+	display: block;
+	overflow: auto;
+	max-height: 34vh;
+}
+
+#battleBody > table .regiment {
+	width: 13em;
+	font-weight: bold;
+}
+
+tr.battleCasualties, tr.battleSurvivors {
+	font-style: italic;
+	font-size: .9em;
+}
+
 .drag-trigger {
 	border-left: 1em solid transparent;
 	border-right: 1em solid #000;
diff --git a/index.html b/index.html
index 38ade5c20..0040c773c 100644
--- a/index.html
+++ b/index.html
@@ -2445,15 +2445,30 @@
       </div>
     </div>
 
-    <div id="battleScreen" class="dialog" style="display: none">
+    <div id="battleScreen" class="dialog stable" style="display: none">
       <div id="battleBody">
-        <div style="font-size:1.2em; font-weight: bold"><div style="width: 1.2em; display: inline-block">⚔</div><span>Attackers</span></div>
-        <table id="battleAttackers" style="padding: .2em .6em .2em .6em; border: 1px solid #ccc; margin: .0 0 .4em 0"><thead><tr></tr></thead><tbody></tbody></table>
-        <div style="font-size:1.2em; font-weight: bold"><div style="width: 1.2em; display: inline-block">🛡</div><span>Defenders</span></div>
-        <table id="battleDefenders" style="padding: .2em .6em .2em .6em; border: 1px solid #ccc; margin: .0 0 .4em 0"><thead><tr></tr></thead><tbody></tbody></table>
+        <div style="font-size:1.2em; font-weight: bold">
+          <div style="width: 1.2em; display: inline-block">⚔</div><span>Attackers</span>
+          <div style="float: right; font-size: .7em">
+            <span data-tip="Attackers power considering phase and randon factor" style="padding: .2em" class="icon-button-power">43</span>
+            <button data-tip="Battle phase. Click to change" class="icon-button-pursue"></button>
+            <button data-tip="Random factor for attackers. Click to re-roll" style="padding: .1em .2em" class="icon-button-die">12</button>
+          </div>
+        </div>
+        <table id="battleAttackers"><thead><tr></tr></thead><tbody></tbody></table>
+        <div style="font-size:1.2em; font-weight: bold">
+          <div style="width: 1.2em; display: inline-block">🛡</div><span>Defenders</span>
+          <div style="float: right; font-size: .7em">
+            <span data-tip="Defenders power considering phase and randon factor" style="padding: .2em" class="icon-button-power">65</span>
+            <button data-tip="Battle phase. Click to change" class="icon-button-skirmish"></button>
+            <button data-tip="Random factor for defenders. Click to re-roll" style="padding: .1em .2em" class="icon-button-die">05</button>
+          </div>
+        </div>
+        <table id="battleDefenders"><thead><tr></tr></thead><tbody></tbody></table>
       </div>
 
       <div id="battleBottom">
+        <button id="battleAddRegiment" data-tip="Add regiment to the battle" class="icon-user-plus"></button>
         <button id="battleRoll" data-tip="Roll dice to randomize sides power and battle phase" class="icon-die"></button>
         <button id="battleNext" data-tip="Calculate and apply phase results" class="icon-play"></button>
         <button id="battleApply" data-tip="Apply battle results" class="icon-check"></button>
@@ -3360,8 +3375,8 @@
           <tr>
             <th data-tip="Unit icon">Icon</th>
             <th data-tip="Unit name. If name is changed for existing unit, old unit will be replaced">Unit name</th>
-            <th data-tip="Conscription percentage for rural population">Rural %</th>
-            <th data-tip="Conscription percentage for urban population">Urban %</th>
+            <th data-tip="Conscription percentage for rural population">Rural</th>
+            <th data-tip="Conscription percentage for urban population">Urban</th>
             <th data-tip="Average number of people in crew (used for total personnel calculation)">Crew</th>
             <th data-tip="Unit military power (used for battle simulation)">Power</th>
             <th data-tip="Unit type to apply special rules on forces recalculation">Type</th>
@@ -3608,4 +3623,5 @@
   <script defer src="modules/ui/3d.js"></script>
   <script defer src="libs/quantize.min.js"></script>
   <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
+  <script defer src="libs/publicstorage.js"></script>
 </body>
diff --git a/libs/publicstorage.js b/libs/publicstorage.js
new file mode 100644
index 000000000..9d8ebe540
--- /dev/null
+++ b/libs/publicstorage.js
@@ -0,0 +1,188 @@
+// https://github.com/Highbrainer/jeevaneo-js-publicstorage. MIT
+const IFRAME_ROOT_URL = "https://publicstorage.neocities.org/shared-iframe.html";
+
+class PublicStorageAccess {
+
+	 constructor ({debug=false}={}) {
+		 this.uid = this.uniqueId();
+		 this.debug=debug;
+	 }
+	 
+	uniqueId() {
+		function chr4(){
+			return Math.random().toString(16).slice(-4);
+			}
+		return chr4() + chr4() +
+				'-' + chr4() +
+				'-' + chr4() +
+				'-' + chr4() +
+				'-' + chr4() + chr4() + chr4();
+	}
+
+	_debug(msg) {
+		if(this.debug) {
+			if(console && console.debug) {
+				console.debug(msg);
+			}
+		}
+	}
+	
+	 prepareIFrame() {
+		const that = this;
+		const iframe = document.createElement("iframe");
+		iframe.id=that.uid;
+		iframe.src=IFRAME_ROOT_URL + "?uid=init-"+that.uid;
+		iframe.style.cssText="display:none;";
+		return new Promise(function(resolve, reject) {
+			window.addEventListener('message', function mafunc(tkn) {
+				
+				if (IFRAME_ROOT_URL.indexOf(tkn.origin)<0) {
+					return;
+				}
+				
+				try {
+					const packet = JSON.parse(tkn.data);
+					
+					if(!(packet.frameId === "init-" + that.uid)) {
+						// ignore
+						return;
+					}
+					
+					if(packet.ready) {
+						resolve(iframe);					
+					}
+				} catch (e) {
+					reject(tkn.data);
+				}
+				window.removeEventListener('message', mafunc);
+		    });
+			onLoadThen().then(() => {
+				document.getElementsByTagName("body")[0].appendChild(iframe);
+			});
+
+			setTimeout(()=>reject(`Request ${that.uid} TIMEOUTED!`), 20000);
+		});
+	}
+	 
+	 access(access, prop, value = null, level = "local") {
+			
+			if(!(access === "get" || access === "set" || access === "delete")) {
+				throw new Error("access can only be 'set', 'get' or 'delete' - not '" + access + "'");
+			}
+			
+			if (!prop) {
+				throw new Error("Prop name is mandatory");
+			}
+			
+			if(!(level === "local" || level === "session")) {
+				throw new Error("level can only be 'session' or 'local' - not '" + access + "'");
+			}
+				
+			const that = this;
+			
+			const promise = new Promise(function(resolve, reject) {
+				that.prepareIFrame().then(iframe => {
+					window.addEventListener('message', function mafunc(tkn) {
+						if (IFRAME_ROOT_URL.indexOf(tkn.origin)<0) {
+							return;
+						}
+						try {
+							var packet = JSON.parse(tkn.data);
+							
+							if(!(packet.uid === that.uid)) {
+								// ignore
+								return;
+							}
+							resolve(packet.body);
+						} catch (e) {
+							reject(tkn.data);
+						}
+						iframe.parentNode.removeChild(iframe);
+						window.removeEventListener('message', mafunc);
+				    });
+			
+					const request = {uid:that.uid, access:access, prop:prop, value:value, level:level};
+					iframe.contentWindow.postMessage(JSON.stringify(request), '*');
+					setTimeout(()=>reject("TIMEOUTED!"), 20000);
+				});
+			});
+			return promise;
+		}
+	
+}
+
+function __createDebugIFrame() {
+	onLoadThen().then(function(){
+		const iframe = document.createElement("iframe");
+		iframe.src=IFRAME_ROOT_URL + "?for-debug-only";
+		iframe.style.cssText="display:none;";
+		document.getElementsByTagName("body")[0].appendChild(iframe);
+	});
+}
+
+class PublicStorage { 
+	
+	constructor({debug=false}={}) {
+		if(debug) {
+				__createDebugIFrame();
+		}
+	}
+	 
+	sessionGet(prop) {
+		 return new PublicStorageAccess().access("get", prop, null, "session");
+	}
+	sessionSet(prop, value) {
+		 return new PublicStorageAccess().access("set", prop, value, "session");
+	}
+	sessionUnset(prop) {
+		 return new PublicStorageAccess().access("delete", prop, null, "session");
+	}
+	localGet(prop) {
+		 return new PublicStorageAccess().access("get", prop, null, "local");
+	}
+	localSet(prop, value) {
+		 return new PublicStorageAccess().access("set", prop, value, "local");
+	}
+	localUnset(prop) {
+		 return new PublicStorageAccess().access("delete", prop, null, "local");
+	}
+	get(prop) {
+		 return this.localGet(prop);
+	}
+	set(prop, value) {
+		 return this.localSet(prop, value);
+	}
+	unset(prop) {
+		return this.localUnset(prop);
+	}
+}
+
+const publicstorage = new PublicStorage();
+
+function onLoadThen() {
+	return new Promise(function(resolve, reject) {
+		if (window) {
+			if(document.getElementsByTagName('BODY')[0]) {
+				resolve();
+			} else {
+				registerOnLoad(function unregisterme() {
+					resolve();
+					window.removeEventListener('load', unregisterme);
+				});
+			}
+		}
+		setTimeout(function() {reject(new Error("Timeout waiting for onLoad!"));}, 10000);
+	});
+}
+
+function registerOnLoad(lambda) {
+	if (window.addEventListener) {
+		  window.addEventListener('load', lambda);
+	} else if (window.attachEvent) {
+		  window.attachEvent('onload', lambda);
+	}
+}
+
+onLoadThen().then(() => window.publicstorage = publicstorage).catch(e=> console.error(e));
+//export {onLoadThen, PublicStorage, publicstorage as default}
+// module.exports = onLoadThen();
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 68f2450f0..bc33d9990 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -293,7 +293,15 @@ async function saveMap() {
   document.body.appendChild(link);
   link.click();
   tip(`${link.download} is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
-  window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000);
+  window.URL.revokeObjectURL(URL);
+
+  // send saved files count and size to server for usage analysis (for the future Cloud storage)
+  publicstorage.get("fmg").then(fmg => {
+    if (!fmg) return;
+    fmg.size = (fmg.size * fmg.maps + blob.size) / (fmg.maps + 1);
+    fmg.maps += 1;
+    publicstorage.set("fmg", fmg).then(fmg => console.log(fmg));
+  });
 }
 
 // Send .map file to server [test function]
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 368476393..01127d2dc 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -19,13 +19,13 @@ function showBattleScreen(attacker, defender) {
   modules.showBattleScreen = true;
 
   // add listeners
-  //document.getElementById("regimentNameRestore").addEventListener("click", restoreName);
+  document.getElementById("battleAddRegiment").addEventListener("click", addSide);
 
   function addHeaders() {
     document.getElementById("battleScreen").querySelectorAll("th").forEach(el => el.remove());
     const attackers = battleAttackers.querySelector("tr");
     const defenders = battleDefenders.querySelector("tr");
-    let headers = "<th></th>";
+    let headers = "<th></th><th></th>";
 
     for (const u of options.military) {
       const label = capitalize(u.name.replace(/_/g, ' '));
@@ -38,12 +38,55 @@ function showBattleScreen(attacker, defender) {
   }
 
   function addRegiment(div, regiment) {
-    let line = `<tr><th>${regiment.name}</th>`;
+    const state = ra(pack.states), supply = rand(1000) + " " + distanceUnitInput.value;
+    const color = state.color[0] === "#" ? state.color : "#999";
+    const icon = `<svg width="1.4em" height="1.4em" style="margin-bottom: -.6em;">
+      <rect x="0" y="0" width="100%" height="100%" fill="${color}" class="fillRect"></rect>
+      <text x="0" y="1.04em" style="">${regiment.icon}</text></svg>`;
+    const body = `<tbody id="battle${state.i}-${regiment.i}">`;
+
+    let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment">${regiment.name.slice(0,25)}</td>`;
+    let casualties = `<tr class="battleCasualties"><td></td><td>${state.fullName}</td>`;
+    let survivors = `<tr class="battleSurvivors"><td></td><td>Supply line length: ${supply}</td>`;
+
     for (const u of options.military) {
-      line += `<th>${regiment.u[u.name]||0}</th>`;
+      initial += `<td style="width: 2.5em; text-align: center">${regiment.u[u.name]||0}</td>`;
+      casualties += `<td style="width: 2.5em; text-align: center; color: red">0</td>`;
+      survivors += `<td style="width: 2.5em; text-align: center; color: green">${regiment.u[u.name]||0}</td>`;
+    }
+
+    initial += `<td style="width: 2.5em; text-align: center">${regiment.a||0}</td></tr>`;
+    casualties += `<td style="width: 2.5em; text-align: center; color: red">0</td></tr>`;
+    survivors += `<td style="width: 2.5em; text-align: center; color: green">${regiment.a||0}</td></tr>`;
+
+    div.innerHTML += body + initial + casualties + survivors + "</tbody>";
+  }
+
+  function addSide() {
+    const states = pack.states.filter(s => s.i && !s.removed);
+    const stateOptions = states.map(s => `<option value=${s.i}>${s.fullName}</option>`).join("");
+    const regiments = states[0].military.map(r => `<option value=${r.i}>${r.icon} ${r.name} (${r.a})</option>`).join("");
+    alertMessage.innerHTML = `<select id="addSideSide" data-tip="Select side"><option>Attackers</option><option>Defenders</option></select>
+      <select id="addSideState" data-tip="Select state">${stateOptions}</select><br>
+      <select id="addSideRegiment" data-tip="Select regiment">${regiments}</select>`;
+    $("#alert").dialog({resizable: false, title: "Add regiment to the battle",
+      buttons: {
+        Add: function() {
+          $(this).dialog("close");
+          const div = document.getElementById("addSideSide").selectedIndex ? battleDefenders : battleAttackers;
+          const state = pack.states.find(s => s.i == document.getElementById("addSideState").value);
+          const regiment = state.military.find(r => r.i == document.getElementById("addSideRegiment").value);
+          addRegiment(div, regiment);
+        },
+        Cancel: function() {$(this).dialog("close");}
+      }
+    });
+
+    document.getElementById("addSideState").onchange = function () {
+      const state = pack.states.find(s => s.i == this.value);
+      const regiments = state.military.map(r => `<option value=${r.i}>${r.icon} ${r.name} (${r.a})</option>`).join("");
+      document.getElementById("addSideRegiment").innerHTML = regiments;
     }
-    line += `<th>${regiment.a||0}</th></tr>`;
-    div.querySelector("tbody").insertAdjacentHTML("beforebegin", line);
   }
 
   function closeBattleScreen() {
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 7f18a688d..073bf25aa 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -1,5 +1,4 @@
 "use strict";
-
 function showEPForRoute(node) {
   const points = [];
   debug.select("#controlPoints").selectAll("circle").each(function() {
@@ -34,7 +33,7 @@ function showElevationProfile(data, routeLen, isRiver) {
     position: {my: "left top", at: "left+20 bottom-240", of: window, collision: "fit"}
   });
 
-  // Azgaar asked if we can prevent river graphs from showing rivers as flowing uphill
+  // prevent river graphs from showing rivers as flowing uphill
   var slope = 0;
   if (isRiver) {
     if (pack.cells.h[data[0]] < pack.cells.h[data[data.length-1]]) {
@@ -73,10 +72,6 @@ function showElevationProfile(data, routeLen, isRiver) {
     j++;
   }
 
-  const heightDiff = ma-mi+1;
-
-
-//  const w = document.getElementById("elevationProfile").clientWidth - 32;
   const w = window.innerWidth-280;
   h = 100;
 
@@ -88,10 +83,7 @@ function showElevationProfile(data, routeLen, isRiver) {
   chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z");
 
   // main graph line
-  var lineFunc = d3.line()
-    .x(function(d) { return d.x * w / points.length + xOffset})
-    .y(function(d) { return h-d.y + yOffset });
-
+  var lineFunc = d3.line().x(d => d.x * w / points.length + xOffset).y(d => h-d.y + yOffset);
   chart.append("path").attr("d", lineFunc(points)).attr("stroke", "purple").attr("fill", "none").attr("id", "elevationLine");
 
   // y-axis labels for starting and ending heights
diff --git a/modules/ui/regiment-editor.js b/modules/ui/regiment-editor.js
index d4a4f1487..e53eb4650 100644
--- a/modules/ui/regiment-editor.js
+++ b/modules/ui/regiment-editor.js
@@ -215,7 +215,7 @@ function editRegiment(selector) {
       .style("dominant-baseline", "central").style("text-anchor", "middle")
       .transition(attack).attr("font-size", 1000).attr("opacity", 0).remove();
 
-    tip("", false);
+    clearMainTip();
     $("#regimentEditor").dialog("close");
   }
 

From beb2d0ad7cf5479706f5d81aecba332e7b9bf680 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Tue, 5 May 2020 02:00:40 +0300
Subject: [PATCH 07/38] v1.4.06

---
 icons.css                      |   5 +-
 index.css                      |  43 +++-
 index.html                     |  59 +++--
 modules/military-generator.js  |  30 ++-
 modules/ocean-layers.js        |   8 +-
 modules/save-and-load.js       |   3 +
 modules/ui/battle-screen.js    | 380 ++++++++++++++++++++++++++++-----
 modules/ui/editors.js          |   2 +-
 modules/ui/heightmap-editor.js |   2 +-
 modules/ui/options.js          |   2 +-
 modules/ui/provinces-editor.js |  15 ++
 modules/ui/regiment-editor.js  |  35 ++-
 modules/ui/states-editor.js    |   1 +
 modules/utils.js               |   2 +-
 14 files changed, 474 insertions(+), 113 deletions(-)

diff --git a/icons.css b/icons.css
index 5ef9555d3..73e3c3b5a 100644
--- a/icons.css
+++ b/icons.css
@@ -250,7 +250,6 @@
 .icon-smooth:before {font-weight: bold;content:'∼';}
 .icon-disrupt:before {font-weight: bold;content:'⥄';}
 .icon-if:before {font-style: italic; font-weight: bold;content:'if';}
-/* .icon-coa:before {content: '⚜'; font-size: 1.1em; margin: -2px;} */
 .icon-coa:before {content:'\f3ed'; font-size: .9em; color: #999;} /* '' */
 .icon-half:before {font-weight: bold;content:'½';}
 .icon-curve:before {content: 'C';}
@@ -265,11 +264,9 @@
   font-family: monospace;
 }
 .icon-die:before {content:'🎲';}
-
-.icon-button-plus:before {content:'➕'; padding-right: .4em;}
 .icon-button-die:before {content:'🎲'; padding-right: .4em;}
 .icon-button-power:before {content:'💪'; padding-right: .6em;}
 .icon-button-skirmish:before {content:'🎯'; padding-right: .4em;}
-.icon-button-melee:before {content:'🗡'; padding-right: .4em;}
+.icon-button-melee:before {content:'⚔️'; padding-right: .4em;}
 .icon-button-pursue:before {content:'🐎'; padding-right: .4em;}
 .icon-button-retreat:before {content:'🏳️'; padding-right: .4em;}
diff --git a/index.css b/index.css
index c1cbe4ed1..060932373 100644
--- a/index.css
+++ b/index.css
@@ -583,6 +583,7 @@ button.options {
 	font-weight: bold;
 	float: left;
 	border: none;
+	border-radius: 0;
 	padding: 8px 10px;
 	transition: 0.2s;
 }
@@ -945,10 +946,11 @@ body button.noicon {
 #battleBody > table {
 	padding: .2em .6em .2em .6em;
 	border: 1px solid #ccc;
-	margin: 0 0 .4em 0;
+	margin: .2em 0 .4em 0;
 	display: block;
 	overflow: auto;
 	max-height: 34vh;
+	width: 100%;
 }
 
 #battleBody > table .regiment {
@@ -961,6 +963,45 @@ tr.battleCasualties, tr.battleSurvivors {
 	font-size: .9em;
 }
 
+#battleBody div.battlePhases {
+	position: absolute;
+	background-color: #fff;
+}
+
+#battleBody div.battlePhases > button {
+	width: 3.2em;
+	display: block;
+	margin: .2em 0;
+}
+
+div#regimentSelectorBody {
+	max-height: 50vh;
+	font-size: .9em;
+}
+
+div#regimentSelectorBody > div {
+	padding: .1em;
+	border: 1px solid #fff;
+}
+
+div#regimentSelectorBody > div:hover {
+	border: 1px solid #ccc;
+}
+
+div#regimentSelectorBody > div.selected {
+	border: 1px solid #b28585;
+}
+
+div#regimentSelectorBody > div.inactive {
+	background-color: #eee;
+	color: #aaa;
+}
+
+div#regimentSelectorBody > div > div {
+	display: inline-block;
+	pointer-events: none;
+}
+
 .drag-trigger {
 	border-left: 1em solid transparent;
 	border-right: 1em solid #000;
diff --git a/index.html b/index.html
index 0040c773c..3f02c81bb 100644
--- a/index.html
+++ b/index.html
@@ -2448,32 +2448,60 @@
     <div id="battleScreen" class="dialog stable" style="display: none">
       <div id="battleBody">
         <div style="font-size:1.2em; font-weight: bold">
-          <div style="width: 1.2em; display: inline-block">⚔</div><span>Attackers</span>
+          <span>Attackers</span>
           <div style="float: right; font-size: .7em">
-            <span data-tip="Attackers power considering phase and randon factor" style="padding: .2em" class="icon-button-power">43</span>
-            <button data-tip="Battle phase. Click to change" class="icon-button-pursue"></button>
-            <button data-tip="Random factor for attackers. Click to re-roll" style="padding: .1em .2em" class="icon-button-die">12</button>
+            <meter id="battleMorale_attackers" data-tip="Attackers morale: " min=0 max=100 low=33 high=66 optimum=80 style="padding: .1em"></meter>
+            <div id="battlePower_attackers" data-tip="Attackers strength during this phase" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
+            <div style="display: inline-block;">
+              <button id="battlePhase_attackers" data-tip="Battle phase. Click to change" class="icon-button-pursue" style="width: 3.2em"></button>
+              <div class="battlePhases" style="display: none">
+                <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
+                <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+                <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+                <button data-tip="Retreat phase. All units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+              </div>
+            </div>
+            <button id="battleDie_attackers" data-tip="Random factor for attackers. Click to re-roll" style="padding: .1em .2em; width: 3.2em" class="icon-button-die"></button>
           </div>
         </div>
-        <table id="battleAttackers"><thead><tr></tr></thead><tbody></tbody></table>
+        <table id="battleAttackers"></table>
         <div style="font-size:1.2em; font-weight: bold">
-          <div style="width: 1.2em; display: inline-block">🛡</div><span>Defenders</span>
+          <span></span>Defenders</span>
           <div style="float: right; font-size: .7em">
-            <span data-tip="Defenders power considering phase and randon factor" style="padding: .2em" class="icon-button-power">65</span>
-            <button data-tip="Battle phase. Click to change" class="icon-button-skirmish"></button>
-            <button data-tip="Random factor for defenders. Click to re-roll" style="padding: .1em .2em" class="icon-button-die">05</button>
+            <meter id="battleMorale_defenders" data-tip="Defenders morale: " min=0 max=100 low=33 high=66 optimum=80 style="padding: .1em"></meter>
+            <div id="battlePower_defenders" data-tip="Defenders strength during this phase" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
+            <div style="display: inline-block;">
+              <button id="battlePhase_defenders" data-tip="Battle phase. Click to change" class="icon-button-pursue" style="width: 3.2em"></button>
+              <div class="battlePhases" style="display: none">
+                <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
+                <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+                <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+                <button data-tip="Retreat phase. All units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+              </div>
+            </div>
+            <button id="battleDie_defenders" data-tip="Random factor for defenders. Click to re-roll" style="padding: .1em .2em; width: 3.2em" class="icon-button-die"></button>
           </div>
         </div>
-        <table id="battleDefenders"><thead><tr></tr></thead><tbody></tbody></table>
+        <table id="battleDefenders"></table>
       </div>
 
       <div id="battleBottom">
         <button id="battleAddRegiment" data-tip="Add regiment to the battle" class="icon-user-plus"></button>
-        <button id="battleRoll" data-tip="Roll dice to randomize sides power and battle phase" class="icon-die"></button>
-        <button id="battleNext" data-tip="Calculate and apply phase results" class="icon-play"></button>
-        <button id="battleApply" data-tip="Apply battle results" class="icon-check"></button>
-        <button id="battleCancel" data-tip="Cancel battle results and restore initial troop value" class="icon-cancel"></button>
+        <button id="battleRoll" data-tip="Roll dice to update random factor" class="icon-die"></button>
+        <button id="battleRun" data-tip="Iterate battle" class="icon-play"></button>
+        <button id="battleApply" data-tip="Apply battle results and close the screen" class="icon-check"></button>
+        <button id="battleCancel" data-tip="Cancel battle results and close the screen" class="icon-cancel"></button>
+      </div>
+    </div>
+
+    <div id="regimentSelectorScreen" class="dialog" style="display: none">
+      <div id="regimentSelectorHeader" class="header">
+        <div style="left: 1.2em;" data-tip="Click to sort by state name" class="sortable alphabetically" data-sortby="state">State&nbsp;</div>
+        <div style="left: 9.2em;" data-tip="Click to sort by regiment name" class="sortable alphabetically" data-sortby="regiment">Regiment&nbsp;</div>
+        <div style="left: 22.4em;" data-tip="Click to sort by total military forces" class="sortable" data-sortby="total">Total&nbsp;</div>
+        <div style="left: 28em;" data-tip="Click to sort by distance to the battlefield" class="sortable icon-sort-number-up" data-sortby="distance">Distance&nbsp;</div>
       </div>
+      <div id="regimentSelectorBody"></div>
     </div>
 
     <div id="brushesPanel" class="dialog stable" style="display: none">
@@ -2859,6 +2887,7 @@
       <div id="provincesBottom">
         <button id="provincesEditorRefresh" data-tip="Refresh the Editor" class="icon-cw"></button>
         <button id="provincesEditStyle" data-tip="Edit provinces style in Style Editor" class="icon-adjust"></button>
+        <button id="provincesRecolor" data-tip="Recolor listed provinces based on state color" class="icon-paint-roller"></button>
         <button id="provincesPercentage" data-tip="Toggle percentage / absolute values views" class="icon-percent"></button>
         <button id="provincesChart" data-tip="Show provinces chart" class="icon-chart-area"></button>
         <button id="provincesToggleLabels" data-tip="Toggle province labels" class="icon-font"></button>
@@ -3247,7 +3276,7 @@
           <input id="populationRate" data-stored="populationRate" type="number" min=10 max=9990 step=10 value=1000 data-value=1000 style="width:4.5em">
         </div>
 
-        <div data-tip="Set ubranization rate: burgs population relative to all population">
+        <div data-tip="Set urbranization rate: burgs population relative to all population">
           <div>Urbanization rate:</div>
           <input id="urbanizationOutput" type="range" min=.01 max=5 step=.01 value=1>
           <input id="urbanization" data-stored="urbanization" type="number" min=.01 max=5 step=.01 value=1 data-value=1>
diff --git a/modules/military-generator.js b/modules/military-generator.js
index e6dc44b13..3b509cbb3 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -190,7 +190,7 @@
       const regiments = nodes.filter(n => n.t).sort((a,b) => b.t - a.t).map((r, i) => {
         const u = {}; u[r.u] = r.a;
         (r.childen||[]).forEach(n => u[n.u] = u[n.u] ? u[n.u] += n.a : n.a);
-        return {i, a:r.t, cell:r.cell, x:r.x, y:r.y, bx:r.x, by:r.y, u, n:r.n, name};
+        return {i, a:r.t, cell:r.cell, x:r.x, y:r.y, bx:r.x, by:r.y, u, n:r.n, name, state: s.i};
       });
 
       // generate name for regiments
@@ -210,9 +210,9 @@
     return [
       {icon: "⚔️", name:"infantry",  rural:.25,  urban:.2,   crew:1,   power:1,  type:"melee",     separate:0},
       {icon: "🏹", name:"archers",   rural:.12,  urban:.2,   crew:1,   power:1,  type:"ranged",    separate:0},
-      {icon: "🐴", name:"cavalry",   rural:.12,  urban:.03,  crew:3,   power:4,  type:"mounted",   separate:0},
-      {icon: "💣", name:"artillery", rural:0,    urban:.03,  crew:8,   power:12, type:"machinery", separate:0},
-      {icon: "🌊", name:"fleet",     rural:0,    urban:.015, crew:100, power:50, type:"naval",     separate:1}
+      {icon: "🐴", name:"cavalry",   rural:.12,  urban:.03,  crew:2,   power:2,  type:"mounted",   separate:0},
+      {icon: "💣", name:"artillery", rural:0,    urban:.03,  crew:8,   power:12,  type:"machinery", separate:0},
+      {icon: "🌊", name:"fleet",     rural:0,    urban:.015, crew:100, power:50,  type:"naval",     separate:1}
     ];
   }
 
@@ -256,6 +256,26 @@
     g.append("text").attr("class", "regimentIcon").attr("x", x1-size).attr("y", reg.y).text(reg.icon);
   }
 
+  // move one regiment to another
+  const moveRegiment = function(reg, x, y) {
+    const el = armies.select("g#army"+reg.state).select("g#regiment"+reg.state+"-"+reg.i);
+    if (!el.size()) return;
+
+    const duration = Math.hypot(reg.x - x, reg.y - y) * 8;
+    reg.x = x; reg.y = y;
+    const size = +armies.attr("box-size");
+    const w = reg.n ? size * 4 : size * 6;
+    const h = size * 2;
+    const x1 = x => rn(x - w / 2, 2);
+    const y1 = y => rn(y - size, 2);
+
+    const move = d3.transition().duration(duration).ease(d3.easeSinInOut);
+    el.select("rect").transition(move).attr("x", x1(x)).attr("y", y1(y));
+    el.select("text").transition(move).attr("x", x).attr("y", y);
+    el.selectAll("rect:nth-of-type(2)").transition(move).attr("x", x1(x)-h).attr("y", y1(y));
+    el.select(".regimentIcon").transition(move).attr("x", x1(x)-size).attr("y", y);
+  }
+
   // utilize si function to make regiment total text fit regiment box
   const getTotal = reg => reg.a > (reg.n ? 999 : 99999) ? si(reg.a) : reg.a;
 
@@ -304,6 +324,6 @@
   //   note.legend = note.legend.replace(oldComposition, newComposition);
   // }
 
-  return {generate, getDefaultOptions, getName, generateNote, drawRegiments, drawRegiment, getTotal, getEmblem};
+  return {generate, getDefaultOptions, getName, generateNote, drawRegiments, drawRegiment, moveRegiment, getTotal, getEmblem};
 
 })));
\ No newline at end of file
diff --git a/modules/ocean-layers.js b/modules/ocean-layers.js
index 7751b376f..b5be82f47 100644
--- a/modules/ocean-layers.js
+++ b/modules/ocean-layers.js
@@ -33,15 +33,15 @@
       const relaxed = chain.filter((v, i) => !(i%relax) || vertices.c[v].some(c => c >= pointsN));
       if (relaxed.length < 4) continue;
       const points = clipPoly(relaxed.map(v => vertices.p[v]), 1);
-      const inside = d3.polygonContains(points, grid.points[i]);
-      chains.push([t, points, inside]);
+      //const inside = d3.polygonContains(points, grid.points[i]);
+      chains.push([t, points]); //chains.push([t, points, inside]);
     }
 
-    const bbox = `M0,0h${graphWidth}v${graphHeight}h${-graphWidth}Z`;
+    //const bbox = `M0,0h${graphWidth}v${graphHeight}h${-graphWidth}Z`;
     for (const t of limits) {
       const layer = chains.filter(c => c[0] === t);
       let path = layer.map(c => round(lineGen(c[1]))).join("");
-      if (layer.every(c => !c[2])) path = bbox + path; // add outer ring if all segments are outside (works not for all cases)
+      //if (layer.every(c => !c[2])) path = bbox + path; // add outer ring if all segments are outside (works not for all cases)
       if (path) oceanLayers.append("path").attr("d", path).attr("fill", "#ecf2f9").style("opacity", opacity);
     }
 
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index bc33d9990..47ac9274d 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -1018,6 +1018,9 @@ function parseLoadedData(data) {
           if (type === "magical") return "🔮";
           else return "⚔️";
         }
+
+        // 1.4 added state reference for regiments
+        pack.states.filter(s => s.military).forEach(s => s.military.forEach(r => r.state = s.i));
       }
 
     }()
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 01127d2dc..988197362 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -1,53 +1,83 @@
 "use strict";
-function showBattleScreen(attacker, defender) {
-  if (customization) return;
-  closeDialogs(".stable");
-
-  const battle = {name:"Battle", attackers:[attacker], defenders:[defender]};
-  const battleAttackers = document.getElementById("battleAttackers");
-  const battleDefenders = document.getElementById("battleDefenders");
-  addHeaders();
-  addRegiment(battleAttackers, attacker);
-  addRegiment(battleDefenders, defender);
-
-  $("#battleScreen").dialog({
-    title: battle.name, resizable: false, width: fitContent(), close: closeBattleScreen,
-    position: {my: "center", at: "center", of: "#map"}
-  });
-
-  if (modules.showBattleScreen) return;
-  modules.showBattleScreen = true;
-
-  // add listeners
-  document.getElementById("battleAddRegiment").addEventListener("click", addSide);
-
-  function addHeaders() {
-    document.getElementById("battleScreen").querySelectorAll("th").forEach(el => el.remove());
-    const attackers = battleAttackers.querySelector("tr");
-    const defenders = battleDefenders.querySelector("tr");
-    let headers = "<th></th><th></th>";
+class Battle {
+
+  constructor(attacker, defender) {
+    if (customization) return;
+    closeDialogs(".stable");
+    customization = 13; // enter customization to avoid unwanted dialog closing
+
+    Battle.prototype.context = this; // store context
+    this.x = defender.x;
+    this.y = defender.y;
+    this.name = this.getBattleName();
+    this.iteration = 0;
+    this.attackers = {regiments:[], distances:[], morale:100};
+    this.defenders = {regiments:[], distances:[], morale:100};
+
+    this.addHeaders();
+    this.addRegiment("attackers", attacker);
+    this.addRegiment("defenders", defender);
+    this.randomize();
+    this.calculateStrength("attackers");
+    this.calculateStrength("defenders");
+    this.getInitialMorale();
+
+    $("#battleScreen").dialog({
+      title: this.name, resizable: false, width: fitContent(), close: this.closeBattleScreen,
+      position: {my: "center", at: "center", of: "#map"}
+    });
+
+    if (modules.Battle) return;
+    modules.Battle = true;
+
+    // add listeners
+    document.getElementById("battleAddRegiment").addEventListener("click", this.addSide);
+    document.getElementById("battleRoll").addEventListener("click", () => Battle.prototype.context.randomize());
+    document.getElementById("battleRun").addEventListener("click", () => Battle.prototype.context.run());
+    document.getElementById("battleApply").addEventListener("click", () => Battle.prototype.context.applyResults());
+    document.getElementById("battleCancel").addEventListener("click", () => Battle.prototype.context.cancelResults());
+
+    document.getElementById("battlePhase_attackers").addEventListener("click", ev => this.toggleChangePhase(ev, "attackers"));
+    document.getElementById("battlePhase_attackers").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changePhase(ev, "attackers"));
+    document.getElementById("battlePhase_defenders").addEventListener("click", ev => this.toggleChangePhase(ev, "defenders"));
+    document.getElementById("battlePhase_defenders").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changePhase(ev, "defenders"));
+    document.getElementById("battleDie_attackers").addEventListener("click", () => Battle.prototype.context.rollDie("attackers"));
+    document.getElementById("battleDie_defenders").addEventListener("click", () => Battle.prototype.context.rollDie("defenders"));
+  }
+
+  getBattleName() {
+    const cell = findCell(this.x, this.y);
+    const burg = pack.cells.burg[cell] ? pack.burgs[pack.cells.burg[cell]].name : null;
+    return burg ? burg + " Battle" : Names.getCulture(pack.cells.culture[cell]) + " Battle"
+  }
+
+  addHeaders() {
+    let headers = "<thead><tr><th></th><th></th>";
 
     for (const u of options.military) {
       const label = capitalize(u.name.replace(/_/g, ' '));
       headers += `<th data-tip="${label}">${u.icon}</th>`;
     }
 
-    headers += "<th>Total</th>";
-    attackers.insertAdjacentHTML("beforebegin", headers);
-    defenders.insertAdjacentHTML("beforebegin", headers);
+    headers += "<th data-tip='Total military''>Total</th></tr></thead>";
+    battleAttackers.innerHTML = battleDefenders.innerHTML = headers;
   }
 
-  function addRegiment(div, regiment) {
-    const state = ra(pack.states), supply = rand(1000) + " " + distanceUnitInput.value;
+  addRegiment(side, regiment) {
+    regiment.casualties = Object.keys(regiment.u).reduce((a,b) => (a[b]=0,a), {});
+    regiment.survivors = Object.assign({}, regiment.u);
+
+    const state = pack.states[regiment.state];
+    const distance = Math.hypot(this.y-regiment.by, this.x-regiment.bx) * distanceScaleInput.value | 0; // distance between regiment and its base
     const color = state.color[0] === "#" ? state.color : "#999";
-    const icon = `<svg width="1.4em" height="1.4em" style="margin-bottom: -.6em;">
+    const icon = `<svg width="1.4em" height="1.4em" style="margin-bottom: -.6em">
       <rect x="0" y="0" width="100%" height="100%" fill="${color}" class="fillRect"></rect>
       <text x="0" y="1.04em" style="">${regiment.icon}</text></svg>`;
     const body = `<tbody id="battle${state.i}-${regiment.i}">`;
 
-    let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment">${regiment.name.slice(0,25)}</td>`;
-    let casualties = `<tr class="battleCasualties"><td></td><td>${state.fullName}</td>`;
-    let survivors = `<tr class="battleSurvivors"><td></td><td>Supply line length: ${supply}</td>`;
+    let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment">${regiment.name.slice(0, 24)}</td>`;
+    let casualties = `<tr class="battleCasualties"><td></td><td>${state.fullName.slice(0, 26)}</td>`;
+    let survivors = `<tr class="battleSurvivors"><td></td><td>Distance to base: ${distance} ${distanceUnitInput.value}</td>`;
 
     for (const u of options.military) {
       initial += `<td style="width: 2.5em; text-align: center">${regiment.u[u.name]||0}</td>`;
@@ -59,38 +89,274 @@ function showBattleScreen(attacker, defender) {
     casualties += `<td style="width: 2.5em; text-align: center; color: red">0</td></tr>`;
     survivors += `<td style="width: 2.5em; text-align: center; color: green">${regiment.a||0}</td></tr>`;
 
+    const div = side === "attackers" ? battleAttackers : battleDefenders;
     div.innerHTML += body + initial + casualties + survivors + "</tbody>";
+    this[side].regiments.push(regiment);
+    this[side].distances.push(distance);
   }
 
-  function addSide() {
-    const states = pack.states.filter(s => s.i && !s.removed);
-    const stateOptions = states.map(s => `<option value=${s.i}>${s.fullName}</option>`).join("");
-    const regiments = states[0].military.map(r => `<option value=${r.i}>${r.icon} ${r.name} (${r.a})</option>`).join("");
-    alertMessage.innerHTML = `<select id="addSideSide" data-tip="Select side"><option>Attackers</option><option>Defenders</option></select>
-      <select id="addSideState" data-tip="Select state">${stateOptions}</select><br>
-      <select id="addSideRegiment" data-tip="Select regiment">${regiments}</select>`;
-    $("#alert").dialog({resizable: false, title: "Add regiment to the battle",
+  addSide() {
+    const body = document.getElementById("regimentSelectorBody");
+    const context = Battle.prototype.context;
+    const regiments = pack.states.filter(s => s.military && !s.removed).map(s => s.military).flat();
+    const distance = reg => rn(Math.hypot(context.y-reg.y, context.x-reg.x) * distanceScaleInput.value) + " " + distanceUnitInput.value;
+    const isAdded = reg => context.defenders.regiments.some(r => r === reg) || context.attackers.regiments.some(r => r === reg);
+
+    body.innerHTML = regiments.map(r => {
+      const s = pack.states[r.state], added = isAdded(r), dist = added ? "0 " + distanceUnitInput.value : distance(r);
+      return `<div ${added ? "class='inactive'" : ""} data-s=${s.i} data-i=${r.i} data-state=${s.name} data-regiment=${r.name} 
+        data-total=${r.a} data-distance=${dist} data-tip="Click to select regiment">
+        <svg width=".9em" height=".9em" style="margin-bottom:-1px"><rect x="0" y="0" width="100%" height="100%" fill="${s.color}" class="fillRect"></svg>
+        <div style="width:6em">${s.name.slice(0, 11)}</div>
+        <div style="width:1.2em">${r.icon}</div>
+        <div style="width:13em">${r.name.slice(0, 24)}</div>
+        <div style="width:4em">${r.a}</div>
+        <div style="width:4em">${dist}</div>
+      </div>`;
+    }).join("");
+
+    $("#regimentSelectorScreen").dialog({
+      resizable: false, width: fitContent(), title: "Add regiment to the battle",
+      position: {my: "left center", at: "right+10 center", of: "#battleScreen"}, close: addSideClosed,
       buttons: {
-        Add: function() {
-          $(this).dialog("close");
-          const div = document.getElementById("addSideSide").selectedIndex ? battleDefenders : battleAttackers;
-          const state = pack.states.find(s => s.i == document.getElementById("addSideState").value);
-          const regiment = state.military.find(r => r.i == document.getElementById("addSideRegiment").value);
-          addRegiment(div, regiment);
-        },
-        Cancel: function() {$(this).dialog("close");}
+        "Add to attackers": () => addSideClicked("attackers"),
+        "Add to defenders": () => addSideClicked("defenders"),
+        Cancel: () => $("#regimentSelectorScreen").dialog("close")
       }
     });
 
-    document.getElementById("addSideState").onchange = function () {
-      const state = pack.states.find(s => s.i == this.value);
-      const regiments = state.military.map(r => `<option value=${r.i}>${r.icon} ${r.name} (${r.a})</option>`).join("");
-      document.getElementById("addSideRegiment").innerHTML = regiments;
+    applySorting(regimentSelectorHeader);
+    body.addEventListener("click", selectLine);
+
+    function selectLine(ev) {
+      if (ev.target.className === "inactive") {tip("Regiment is already in the battle", false, "error"); return};
+      ev.target.classList.toggle("selected");
+    }
+
+    function addSideClicked(side) {
+      const selected = body.querySelectorAll(".selected");
+      if (!selected.length) {tip("Please select a regiment first", false, "error"); return}
+
+      $("#regimentSelectorScreen").dialog("close");
+      selected.forEach(line => {
+        const state = pack.states[line.dataset.s];
+        const regiment = state.military.find(r => r.i == +line.dataset.i);
+        Battle.prototype.addRegiment.call(context, side, regiment);
+        Battle.prototype.calculateStrength.call(context, side);
+        Battle.prototype.getInitialMorale.call(context);
+
+        // move regiment
+        const defenders = context.defenders.regiments, attackers = context.attackers.regiments;
+        const shift = side === "attackers" ? attackers.length * -8 : (defenders.length-1) * 8;
+        regiment.px = regiment.x;
+        regiment.py = regiment.y;
+        Military.moveRegiment(regiment, defenders[0].x, defenders[0].y + shift);
+      });
+    }
+
+    function addSideClosed() {
+      body.innerHTML = "";
+      body.removeEventListener("click", selectLine);
     }
   }
 
-  function closeBattleScreen() {
+  getJoinedForces(regiments) {
+    return regiments.reduce((a, b) => {
+      for (let k in b.survivors) {
+        if (!b.survivors.hasOwnProperty(k)) continue;
+        a[k] = (a[k] || 0) + b.survivors[k];
+      }
+      return a;
+    }, {});
+  }
+
+  calculateStrength(side) {
+    const scheme = {
+      "skirmish": {"melee":.2, "ranged":2.4, "mounted":.1, "machinery":3, "naval":1, "armored":.2, "aviation":1.8, "magical":1.8}, // ranged excel
+      "melee": {"melee":2, "ranged":1.2, "mounted":1.5, "machinery":.5, "naval":.2, "armored":2, "aviation":.8, "magical":.8}, // melee excel
+      "pursue": {"melee":1, "ranged":1, "mounted":4, "machinery":.05, "naval":1, "armored":1, "aviation":1.5, "magical":.6}, // mounted excel
+      "retreat": {"melee":.1, "ranged":.01, "mounted":.5, "machinery":.01, "naval":.2, "armored":.1, "aviation":.8, "magical":.05} // mounted excel
+    };
+
+    const forces = this.getJoinedForces(this[side].regiments);
+    const phase = this[side].phase;
+    const adjuster = populationRate.value / 10; // population adjuster, by default 100
+    this[side].power = d3.sum(options.military.map(u => (forces[u.name] || 0) * u.power * scheme[phase][u.type])) / adjuster;
+    const UIvalue = this[side].power ? Math.max(this[side].power|0, 1) : 0;
+    document.getElementById("battlePower_"+side).innerHTML = UIvalue;
+  }
+
+  getInitialMorale() {
+    const powerFee = diff => Math.min(Math.max(100 - diff ** 1.5 * 10 + 10, 50), 100);
+    const distanceFee = dist => Math.min(d3.mean(dist) / 50, 15);
+    const powerDiff = this.defenders.power / this.attackers.power;
+    this.attackers.morale = powerFee(powerDiff) - distanceFee(this.attackers.distances);
+    this.defenders.morale = powerFee(1 / powerDiff) - distanceFee(this.defenders.distances);
+    this.updateMorale("attackers");
+    this.updateMorale("defenders");
+  }
+
+  updateMorale(side) {
+    const morale = document.getElementById("battleMorale_"+side);
+    morale.dataset.tip = morale.dataset.tip.replace(morale.value, "");
+    morale.value = this[side].morale | 0;
+    morale.dataset.tip += morale.value;
+  }
+
+  randomize() {
+    this.rollDie("attackers");
+    this.rollDie("defenders");
+    this.selectPhase();
+    this.calculateStrength("attackers");
+    this.calculateStrength("defenders");
+  }
+
+  rollDie(side) {
+    const el = document.getElementById("battleDie_"+side);
+    const prev = +el.innerHTML;
+    do {el.innerHTML = rand(1, 6)} while (el.innerHTML === prev)
+    this[side].die = +el.innerHTML;
+  }
+
+  selectPhase() {
+    const phase = this.getPhase();
+    this.attackers.phase = phase[0];
+    this.defenders.phase = phase[1];
+    document.getElementById("battlePhase_attackers").className = "icon-button-" + this.attackers.phase;
+    document.getElementById("battlePhase_defenders").className = "icon-button-" + this.defenders.phase;
+  }
+
+  getPhase() {
+    const i = this.iteration;
+    const prev = [this.attackers.phase || "skirmish", this.defenders.phase || "skirmish"]; // previous phase
+    const morale = [this.attackers.morale, this.defenders.morale];
 
+    if (P(1 - morale[0] / 25)) return ["retreat", "pursue"];
+    if (P(1 - morale[1] / 25)) return ["pursue", "retreat"];
+
+    if (prev[0] === "skirmish" && prev[1] === "skirmish") {
+      const forces = this.getJoinedForces(this.attackers.regiments.concat(this.defenders.regiments));
+      const total = d3.sum(Object.values(forces)); // total forces
+      const ranged = d3.sum(options.military.filter(u => u.type === "ranged").map(u => u.name).map(u => forces[u])) / total;
+      if (ranged && (P(ranged) || P(.8-i/10))) return ["skirmish", "skirmish"];
+    }
+
+    return ["melee", "melee"]; // default option
+  }
+
+  run() {
+    // validations
+    if (!this.attackers.power) {tip("Attackers army destroyed", false, "warn"); return}
+    if (!this.defenders.power) {tip("Defenders army destroyed", false, "warn"); return}
+
+    // calculate casualties
+    const attack = this.attackers.power * (this.attackers.die / 10 + .4);
+    const defence = this.defenders.power * (this.defenders.die / 10 + .4);
+    const phase = {"skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3}; // casualties modifier for phase
+    const casualties = Math.random() * phase[this.attackers.phase]; // total casualties, ~10% per iteration
+    const casualtiesA = casualties * defence / (attack + defence); // attackers casualties, ~5% per iteration
+    const casualtiesD = casualties * attack / (attack + defence); // defenders casualties, ~5% per iteration
+
+    this.calculateCasualties("attackers", casualtiesA);
+    this.calculateCasualties("defenders", casualtiesD);
+
+    // change morale
+    this.attackers.morale = Math.max(this.attackers.morale - casualtiesA * 100, 0);
+    this.defenders.morale = Math.max(this.defenders.morale - casualtiesD * 100, 0);
+
+    // update table values
+    this.updateTable("attackers");
+    this.updateTable("defenders");
+
+    // prepare for next iteration
+    this.iteration += 1;
+    this.selectPhase();
+    this.calculateStrength("attackers");
+    this.calculateStrength("defenders");
+  }
+
+  calculateCasualties(side, casualties) {
+    for (const r of this[side].regiments) {
+      for (const unit in r.u) {
+        const rand = .8 + Math.random() * .4;
+        const died = Math.min(Pint(r.u[unit] * casualties * rand), r.survivors[unit]);
+        r.casualties[unit] -= died;
+        r.survivors[unit] -= died;
+      }
+    }
+  }
+
+  updateTable(side) {
+    for (const r of this[side].regiments) {
+      const tbody = document.getElementById("battle" + r.state + "-" + r.i);
+      const battleCasualties = tbody.querySelector(".battleCasualties");
+      const battleSurvivors = tbody.querySelector(".battleSurvivors");
+
+      let index = 3; // index to find table element easily
+      for (const u of options.military) {
+        battleCasualties.querySelector(`td:nth-child(${index})`).innerHTML = r.casualties[u.name] || 0;
+        battleSurvivors.querySelector(`td:nth-child(${index})`).innerHTML = r.survivors[u.name] || 0;
+        index++;
+      }
+
+      battleCasualties.querySelector(`td:nth-child(${index})`).innerHTML = d3.sum(Object.values(r.casualties));
+      battleSurvivors.querySelector(`td:nth-child(${index})`).innerHTML = d3.sum(Object.values(r.survivors));
+    }
+    this.updateMorale(side);
+  }
+
+  toggleChangePhase(ev, side) {
+    ev.stopPropagation();
+    const button = document.getElementById("battlePhase_"+side);
+    const div = button.nextElementSibling;
+    button.style.opacity = .5;
+    div.style.display = "block";
+
+    const hideSection = function() {button.style.opacity = 1; div.style.display = "none"}
+    document.getElementsByTagName("body")[0].addEventListener("click", hideSection, {once: true});
+  }
+
+  changePhase(ev, side) {
+    if (ev.target.tagName !== "BUTTON") return;
+    const phase = this[side].phase = ev.target.dataset.phase;
+    const button = document.getElementById("battlePhase_"+side);
+    button.className = "icon-button-" + phase;
+    this.calculateStrength(side);
+  }
+
+  applyResults() {
+    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => {
+      r.u = Object.assign({}, r.survivors);
+      r.a = d3.sum(Object.values(r.u)); // reg total
+      armies.select(`g#regiment${r.state}-${r.i} > text`).text(Military.getTotal(r)); // update reg box
+      Military.moveRegiment(r, r.x + rand(30) - 15, r.y + rand(30) - 15);
+    });
+
+    $("#battleScreen").dialog("close");
+  }
+
+  cancelResults() {
+    // move regiments back to initial positions
+    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => {
+      Military.moveRegiment(r, r.px, r.py);
+    });
+
+    $("#battleScreen").dialog("close");
+  }
+
+  closeBattleScreen() {
+    battleAttackers.innerHTML = battleDefenders.innerHTML = ""; // clean DOM
+    customization = 0; // exit edit mode
+
+    // clean temp data
+    const context = Battle.prototype.context;
+    context.attackers.regiments.concat(context.defenders.regiments).forEach(r => {
+      delete r.px;
+      delete r.py;
+      delete r.casualties;
+      delete r.survivors;
+    });
+    delete Battle.prototype.context;
   }
 
 }
\ No newline at end of file
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 2d65bdbf0..46908c2a7 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -377,7 +377,7 @@ function createPicker() {
   const height = bbox.height + 9;
 
   picker.insert("rect", ":first-child").attr("x", 0).attr("y", 0).attr("width", width).attr("height", height).attr("fill", "#ffffff").attr("stroke", "#5d4651").on("mousemove", pos);
-  picker.insert("text", ":first-child").attr("x", 291).attr("y", -11).attr("id", "pickerCloseText").text("✖");
+  picker.insert("text", ":first-child").attr("x", 291).attr("y", -10).attr("id", "pickerCloseText").text("✕");
   picker.insert("rect", ":first-child").attr("x", 288).attr("y", -21).attr("id", "pickerCloseRect").attr("width", 14).attr("height", 14).on("mousemove", cl).on("click", closePicker);
   picker.insert("text", ":first-child").attr("x", 12).attr("y", -10).attr("id", "pickerLabel").text("Color Picker").on("mousemove", pos);
   picker.insert("rect", ":first-child").attr("x", 0).attr("y", -30).attr("width", width).attr("height", 30).attr("id", "pickerHeader").on("mousemove", pos);
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 7f3a9bfd2..26caca4d4 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -1167,7 +1167,7 @@ function editHeightmap() {
 
     function setConvertColorsNumber() {
       prompt(`Please provide a desired number of colors. <br>An actual number depends on color scheme and may vary from desired`, 
-      {default:convertColors.value, step:1, min:3, max:255}, number => {
+      {default:+convertColors.value, step:1, min:3, max:255}, number => {
         convertColors.value = number;
         heightsFromImage(number);
       });
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 906914ad8..477f5ffba 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -71,7 +71,7 @@ document.getElementById("options").querySelector("div.tab").addEventListener("cl
 
 // show popup with a list of Patreon supportes (updated manually, to be replaced with API call)
 function showSupporters() {
-  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords";
+  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords, Joshua E Goodwin, SirTobit , Allen S. Rout, Allen Bull Bear, Pippa Mitchell, R K, G0atfather, Ryan Lege, Caner Oleas Pekgönenç, Bradley Edwards, Tertiary , Austin Miller, Jesse Holmes";
   alertMessage.innerHTML = "<ul style='column-count: 3; column-gap: 2em'>" + supporters.split(", ").sort().map(n => `<li>${n}</li>`).join("") + "</ul>";
   $("#alert").dialog({resizable: false, title: "Patreon Supporters", width: "30vw", position: {my: "center", at: "center", of: "svg"}});
 }
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
index a7916a46f..58b02b0f8 100644
--- a/modules/ui/provinces-editor.js
+++ b/modules/ui/provinces-editor.js
@@ -31,6 +31,7 @@ function editProvinces() {
   document.getElementById("provincesManuallyApply").addEventListener("click", applyProvincesManualAssignent);
   document.getElementById("provincesManuallyCancel").addEventListener("click", () => exitProvincesManualAssignment());
   document.getElementById("provincesAdd").addEventListener("click", enterAddProvinceMode);
+  document.getElementById("provincesRecolor").addEventListener("click", recolorProvinces);
 
   body.addEventListener("click", function(ev) {
     if (customization) return;
@@ -808,6 +809,20 @@ function editProvinces() {
     if (provincesAdd.classList.contains("pressed")) provincesAdd.classList.remove("pressed");
   }
 
+  function recolorProvinces() {
+    const state = +document.getElementById("provincesFilterState").value;
+
+    pack.provinces.forEach(p => {
+      if (!p || p.removed) return;
+      if (state !== -1 && p.state !== state) return;
+      const stateColor = pack.states[p.state].color;
+      const rndColor = getRandomColor();
+      p.color = stateColor[0] === "#" ? d3.color(d3.interpolate(stateColor, rndColor)(.2)).hex() : rndColor;
+    });
+
+    if (!layerIsOn("toggleProvinces")) toggleProvinces(); else drawProvinces();
+  }
+
   function downloadProvincesData() {
     const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value;
     let data = "Id,Province,Form,State,Color,Capital,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers
diff --git a/modules/ui/regiment-editor.js b/modules/ui/regiment-editor.js
index e53eb4650..881ce3bfb 100644
--- a/modules/ui/regiment-editor.js
+++ b/modules/ui/regiment-editor.js
@@ -113,7 +113,7 @@ function editRegiment(selector) {
 
   function splitRegiment() {
     const reg = regiment(), u1 = reg.u;
-    const state = elSelected.dataset.state, military = pack.states[state].military;
+    const state = +elSelected.dataset.state, military = pack.states[state].military;
     const i = last(military).i + 1, u2 = Object.assign({}, u1); // u clone
 
     Object.keys(u2).forEach(u => u2[u] = Math.floor(u2[u]/2)); // halved new reg
@@ -129,7 +129,7 @@ function editRegiment(selector) {
     // create new regiment
     const shift = +armies.attr("box-size") * 2;
     const y = function(x, y) {do {y+=shift} while (military.find(r => r.x === x && r.y === y)); return y;}
-    const newReg = {a, cell:reg.cell, i, n:reg.n, u:u2, x:reg.x, y:y(reg.x, reg.y), bx:reg.bx, by:reg.by, icon: reg.icon};
+    const newReg = {a, cell:reg.cell, i, n:reg.n, u:u2, x:reg.x, y:y(reg.x, reg.y), bx:reg.bx, by:reg.by, state, icon: reg.icon};
     newReg.name = Military.getName(newReg, military);
     military.push(newReg);
     Military.generateNote(newReg, pack.states[state]); // add legend
@@ -153,10 +153,10 @@ function editRegiment(selector) {
     const point = d3.mouse(this);
     const cell = findCell(point[0], point[1]);
     const x = pack.cells.p[cell][0], y = pack.cells.p[cell][1];
-    const state = elSelected.dataset.state, military = pack.states[state].military;
+    const state = +elSelected.dataset.state, military = pack.states[state].military;
     const i = military.length ? last(military).i + 1 : 0;
     const n = +(pack.cells.h[cell] < 20); // naval or land
-    const reg = {a:0, cell, i, n, u:{}, x, y, bx:x, by:y, icon:"🛡️"};
+    const reg = {a:0, cell, i, n, u:{}, x, y, bx:x, by:y, state, icon:"🛡️"};
     reg.name = Military.getName(reg, military);
     military.push(reg);
     Military.generateNote(reg, pack.states[state]); // add legend
@@ -190,30 +190,19 @@ function editRegiment(selector) {
     const defender = pack.states[regSelected.dataset.state].military.find(r => r.i == regSelected.dataset.id);
     if (!attacker.a || !defender.a) {tip("Regiment has no troops to battle", false, "error"); return;}
 
-    // move attacked to defender
-    const duration = Math.hypot(attacker.x - defender.x, attacker.y - defender.y) * 6;
-    const x = attacker.x = defender.x;
-    const y = attacker.y = defender.y + 8;
+    // save initial position to temp attribute
+    attacker.px = attacker.x, attacker.py = attacker.y;
+    defender.px = defender.x, defender.py = defender.y;
 
-    const size = +armies.attr("box-size");
-    const w = attacker.n ? size * 4 : size * 6;
-    const h = size * 2;
-    const x1 = x => rn(x - w / 2, 2);
-    const y1 = y => rn(y - size, 2);
-
-    const move = d3.transition().duration(duration).ease(d3.easeSinInOut);
-    const attack = d3.transition().delay(duration).duration(800).ease(d3.easeSinInOut).on("end", () => showBattleScreen(attacker, defender));
-
-    d3.select(elSelected.querySelector("rect")).transition(move).attr("x", x1(x)).attr("y", y1(y));
-    d3.select(elSelected.querySelector("text")).transition(move).attr("x", x).attr("y", y);
-    d3.select(elSelected.querySelectorAll("rect")[1]).transition(move).attr("x", x1(x)-h).attr("y", y1(y));
-    d3.select(elSelected.querySelector(".regimentIcon")).transition(move).attr("x", x1(x)-size).attr("y", y);
+    // move attacker to defender
+    Military.moveRegiment(attacker, defender.x, defender.y-8);
 
-    // battle icon
+    // draw battle icon
+    const attack = d3.transition().delay(300).duration(700).ease(d3.easeSinInOut).on("end", () => new Battle(attacker, defender));
     svg.append("text").attr("x", window.innerWidth/2).attr("y", window.innerHeight/2)
       .text("⚔️").attr("font-size", 0).attr("opacity", 1)
       .style("dominant-baseline", "central").style("text-anchor", "middle")
-      .transition(attack).attr("font-size", 1000).attr("opacity", 0).remove();
+      .transition(attack).attr("font-size", 1000).attr("opacity", .2).remove();
 
     clearMainTip();
     $("#regimentEditor").dialog("close");
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index f344d8215..b776cdc27 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -930,5 +930,6 @@ function editStates() {
     if (customization === 2) exitStatesManualAssignment("close");
     if (customization === 3) exitAddStateMode();
     debug.selectAll(".highlight").remove();
+    body.innerHTML = "";
   }
 }
diff --git a/modules/utils.js b/modules/utils.js
index d979e4565..a7c0328e1 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -232,7 +232,7 @@ function gauss(expected = 100, deviation = 30, min = 0, max = 300, round = 0) {
   return rn(Math.max(Math.min(d3.randomNormal(expected, deviation)(), max), min), round);
 }
 
-// get integer from float as floor + P(fractional)
+/** This is a description of the foo function. */
 function Pint(float) {
   return ~~float + +P(float % 1);
 }

From 2d2432acb2f765064a8623230e231c38d7df9b0b Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 7 May 2020 21:58:46 +0300
Subject: [PATCH 08/38] v1.4.07

---
 modules/ui/battle-screen.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 988197362..f3e062f0a 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -23,8 +23,9 @@ class Battle {
     this.getInitialMorale();
 
     $("#battleScreen").dialog({
-      title: this.name, resizable: false, width: fitContent(), close: this.closeBattleScreen,
-      position: {my: "center", at: "center", of: "#map"}
+      title: this.name, resizable: false, width: fitContent(),
+      position: {my: "center", at: "center", of: "#map"},
+      close: () => Battle.prototype.context.cancelResults()
     });
 
     if (modules.Battle) return;
@@ -332,7 +333,8 @@ class Battle {
       Military.moveRegiment(r, r.x + rand(30) - 15, r.y + rand(30) - 15);
     });
 
-    $("#battleScreen").dialog("close");
+    $("#battleScreen").dialog("destroy");
+    this.cleanData();
   }
 
   cancelResults() {
@@ -342,15 +344,15 @@ class Battle {
     });
 
     $("#battleScreen").dialog("close");
+    this.cleanData();
   }
 
-  closeBattleScreen() {
+  cleanData() {
     battleAttackers.innerHTML = battleDefenders.innerHTML = ""; // clean DOM
     customization = 0; // exit edit mode
 
     // clean temp data
-    const context = Battle.prototype.context;
-    context.attackers.regiments.concat(context.defenders.regiments).forEach(r => {
+    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => {
       delete r.px;
       delete r.py;
       delete r.casualties;

From bb0251c020eeac436909842f0f853b1d6785c8b8 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 9 May 2020 14:44:18 +0300
Subject: [PATCH 09/38] v1.4.08

---
 index.css                     |  4 ++++
 index.html                    |  2 +-
 modules/military-generator.js | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/index.css b/index.css
index 060932373..bd7651838 100644
--- a/index.css
+++ b/index.css
@@ -1718,6 +1718,10 @@ rect.fillRect {
 	width: 4em;
 }
 
+#militaryOptionsTable button {
+	width: 100%;
+}
+
 #gridOverlay {
 	fill: none;
 }
diff --git a/index.html b/index.html
index 3f02c81bb..d0f14813c 100644
--- a/index.html
+++ b/index.html
@@ -2660,7 +2660,7 @@
         <button id="convertColorsButton" data-tip="Set number of colors" class="icon-signal"></button>
         <input id="convertColors" value="18" style="display: none"/>
         <button id="convertComplete" data-tip="Complete the conversion. All unassigned colors will be considered as ocean" class="icon-check"></button>
-        <button id="convertCancel" data-tip="Cancel the conversion. Previous heoghtmap will be restored" class="icon-cancel"></button>
+        <button id="convertCancel" data-tip="Cancel the conversion. Previous heightmap will be restored" class="icon-cancel"></button>
       </div>
 
       <div data-tip="Set opacity of the loaded image" style="padding-top: 4px"><i>Overlay opacity:</i><br>
diff --git a/modules/military-generator.js b/modules/military-generator.js
index 3b509cbb3..009b4b0de 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -88,7 +88,7 @@
         if (!t) continue;
         let x = p[i][0], y = p[i][1], n = 0;
         if (u.type === "naval") {let haven = cells.haven[i]; x = p[haven][0], y = p[haven][1]; n = 1}; // place naval to sea
-        s.temp.platoons.push({cell: i, a:t, t, x, y, u:u.name, n, s:u.separate});
+        s.temp.platoons.push({cell: i, a:t, t, x, y, u:u.name, n, s:u.separate, type:u.type});
       }
     }
 
@@ -140,8 +140,8 @@
         const t = rn(army * s.temp[u.name] * populationRate.value);
         if (!t) continue;
         let x = p[b.cell][0], y = p[b.cell][1], n = 0;
-        if (u.type === "naval") {let haven = cells.haven[b.cell]; x = p[haven][0], y = p[haven][1]; n = 1}; // place naval to sea
-        s.temp.platoons.push({cell: b.cell, a:t, t, x, y, u:u.name, n, s:u.separate});
+        if (u.type === "naval") {let haven = cells.haven[b.cell]; x = p[haven][0], y = p[haven][1]; n = 1}; // place naval in sea cell
+        s.temp.platoons.push({cell: b.cell, a:t, t, x, y, u:u.name, n, s:u.separate, type:u.type});
       }
     }
 
@@ -154,7 +154,8 @@
     }()
 
     const expected = 3 * populationRate.value; // expected regiment size
-    const mergeable = (n, s) => (!n.s && !s.s) || n.u === s.u;
+    const mergeable = (n0, n1) => (!n0.s && !n1.s) || n0.type === n1.type; // check if regiments can be merged
+
     // get regiments for each state
     valid.forEach(s => {
       s.military = createRegiments(s.temp.platoons, s);
@@ -164,7 +165,7 @@
 
     function createRegiments(nodes, s) {
       if (!nodes.length) return [];
-      nodes.sort((a,b) => a.a - b.a);
+      nodes.sort((a,b) => a.a - b.a); // form regiments in cells with most troops
       const tree = d3.quadtree(nodes, d => d.x, d => d.y);
       nodes.forEach(n => {
         tree.remove(n);
@@ -186,7 +187,7 @@
         n0.t = 0;
       }
 
-      // parse regiments data to easy-readable json
+      // parse regiments data
       const regiments = nodes.filter(n => n.t).sort((a,b) => b.t - a.t).map((r, i) => {
         const u = {}; u[r.u] = r.a;
         (r.childen||[]).forEach(n => u[n.u] = u[n.u] ? u[n.u] += n.a : n.a);
@@ -208,9 +209,9 @@
 
   const getDefaultOptions = function() {
     return [
-      {icon: "⚔️", name:"infantry",  rural:.25,  urban:.2,   crew:1,   power:1,  type:"melee",     separate:0},
-      {icon: "🏹", name:"archers",   rural:.12,  urban:.2,   crew:1,   power:1,  type:"ranged",    separate:0},
-      {icon: "🐴", name:"cavalry",   rural:.12,  urban:.03,  crew:2,   power:2,  type:"mounted",   separate:0},
+      {icon: "⚔️", name:"infantry",  rural:.25,  urban:.2,   crew:1,   power:1,  type:"melee",      separate:0},
+      {icon: "🏹", name:"archers",   rural:.12,  urban:.2,   crew:1,   power:1,  type:"ranged",     separate:0},
+      {icon: "🐴", name:"cavalry",   rural:.12,  urban:.03,  crew:2,   power:2,  type:"mounted",    separate:0},
       {icon: "💣", name:"artillery", rural:0,    urban:.03,  crew:8,   power:12,  type:"machinery", separate:0},
       {icon: "🌊", name:"fleet",     rural:0,    urban:.015, crew:100, power:50,  type:"naval",     separate:1}
     ];
@@ -290,9 +291,8 @@
 
   // get default regiment emblem
   const getEmblem = function(r) {
-    if (r.n) return "🌊";
-    if (!Object.values(r.u).length) return "🔰"; // regiment without troops
-    if (cells.burg[r.cell] && pack.burgs[cells.burg[r.cell]].capital) return "👑"; // "Royal" regiment based in capital
+    if (!r.n && !Object.values(r.u).length) return "🔰"; // "Newbie" regiment without troops
+    if (!r.n && pack.states[r.state].form === "Monarchy" && cells.burg[r.cell] && pack.burgs[cells.burg[r.cell]].capital) return "👑"; // "Royal" regiment based in capital
     const mainUnit = Object.entries(r.u).sort((a,b) => b[1]-a[1])[0][0]; // unit with more troops in regiment
     const unit = options.military.find(u => u.name === mainUnit);
     return unit.icon;

From 617e8d430614aba6a485579382d80eb4ada5d7f5 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 9 May 2020 23:51:14 +0300
Subject: [PATCH 10/38] v1.4.09

---
 index.html                     |  4 +--
 main.js                        | 15 ++++-----
 modules/burgs-and-states.js    | 37 ++-------------------
 modules/routes-generator.js    | 60 +++++++++++++---------------------
 modules/save-and-load.js       |  6 ++--
 modules/ui/editors.js          | 25 +++++++++++---
 modules/ui/heightmap-editor.js |  3 +-
 modules/ui/layers.js           |  3 +-
 modules/ui/provinces-editor.js | 28 ++++------------
 modules/ui/states-editor.js    | 27 ++++-----------
 modules/ui/style.js            | 18 ++++------
 modules/ui/zones-editor.js     | 29 +++++-----------
 12 files changed, 89 insertions(+), 166 deletions(-)

diff --git a/index.html b/index.html
index d0f14813c..ed98113aa 100644
--- a/index.html
+++ b/index.html
@@ -214,8 +214,8 @@
         <mask id="water">
           <rect x="0" y="0" width="100%" height="100%" fill="white"></rect>
         </mask>
-        <mask id="fog">
-          <rect x="0" y="0" width="100%" height="100%" fill="white"></rect>
+        <mask id="fog" style="stroke-width: 10; stroke: black; stroke-linejoin: round; stroke-opacity: .1;">
+          <rect x="0" y="0" width="100%" height="100%" fill="white" stroke="none"></rect>
         </mask>
         <g id="textPaths"></g>
         <g id="statePaths"></g>
diff --git a/main.js b/main.js
index 0626e5b7c..5593b1247 100644
--- a/main.js
+++ b/main.js
@@ -61,8 +61,7 @@ let burgIcons = icons.append("g").attr("id", "burgIcons");
 let anchors = icons.append("g").attr("id", "anchors");
 let armies = viewbox.append("g").attr("id", "armies").style("display", "none");
 let markers = viewbox.append("g").attr("id", "markers").style("display", "none");
-let fogging = viewbox.append("g").attr("id", "fogging-cont").attr("mask", "url(#fog)")
-  .append("g").attr("id", "fogging").style("display", "none");
+let fogging = viewbox.append("g").attr("id", "fogging-cont").attr("mask", "url(#fog)").append("g").attr("id", "fogging").style("display", "none");
 let ruler = viewbox.append("g").attr("id", "ruler").style("display", "none");
 let debug = viewbox.append("g").attr("id", "debug");
 
@@ -94,6 +93,7 @@ population.append("g").attr("id", "urban");
 
 // fogging
 fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%");
+fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%").attr("fill", "#e8f0f6").attr("filter", "url(#splotch)");
 
 // assign events separately as not a viewbox child
 scaleBar.on("mousemove", () => tip("Click to open Units Editor"));
@@ -335,7 +335,7 @@ function applyDefaultBiomesSystem() {
 }
 
 function showWelcomeMessage() {
-  const post = link("https://www.reddit.com/r/FantasyMapGenerator/comments/ft5b41/update_new_version_is_published_military_update_v/", "Main changes:"); // announcement on Reddit
+  const post = link("https://www.reddit.com/r/FantasyMapGenerator/comments/ft5b41/update_new_version_is_published_military_update_v14/", "Main changes:"); // announcement on Reddit
   const changelog = link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog", "previous version");
   const reddit = link("https://www.reddit.com/r/FantasyMapGenerator", "Reddit community");
   const discord = link("https://discordapp.com/invite/X7E84HU", "Discord server");
@@ -346,10 +346,10 @@ function showWelcomeMessage() {
     This version is compatible with ${changelog}, loaded <i>.map</i> files will be auto-updated.
 
     <ul>${post}
-      <li>Military Forces generation</li>
-      <li>Military Forces overview</li>
-      <li>Military Units editor</li>
-      <li>Regiments editor</li>
+      <li>Battle simulation</li>
+      <li>Ice layer and Ice editor</li>
+      <li>Route Elevation profile</li>
+      <li>Name generator improvement</li>
     </ul>
 
     <p>You can can also download a ${desktop}.</p>
@@ -528,7 +528,6 @@ function generate() {
     elevateLakes();
     Rivers.generate();
     defineBiomes();
-    drawIce();
 
     rankCells();
     Cultures.generate();
diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index 95637a24d..fecfffac6 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -140,46 +140,15 @@
   // define burg coordinates, port status and define details
   const specifyBurgs = function() {
     console.time("specifyBurgs");
-    const cells = pack.cells, vertices = pack.vertices, features = pack.features;
-
-    // separate arctic seas for correct searoutes generation
-    void function checkAccessibility() {
-      const oceanCells = cells.i.filter(i => cells.h[i] < 20 && features[cells.f[i]].type === "ocean");
-      const marked = [];
-      let firstCell = oceanCells.find(i => !marked[i]);
-
-      while (firstCell !== undefined) {
-        const queue = [firstCell];
-        const f = features[cells.f[firstCell]]; // old feature
-        const i = last(features).i+1; // new feature id to assign
-        const biome = cells.biome[firstCell];
-        marked[firstCell] = 1;
-        let cellNumber = 1;
-
-        while (queue.length) {
-          for (const c of cells.c[queue.pop()]) {
-            if (cells.biome[c] !== biome || cells.h[c] >= 20) continue;
-            if (marked[c]) continue;
-            queue.push(c);
-            cells.f[c] = i;
-            marked[c] = 1;
-            cellNumber++;
-          }
-        }
-
-        const group = biome ? "frozen " + f.group : f.group;
-        features.push({i, parent:f.i, land:false, border:f.border, type:"ocean", cells: cellNumber, firstCell, group});
-        firstCell = oceanCells.find(i => !marked[i]);
-      }
-    }()
+    const cells = pack.cells, vertices = pack.vertices, features = pack.features, temp = grid.cells.temp;
 
     for (const b of pack.burgs) {
       if (!b.i) continue;
       const i = b.cell;
 
-      // asign port status
+      // asign port status to some coastline burgs with temp > 0 °C
       const haven = cells.haven[i];
-      if (haven && cells.biome[haven] === 0) {
+      if (haven && temp[cells.g[i]] > 0) {
         const f = cells.f[haven]; // water body id
         // port is a capital with any harbor OR town with good harbor
         const port = features[f].cells > 1 && ((b.capital && cells.harbor[i]) || cells.harbor[i] === 1);
diff --git a/modules/routes-generator.js b/modules/routes-generator.js
index ad394a790..e02c4a6fb 100644
--- a/modules/routes-generator.js
+++ b/modules/routes-generator.js
@@ -61,52 +61,35 @@
 
   const getSearoutes = function() {
     console.time("generateSearoutes");
-    const cells = pack.cells, allPorts = pack.burgs.filter(b => b.port > 0 && !b.removed);
+    const allPorts = pack.burgs.filter(b => b.port > 0 && !b.removed);
     if (allPorts.length < 2) return [];
+
     const bodies = new Set(allPorts.map(b => b.port)); // features with ports
     let paths = []; // array to store path segments
+    const connected = []; // store cell id of connected burgs
 
     bodies.forEach(function(f) {
-      const ports = allPorts.filter(b => b.port === f);
+      const ports = allPorts.filter(b => b.port === f); // all ports on the same feature
       if (ports.length < 2) return;
-      const first = ports[0].cell;
-      const farthest = ports[d3.scan(ports, (a, b) => ((b.y - ports[0].y) ** 2 + (b.x - ports[0].x) ** 2) - ((a.y - ports[0].y) ** 2 + (a.x - ports[0].x) ** 2))].cell;
-
-      // directly connect first port with the farthest one on the same island to remove gap
-      void function() {
-        if (!pack.features[f] || pack.features[f].type === "lake") return;
-        const portsOnIsland = ports.filter(b => cells.f[b.cell] === cells.f[first]);
-        if (portsOnIsland.length < 4) return;
-        const opposite = ports[d3.scan(portsOnIsland, (a, b) => ((b.y - ports[0].y) ** 2 + (b.x - ports[0].x) ** 2) - ((a.y - ports[0].y) ** 2 + (a.x - ports[0].x) ** 2))].cell;
-        //debug.append("circle").attr("cx", pack.cells.p[opposite][0]).attr("cy", pack.cells.p[opposite][1]).attr("r", 1);
-        //debug.append("circle").attr("cx", pack.cells.p[first][0]).attr("cy", pack.cells.p[first][1]).attr("fill", "red").attr("r", 1);
-        const [from, exit, passable] = findOceanPath(opposite, first);
-        if (!passable) return;
-        from[first] = cells.haven[first];
-        const path = restorePath(opposite, first, "ocean", from);
-        paths = paths.concat(path);
-      }()
-
-      // directly connect first port with the farthest one
-      void function() {
-        const [from, exit, passable] = findOceanPath(farthest, first);
-        if (!passable) return;
-        from[first] = cells.haven[first];
-        const path = restorePath(farthest, first, "ocean", from);
-        paths = paths.concat(path);
-      }()
-
-      // indirectly connect first port with all other ports
-      void function() {
-        if (ports.length < 3) return;
-        for (const p of ports) {
-          if (p.cell === first || p.cell === farthest) continue;
-          const [from, exit, passable] = findOceanPath(p.cell, first, true);
+
+      for (let s=0; s < ports.length; s++) {
+        const source = ports[s].cell;
+        if (connected[source]) continue;
+
+        for (let t=s+1; t < ports.length; t++) {
+          const target = ports[t].cell;
+          if (connected[target]) continue;
+
+          const [from, exit, passable] = findOceanPath(target, source, true);
           if (!passable) continue;
-          const path = restorePath(p.cell, exit, "ocean", from);
+
+          const path = restorePath(target, exit, "ocean", from);
           paths = paths.concat(path);
+
+          connected[source] = 1;
+          connected[target] = 1;
         }
-      }()
+      }
 
     });
 
@@ -235,7 +218,7 @@
 
   // find water paths
   function findOceanPath(start, exit = null, toRoute = null) {
-    const cells = pack.cells;
+    const cells = pack.cells, temp = grid.cells.temp;
     const queue = new PriorityQueue({comparator: (a, b) => a.p - b.p});
     const cost = [], from = [];
     queue.queue({e: start, p: 0});
@@ -247,6 +230,7 @@
       for (const c of cells.c[n]) {
         if (c === exit) {from[c] = n; return [from, exit, true];}
         if (cells.h[c] >= 20) continue; // ignore land cells
+        if (temp[cells.g[c]] <= -5) continue; // ignore cells with term <= -5
         const dist2 = (cells.p[c][1] - cells.p[n][1]) ** 2 + (cells.p[c][0] - cells.p[n][0]) ** 2;
         const totalCost = p + (cells.road[c] ? 1 + dist2 / 2 : dist2 + (cells.t[c] ? 1 : 100));
 
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 47ac9274d..7aded690b 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -832,11 +832,9 @@ function parseLoadedData(data) {
         if (!markers.selectAll("*").size()) {addMarkers(); turnButtonOn("toggleMarkers");}
 
         // 1.0 add fogging layer (state focus)
-        fogging = viewbox.insert("g", "#ruler").attr("id", "fogging-cont").attr("mask", "url(#fog)")
-          .append("g").attr("id", "fogging").style("display", "none");
+        fogging = viewbox.insert("g", "#ruler").attr("id", "fogging-cont").attr("mask", "url(#fog)").append("g").attr("id", "fogging").style("display", "none");
         fogging.append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%");
-        defs.append("mask").attr("id", "fog").append("rect").attr("x", 0).attr("y", 0).attr("width", "100%")
-          .attr("height", "100%").attr("fill", "white");
+        defs.append("mask").attr("id", "fog").append("rect").attr("x", 0).attr("y", 0).attr("width", "100%").attr("height", "100%").attr("fill", "white");
 
         // 1.0 changes states opacity bask to regions level
         if (statesBody.attr("opacity")) {
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 46908c2a7..3b811f2c8 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -527,11 +527,26 @@ function changePickerSpace() {
   openPicker.updateFill();
 }
 
-// remove all fogging
-function unfog() {
-  defs.select("#fog").selectAll("path").remove();
-  fogging.selectAll("path").remove();
-  fogging.style("display", "none");
+// add fogging
+function fog(id, path) {
+  if (defs.select("#fog #"+id).size()) return;
+  const fadeIn = d3.transition().duration(2000).ease(d3.easeSinInOut);
+  if (defs.select("#fog path").size()) {
+    defs.select("#fog").append("path").attr("d", path).attr("id", id).attr("opacity", 0).transition(fadeIn).attr("opacity", 1);
+  } else {
+    defs.select("#fog").append("path").attr("d", path).attr("id", id).attr("opacity", 1);
+    const opacity = fogging.attr("opacity");
+    fogging.style("display", "block").attr("opacity", 0).transition(fadeIn).attr("opacity", opacity);
+  }
+}
+
+// remove fogging
+function unfog(id) {
+  let el = defs.select("#fog #"+id);
+  if (!id || !el.size()) el = defs.select("#fog").selectAll("path");
+
+  el.remove();
+  if (!defs.selectAll("#fog path").size()) fogging.style("display", "none");
 }
 
 function getFileName(dataType) {
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 26caca4d4..f888d42c5 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -185,7 +185,6 @@ function editHeightmap() {
     }
 
     defineBiomes();
-
     rankCells();
     Cultures.generate();
     Cultures.expand();
@@ -354,6 +353,8 @@ function editHeightmap() {
       if (!b.i || b.removed) continue;
       b.cell = findBurgCell(b.x, b.y);
       b.feature = pack.cells.f[b.cell];
+      //if (b.port) b.port = pack.cells.f[pack.cells.haven[b.cell]]; // water body id
+
       pack.cells.burg[b.cell] = b.i;
       if (!b.capital && pack.cells.h[b.cell] < 20) removeBurg(b.i);
       if (b.capital) pack.states[b.state].center = b.cell;
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index deb78f835..614b556dd 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -460,6 +460,7 @@ function toggleIce() {
   if (!layerIsOn("toggleIce")) {
     turnButtonOn("toggleIce");
     $('#ice').fadeIn();
+    if (!ice.selectAll("*").size()) drawIce();
     if (event && isCtrlClick(event)) editStyle("ice");
   } else {
     if (event && isCtrlClick(event)) {editStyle("ice"); return;}
@@ -473,7 +474,7 @@ function drawIce() {
   const used = new Uint8Array(cells.i.length);
   Math.seedrandom(seed);
 
-  const shieldMin = -6; // min temp to form ice shield (glacier)
+  const shieldMin = -6; // max temp to form ice shield (glacier)
   const icebergMax = 2; // max temp to form an iceberg
 
   for (const i of grid.cells.i) {
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
index 58b02b0f8..7d7385295 100644
--- a/modules/ui/provinces-editor.js
+++ b/modules/ui/provinces-editor.js
@@ -42,7 +42,7 @@ function editProvinces() {
     if (cl.contains("icon-star-empty")) capitalZoomIn(p); else
     if (cl.contains("icon-flag-empty")) triggerIndependencePromps(p); else
     if (cl.contains("culturePopulation")) changePopulation(p); else
-    if (cl.contains("icon-pin")) focusOn(p, cl); else
+    if (cl.contains("icon-pin")) toggleFog(p, cl); else
     if (cl.contains("icon-trash-empty")) removeProvince(p);
   });
 
@@ -282,7 +282,7 @@ function editProvinces() {
     BurgsAndStates.drawStateLabels([newState, oldState]);
 
     // remove old province
-    unfocus(p);
+    unfog("focusProvince"+p);
     if (states[oldState].provinces.includes(p)) states[oldState].provinces.splice(states[oldState].provinces.indexOf(p), 1);
     provinces[p].removed = true;
 
@@ -347,24 +347,10 @@ function editProvinces() {
 
   }
 
-  function focusOn(p, cl) {
-    const inactive = cl.contains("inactive");
+  function toggleFog(p, cl) {
+    const path = provs.select("#province"+p).attr("d"), id = "focusProvince"+p;
+    cl.contains("inactive") ? fog(id, path) : unfog(id);
     cl.toggle("inactive");
-
-    if (inactive) {
-      if (defs.select("#fog #focusProvince"+p).size()) return;
-      fogging.style("display", "block");
-      const path = provs.select("#province"+p).attr("d");
-      defs.select("#fog").append("path").attr("d", path).attr("fill", "black").attr("id", "focusProvince"+p);
-      fogging.append("path").attr("d", path).attr("id", "focusProvinceHalo"+p)
-        .attr("fill", "none").attr("stroke", pack.provinces[p].color).attr("filter", "url(#blur5)");
-    } else unfocus(p);
-  }
-
-  function unfocus(p) {
-    defs.select("#focusProvince"+p).remove();
-    fogging.select("#focusProvinceHalo"+p).remove();
-    if (!defs.selectAll("#fog path").size()) fogging.style("display", "none"); // all items are de-focused
   }
 
   function removeProvince(p) {
@@ -377,7 +363,7 @@ function editProvinces() {
           const state = pack.provinces[p].state;
           if (pack.states[state].provinces.includes(p)) pack.states[state].provinces.splice(pack.states[state].provinces.indexOf(p), 1);
           pack.provinces[p].removed = true;
-          unfocus(p);
+          unfog("focusProvince"+p);
       
           const g = provs.select("#provincesBody");
           g.select("#province"+p).remove();
@@ -853,7 +839,7 @@ function editProvinces() {
           $(this).dialog("close");
           pack.provinces.filter(p => p.i).forEach(p => {
             p.removed = true;
-            unfocus(p.i);
+            unfog("focusProvince"+p.i);
           });
           pack.cells.i.forEach(i => pack.cells.province[i] = 0);
           pack.states.filter(s => s.i && !s.removed).forEach(s => s.provinces = []);
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index b776cdc27..2f1d5800c 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -45,7 +45,7 @@ function editStates() {
     if (cl.contains("icon-coa")) stateOpenCOA(ev, state); else
     if (cl.contains("icon-star-empty")) stateCapitalZoomIn(state); else
     if (cl.contains("culturePopulation")) changePopulation(state); else
-    if (cl.contains("icon-pin")) focusOnState(state, cl); else
+    if (cl.contains("icon-pin")) toggleFog(state, cl); else
     if (cl.contains("icon-trash-empty")) stateRemovePrompt(state);
   });
 
@@ -171,6 +171,8 @@ function editStates() {
 
   function stateHighlightOn(event) {
     if (!layerIsOn("toggleStates")) return;
+    if (defs.select("#fog path").size()) return;
+
     const state = +event.target.dataset.id;
     if (customization || !state) return;
     const d = regions.select("#state"+state).attr("d");
@@ -405,26 +407,11 @@ function editStates() {
     recalculateStates();
   }
 
-  function focusOnState(state, cl) {
+  function toggleFog(state, cl) {
     if (customization) return;
-
-    const inactive = cl.contains("inactive");
+    const path = statesBody.select("#state"+state).attr("d"), id = "focusState"+state;
+    cl.contains("inactive") ? fog(id, path) : unfog(id);
     cl.toggle("inactive");
-
-    if (inactive) {
-      if (defs.select("#fog #focusState"+state).size()) return;
-      fogging.style("display", "block");
-      const path = statesBody.select("#state"+state).attr("d");
-      defs.select("#fog").append("path").attr("d", path).attr("fill", "black").attr("id", "focusState"+state);
-      fogging.append("path").attr("d", path).attr("id", "focusStateHalo"+state)
-        .attr("fill", "none").attr("stroke", pack.states[state].color).attr("filter", "url(#blur5)");
-    } else unfocus(state);
-  }
-
-  function unfocus(s) {
-    defs.select("#focusState"+s).remove();
-    fogging.select("#focusStateHalo"+s).remove();
-    if (!defs.selectAll("#fog path").size()) fogging.style("display", "none"); // all items are de-focused
   }
 
   function stateRemovePrompt(state) {
@@ -446,7 +433,7 @@ function editStates() {
     statesBody.select("#state"+state).remove();
     statesBody.select("#state-gap"+state).remove();
     statesHalo.select("#state-border"+state).remove();
-    unfocus(state);
+    unfog("focusState"+state);
     const label = document.querySelector("#stateLabel"+state);
     if (label) label.remove();
     pack.burgs.forEach(b => {if(b.state === state) b.state = 0;});
diff --git a/modules/ui/style.js b/modules/ui/style.js
index 6550c541b..ffd87be9f 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -65,12 +65,6 @@ function selectStyleElement() {
     styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || "";
   }
 
-  // stroke width
-  if (sel === "fogging") {
-    styleStrokeWidth.style.display = "block";
-    styleStrokeWidthInput.value = styleStrokeWidthOutput.value = el.attr("stroke-width") || "";
-  }
-
   // stroke dash
   if (sel === "routes" || sel === "borders" || sel === "gridOverlay" || sel === "temperature" || sel === "legend" || sel === "population" || sel === "coordinates"|| sel === "zones") {
     styleStrokeDash.style.display = "block";
@@ -697,22 +691,22 @@ function applyStyleOnLoad() {
 
 function addDefaulsStyles() {
   if (!localStorage.getItem("styleClean")) {
-    const clean = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0,"data-width":null,"stroke-width":0},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":null},"#oceanLayers":{"filter":"","layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"","mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const clean = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":0.5,"filter":"url(#blur7)","mask":"url(#land)"},"#stateBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":0.8,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.09,"filter":null,"mask":"url(#land)"},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#414141","stroke-width":0.45,"stroke-dasharray":3,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eeedeb","filter":null},"#markers":{"opacity":null,"rescale":null,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0,"fill":"#0080ff","filter":null},"#population":{"opacity":null,"stroke-width":2.58,"stroke-dasharray":0,"stroke-linecap":"butt","filter":"url(#blur3)"},"#rural":{"stroke":"#ff0000"},"#urban":{"stroke":"#800000"},"#freshwater":{"opacity":0.5,"fill":"#aadaff","stroke":"#5f799d","stroke-width":0,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#595959","stroke-width":0.4,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#aadaff"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#f6d068","stroke-width":0.7,"stroke-dasharray":0,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":1,"stroke":"#ffffff","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#4f82c6","stroke-width":0.45,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":"url(#water)"},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":0,"data-width":null,"stroke-width":0},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.8,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow01)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.7,"stroke":"#ff6262","stroke-width":0,"stroke-dasharray":"","stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":null},"#oceanLayers":{"filter":"","layers":"none"},"#oceanBase":{"fill":"#aadaff"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":0.5,"scheme":"bright","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"","mask":"url(#land)"},"#legend":{"data-size":12.74,"font-size":12.74,"data-font":"Arial","font-family":"Arial","stroke":"#909090","stroke-width":1.13,"stroke-dasharray":0,"stroke-linecap":"round","data-x":98.39,"data-y":12.67,"data-columns":null},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#414141","data-size":7,"font-size":7,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#303030","stroke-width":1.7},"#burgLabels > #towns":{"opacity":1,"fill":"#414141","data-size":3,"font-size":3,"data-font":"Arial","font-family":"Arial"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.06},"#labels > #states":{"opacity":1,"fill":"#292929","stroke":"#303030","stroke-width":0,"data-size":10,"font-size":10,"data-font":"Arial","font-family":"Arial","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#414141","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Arial","font-family":"Arial","filter":null},"#fogging":{"opacity":1,"fill":"#ffffff","filter":null}}`;
     localStorage.setItem("styleClean", clean);
   }
 
   if (!localStorage.getItem("styleGloom")) {
-    const gloom = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":"","mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":"","mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":"url(#dropShadow)"},"#statesHalo":{"opacity":1,"data-width":10.2,"stroke-width":10.2},"#provs":{"opacity":0.5,"filter":""},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern3)"},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":""},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const gloom = `{"#map":{"background-color":"#000000","filter":null,"data-filter":null},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":"url(#land)"},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":""},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.3,"stroke-dasharray":".7 1","stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":14,"font-size":14,"stroke":"#4a4a4a","stroke-width":1,"stroke-dasharray":6,"stroke-linecap":null,"filter":"","mask":""},"#compass":{"opacity":0.6,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(100 100) scale(0.3)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":1,"filter":null},"#cults":{"opacity":0.7,"stroke":"#777777","stroke-width":1.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#e0e0e0","filter":null},"#markers":{"opacity":0.8,"rescale":1,"filter":"url(#dropShadow05)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000aa"},"#urban":{"stroke":"#9d0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.6,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":0.9,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":"","fill":"#779582"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":1,"stroke":"#8b4418","stroke-width":0.9,"stroke-dasharray":"2 3","stroke-linecap":"round","filter":"","mask":null},"#trails":{"opacity":1,"stroke":"#844017","stroke-width":0.2,"stroke-dasharray":".5 1","stroke-linecap":"round","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#5e1865","stroke-width":0.6,"stroke-dasharray":"1.2 2.4","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":"url(#dropShadow)"},"#statesHalo":{"opacity":1,"data-width":10.2,"stroke-width":10.2},"#provs":{"opacity":0.5,"filter":""},"#temperature":{"opacity":1,"font-size":"11px","fill":"#62001b","fill-opacity":0.3,"stroke":null,"stroke-width":2,"stroke-dasharray":2,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.8,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{"x":0,"y":0},"#zones":{"opacity":0.5,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":"url(#dropShadow01)","mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":null,"layers":"-6,-4,-2"},"#oceanBase":{"fill":"#4e6964"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern3)"},"#terrs":{"opacity":1,"scheme":"bright","terracing":0,"skip":0,"relax":1,"curve":1,"filter":"url(#filter-grayscale)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":2,"stroke":"#444444","stroke-width":0.25,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":0.8,"fill":"#ffffff","size":4,"stroke":"#3e3e4b","stroke-width":1},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":3,"font-size":3,"data-font":"Bitter","font-family":"Bitter"},"#burgIcons > #towns":{"opacity":0.95,"fill":"#ffffff","fill-opacity":0.7,"size":0.8,"stroke":"#3e3e4b","stroke-width":0.2,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1.6,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#4e4e4e","stroke":"#b5b5b5","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":""},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#1b1423","filter":null}}`;
     localStorage.setItem("styleGloom", gloom);
   }
 
   if (!localStorage.getItem("styleAncient")) {
-    const ancient = `{"#map":{"background-color":"#000000","filter":"url(#filter-sepia)","data-filter":"sepia"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.05,"opacity":0.8,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eee9d7","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#5d97bb"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.8,"stroke":"#2e1607","stroke-width":1.23,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.8,"stroke":"#331809","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":""},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":"url(#blur5)","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#a7a01f"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern1)"},"#terrs":{"opacity":null,"scheme":"light","terracing":0,"skip":0,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":8,"font-size":8,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#54251d","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#463124","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const ancient = `{"#map":{"background-color":"#000000","filter":"url(#filter-sepia)","data-filter":"sepia"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.05,"opacity":0.8,"fill-opacity":0.8,"filter":null},"#biomes":{"opacity":null,"filter":null,"mask":null},"#stateBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":0.8,"stroke":"#56566d","stroke-width":0.2,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":"translate(80 80) scale(.25)"},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#eee9d7","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":0.5,"fill":"#a6c1fd","stroke":"#5f799d","stroke-width":0.7,"filter":null},"#salt":{"opacity":0.5,"fill":"#409b8a","stroke":"#388985","stroke-width":0.7,"filter":null},"#sinkhole":{"opacity":1,"fill":"#5bc9fd","stroke":"#53a3b0","stroke-width":0.7,"filter":null},"#frozen":{"opacity":0.95,"fill":"#cdd4e7","stroke":"#cfe0eb","stroke-width":0,"filter":null},"#lava":{"opacity":0.7,"fill":"#90270d","stroke":"#f93e0c","stroke-width":2,"filter":"url(#crumpled)"},"#dry":{"opacity":0.7,"fill":"#c9bfa7","stroke":"#8e816f","stroke-width":0.7,"filter":null},"#sea_island":{"opacity":0.5,"stroke":"#1f3846","stroke-width":0.7,"filter":"url(#dropShadow)","auto-filter":1},"#lake_island":{"opacity":1,"stroke":"#7c8eaf","stroke-width":0.35,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":null,"filter":null,"fill":"#5d97bb"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.8,"stroke":"#2e1607","stroke-width":1.23,"stroke-dasharray":3,"stroke-linecap":"inherit","filter":null,"mask":null},"#trails":{"opacity":0.8,"stroke":"#331809","stroke-width":0.5,"stroke-dasharray":"1 2","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.8,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":""},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.7,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#outline)"},"#texture":{"opacity":null,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":1},"#oceanLayers":{"filter":"url(#blur5)","layers":"-6,-4,-2"},"#oceanBase":{"fill":"#a7a01f"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#pattern1)"},"#terrs":{"opacity":null,"scheme":"light","terracing":0,"skip":0,"relax":0,"curve":0,"filter":null,"mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":8,"font-size":8,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#fdfab9","fill-opacity":0.7,"size":1,"stroke":"#54251d","stroke-width":0.3,"stroke-dasharray":".3 .4","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#fef4d8","fill-opacity":0.7,"size":0.5,"stroke":"#463124","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null}}`;
     localStorage.setItem("styleAncient", ancient);
   }
 
   if (!localStorage.getItem("styleMonochrome")) {
-    const monochrome = `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":""},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":1,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":0},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging-cont":{"opacity":null,"fill":null,"stroke-width":null}}`;
+    const monochrome = `{"#map":{"background-color":"#000000","filter":"url(#filter-grayscale)","data-filter":"grayscale"},"#armies":{"font-size":6,"box-size":3,"stroke":"#000","stroke-width":0.3,"opacity":1,"fill-opacity":1,"filter":null},"#biomes":{"opacity":null,"filter":"url(#blur5)","mask":null},"#stateBorders":{"opacity":1,"stroke":"#56566d","stroke-width":1,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null},"#provinceBorders":{"opacity":1,"stroke":"#56566d","stroke-width":0.4,"stroke-dasharray":1,"stroke-linecap":"butt","filter":null},"#cells":{"opacity":null,"stroke":"#808080","stroke-width":0.1,"filter":null,"mask":null},"#gridOverlay":{"opacity":0.8,"size":10,"type":"pointyHex","stroke":"#808080","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"transform":null,"filter":null,"mask":null},"#coordinates":{"opacity":1,"data-size":12,"font-size":12,"stroke":"#d4d4d4","stroke-width":1,"stroke-dasharray":5,"stroke-linecap":null,"filter":null,"mask":null},"#compass":{"opacity":0.8,"transform":null,"filter":null,"mask":"url(#water)","shape-rendering":"optimizespeed"},"#rose":{"transform":null},"#relig":{"opacity":0.7,"stroke":"#404040","stroke-width":0.7,"filter":null},"#cults":{"opacity":0.6,"stroke":"#777777","stroke-width":0.5,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#landmass":{"opacity":1,"fill":"#000000","filter":null},"#markers":{"opacity":null,"rescale":1,"filter":"url(#dropShadow01)"},"#prec":{"opacity":null,"stroke":"#000000","stroke-width":0.1,"fill":"#003dff","filter":null},"#population":{"opacity":null,"stroke-width":1.6,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null},"#rural":{"stroke":"#0000ff"},"#urban":{"stroke":"#ff0000"},"#freshwater":{"opacity":1,"fill":"#000000","stroke":"#515151","stroke-width":0,"filter":null},"#salt":{"opacity":1,"fill":"#000000","stroke":"#484848","stroke-width":0,"filter":null},"#sinkhole":{"opacity":1,"fill":"#000000","stroke":"#5f5f5f","stroke-width":0.5,"filter":null},"#frozen":{"opacity":1,"fill":"#000000","stroke":"#6f6f6f","stroke-width":0,"filter":null},"#lava":{"opacity":1,"fill":"#000000","stroke":"#5d5d5d","stroke-width":0,"filter":""},"#sea_island":{"opacity":1,"stroke":"#1f3846","stroke-width":0,"filter":"","auto-filter":0},"#lake_island":{"opacity":0,"stroke":"#7c8eaf","stroke-width":0,"filter":null},"#terrain":{"opacity":null,"set":"simple","size":1,"density":0.4,"filter":null,"mask":null},"#rivers":{"opacity":0.2,"filter":"url(#blur1)","fill":"#000000"},"#ruler":{"opacity":null,"filter":null},"#roads":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.7,"stroke-dasharray":2,"stroke-linecap":"butt","filter":null,"mask":null},"#trails":{"opacity":0.9,"stroke":"#d06324","stroke-width":0.25,"stroke-dasharray":".8 1.6","stroke-linecap":"butt","filter":null,"mask":null},"#searoutes":{"opacity":0.8,"stroke":"#ffffff","stroke-width":0.45,"stroke-dasharray":"1 2","stroke-linecap":"round","filter":null,"mask":null},"#regions":{"opacity":0.4,"filter":null},"#statesHalo":{"opacity":1,"data-width":10,"stroke-width":10},"#provs":{"opacity":0.6,"filter":null},"#temperature":{"opacity":null,"font-size":"8px","fill":"#000000","fill-opacity":0.3,"stroke":null,"stroke-width":1.8,"stroke-dasharray":null,"stroke-linecap":null,"filter":null},"#ice":{"opacity":0.8,"fill":"#e8f0f6","stroke":"#e8f0f6","stroke-width":1,"filter":"url(#dropShadow05)"},"#texture":{"opacity":1,"filter":null,"mask":"url(#land)"},"#textureImage":{},"#zones":{"opacity":0.6,"stroke":"#333333","stroke-width":0,"stroke-dasharray":null,"stroke-linecap":"butt","filter":null,"mask":null},"#ocean":{"opacity":0},"#oceanLayers":{"filter":null,"layers":"none"},"#oceanBase":{"fill":"#000000"},"#oceanPattern":{"opacity":null},"#oceanicPattern":{"filter":"url(#emptyImage)"},"#terrs":{"opacity":1,"scheme":"monochrome","terracing":0,"skip":5,"relax":0,"curve":0,"filter":"url(#blur3)","mask":"url(#land)"},"#legend":{"data-size":13,"font-size":13,"data-font":"Almendra+SC","font-family":"Almendra SC","stroke":"#812929","stroke-width":2.5,"stroke-dasharray":"0 4 10 4","stroke-linecap":"round","data-x":99,"data-y":93,"data-columns":8},"#legendBox":{},"#burgLabels > #cities":{"opacity":1,"fill":"#3e3e4b","data-size":7,"font-size":7,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #cities":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":1,"stroke":"#3e3e4b","stroke-width":0.24,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #cities":{"opacity":1,"fill":"#ffffff","size":2,"stroke":"#3e3e4b","stroke-width":1.2},"#burgLabels > #towns":{"opacity":1,"fill":"#3e3e4b","data-size":4,"font-size":4,"data-font":"Almendra+SC","font-family":"Almendra SC"},"#burgIcons > #towns":{"opacity":1,"fill":"#ffffff","fill-opacity":0.7,"size":0.5,"stroke":"#3e3e4b","stroke-width":0.12,"stroke-dasharray":"","stroke-linecap":"butt"},"#anchors > #towns":{"opacity":1,"fill":"#ffffff","size":1,"stroke":"#3e3e4b","stroke-width":1.2},"#labels > #states":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":22,"font-size":22,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#labels > #addedLabels":{"opacity":1,"fill":"#3e3e4b","stroke":"#3a3a3a","stroke-width":0,"data-size":18,"font-size":18,"data-font":"Almendra+SC","font-family":"Almendra SC","filter":null},"#fogging":{"opacity":0.98,"fill":"#30426f","filter":null}}`;
     localStorage.setItem("styleMonochrome", monochrome);
   }
 }
@@ -800,7 +794,7 @@ function applyDefaultStyle() {
   labels.select("#states").attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", stateLabelSize).attr("data-size", stateLabelSize).attr("filter", null);
   labels.select("#addedLabels").attr("fill", "#3e3e4b").attr("opacity", 1).attr("stroke", "#3a3a3a").attr("stroke-width", 0).attr("font-family", "Almendra SC").attr("data-font", "Almendra+SC").attr("font-size", 18).attr("data-size", 18).attr("filter", null);
 
-  fogging.attr("opacity", .8).attr("fill", "#000000").attr("stroke-width", 5);
+  fogging.attr("opacity", .98).attr("fill", "#30426f");
 }
 
 // apply style settings in JSON
@@ -949,7 +943,7 @@ function addStylePreset() {
       "#anchors > #towns":["opacity", "fill", "size", "stroke", "stroke-width"],
       "#labels > #states":["opacity", "fill", "stroke", "stroke-width", "data-size", "font-size", "data-font", "font-family", "filter"],
       "#labels > #addedLabels":["opacity", "fill", "stroke", "stroke-width", "data-size", "font-size", "data-font", "font-family", "filter"],
-      "#fogging-cont":["opacity", "fill", "stroke-width"]
+      "#fogging":["opacity", "fill", "filter"]
     };
 
     for (const selector in attributes) {
diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js
index d7ef87334..7e751b7c8 100644
--- a/modules/ui/zones-editor.js
+++ b/modules/ui/zones-editor.js
@@ -30,7 +30,7 @@ function editZones() {
     if (cl.contains("culturePopulation")) {changePopulation(zone); return;}
     if (cl.contains("icon-trash-empty")) {zoneRemove(zone); return;}
     if (cl.contains("icon-eye")) {toggleVisibility(el); return;}
-    if (cl.contains("icon-pin")) {focusOnZone(zone, cl); return;}
+    if (cl.contains("icon-pin")) {toggleFog(zone, cl); return;}
     if (cl.contains("fillRect")) {changeFill(el); return;}
     if (customization) selectZone(el);
   });
@@ -194,7 +194,7 @@ function editZones() {
     zones.selectAll("g").each(function() {
       if (this.dataset.cells) return;
       // all zone cells are removed
-      unfocus(this.id);
+      unfog("focusZone"+this.id);
       this.style.display = "block";
     });
 
@@ -253,24 +253,13 @@ function editZones() {
     el.classList.toggle("inactive");
   }
 
-  function focusOnZone(zone, cl) {
-    const inactive = cl.contains("inactive");
-    cl.toggle("inactive");
-
-    if (inactive) {
-      if (defs.select("#fog #focus"+zone).size()) return;
-      const dataCells = zones.select("#"+zone).attr("data-cells");
-      if (!dataCells) return;
-      const data = dataCells.split(",").map(c => +c);
-      const g = defs.select("#fog").append("g").attr("fill", "black").attr("stroke", "black").attr("id", "focus"+zone);
-      g.selectAll("path").data(data).enter().append("path").attr("d", d => "M" + getPackPolygon(d) + "Z");
-      fogging.style("display", "block");
-    } else unfocus(zone);
-  }
+  function toggleFog(z, cl) {
+    const dataCells = zones.select("#"+z).attr("data-cells");
+    if (!dataCells) return;
 
-  function unfocus(z) {
-    defs.select("#focus"+z).remove();
-    if (!defs.selectAll("#fog path").size()) fogging.style("display", "none"); // all states are de-focused
+    const path = "M" + dataCells.split(",").map(c => getPackPolygon(+c)).join("M") + "Z", id = "focusZone"+z;
+    cl.contains("inactive") ? fog(id, path) : unfog(id);
+    cl.toggle("inactive");
   }
 
   function toggleLegend() {
@@ -414,7 +403,7 @@ function editZones() {
 
   function zoneRemove(zone) {
     zones.select("#"+zone).remove();
-    unfocus(zone);
+    unfog("focusZone"+zone);
     zonesEditorAddLines();
   }
 

From eb00895c4042566e936d7772e3407bc799dc387d Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 9 May 2020 23:52:22 +0300
Subject: [PATCH 11/38] v1.4.10

---
 main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.js b/main.js
index 5593b1247..66258d8c1 100644
--- a/main.js
+++ b/main.js
@@ -350,6 +350,7 @@ function showWelcomeMessage() {
       <li>Ice layer and Ice editor</li>
       <li>Route Elevation profile</li>
       <li>Name generator improvement</li>
+      <li>Fogging style change</li>
     </ul>
 
     <p>You can can also download a ${desktop}.</p>

From 8622e53beb93df97f02abb7b9d5c16be427d3d70 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 10 May 2020 00:11:35 +0300
Subject: [PATCH 12/38] v1.4.11

---
 index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.css b/index.css
index bd7651838..12a67e672 100644
--- a/index.css
+++ b/index.css
@@ -116,7 +116,7 @@ button, select, a, .pointer {
 	stroke-linejoin: round;
 }
 
-#regions, #cults, #relig, #biomes, #provs, #terrs, #biomes, #tooltip, #temperature, #texture, #landmass {
+#regions, #cults, #relig, #biomes, #provs, #terrs, #biomes, #tooltip, #temperature, #texture, #landmass, #fogging {
 	pointer-events: none;
 }
 

From 1488a955b7dd389babcb416bf7fa81d3e4d1db17 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 10 May 2020 15:03:44 +0300
Subject: [PATCH 13/38] v1.4.12

---
 index.html           | 18 ++++++------------
 modules/ui/layers.js |  5 +++--
 modules/ui/style.js  |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/index.html b/index.html
index ed98113aa..e93fe5347 100644
--- a/index.html
+++ b/index.html
@@ -1776,17 +1776,6 @@
             </td>
           </tr>
 
-          <tr data-tip="Define scale of a saved png/jpeg image (e.g. 5x). Saving big images is slow and may cause a browser crash!">
-            <td></td>
-            <td>PNG/JPEG scale</td>
-            <td>
-              <input id="pngResolutionInput" data-stored="pngResolution" type="range" min=1 max=8 value=1>
-            </td>
-            <td>
-              <input id="pngResolutionOutput" data-stored="pngResolution" type="number" min=1 max=8 value=1>
-            </td>
-          </tr>
-
           <tr data-tip="Set minimum and maximum possible zoom level">
             <td></td>
             <td>Zoom extent</td>
@@ -3535,7 +3524,7 @@
     <div id="preview3d" class="dialog stable" style="display: none; padding: 0px"></div>
 
     <div id="saveMapData" style="display: none" class="dialog">
-      <div style="margin-bottom: .3em">Please select a saving variant:</div>
+      <div style="margin-bottom: .3em; font-weight: bold">Please select saving variant:</div>
       <div>
         <button onclick="saveMap()" data-tip="Download the map as fully-functional .map file to your machine">.map</button>
         <button onclick="saveSVG()" data-tip="Download the map as vector image (open in browser or Inkscape)">.svg</button>
@@ -3545,6 +3534,11 @@
         <button onclick="quickSave()" data-tip="Save fully-functional map to browser storage. Shortcut: F6">storage</button>
       </div>
       <p style="font-style: italic">Generator uses pop-up window to download files. Please ensure your browser does not block popups</p>
+      <div data-tip="Define scale of a saved png/jpeg image (e.g. 5x). Saving big images is slow and may cause a browser crash!" style="margin-bottom: .3em">
+        PNG / JPEG scale:
+        <input id="pngResolutionInput" data-stored="pngResolution" type="range" min=1 max=8 value=1 style="width: 10.8em">
+        <input id="pngResolutionOutput" data-stored="pngResolution" type="number" min=1 max=8 value=1>
+      </div>
     </div>
 
     <div id="loadMapData" style="display: none" class="dialog">
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 614b556dd..4298ec177 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -16,6 +16,7 @@ function restoreLayers() {
   if (layerIsOn("toggleCultures")) drawCultures();
   if (layerIsOn("toggleProvinces")) drawProvinces();
   if (layerIsOn("toggleReligions")) drawReligions();
+  if (layerIsOn("toggleIce")) drawIce();
 
   // states are getting rendered each time, if it's not required than layers should be hidden
   if (!layerIsOn("toggleBorders")) $('#borders').fadeOut();
@@ -28,13 +29,13 @@ restoreCustomPresets(); // run on-load
 
 function getDefaultPresets() {
   return {
-    "political": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
+    "political": ["toggleBorders", "toggleIcons", "toggleIce", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
     "cultural": ["toggleBorders", "toggleCultures", "toggleIcons", "toggleLabels", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "religions": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleReligions", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "provinces": ["toggleBorders", "toggleIcons", "toggleProvinces", "toggleRivers", "toggleScaleBar"],
     "biomes": ["toggleBiomes", "toggleIce", "toggleRivers", "toggleScaleBar"],
     "heightmap": ["toggleHeight", "toggleRivers"],
-    "physical": ["toggleCoordinates", "toggleHeight", "toggleRivers", "toggleScaleBar"],
+    "physical": ["toggleCoordinates", "toggleHeight", "toggleIce", "toggleRivers", "toggleScaleBar"],
     "poi": ["toggleBorders", "toggleHeight", "toggleIce", "toggleIcons", "toggleMarkers", "toggleRivers", "toggleRoutes", "toggleScaleBar"],
     "military": ["toggleBorders", "toggleIcons", "toggleLabels", "toggleMilitary", "toggleRivers", "toggleRoutes", "toggleScaleBar", "toggleStates"],
     "landmass": ["toggleScaleBar"]
diff --git a/modules/ui/style.js b/modules/ui/style.js
index ffd87be9f..f715a8849 100644
--- a/modules/ui/style.js
+++ b/modules/ui/style.js
@@ -716,7 +716,7 @@ function applyDefaultStyle() {
   armies.attr("opacity", 1).attr("fill-opacity", 1).attr("font-size", 6).attr("box-size", 3).attr("stroke", "#000").attr("stroke-width", .3);
 
   biomes.attr("opacity", null).attr("filter", null).attr("mask", null);
-  ice.attr("opacity", 1).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
+  ice.attr("opacity", .8).attr("fill", "#e8f0f6").attr("stroke", "#e8f0f6").attr("stroke-width", 1).attr("filter", "url(#dropShadow05)");
   stateBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", 1).attr("stroke-dasharray", "2").attr("stroke-linecap", "butt").attr("filter", null);
   provinceBorders.attr("opacity", .8).attr("stroke", "#56566d").attr("stroke-width", .2).attr("stroke-dasharray", "1").attr("stroke-linecap", "butt").attr("filter", null);
   cells.attr("opacity", null).attr("stroke", "#808080").attr("stroke-width", .1).attr("filter", null).attr("mask", null);

From 6dd1e22e93cac3ad9930bf4befef4926d42907ea Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 10 May 2020 18:26:12 +0300
Subject: [PATCH 14/38] v1.4.13

---
 index.css                   |  1 -
 index.html                  | 18 ++++++++++++++++--
 main.js                     | 33 +++++++++++++++------------------
 modules/save-and-load.js    |  3 ++-
 modules/ui/battle-screen.js |  5 +----
 modules/ui/options.js       | 19 +++++++++++++++++++
 6 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/index.css b/index.css
index 12a67e672..f4e72beb2 100644
--- a/index.css
+++ b/index.css
@@ -476,7 +476,6 @@ input[type="color"]::-webkit-color-swatch-wrapper {
 	width: 100%;
   background-color: white;
   text-align: left;
-  height: 1.5em;
 }
 
 #optionsContent input[type="range"] {
diff --git a/index.html b/index.html
index e93fe5347..896ff7850 100644
--- a/index.html
+++ b/index.html
@@ -1581,7 +1581,7 @@
             </td>
           </tr>
 
-          <tr data-tip="Click to set up map name to be used for downloaded files">
+          <tr data-tip="Define map name (will be used to name downloaded files)">
             <td>
               <i data-locked=0 id="lock_mapName" class="icon-lock-open"></i>
             </td>
@@ -1594,6 +1594,20 @@
             </td>
           </tr>
 
+          <tr data-tip="Define current year and era name">
+            <td>
+              <i data-locked=0 id="lock_era" class="icon-lock-open"></i>
+            </td>
+            <td>Year and era</td>
+            <td>
+              <input id="yearInput" data-stored="year" type="number" step=1 class="paired" style="width: 24%; float: left; font-size: smaller">
+              <input id="eraInput" data-stored="era" autocorrect="off" spellcheck="false" type="text" style="width: 75%; float: right" class="long">
+            </td>
+            <td>
+              <i id="optionsEraRegenerate" data-tip="Regenerate era" class="icon-arrows-cw"></i>
+            </td>
+          </tr>
+
           <tr data-tip="Select template to be used for a Heightmap generation">
             <td>
               <i data-locked=0 id="lock_template" class="icon-lock-open"></i>
@@ -1685,7 +1699,7 @@
               <input id="powerInput" data-stored="power" type="range" min=0 max=10 step=.2 value=5>
             </td>
             <td>
-              <input id="powerOutput" data-stored="power" type="number" min=0 max=10 step=.2 value=5>
+              <input id="powerOutput" data-stored="power" type="number" min=0 max=10 step=.1 value=5>
             </td>
           </tr>
 
diff --git a/main.js b/main.js
index 66258d8c1..9dd78c21d 100644
--- a/main.js
+++ b/main.js
@@ -102,7 +102,7 @@ legend.on("mousemove", () => tip("Drag to change the position. Click to hide the
 // main data variables
 let grid = {}; // initial grapg based on jittered square grid and data
 let pack = {}; // packed graph and data
-let seed, mapHistory = [], elSelected, modules = {}, notes = [];
+let seed, mapId, mapHistory = [], elSelected, modules = {}, notes = [];
 let customization = 0; // 0 - no; 1 = heightmap draw; 2 - states draw; 3 - add state/burg; 4 - cultures draw
 
 let biomesData = applyDefaultBiomesSystem();
@@ -121,11 +121,6 @@ let options = {}; // options object
 let mapCoordinates = {}; // map coordinates on globe
 options.winds = [225, 45, 225, 315, 135, 315]; // default wind directions
 
-// woldbuilding options
-options.year = rand(100, 2000); // current year
-options.era = Names.getBaseShort(P(.7) ? 1 : rand(nameBases.length)) + " Era"; // current era name, global for all cultures
-options.eraShort = options.era[0] + "E"; // short name for era
-
 applyStoredOptions();
 let graphWidth = +mapWidthInput.value, graphHeight = +mapHeightInput.value; // voronoi graph extention, cannot be changed arter generation
 let svgWidth = graphWidth, svgHeight = graphHeight; // svg canvas resolution, can be changed
@@ -1699,18 +1694,20 @@ function showStatistics() {
   const template = templateInput.value;
   const templateRandom = locked("template") ? "" : "(random)";
   const stats = `  Seed: ${seed}
-  Canvas size: ${graphWidth}x${graphHeight}
-  Template: ${template} ${templateRandom}
-  Points: ${grid.points.length}
-  Cells: ${pack.cells.i.length}
-  Map size: ${mapSizeOutput.value}%
-  States: ${pack.states.length-1}
-  Provinces: ${pack.provinces.length-1}
-  Burgs: ${pack.burgs.length-1}
-  Religions: ${pack.religions.length-1}
-  Culture set: ${culturesSet.selectedOptions[0].innerText}
-  Cultures: ${pack.cultures.length-1}`;
-  mapHistory.push({seed, width:graphWidth, height:graphHeight, template, created: Date.now()});
+    Canvas size: ${graphWidth}x${graphHeight}
+    Template: ${template} ${templateRandom}
+    Points: ${grid.points.length}
+    Cells: ${pack.cells.i.length}
+    Map size: ${mapSizeOutput.value}%
+    States: ${pack.states.length-1}
+    Provinces: ${pack.provinces.length-1}
+    Burgs: ${pack.burgs.length-1}
+    Religions: ${pack.religions.length-1}
+    Culture set: ${culturesSet.selectedOptions[0].innerText}
+    Cultures: ${pack.cultures.length-1}`;
+
+  mapId = Date.now(); // unique map id is it's creation date number
+  mapHistory.push({seed, width:graphWidth, height:graphHeight, template, created:mapId});
   console.log(stats);
 }
 
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 7aded690b..8311d5f0a 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -225,7 +225,7 @@ function getMapData() {
     const date = new Date();
     const dateString = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate();
     const license = "File can be loaded in azgaar.github.io/Fantasy-Map-Generator";
-    const params = [version, license, dateString, seed, graphWidth, graphHeight].join("|");
+    const params = [version, license, dateString, seed, graphWidth, graphHeight, mapId].join("|");
     const settings = [distanceUnitInput.value, distanceScaleInput.value, areaUnit.value,
       heightUnit.value, heightExponentInput.value, temperatureScale.value,
       barSize.value, barLabel.value, barBackOpacity.value, barBackColor.value,
@@ -586,6 +586,7 @@ function parseLoadedData(data) {
       if (params[3]) {seed = params[3]; optionsSeed.value = seed;}
       if (params[4]) graphWidth = +params[4];
       if (params[5]) graphHeight = +params[5];
+      mapId = params[6] ? +params[6] : Date.now();
     }()
 
     console.group("Loaded Map " + seed);
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index f3e062f0a..de9882f29 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -339,10 +339,7 @@ class Battle {
 
   cancelResults() {
     // move regiments back to initial positions
-    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => {
-      Military.moveRegiment(r, r.px, r.py);
-    });
-
+    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => Military.moveRegiment(r, r.px, r.py));
     $("#battleScreen").dialog("close");
     this.cleanData();
   }
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 477f5ffba..5fbef6a87 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -117,6 +117,7 @@ optionsContent.addEventListener("click", function(event) {
   else if (id === "optionsSeedGenerate") generateMapWithSeed();
   else if (id === "optionsMapHistory") showSeedHistoryDialog();
   else if (id === "optionsCopySeed") copyMapURL();
+  else if (id === "optionsEraRegenerate") regenerateEra();
   else if (id === "zoomExtentDefault") restoreDefaultZoomExtent();
   else if (id === "translateExtent") toggleTranslateExtent(event.target);
 });
@@ -354,6 +355,9 @@ function randomizeOptions() {
   if (!stored("distanceUnit")) distanceUnitInput.value = US || UK ? "mi" : "km";
   if (!stored("heightUnit")) heightUnit.value = US || UK ? "ft" : "m";
   if (!stored("temperatureScale")) temperatureScale.value = US ? "°F" : "°C";
+
+  // World settings
+  generateEra();
 }
 
 // select heightmap template pseudo-randomly
@@ -389,6 +393,21 @@ function randomizeCultureSet() {
   changeCultureSet();
 }
 
+// generate current year and era name
+function generateEra() {
+  if (!stored("year")) yearInput.value = rand(100, 2000); // current year
+  if (!stored("era")) eraInput.value = Names.getBaseShort(P(.7) ? 1 : rand(nameBases.length)) + " Era";
+  options.year = yearInput.value;
+  options.era = eraInput.value;
+  options.eraShort = options.era.split(" ").map(w => w[0].toUpperCase()).join(""); // short name for era
+}
+
+function regenerateEra() {
+  unlock("era");
+  options.era = eraInput.value = Names.getBaseShort(P(.7) ? 1 : rand(nameBases.length)) + " Era";
+  options.eraShort = options.era.split(" ").map(w => w[0].toUpperCase()).join("");
+}
+
 // remove all saved data from LocalStorage and reload the page
 function restoreDefaultOptions() {
   localStorage.clear();

From 2a67ee5d9f5ba18b2280d01a3cff03d6260cbe77 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 16 May 2020 00:52:45 +0300
Subject: [PATCH 15/38] v1.4.14

---
 index.css                      |  11 +-
 index.html                     |  27 +-
 libs/publicstorage.js          | 188 -------
 libs/quantize.min.js           |   1 -
 libs/rgbquant.js               | 935 +++++++++++++++++++++++++++++++++
 main.js                        |   1 +
 modules/river-generator.js     |   8 +-
 modules/save-and-load.js       |   8 -
 modules/ui/editors.js          |   6 -
 modules/ui/general.js          |   6 +
 modules/ui/heightmap-editor.js |  64 ++-
 modules/ui/markers-editor.js   |  16 +-
 modules/ui/notes-editor.js     |   4 +-
 modules/ui/provinces-editor.js |   2 +-
 14 files changed, 1010 insertions(+), 267 deletions(-)
 delete mode 100644 libs/publicstorage.js
 delete mode 100644 libs/quantize.min.js
 create mode 100644 libs/rgbquant.js

diff --git a/index.css b/index.css
index f4e72beb2..1cd18ea79 100644
--- a/index.css
+++ b/index.css
@@ -60,6 +60,13 @@ textarea {
 	pointer-events: none;
 }
 
+#preview {
+	position: absolute;
+	bottom: 1em;
+	left: 1em;
+	cursor: pointer;
+}
+
 #pickerContainer {
 	position: absolute;
 	z-index: 100;
@@ -1021,8 +1028,8 @@ div#regimentSelectorBody > div > div {
 }
 
 .color-div {
-	width: 2.7em;
-	height: 1.1em;
+	width: 2.5em;
+	height: 1em;
 	display: inline-block;
 	margin: .1em .2em;
 	border: 1px #c5c5c5 groove;
diff --git a/index.html b/index.html
index 896ff7850..7c0e1c5fb 100644
--- a/index.html
+++ b/index.html
@@ -2103,7 +2103,7 @@
 
       <button id="labelAlign" data-tip="Turn text path into a straight line" class="icon-resize-horizontal"></button>
       <button id="labelLegend" data-tip="Edit free text notes (legend) for this label" class="icon-edit"></button>
-      <button id="labelRemoveSingle" data-tip="Remove the label. Shortcut: Delete" class="icon-trash"></button>
+      <button id="labelRemoveSingle" data-tip="Remove the label. Shortcut: Delete" class="icon-trash fastDelete"></button>
     </div>
 
     <div id="riverEditor" class="dialog" style="display: none">
@@ -2130,7 +2130,7 @@
       <button id="riverElevationProfile" data-tip="Show the elevation profile for the river" class="icon-chart-area"></button>
       <button id="riverNew" data-tip="Create new river clicking on map" class="icon-map-pin"></button>
       <button id="riverLegend" data-tip="Edit free text notes (legend) for the river" class="icon-edit"></button>
-      <button id="riverRemove" data-tip="Remove river. Shortcut: Delete" class="icon-trash"></button>
+      <button id="riverRemove" data-tip="Remove river. Shortcut: Delete" class="icon-trash fastDelete"></button>
     </div>
 
     <div id="elevationProfile" class="dialog" style="display: none" width="100%">
@@ -2153,7 +2153,7 @@
       <button id="routeSplit" data-tip="Click on a control point to split the route" class="icon-unlink"></button>
       <button id="routeLegend" data-tip="Edit free text notes (legend) for the route" class="icon-edit"></button>
       <button id="routeNew" data-tip="Create new route clicking on map" class="icon-map-pin"></button>
-      <button id="routeRemove" data-tip="Remove route. Shortcut: Delete" class="icon-trash"></button>
+      <button id="routeRemove" data-tip="Remove route. Shortcut: Delete" class="icon-trash fastDelete"></button>
     </div>
 
     <div id="lakeEditor" class="dialog" style="display: none">
@@ -2176,7 +2176,7 @@
       <button id="iceRandomize" data-tip="Randomize Iceberd shape" class="icon-shuffle"></button>
       <input id="iceSize" data-tip="Change Iceberg size" type="range" min=".05" max="1" step=".01">
       <button id="iceNew" data-tip="Add an Iceberg (click on map)" class="icon-plus"></button>
-      <button id="iceRemove" data-tip="Remove the element. Shortcut: Delete" class="icon-trash"></button>
+      <button id="iceRemove" data-tip="Remove the element. Shortcut: Delete" class="icon-trash fastDelete"></button>
     </div>
 
     <div id="coastlineEditor" class="dialog" style="display: none">
@@ -2322,7 +2322,7 @@
         <button id="reliefCopy" data-tip="Copy selected relief icon" class="icon-clone"></button>
         <button id="reliefMoveFront" data-tip="Move selected relief icon to front" class="icon-level-up"></button>
         <button id="reliefMoveBack" data-tip="Move selected relief icon back" class="icon-level-down"></button>
-        <button id="reliefRemove" data-tip="Remove selected relief icon. Shortcut: Delete" class="icon-trash"></button>
+        <button id="reliefRemove" data-tip="Remove selected relief icon. Shortcut: Delete" class="icon-trash fastDelete"></button>
       </div>
     </div>
 
@@ -2375,7 +2375,7 @@
         <button id="burgOpenCOA" data-tip="Open burg's COA in the Iron Arachne Heraldry Generator. Ctrl + click to change the seed" class="icon-shield-alt"></button>
         <button id="burgRelocate" data-tip="Relocate burg" class="icon-target"></button>
         <button id="burglLegend" data-tip="Edit free text notes (legend) for this burg" class="icon-edit"></button>
-        <button id="burgRemove" data-tip="Remove non-capital burg. Shortcut: Delete" class="icon-trash"></button>
+        <button id="burgRemove" data-tip="Remove non-capital burg. Shortcut: Delete" class="icon-trash fastDelete"></button>
       </div>
     </div>
 
@@ -2416,7 +2416,7 @@
       <button id="markerToggleBubble" data-tip="Toggle pin (bubble) display" class="icon-info-circled"></button>
       <button id="markerLegendButton" data-tip="Edit place legend (free text notes)" class="icon-edit"></button>
       <button id="markerAdd" data-tip="Add additional marker of that type" class="icon-plus"></button>
-      <button id="markerRemove" data-tip="Remove the marker. Shortcut: Delete" class="icon-trash"></button>
+      <button id="markerRemove" data-tip="Remove the marker. Shortcut: Delete" class="icon-trash fastDelete"></button>
     </div>
 
     <div id="regimentEditor" class="dialog" style="display: none">
@@ -2444,7 +2444,7 @@
         <button id="regimentAttach" data-tip="Attach regiment to another one (include this regiment to another one)" class="icon-attach"></button>
         <button id="regimentRegenerateLegend" data-tip="Regenerate legend for this regiment" class="icon-retweet"></button>
         <button id="regimentLegend" data-tip="Edit free text notes (legend) for this regiment" class="icon-edit"></button>
-        <button id="regimentRemove" data-tip="Remove regiment. Shortcut: Delete" class="icon-trash"></button>
+        <button id="regimentRemove" data-tip="Remove regiment. Shortcut: Delete" class="icon-trash fastDelete"></button>
       </div>
     </div>
 
@@ -2660,8 +2660,8 @@
         <button id="convertImageLoad" data-tip="Load image to convert" class="icon-upload"></button>
         <button id="convertAutoLum" data-tip="Auto-assign colors based on liminosity (good to monochrome images)" class="icon-adjust"></button>
         <button id="convertAutoHue" data-tip="Auto-assign colors based on hue (good to colored images)" class="icon-brush"></button>
-        <button id="convertColorsButton" data-tip="Set number of colors" class="icon-signal"></button>
-        <input id="convertColors" value="18" style="display: none"/>
+        <button id="convertColorsButton" data-tip="Set maximum number of colors" class="icon-signal"></button>
+        <input id="convertColors" value="128" style="display: none"/>
         <button id="convertComplete" data-tip="Complete the conversion. All unassigned colors will be considered as ocean" class="icon-check"></button>
         <button id="convertCancel" data-tip="Cancel the conversion. Previous heightmap will be restored" class="icon-cancel"></button>
       </div>
@@ -2675,7 +2675,7 @@
         <i>Set height: </i>
         <span id="colorsSelectValue"></span>
         <span>(<span id="colorsSelectFriendly">0</span>)</span><br>
-        <div id="colorScheme"></div>
+        <div id="imageConverterPalette"></div>
       </div>
 
       <div data-tip="Select a color to re-assign the height value" id="colorsAssigned" style="display: none">
@@ -3124,7 +3124,7 @@
         <button id="notesFocus" data-tip="Focus on selected object" class="icon-target"></button>
         <button id="notesDownload" data-tip="Download notes to PC" class="icon-download"></button>
         <button id="notesUpload" data-tip="Upload notes from PC" class="icon-upload"></button>
-        <button id="notesRemove" data-tip="Remove this note" class="icon-trash"></button>
+        <button id="notesRemove" data-tip="Remove this note" class="icon-trash fastDelete"></button>
       </div>
     </div>
 
@@ -3658,7 +3658,6 @@
   <script defer src="modules/ui/battle-screen.js"></script>
   <script defer src="modules/ui/editors.js"></script>
   <script defer src="modules/ui/3d.js"></script>
-  <script defer src="libs/quantize.min.js"></script>
+  <script defer src="libs/rgbquant.js"></script>
   <script defer src="libs/jquery.ui.touch-punch.min.js"></script>
-  <script defer src="libs/publicstorage.js"></script>
 </body>
diff --git a/libs/publicstorage.js b/libs/publicstorage.js
deleted file mode 100644
index 9d8ebe540..000000000
--- a/libs/publicstorage.js
+++ /dev/null
@@ -1,188 +0,0 @@
-// https://github.com/Highbrainer/jeevaneo-js-publicstorage. MIT
-const IFRAME_ROOT_URL = "https://publicstorage.neocities.org/shared-iframe.html";
-
-class PublicStorageAccess {
-
-	 constructor ({debug=false}={}) {
-		 this.uid = this.uniqueId();
-		 this.debug=debug;
-	 }
-	 
-	uniqueId() {
-		function chr4(){
-			return Math.random().toString(16).slice(-4);
-			}
-		return chr4() + chr4() +
-				'-' + chr4() +
-				'-' + chr4() +
-				'-' + chr4() +
-				'-' + chr4() + chr4() + chr4();
-	}
-
-	_debug(msg) {
-		if(this.debug) {
-			if(console && console.debug) {
-				console.debug(msg);
-			}
-		}
-	}
-	
-	 prepareIFrame() {
-		const that = this;
-		const iframe = document.createElement("iframe");
-		iframe.id=that.uid;
-		iframe.src=IFRAME_ROOT_URL + "?uid=init-"+that.uid;
-		iframe.style.cssText="display:none;";
-		return new Promise(function(resolve, reject) {
-			window.addEventListener('message', function mafunc(tkn) {
-				
-				if (IFRAME_ROOT_URL.indexOf(tkn.origin)<0) {
-					return;
-				}
-				
-				try {
-					const packet = JSON.parse(tkn.data);
-					
-					if(!(packet.frameId === "init-" + that.uid)) {
-						// ignore
-						return;
-					}
-					
-					if(packet.ready) {
-						resolve(iframe);					
-					}
-				} catch (e) {
-					reject(tkn.data);
-				}
-				window.removeEventListener('message', mafunc);
-		    });
-			onLoadThen().then(() => {
-				document.getElementsByTagName("body")[0].appendChild(iframe);
-			});
-
-			setTimeout(()=>reject(`Request ${that.uid} TIMEOUTED!`), 20000);
-		});
-	}
-	 
-	 access(access, prop, value = null, level = "local") {
-			
-			if(!(access === "get" || access === "set" || access === "delete")) {
-				throw new Error("access can only be 'set', 'get' or 'delete' - not '" + access + "'");
-			}
-			
-			if (!prop) {
-				throw new Error("Prop name is mandatory");
-			}
-			
-			if(!(level === "local" || level === "session")) {
-				throw new Error("level can only be 'session' or 'local' - not '" + access + "'");
-			}
-				
-			const that = this;
-			
-			const promise = new Promise(function(resolve, reject) {
-				that.prepareIFrame().then(iframe => {
-					window.addEventListener('message', function mafunc(tkn) {
-						if (IFRAME_ROOT_URL.indexOf(tkn.origin)<0) {
-							return;
-						}
-						try {
-							var packet = JSON.parse(tkn.data);
-							
-							if(!(packet.uid === that.uid)) {
-								// ignore
-								return;
-							}
-							resolve(packet.body);
-						} catch (e) {
-							reject(tkn.data);
-						}
-						iframe.parentNode.removeChild(iframe);
-						window.removeEventListener('message', mafunc);
-				    });
-			
-					const request = {uid:that.uid, access:access, prop:prop, value:value, level:level};
-					iframe.contentWindow.postMessage(JSON.stringify(request), '*');
-					setTimeout(()=>reject("TIMEOUTED!"), 20000);
-				});
-			});
-			return promise;
-		}
-	
-}
-
-function __createDebugIFrame() {
-	onLoadThen().then(function(){
-		const iframe = document.createElement("iframe");
-		iframe.src=IFRAME_ROOT_URL + "?for-debug-only";
-		iframe.style.cssText="display:none;";
-		document.getElementsByTagName("body")[0].appendChild(iframe);
-	});
-}
-
-class PublicStorage { 
-	
-	constructor({debug=false}={}) {
-		if(debug) {
-				__createDebugIFrame();
-		}
-	}
-	 
-	sessionGet(prop) {
-		 return new PublicStorageAccess().access("get", prop, null, "session");
-	}
-	sessionSet(prop, value) {
-		 return new PublicStorageAccess().access("set", prop, value, "session");
-	}
-	sessionUnset(prop) {
-		 return new PublicStorageAccess().access("delete", prop, null, "session");
-	}
-	localGet(prop) {
-		 return new PublicStorageAccess().access("get", prop, null, "local");
-	}
-	localSet(prop, value) {
-		 return new PublicStorageAccess().access("set", prop, value, "local");
-	}
-	localUnset(prop) {
-		 return new PublicStorageAccess().access("delete", prop, null, "local");
-	}
-	get(prop) {
-		 return this.localGet(prop);
-	}
-	set(prop, value) {
-		 return this.localSet(prop, value);
-	}
-	unset(prop) {
-		return this.localUnset(prop);
-	}
-}
-
-const publicstorage = new PublicStorage();
-
-function onLoadThen() {
-	return new Promise(function(resolve, reject) {
-		if (window) {
-			if(document.getElementsByTagName('BODY')[0]) {
-				resolve();
-			} else {
-				registerOnLoad(function unregisterme() {
-					resolve();
-					window.removeEventListener('load', unregisterme);
-				});
-			}
-		}
-		setTimeout(function() {reject(new Error("Timeout waiting for onLoad!"));}, 10000);
-	});
-}
-
-function registerOnLoad(lambda) {
-	if (window.addEventListener) {
-		  window.addEventListener('load', lambda);
-	} else if (window.attachEvent) {
-		  window.attachEvent('onload', lambda);
-	}
-}
-
-onLoadThen().then(() => window.publicstorage = publicstorage).catch(e=> console.error(e));
-//export {onLoadThen, PublicStorage, publicstorage as default}
-// module.exports = onLoadThen();
diff --git a/libs/quantize.min.js b/libs/quantize.min.js
deleted file mode 100644
index 4d8228eb9..000000000
--- a/libs/quantize.min.js
+++ /dev/null
@@ -1 +0,0 @@
-if(!pv)var pv={map:function(r,n){var o={};return n?r.map(function(r,t){return o.index=t,n.call(o,r)}):r.slice()},naturalOrder:function(r,n){return r<n?-1:r>n?1:0},sum:function(r,n){var o={};return r.reduce(n?function(r,t,u){return o.index=u,r+n.call(o,t)}:function(r,n){return r+n},0)},max:function(r,n){return Math.max.apply(null,n?pv.map(r,n):r)}};var MMCQ=function(){var r=5,n=8-r,o=1e3,t=.75;function u(n,o,t){return(n<<2*r)+(o<<r)+t}function e(r){var n=[],o=!1;function t(){n.sort(r),o=!0}return{push:function(r){n.push(r),o=!1},peek:function(r){return o||t(),void 0===r&&(r=n.length-1),n[r]},pop:function(){return o||t(),n.pop()},size:function(){return n.length},map:function(r){return n.map(r)},debug:function(){return o||t(),n}}}function i(r,n,o,t,u,e,i){var c=this;c.r1=r,c.r2=n,c.g1=o,c.g2=t,c.b1=u,c.b2=e,c.histo=i}function c(){this.vboxes=new e(function(r,n){return pv.naturalOrder(r.vbox.count()*r.vbox.volume(),n.vbox.count()*n.vbox.volume())})}function f(r,n){if(n.count()){var o=n.r2-n.r1+1,t=n.g2-n.g1+1,e=n.b2-n.b1+1,i=pv.max([o,t,e]);if(1==n.count())return[n.copy()];var c,f,a,v,s=0,p=[],l=[];if(i==o)for(c=n.r1;c<=n.r2;c++){for(v=0,f=n.g1;f<=n.g2;f++)for(a=n.b1;a<=n.b2;a++)v+=r[u(c,f,a)]||0;s+=v,p[c]=s}else if(i==t)for(c=n.g1;c<=n.g2;c++){for(v=0,f=n.r1;f<=n.r2;f++)for(a=n.b1;a<=n.b2;a++)v+=r[u(f,c,a)]||0;s+=v,p[c]=s}else for(c=n.b1;c<=n.b2;c++){for(v=0,f=n.r1;f<=n.r2;f++)for(a=n.g1;a<=n.g2;a++)v+=r[u(f,a,c)]||0;s+=v,p[c]=s}return p.forEach(function(r,n){l[n]=s-r}),h(i==o?"r":i==t?"g":"b")}function h(r){var o,t,u,e,i,f=r+"1",a=r+"2",v=0;for(c=n[f];c<=n[a];c++)if(p[c]>s/2){for(u=n.copy(),e=n.copy(),i=(o=c-n[f])<=(t=n[a]-c)?Math.min(n[a]-1,~~(c+t/2)):Math.max(n[f],~~(c-1-o/2));!p[i];)i++;for(v=l[i];!v&&p[i-1];)v=l[--i];return u[a]=i,e[f]=u[a]+1,[u,e]}}}return i.prototype={volume:function(r){var n=this;return n._volume&&!r||(n._volume=(n.r2-n.r1+1)*(n.g2-n.g1+1)*(n.b2-n.b1+1)),n._volume},count:function(r){var n=this,o=n.histo;if(!n._count_set||r){var t,e,i,c=0;for(t=n.r1;t<=n.r2;t++)for(e=n.g1;e<=n.g2;e++)for(i=n.b1;i<=n.b2;i++)c+=o[u(t,e,i)]||0;n._count=c,n._count_set=!0}return n._count},copy:function(){var r=this;return new i(r.r1,r.r2,r.g1,r.g2,r.b1,r.b2,r.histo)},avg:function(n){var o=this,t=o.histo;if(!o._avg||n){var e,i,c,f,a=0,v=1<<8-r,s=0,p=0,l=0;for(i=o.r1;i<=o.r2;i++)for(c=o.g1;c<=o.g2;c++)for(f=o.b1;f<=o.b2;f++)a+=e=t[u(i,c,f)]||0,s+=e*(i+.5)*v,p+=e*(c+.5)*v,l+=e*(f+.5)*v;o._avg=a?[~~(s/a),~~(p/a),~~(l/a)]:[~~(v*(o.r1+o.r2+1)/2),~~(v*(o.g1+o.g2+1)/2),~~(v*(o.b1+o.b2+1)/2)]}return o._avg},contains:function(r){var o=this,t=r[0]>>n;return gval=r[1]>>n,bval=r[2]>>n,t>=o.r1&&t<=o.r2&&gval>=o.g1&&gval<=o.g2&&bval>=o.b1&&bval<=o.b2}},c.prototype={push:function(r){this.vboxes.push({vbox:r,color:r.avg()})},palette:function(){return this.vboxes.map(function(r){return r.color})},size:function(){return this.vboxes.size()},map:function(r){for(var n=this.vboxes,o=0;o<n.size();o++)if(n.peek(o).vbox.contains(r))return n.peek(o).color;return this.nearest(r)},nearest:function(r){for(var n,o,t,u=this.vboxes,e=0;e<u.size();e++)((o=Math.sqrt(Math.pow(r[0]-u.peek(e).color[0],2)+Math.pow(r[1]-u.peek(e).color[1],2)+Math.pow(r[2]-u.peek(e).color[2],2)))<n||void 0===n)&&(n=o,t=u.peek(e).color);return t},forcebw:function(){var r=this.vboxes;r.sort(function(r,n){return pv.naturalOrder(pv.sum(r.color),pv.sum(n.color))});var n=r[0].color;n[0]<5&&n[1]<5&&n[2]<5&&(r[0].color=[0,0,0]);var o=r.length-1,t=r[o].color;t[0]>251&&t[1]>251&&t[2]>251&&(r[o].color=[255,255,255])}},{quantize:function(a,v){if(v++,!a.length||v<2||v>256)return!1;var s,p,l,h,b,g,m=(s=a,g=new Array(1<<3*r),s.forEach(function(r){l=r[0]>>n,h=r[1]>>n,b=r[2]>>n,p=u(l,h,b),g[p]=(g[p]||0)+1}),g);m.forEach(function(){});var x,_,d,w,z,M,y,k,O,E,q=(x=m,z=1e6,M=0,y=1e6,k=0,O=1e6,E=0,a.forEach(function(r){_=r[0]>>n,d=r[1]>>n,w=r[2]>>n,_<z?z=_:_>M&&(M=_),d<y?y=d:d>k&&(k=d),w<O?O=w:w>E&&(E=w)}),new i(z,M,y,k,O,E,x)),A=new e(function(r,n){return pv.naturalOrder(r.count(),n.count())});function C(r,n){for(var t,u=1,e=0;e<o;)if((t=r.pop()).count()){var i=f(m,t),c=i[0],a=i[1];if(!c)return;if(r.push(c),a&&(r.push(a),u++),u>=n)return;if(e++>o)return}else r.push(t),e++}A.push(q),C(A,t*v);for(var Q=new e(function(r,n){return pv.naturalOrder(r.count()*r.volume(),n.count()*n.volume())});A.size();)Q.push(A.pop());C(Q,v-Q.size());for(var j=new c;Q.size();)j.push(Q.pop());return j}}}();
\ No newline at end of file
diff --git a/libs/rgbquant.js b/libs/rgbquant.js
new file mode 100644
index 000000000..bc0bd1b9c
--- /dev/null
+++ b/libs/rgbquant.js
@@ -0,0 +1,935 @@
+/*
+* Copyright (c) 2015, Leon Sorokin
+* All rights reserved. (MIT Licensed)
+*
+* RgbQuant.js - an image quantization lib
+*/
+
+(function(){
+	function RgbQuant(opts) {
+		opts = opts || {};
+
+		// 1 = by global population, 2 = subregion population threshold
+		this.method = opts.method || 2;
+		// desired final palette size
+		this.colors = opts.colors || 256;
+		// # of highest-frequency colors to start with for palette reduction
+		this.initColors = opts.initColors || 4096;
+		// color-distance threshold for initial reduction pass
+		this.initDist = opts.initDist || 0.01;
+		// subsequent passes threshold
+		this.distIncr = opts.distIncr || 0.005;
+		// palette grouping
+		this.hueGroups = opts.hueGroups || 10;
+		this.satGroups = opts.satGroups || 10;
+		this.lumGroups = opts.lumGroups || 10;
+		// if > 0, enables hues stats and min-color retention per group
+		this.minHueCols = opts.minHueCols || 0;
+		// HueStats instance
+		this.hueStats = this.minHueCols ? new HueStats(this.hueGroups, this.minHueCols) : null;
+
+		// subregion partitioning box size
+		this.boxSize = opts.boxSize || [64,64];
+		// number of same pixels required within box for histogram inclusion
+		this.boxPxls = opts.boxPxls || 2;
+		// palette locked indicator
+		this.palLocked = false;
+		// palette sort order
+//		this.sortPal = ['hue-','lum-','sat-'];
+
+		// dithering/error diffusion kernel name
+		this.dithKern = opts.dithKern || null;
+		// dither serpentine pattern
+		this.dithSerp = opts.dithSerp || false;
+		// minimum color difference (0-1) needed to dither
+		this.dithDelta = opts.dithDelta || 0;
+
+		// accumulated histogram
+		this.histogram = {};
+		// palette - rgb triplets
+		this.idxrgb = opts.palette ? opts.palette.slice(0) : [];
+		// palette - int32 vals
+		this.idxi32 = [];
+		// reverse lookup {i32:idx}
+		this.i32idx = {};
+		// {i32:rgb}
+		this.i32rgb = {};
+		// enable color caching (also incurs overhead of cache misses and cache building)
+		this.useCache = opts.useCache !== false;
+		// min color occurance count needed to qualify for caching
+		this.cacheFreq = opts.cacheFreq || 10;
+		// allows pre-defined palettes to be re-indexed (enabling palette compacting and sorting)
+		this.reIndex = opts.reIndex || this.idxrgb.length == 0;
+		// selection of color-distance equation
+		this.colorDist = opts.colorDist == "manhattan" ? distManhattan : distEuclidean;
+
+		// if pre-defined palette, build lookups
+		if (this.idxrgb.length > 0) {
+			var self = this;
+			this.idxrgb.forEach(function(rgb, i) {
+				var i32 = (
+					(255    << 24) |	// alpha
+					(rgb[2] << 16) |	// blue
+					(rgb[1] <<  8) |	// green
+					 rgb[0]				// red
+				) >>> 0;
+
+				self.idxi32[i]		= i32;
+				self.i32idx[i32]	= i;
+				self.i32rgb[i32]	= rgb;
+			});
+		}
+	}
+
+	// gathers histogram info
+	RgbQuant.prototype.sample = function sample(img, width) {
+		if (this.palLocked)
+			throw "Cannot sample additional images, palette already assembled.";
+
+		var data = getImageData(img, width);
+
+		switch (this.method) {
+			case 1: this.colorStats1D(data.buf32); break;
+			case 2: this.colorStats2D(data.buf32, data.width); break;
+		}
+	};
+
+	// image quantizer
+	// todo: memoize colors here also
+	// @retType: 1 - Uint8Array (default), 2 - Indexed array, 3 - Match @img type (unimplemented, todo)
+	RgbQuant.prototype.reduce = function reduce(img, retType, dithKern, dithSerp) {
+		if (!this.palLocked)
+			this.buildPal();
+
+		dithKern = dithKern || this.dithKern;
+		dithSerp = typeof dithSerp != "undefined" ? dithSerp : this.dithSerp;
+
+		retType = retType || 1;
+
+		// reduce w/dither
+		if (dithKern)
+			var out32 = this.dither(img, dithKern, dithSerp);
+		else {
+			var data = getImageData(img),
+				buf32 = data.buf32,
+				len = buf32.length,
+				out32 = new Uint32Array(len);
+
+			for (var i = 0; i < len; i++) {
+				var i32 = buf32[i];
+				out32[i] = this.nearestColor(i32);
+			}
+		}
+
+		if (retType == 1)
+			return new Uint8Array(out32.buffer);
+
+		if (retType == 2) {
+			var out = [],
+				len = out32.length;
+
+			for (var i = 0; i < len; i++) {
+				var i32 = out32[i];
+				out[i] = this.i32idx[i32];
+			}
+
+			return out;
+		}
+	};
+
+	// adapted from http://jsbin.com/iXofIji/2/edit by PAEz
+	RgbQuant.prototype.dither = function(img, kernel, serpentine) {
+		// http://www.tannerhelland.com/4660/dithering-eleven-algorithms-source-code/
+		var kernels = {
+			FloydSteinberg: [
+				[7 / 16, 1, 0],
+				[3 / 16, -1, 1],
+				[5 / 16, 0, 1],
+				[1 / 16, 1, 1]
+			],
+			FalseFloydSteinberg: [
+				[3 / 8, 1, 0],
+				[3 / 8, 0, 1],
+				[2 / 8, 1, 1]
+			],
+			Stucki: [
+				[8 / 42, 1, 0],
+				[4 / 42, 2, 0],
+				[2 / 42, -2, 1],
+				[4 / 42, -1, 1],
+				[8 / 42, 0, 1],
+				[4 / 42, 1, 1],
+				[2 / 42, 2, 1],
+				[1 / 42, -2, 2],
+				[2 / 42, -1, 2],
+				[4 / 42, 0, 2],
+				[2 / 42, 1, 2],
+				[1 / 42, 2, 2]
+			],
+			Atkinson: [
+				[1 / 8, 1, 0],
+				[1 / 8, 2, 0],
+				[1 / 8, -1, 1],
+				[1 / 8, 0, 1],
+				[1 / 8, 1, 1],
+				[1 / 8, 0, 2]
+			],
+			Jarvis: [			// Jarvis, Judice, and Ninke / JJN?
+				[7 / 48, 1, 0],
+				[5 / 48, 2, 0],
+				[3 / 48, -2, 1],
+				[5 / 48, -1, 1],
+				[7 / 48, 0, 1],
+				[5 / 48, 1, 1],
+				[3 / 48, 2, 1],
+				[1 / 48, -2, 2],
+				[3 / 48, -1, 2],
+				[5 / 48, 0, 2],
+				[3 / 48, 1, 2],
+				[1 / 48, 2, 2]
+			],
+			Burkes: [
+				[8 / 32, 1, 0],
+				[4 / 32, 2, 0],
+				[2 / 32, -2, 1],
+				[4 / 32, -1, 1],
+				[8 / 32, 0, 1],
+				[4 / 32, 1, 1],
+				[2 / 32, 2, 1],
+			],
+			Sierra: [
+				[5 / 32, 1, 0],
+				[3 / 32, 2, 0],
+				[2 / 32, -2, 1],
+				[4 / 32, -1, 1],
+				[5 / 32, 0, 1],
+				[4 / 32, 1, 1],
+				[2 / 32, 2, 1],
+				[2 / 32, -1, 2],
+				[3 / 32, 0, 2],
+				[2 / 32, 1, 2],
+			],
+			TwoSierra: [
+				[4 / 16, 1, 0],
+				[3 / 16, 2, 0],
+				[1 / 16, -2, 1],
+				[2 / 16, -1, 1],
+				[3 / 16, 0, 1],
+				[2 / 16, 1, 1],
+				[1 / 16, 2, 1],
+			],
+			SierraLite: [
+				[2 / 4, 1, 0],
+				[1 / 4, -1, 1],
+				[1 / 4, 0, 1],
+			],
+		};
+
+		if (!kernel || !kernels[kernel]) {
+			throw 'Unknown dithering kernel: ' + kernel;
+		}
+
+		var ds = kernels[kernel];
+
+		var data = getImageData(img),
+//			buf8 = data.buf8,
+			buf32 = data.buf32,
+			width = data.width,
+			height = data.height,
+			len = buf32.length;
+
+		var dir = serpentine ? -1 : 1;
+
+		for (var y = 0; y < height; y++) {
+			if (serpentine)
+				dir = dir * -1;
+
+			var lni = y * width;
+
+			for (var x = (dir == 1 ? 0 : width - 1), xend = (dir == 1 ? width : 0); x !== xend; x += dir) {
+				// Image pixel
+				var idx = lni + x,
+					i32 = buf32[idx],
+					r1 = (i32 & 0xff),
+					g1 = (i32 & 0xff00) >> 8,
+					b1 = (i32 & 0xff0000) >> 16;
+
+				// Reduced pixel
+				var i32x = this.nearestColor(i32),
+					r2 = (i32x & 0xff),
+					g2 = (i32x & 0xff00) >> 8,
+					b2 = (i32x & 0xff0000) >> 16;
+
+				buf32[idx] =
+					(255 << 24)	|	// alpha
+					(b2  << 16)	|	// blue
+					(g2  <<  8)	|	// green
+					 r2;
+
+				// dithering strength
+				if (this.dithDelta) {
+					var dist = this.colorDist([r1, g1, b1], [r2, g2, b2]);
+					if (dist < this.dithDelta)
+						continue;
+				}
+
+				// Component distance
+				var er = r1 - r2,
+					eg = g1 - g2,
+					eb = b1 - b2;
+
+				for (var i = (dir == 1 ? 0 : ds.length - 1), end = (dir == 1 ? ds.length : 0); i !== end; i += dir) {
+					var x1 = ds[i][1] * dir,
+						y1 = ds[i][2];
+
+					var lni2 = y1 * width;
+
+					if (x1 + x >= 0 && x1 + x < width && y1 + y >= 0 && y1 + y < height) {
+						var d = ds[i][0];
+						var idx2 = idx + (lni2 + x1);
+
+						var r3 = (buf32[idx2] & 0xff),
+							g3 = (buf32[idx2] & 0xff00) >> 8,
+							b3 = (buf32[idx2] & 0xff0000) >> 16;
+
+						var r4 = Math.max(0, Math.min(255, r3 + er * d)),
+							g4 = Math.max(0, Math.min(255, g3 + eg * d)),
+							b4 = Math.max(0, Math.min(255, b3 + eb * d));
+
+						buf32[idx2] =
+							(255 << 24)	|	// alpha
+							(b4  << 16)	|	// blue
+							(g4  <<  8)	|	// green
+							 r4;			// red
+					}
+				}
+			}
+		}
+
+		return buf32;
+	};
+
+	// reduces histogram to palette, remaps & memoizes reduced colors
+	RgbQuant.prototype.buildPal = function buildPal(noSort) {
+		if (this.palLocked || this.idxrgb.length > 0 && this.idxrgb.length <= this.colors) return;
+
+		var histG  = this.histogram,
+			sorted = sortedHashKeys(histG, true);
+
+		if (sorted.length == 0)
+			throw "Nothing has been sampled, palette cannot be built.";
+
+		switch (this.method) {
+			case 1:
+				var cols = this.initColors,
+					last = sorted[cols - 1],
+					freq = histG[last];
+
+				var idxi32 = sorted.slice(0, cols);
+
+				// add any cut off colors with same freq as last
+				var pos = cols, len = sorted.length;
+				while (pos < len && histG[sorted[pos]] == freq)
+					idxi32.push(sorted[pos++]);
+
+				// inject min huegroup colors
+				if (this.hueStats)
+					this.hueStats.inject(idxi32);
+
+				break;
+			case 2:
+				var idxi32 = sorted;
+				break;
+		}
+
+		// int32-ify values
+		idxi32 = idxi32.map(function(v){return +v;});
+
+		this.reducePal(idxi32);
+
+		if (!noSort && this.reIndex)
+			this.sortPal();
+
+		// build cache of top histogram colors
+		if (this.useCache)
+			this.cacheHistogram(idxi32);
+
+		this.palLocked = true;
+	};
+
+	RgbQuant.prototype.palette = function palette(tuples, noSort) {
+		this.buildPal(noSort);
+		return tuples ? this.idxrgb : new Uint8Array((new Uint32Array(this.idxi32)).buffer);
+	};
+
+	RgbQuant.prototype.prunePal = function prunePal(keep) {
+		var i32;
+
+		for (var j = 0; j < this.idxrgb.length; j++) {
+			if (!keep[j]) {
+				i32 = this.idxi32[j];
+				this.idxrgb[j] = null;
+				this.idxi32[j] = null;
+				delete this.i32idx[i32];
+			}
+		}
+
+		// compact
+		if (this.reIndex) {
+			var idxrgb = [],
+				idxi32 = [],
+				i32idx = {};
+
+			for (var j = 0, i = 0; j < this.idxrgb.length; j++) {
+				if (this.idxrgb[j]) {
+					i32 = this.idxi32[j];
+					idxrgb[i] = this.idxrgb[j];
+					i32idx[i32] = i;
+					idxi32[i] = i32;
+					i++;
+				}
+			}
+
+			this.idxrgb = idxrgb;
+			this.idxi32 = idxi32;
+			this.i32idx = i32idx;
+		}
+	};
+
+	// reduces similar colors from an importance-sorted Uint32 rgba array
+	RgbQuant.prototype.reducePal = function reducePal(idxi32) {
+		// if pre-defined palette's length exceeds target
+		if (this.idxrgb.length > this.colors) {
+			// quantize histogram to existing palette
+			var len = idxi32.length, keep = {}, uniques = 0, idx, pruned = false;
+
+			for (var i = 0; i < len; i++) {
+				// palette length reached, unset all remaining colors (sparse palette)
+				if (uniques == this.colors && !pruned) {
+					this.prunePal(keep);
+					pruned = true;
+				}
+
+				idx = this.nearestIndex(idxi32[i]);
+
+				if (uniques < this.colors && !keep[idx]) {
+					keep[idx] = true;
+					uniques++;
+				}
+			}
+
+			if (!pruned) {
+				this.prunePal(keep);
+				pruned = true;
+			}
+		}
+		// reduce histogram to create initial palette
+		else {
+			// build full rgb palette
+			var idxrgb = idxi32.map(function(i32) {
+				return [
+					(i32 & 0xff),
+					(i32 & 0xff00) >> 8,
+					(i32 & 0xff0000) >> 16,
+				];
+			});
+
+			var len = idxrgb.length,
+				palLen = len,
+				thold = this.initDist;
+
+			// palette already at or below desired length
+			if (palLen > this.colors) {
+				while (palLen > this.colors) {
+					var memDist = [];
+
+					// iterate palette
+					for (var i = 0; i < len; i++) {
+						var pxi = idxrgb[i], i32i = idxi32[i];
+						if (!pxi) continue;
+
+						for (var j = i + 1; j < len; j++) {
+							var pxj = idxrgb[j], i32j = idxi32[j];
+							if (!pxj) continue;
+
+							var dist = this.colorDist(pxi, pxj);
+
+							if (dist < thold) {
+								// store index,rgb,dist
+								memDist.push([j, pxj, i32j, dist]);
+
+								// kill squashed value
+								delete(idxrgb[j]);
+								palLen--;
+							}
+						}
+					}
+
+					// palette reduction pass
+					// console.log("palette length: " + palLen);
+
+					// if palette is still much larger than target, increment by larger initDist
+					thold += (palLen > this.colors * 3) ? this.initDist : this.distIncr;
+				}
+
+				// if palette is over-reduced, re-add removed colors with largest distances from last round
+				if (palLen < this.colors) {
+					// sort descending
+					sort.call(memDist, function(a,b) {
+						return b[3] - a[3];
+					});
+
+					var k = 0;
+					while (palLen < this.colors) {
+						// re-inject rgb into final palette
+						idxrgb[memDist[k][0]] = memDist[k][1];
+
+						palLen++;
+						k++;
+					}
+				}
+			}
+
+			var len = idxrgb.length;
+			for (var i = 0; i < len; i++) {
+				if (!idxrgb[i]) continue;
+
+				this.idxrgb.push(idxrgb[i]);
+				this.idxi32.push(idxi32[i]);
+
+				this.i32idx[idxi32[i]] = this.idxi32.length - 1;
+				this.i32rgb[idxi32[i]] = idxrgb[i];
+			}
+		}
+	};
+
+	// global top-population
+	RgbQuant.prototype.colorStats1D = function colorStats1D(buf32) {
+		var histG = this.histogram,
+			num = 0, col,
+			len = buf32.length;
+
+		for (var i = 0; i < len; i++) {
+			col = buf32[i];
+
+			// skip transparent
+			if ((col & 0xff000000) >> 24 == 0) continue;
+
+			// collect hue stats
+			if (this.hueStats)
+				this.hueStats.check(col);
+
+			if (col in histG)
+				histG[col]++;
+			else
+				histG[col] = 1;
+		}
+	};
+
+	// population threshold within subregions
+	// FIXME: this can over-reduce (few/no colors same?), need a way to keep
+	// important colors that dont ever reach local thresholds (gradients?)
+	RgbQuant.prototype.colorStats2D = function colorStats2D(buf32, width) {
+		var boxW = this.boxSize[0],
+			boxH = this.boxSize[1],
+			area = boxW * boxH,
+			boxes = makeBoxes(width, buf32.length / width, boxW, boxH),
+			histG = this.histogram,
+			self = this;
+
+		boxes.forEach(function(box) {
+			var effc = Math.max(Math.round((box.w * box.h) / area) * self.boxPxls, 2),
+				histL = {}, col;
+
+			iterBox(box, width, function(i) {
+				col = buf32[i];
+
+				// skip transparent
+				if ((col & 0xff000000) >> 24 == 0) return;
+
+				// collect hue stats
+				if (self.hueStats)
+					self.hueStats.check(col);
+
+				if (col in histG)
+					histG[col]++;
+				else if (col in histL) {
+					if (++histL[col] >= effc)
+						histG[col] = histL[col];
+				}
+				else
+					histL[col] = 1;
+			});
+		});
+
+		if (this.hueStats)
+			this.hueStats.inject(histG);
+	};
+
+	// TODO: group very low lum and very high lum colors
+	// TODO: pass custom sort order
+	RgbQuant.prototype.sortPal = function sortPal() {
+		var self = this;
+
+		this.idxi32.sort(function(a,b) {
+			var idxA = self.i32idx[a],
+				idxB = self.i32idx[b],
+				rgbA = self.idxrgb[idxA],
+				rgbB = self.idxrgb[idxB];
+
+			var hslA = rgb2hsl(rgbA[0],rgbA[1],rgbA[2]),
+				hslB = rgb2hsl(rgbB[0],rgbB[1],rgbB[2]);
+
+			// sort all grays + whites together
+			var hueA = (rgbA[0] == rgbA[1] && rgbA[1] == rgbA[2]) ? -1 : hueGroup(hslA.h, self.hueGroups);
+			var hueB = (rgbB[0] == rgbB[1] && rgbB[1] == rgbB[2]) ? -1 : hueGroup(hslB.h, self.hueGroups);
+
+			var hueDiff = hueB - hueA;
+			if (hueDiff) return -hueDiff;
+
+			var lumDiff = lumGroup(+hslB.l.toFixed(2)) - lumGroup(+hslA.l.toFixed(2));
+			if (lumDiff) return -lumDiff;
+
+			var satDiff = satGroup(+hslB.s.toFixed(2)) - satGroup(+hslA.s.toFixed(2));
+			if (satDiff) return -satDiff;
+		});
+
+		// sync idxrgb & i32idx
+		this.idxi32.forEach(function(i32, i) {
+			self.idxrgb[i] = self.i32rgb[i32];
+			self.i32idx[i32] = i;
+		});
+	};
+
+	// TOTRY: use HUSL - http://boronine.com/husl/
+	RgbQuant.prototype.nearestColor = function nearestColor(i32) {
+		var idx = this.nearestIndex(i32);
+		return idx === null ? 0 : this.idxi32[idx];
+	};
+
+	// TOTRY: use HUSL - http://boronine.com/husl/
+	RgbQuant.prototype.nearestIndex = function nearestIndex(i32) {
+		// alpha 0 returns null index
+		if ((i32 & 0xff000000) >> 24 == 0)
+			return null;
+
+		if (this.useCache && (""+i32) in this.i32idx)
+			return this.i32idx[i32];
+
+		var min = 1000,
+			idx,
+			rgb = [
+				(i32 & 0xff),
+				(i32 & 0xff00) >> 8,
+				(i32 & 0xff0000) >> 16,
+			],
+			len = this.idxrgb.length;
+
+		for (var i = 0; i < len; i++) {
+			if (!this.idxrgb[i]) continue;		// sparse palettes
+
+			var dist = this.colorDist(rgb, this.idxrgb[i]);
+
+			if (dist < min) {
+				min = dist;
+				idx = i;
+			}
+		}
+
+		return idx;
+	};
+
+	RgbQuant.prototype.cacheHistogram = function cacheHistogram(idxi32) {
+		for (var i = 0, i32 = idxi32[i]; i < idxi32.length && this.histogram[i32] >= this.cacheFreq; i32 = idxi32[i++])
+			this.i32idx[i32] = this.nearestIndex(i32);
+	};
+
+	function HueStats(numGroups, minCols) {
+		this.numGroups = numGroups;
+		this.minCols = minCols;
+		this.stats = {};
+
+		for (var i = -1; i < numGroups; i++)
+			this.stats[i] = {num: 0, cols: []};
+
+		this.groupsFull = 0;
+	}
+
+	HueStats.prototype.check = function checkHue(i32) {
+		if (this.groupsFull == this.numGroups + 1)
+			this.check = function() {return;};
+
+		var r = (i32 & 0xff),
+			g = (i32 & 0xff00) >> 8,
+			b = (i32 & 0xff0000) >> 16,
+			hg = (r == g && g == b) ? -1 : hueGroup(rgb2hsl(r,g,b).h, this.numGroups),
+			gr = this.stats[hg],
+			min = this.minCols;
+
+		gr.num++;
+
+		if (gr.num > min)
+			return;
+		if (gr.num == min)
+			this.groupsFull++;
+
+		if (gr.num <= min)
+			this.stats[hg].cols.push(i32);
+	};
+
+	HueStats.prototype.inject = function injectHues(histG) {
+		for (var i = -1; i < this.numGroups; i++) {
+			if (this.stats[i].num <= this.minCols) {
+				switch (typeOf(histG)) {
+					case "Array":
+						this.stats[i].cols.forEach(function(col){
+							if (histG.indexOf(col) == -1)
+								histG.push(col);
+						});
+						break;
+					case "Object":
+						this.stats[i].cols.forEach(function(col){
+							if (!histG[col])
+								histG[col] = 1;
+							else
+								histG[col]++;
+						});
+						break;
+				}
+			}
+		}
+	};
+
+	// Rec. 709 (sRGB) luma coef
+	var Pr = .2126,
+		Pg = .7152,
+		Pb = .0722;
+
+	// http://alienryderflex.com/hsp.html
+	function rgb2lum(r,g,b) {
+		return Math.sqrt(
+			Pr * r*r +
+			Pg * g*g +
+			Pb * b*b
+		);
+	}
+
+	var rd = 255,
+		gd = 255,
+		bd = 255;
+
+	var euclMax = Math.sqrt(Pr*rd*rd + Pg*gd*gd + Pb*bd*bd);
+	// perceptual Euclidean color distance
+	function distEuclidean(rgb0, rgb1) {
+		var rd = rgb1[0]-rgb0[0],
+			gd = rgb1[1]-rgb0[1],
+			bd = rgb1[2]-rgb0[2];
+
+		return Math.sqrt(Pr*rd*rd + Pg*gd*gd + Pb*bd*bd) / euclMax;
+	}
+
+	var manhMax = Pr*rd + Pg*gd + Pb*bd;
+	// perceptual Manhattan color distance
+	function distManhattan(rgb0, rgb1) {
+		var rd = Math.abs(rgb1[0]-rgb0[0]),
+			gd = Math.abs(rgb1[1]-rgb0[1]),
+			bd = Math.abs(rgb1[2]-rgb0[2]);
+
+		return (Pr*rd + Pg*gd + Pb*bd) / manhMax;
+	}
+
+	// http://rgb2hsl.nichabi.com/javascript-function.php
+	function rgb2hsl(r, g, b) {
+		var max, min, h, s, l, d;
+		r /= 255;
+		g /= 255;
+		b /= 255;
+		max = Math.max(r, g, b);
+		min = Math.min(r, g, b);
+		l = (max + min) / 2;
+		if (max == min) {
+			h = s = 0;
+		} else {
+			d = max - min;
+			s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+			switch (max) {
+				case r: h = (g - b) / d + (g < b ? 6 : 0); break;
+				case g:	h = (b - r) / d + 2; break;
+				case b:	h = (r - g) / d + 4; break
+			}
+			h /= 6;
+		}
+//		h = Math.floor(h * 360)
+//		s = Math.floor(s * 100)
+//		l = Math.floor(l * 100)
+		return {
+			h: h,
+			s: s,
+			l: rgb2lum(r,g,b),
+		};
+	}
+
+	function hueGroup(hue, segs) {
+		var seg = 1/segs,
+			haf = seg/2;
+
+		if (hue >= 1 - haf || hue <= haf)
+			return 0;
+
+		for (var i = 1; i < segs; i++) {
+			var mid = i*seg;
+			if (hue >= mid - haf && hue <= mid + haf)
+				return i;
+		}
+	}
+
+	function satGroup(sat) {
+		return sat;
+	}
+
+	function lumGroup(lum) {
+		return lum;
+	}
+
+	function typeOf(val) {
+		return Object.prototype.toString.call(val).slice(8,-1);
+	}
+
+	var sort = isArrSortStable() ? Array.prototype.sort : stableSort;
+
+	// must be used via stableSort.call(arr, fn)
+	function stableSort(fn) {
+		var type = typeOf(this[0]);
+
+		if (type == "Number" || type == "String") {
+			var ord = {}, len = this.length, val;
+
+			for (var i = 0; i < len; i++) {
+				val = this[i];
+				if (ord[val] || ord[val] === 0) continue;
+				ord[val] = i;
+			}
+
+			return this.sort(function(a,b) {
+				return fn(a,b) || ord[a] - ord[b];
+			});
+		}
+		else {
+			var ord = this.map(function(v){return v});
+
+			return this.sort(function(a,b) {
+				return fn(a,b) || ord.indexOf(a) - ord.indexOf(b);
+			});
+		}
+	}
+
+	// test if js engine's Array#sort implementation is stable
+	function isArrSortStable() {
+		var str = "abcdefghijklmnopqrstuvwxyz";
+
+		return "xyzvwtursopqmnklhijfgdeabc" == str.split("").sort(function(a,b) {
+			return ~~(str.indexOf(b)/2.3) - ~~(str.indexOf(a)/2.3);
+		}).join("");
+	}
+
+	// returns uniform pixel data from various img
+	// TODO?: if array is passed, createimagedata, createlement canvas? take a pxlen?
+	function getImageData(img, width) {
+		var can, ctx, imgd, buf8, buf32, height;
+
+		switch (typeOf(img)) {
+			case "HTMLImageElement":
+				can = document.createElement("canvas");
+				can.width = img.naturalWidth;
+				can.height = img.naturalHeight;
+				ctx = can.getContext("2d");
+				ctx.drawImage(img,0,0);
+			case "Canvas":
+			case "HTMLCanvasElement":
+				can = can || img;
+				ctx = ctx || can.getContext("2d");
+			case "CanvasRenderingContext2D":
+				ctx = ctx || img;
+				can = can || ctx.canvas;
+				imgd = ctx.getImageData(0, 0, can.width, can.height);
+			case "ImageData":
+				imgd = imgd || img;
+				width = imgd.width;
+				if (typeOf(imgd.data) == "CanvasPixelArray")
+					buf8 = new Uint8Array(imgd.data);
+				else
+					buf8 = imgd.data;
+			case "Array":
+			case "CanvasPixelArray":
+				buf8 = buf8 || new Uint8Array(img);
+			case "Uint8Array":
+			case "Uint8ClampedArray":
+				buf8 = buf8 || img;
+				buf32 = new Uint32Array(buf8.buffer);
+			case "Uint32Array":
+				buf32 = buf32 || img;
+				buf8 = buf8 || new Uint8Array(buf32.buffer);
+				width = width || buf32.length;
+				height = buf32.length / width;
+		}
+
+		return {
+			can: can,
+			ctx: ctx,
+			imgd: imgd,
+			buf8: buf8,
+			buf32: buf32,
+			width: width,
+			height: height,
+		};
+	}
+
+	// partitions a rect of wid x hgt into
+	// array of bboxes of w0 x h0 (or less)
+	function makeBoxes(wid, hgt, w0, h0) {
+		var wnum = ~~(wid/w0), wrem = wid%w0,
+			hnum = ~~(hgt/h0), hrem = hgt%h0,
+			xend = wid-wrem, yend = hgt-hrem;
+
+		var bxs = [];
+		for (var y = 0; y < hgt; y += h0)
+			for (var x = 0; x < wid; x += w0)
+				bxs.push({x:x, y:y, w:(x==xend?wrem:w0), h:(y==yend?hrem:h0)});
+
+		return bxs;
+	}
+
+	// iterates @bbox within a parent rect of width @wid; calls @fn, passing index within parent
+	function iterBox(bbox, wid, fn) {
+		var b = bbox,
+			i0 = b.y * wid + b.x,
+			i1 = (b.y + b.h - 1) * wid + (b.x + b.w - 1),
+			cnt = 0, incr = wid - b.w + 1, i = i0;
+
+		do {
+			fn.call(this, i);
+			i += (++cnt % b.w == 0) ? incr : 1;
+		} while (i <= i1);
+	}
+
+	// returns array of hash keys sorted by their values
+	function sortedHashKeys(obj, desc) {
+		var keys = [];
+
+		for (var key in obj)
+			keys.push(key);
+
+		return sort.call(keys, function(a,b) {
+			return desc ? obj[b] - obj[a] : obj[a] - obj[b];
+		});
+	}
+
+	// expose
+	this.RgbQuant = RgbQuant;
+
+	// expose to commonJS
+	if (typeof module !== 'undefined' && module.exports) {
+		module.exports = RgbQuant;
+	}
+
+}).call(this);
\ No newline at end of file
diff --git a/main.js b/main.js
index 9dd78c21d..a2b40674c 100644
--- a/main.js
+++ b/main.js
@@ -1174,6 +1174,7 @@ function rankCells() {
   const areaMean = d3.mean(cells.area); // to adjust population by cell area
 
   for (const i of cells.i) {
+    if (cells.h[i] < 20) continue; // no population in water
     let s = +biomesData.habitability[cells.biome[i]]; // base suitability derived from biome habitability
     if (!s) continue; // uninhabitable biomes has 0 suitability
     if (flMean) s += normalize(cells.fl[i] + cells.conf[i], flMean, flMax) * 250; // big rivers and confluences are valued
diff --git a/modules/river-generator.js b/modules/river-generator.js
index 1c89a0314..3431aca7a 100644
--- a/modules/river-generator.js
+++ b/modules/river-generator.js
@@ -271,10 +271,14 @@
 
   // remove river and all its tributaries
   const remove = function(id) {
+    const cells = pack.cells;
     const riversToRemove = pack.rivers.filter(r => r.i === id || getBasin(r.i, r.parent, id) === id).map(r => r.i);
     riversToRemove.forEach(r => rivers.select("#river"+r).remove());
-    pack.cells.r.forEach((r, i) => {
-      if (r && riversToRemove.includes(r)) pack.cells.r[i] = 0;
+    cells.r.forEach((r, i) => {
+      if (!r || !riversToRemove.includes(r)) return;
+      cells.r[i] = 0;
+      cells.fl[i] = grid.cells.prec[cells.g[i]];
+      cells.conf[i] = 0;
     });
     pack.rivers = pack.rivers.filter(r => !riversToRemove.includes(r.i));
   }
diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 8311d5f0a..607e1d7eb 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -294,14 +294,6 @@ async function saveMap() {
   link.click();
   tip(`${link.download} is saved. Open "Downloads" screen (CTRL + J) to check`, true, "success", 7000);
   window.URL.revokeObjectURL(URL);
-
-  // send saved files count and size to server for usage analysis (for the future Cloud storage)
-  publicstorage.get("fmg").then(fmg => {
-    if (!fmg) return;
-    fmg.size = (fmg.size * fmg.maps + blob.size) / (fmg.maps + 1);
-    fmg.maps += 1;
-    publicstorage.set("fmg", fmg).then(fmg => console.log(fmg));
-  });
 }
 
 // Send .map file to server [test function]
diff --git a/modules/ui/editors.js b/modules/ui/editors.js
index 3b811f2c8..e858beaf9 100644
--- a/modules/ui/editors.js
+++ b/modules/ui/editors.js
@@ -111,12 +111,6 @@ function applySorting(headers) {
   }).forEach(line => list.appendChild(line));
 }
 
-// trigger trash button click on "Delete" keypress
-function removeElementOnKey() {
-  $(".dialog:visible .icon-trash").click();
-  $("button:visible:contains('Remove')").click();
-}
-
 function addBurg(point) {
   const cells = pack.cells;
   const x = rn(point[0], 2), y = rn(point[1], 2);
diff --git a/modules/ui/general.js b/modules/ui/general.js
index 9833618ba..3546f018f 100644
--- a/modules/ui/general.js
+++ b/modules/ui/general.js
@@ -462,4 +462,10 @@ function pressControl() {
   if (zonesRemove.offsetParent) {
     zonesRemove.classList.contains("pressed") ? zonesRemove.classList.remove("pressed") : zonesRemove.classList.add("pressed");
   }
+}
+
+// trigger trash button click on "Delete" keypress
+function removeElementOnKey() {
+  $(".dialog:visible .fastDelete").click();
+  $("button:visible:contains('Remove')").click();
 }
\ No newline at end of file
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index f888d42c5..872785557 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -21,7 +21,6 @@ function editHeightmap() {
     });
   }()
 
-  let edits = [];
   restartHistory();
   viewbox.insert("g", "#terrs").attr("id", "heights");
 
@@ -131,6 +130,10 @@ function editHeightmap() {
       return;
     }
 
+    delete window.edits; // remove global variable
+    redo.disabled = templateRedo.disabled = true;
+    undo.disabled = templateUndo.disabled = true;
+
     customization = 0;
     customizationMenu.style.display = "none";
     if (document.getElementById("options").querySelector(".tab > button.active").id === "toolsTab") toolsContent.style.display = "block";
@@ -141,7 +144,6 @@ function editHeightmap() {
     closeDialogs();
     resetZoom();
 
-    restartHistory();
     if (document.getElementById("preview")) document.getElementById("preview").remove();
     if (document.getElementById("canvas3d")) enterStandardView();
 
@@ -316,9 +318,7 @@ function editHeightmap() {
       const land = pack.cells.h[i] >= 20;
 
       // check biome
-      if (!biome[g]) pack.cells.biome[i] = getBiomeId(grid.cells.prec[g], grid.cells.temp[g]);
-      else if (!land && biome[g]) pack.cells.biome[i] = 0;
-      else pack.cells.biome[i] = biome[g];
+      pack.cells.biome[i] = land && biome[g] ? biome[g] : getBiomeId(grid.cells.prec[g], pack.cells.h[i]);
 
       // rivers data
       if (!changeHeights.checked) {
@@ -482,8 +482,8 @@ function editHeightmap() {
 
   // restart edits from 1st step
   function restartHistory() {
-    edits = [];
-    edits.n = 0;
+    window.edits = []; // declare temp global variable
+    window.edits.n = 0;
     redo.disabled = templateRedo.disabled = true;
     undo.disabled = templateUndo.disabled = true;
     updateHistory();
@@ -503,7 +503,7 @@ function editHeightmap() {
     document.getElementById("brushesButtons").addEventListener("click", e => toggleBrushMode(e));
     document.getElementById("changeOnlyLand").addEventListener("click", e => changeOnlyLandClick(e));
     document.getElementById("undo").addEventListener("click", () => restoreHistory(edits.n-1));
-    document.getElementById("redo").addEventListener("click", () => restoreHistory(edits.n+1));  
+    document.getElementById("redo").addEventListener("click", () => restoreHistory(edits.n+1));
     document.getElementById("rescaleShow").addEventListener("click", () => {
       document.getElementById("modifyButtons").style.display = "none";
       document.getElementById("rescaleSection").style.display = "block";
@@ -986,7 +986,7 @@ function editHeightmap() {
     setOverlayOpacity(0);
 
     document.getElementById("convertImageLoad").classList.add("glow"); // add glow effect
-    tip('Image Converter is opened. Upload the image and assign the height for each of the colors', true, "warn"); // main tip
+    tip('Image Converter is opened. Upload the image and assign height value for each of the colors', true, "warn"); // main tip
 
     // remove all heights
     grid.cells.h = new Uint8Array(grid.cells.i.length);
@@ -998,8 +998,8 @@ function editHeightmap() {
 
     // add color pallete
     void function createColorPallete() {
-      const container = d3.select("#colorScheme");
-      container.selectAll("div").data(d3.range(101)).enter().append("div").attr("data-color", i => i)
+      d3.select("#imageConverterPalette").selectAll("div").data(d3.range(101))
+        .enter().append("div").attr("data-color", i => i)
         .style("background-color", i => color(1-(i < 20 ? i-5 : i) / 100))
         .style("width", i => i < 20 || i > 70 ? ".2em" : ".1em")
         .on("touchmove mousemove", showPalleteHeight).on("click", assignHeight);
@@ -1020,7 +1020,7 @@ function editHeightmap() {
       const height = +this.getAttribute("data-color");
       colorsSelectValue.innerHTML = height;
       colorsSelectFriendly.innerHTML = getHeight(height);
-      const former = colorScheme.querySelector(".hoveredColor")
+      const former = imageConverterPalette.querySelector(".hoveredColor")
       if (former) former.className = "";
       this.className = "hoveredColor";
     }
@@ -1038,14 +1038,15 @@ function editHeightmap() {
         convertImageLoad.classList.remove("glow");
       };
 
-      reader.onloadend = function() {img.src = reader.result;};
+      reader.onloadend = () => img.src = reader.result;
       reader.readAsDataURL(file);
     }
 
     function heightsFromImage(count) {
       const ctx = document.getElementById("canvas").getContext("2d");
-      const imageData = ctx.getImageData(0, 0, graphWidth, graphHeight);
-      const data = imageData.data;
+      const q = new RgbQuant({colors:count});
+      q.sample(ctx);
+      const data = q.reduce(ctx);
 
       viewbox.select("#heights").selectAll("*").remove();
       d3.select("#imageConverter").selectAll("div.color-div").remove();
@@ -1053,27 +1054,22 @@ function editHeightmap() {
       colorsUnassigned.style.display = "block";
       colorsAssigned.style.display = "none";
 
-      const gridColors = grid.points.map(p => {
+      let usedColors = new Set();
+      let gridColors = grid.points.map(p => {
         const x = Math.floor(p[0]-.01), y = Math.floor(p[1]-.01);
         const i = (x + y * graphWidth) * 4;
         const r = data[i], g = data[i+1], b = data[i+2];
+        usedColors.add(`rgb(${r},${g},${b})`);
         return [r, g, b];
       });
 
-      const cmap = MMCQ.quantize(gridColors, count);
-      const usedColors = new Set();
-
       viewbox.select("#heights").selectAll("polygon").data(grid.cells.i).join("polygon")
         .attr("points", d => getGridPolygon(d))
-        .attr("id", d => "cell"+d).attr("fill", d => {
-          const clr = `rgb(${cmap.nearest(gridColors[d])})`;
-          usedColors.add(clr);
-          return clr;
-        }).on("click", mapClicked);
+        .attr("id", d => "cell"+d).attr("fill", d => `rgb(${gridColors[d].join(",")})`)
+        .on("click", mapClicked);
 
       const unassigned = [...usedColors].sort((a, b) => d3.lab(a).l - d3.lab(b).l);
-      const unassignedContainer = d3.select("#colorsUnassigned");
-      unassignedContainer.selectAll("div").data(unassigned).enter().append("div")
+      d3.select("#colorsUnassigned").selectAll("div").data(unassigned).enter().append("div")
         .attr("data-color", i => i).style("background-color", i => i)
         .attr("class", "color-div").on("click", colorClicked);
 
@@ -1092,7 +1088,7 @@ function editHeightmap() {
 
       const selectedColor = imageConverter.querySelector("div.selectedColor");
       if (selectedColor) selectedColor.classList.remove("selectedColor");
-      const hoveredColor = colorScheme.querySelector("div.hoveredColor");
+      const hoveredColor = imageConverterPalette.querySelector("div.hoveredColor");
       if (hoveredColor) hoveredColor.classList.remove("hoveredColor");
       colorsSelectValue.innerHTML = colorsSelectFriendly.innerHTML = 0;
 
@@ -1101,7 +1097,7 @@ function editHeightmap() {
 
       if (this.dataset.height) {
         const height = +this.dataset.height;
-        colorScheme.querySelector(`div[data-color="${height}"]`).classList.add("hoveredColor");
+        imageConverterPalette.querySelector(`div[data-color="${height}"]`).classList.add("hoveredColor");
         colorsSelectValue.innerHTML = height;
         colorsSelectFriendly.innerHTML = getHeight(height);
       }
@@ -1142,8 +1138,8 @@ function editHeightmap() {
         const lab = d3.lab(colorFrom);
         const normalized = type === "hue" ? rn(normalize(lab.b + lab.a / 2, -50, 200), 2) : rn(normalize(lab.l, -15, 100), 2);
         let heightTo = rn(normalized * 100);
-        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increated one
-        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increated one
+        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increased one
+        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increased one
         if (assinged[heightTo] && heightTo > 3) heightTo -= 3; // if increased one is also added, try decreased one
         if (assinged[heightTo] && heightTo > 1) heightTo -= 1; // if increased one is also added, try decreased one
 
@@ -1158,16 +1154,16 @@ function editHeightmap() {
       });
 
       // sort assigned colors by height
-      Array.from(colorsAssigned.children).sort((a, b) => {
-        return +a.dataset.height - +b.dataset.height;
-      }).forEach(line => colorsAssigned.appendChild(line));
+      Array.from(colorsAssigned.children)
+        .sort((a, b) => +a.dataset.height - +b.dataset.height)
+        .forEach(line => colorsAssigned.appendChild(line));
 
       colorsAssigned.style.display = "block";
       colorsUnassigned.style.display = "none";
     }
 
     function setConvertColorsNumber() {
-      prompt(`Please provide a desired number of colors. <br>An actual number depends on color scheme and may vary from desired`, 
+      prompt(`Please set maximum number of colors. <br>An actual number is lower and depends on color scheme`,
       {default:+convertColors.value, step:1, min:3, max:255}, number => {
         convertColors.value = number;
         heightsFromImage(number);
diff --git a/modules/ui/markers-editor.js b/modules/ui/markers-editor.js
index f7cd33dd3..a4686d897 100644
--- a/modules/ui/markers-editor.js
+++ b/modules/ui/markers-editor.js
@@ -135,14 +135,18 @@ function editMarker() {
     const id = elSelected.attr("data-id");
     const used = document.querySelectorAll("use[data-id='"+id+"']");
     const count = used.length === 1 ? "1 element" : used.length + " elements";
-    alertMessage.innerHTML = "Are you sure you want to remove the marker (" + count + ")?";
+    alertMessage.innerHTML = "Are you sure you want to remove all markers of that type (" + count + ")?";
 
-    $("#alert").dialog({resizable: false, title: "Remove marker",
+    $("#alert").dialog({resizable: false, title: "Remove marker type",
       buttons: {
         Remove: function() {
           $(this).dialog("close");
           if (id !== "#marker0") d3.select("#defs-markers").select(id).remove();
-          used.forEach(e => e.remove());
+          used.forEach(e => {
+            const index = notes.findIndex(n => n.id === e.id);
+            if (index != -1) notes.splice(index, 1);
+            e.remove();
+          });
           updateGroupOptions();
           updateGroupOptions();
           $("#markerEditor").dialog("close");
@@ -187,12 +191,6 @@ function editMarker() {
     d3.select("#defs-markers").select(id).select("text").attr("y", this.value + "%");
   }
 
-  function applyCustomUnicodeIcon() {
-    if (!this.value) return;
-    const id = elSelected.attr("data-id");
-    d3.select("#defs-markers").select(id).select("text").text(this.value);
-  }
-
   function toggleStyleSection() {
     if (markerStyleSection.style.display === "inline-block") {
       markerEditor.querySelectorAll("button:not(#markerStyle)").forEach(b => b.style.display = "inline-block");
diff --git a/modules/ui/notes-editor.js b/modules/ui/notes-editor.js
index 07376acca..cc49d536b 100644
--- a/modules/ui/notes-editor.js
+++ b/modules/ui/notes-editor.js
@@ -41,7 +41,7 @@ function editNotes(id, name) {
   document.getElementById("notesDownload").addEventListener("click", downloadLegends);
   document.getElementById("notesUpload").addEventListener("click", () => legendsToLoad.click());
   document.getElementById("legendsToLoad").addEventListener("change", function() {uploadFile(this, uploadLegends)});
-  document.getElementById("notesRemove").addEventListener("click", triggernotesRemove);
+  document.getElementById("notesRemove").addEventListener("click", triggerNotesRemove);
 
   function changeObject() {
     const note = notes.find(note => note.id === this.value);
@@ -96,7 +96,7 @@ function editNotes(id, name) {
     editNotes(notes[0].id, notes[0].name);
   }
 
-  function triggernotesRemove() {
+  function triggerNotesRemove() {
     alertMessage.innerHTML = "Are you sure you want to remove the selected note?";
     $("#alert").dialog({resizable: false, title: "Remove note",
       buttons: {
diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js
index 7d7385295..3d64fafce 100644
--- a/modules/ui/provinces-editor.js
+++ b/modules/ui/provinces-editor.js
@@ -114,7 +114,7 @@ function editProvinces() {
       const capital = p.burg ? pack.burgs[p.burg].name : '';
       const separable = p.burg && p.burg !== pack.states[p.state].capital;
       const focused = defs.select("#fog #focusProvince"+p.i).size();
-      lines += `<div class="states" data-id=${p.i} data-name=${p.name} data-form=${p.formName} data-color="${p.color}" data-capital="${capital}" data-state="${stateName}" data-area=${area} data-population=${population}>
+      lines += `<div class="states" data-id=${p.i} data-name="${p.name}" data-form="${p.formName}" data-color="${p.color}" data-capital="${capital}" data-state="${stateName}" data-area=${area} data-population=${population}>
         <svg data-tip="Province fill style. Click to change" width=".9em" height=".9em" style="margin-bottom:-1px"><rect x="0" y="0" width="100%" height="100%" fill="${p.color}" class="fillRect pointer"></svg>
         <input data-tip="Province name. Click to change" class="name pointer" value="${p.name}" readonly>
         <span data-tip="Click to open province COA in the Iron Arachne Heraldry Generator. Ctrl + click to change the seed" class="icon-coa pointer hide"></span>

From a21e7f5ea44728fd73e6d6f8cb7916ce2f1e8e87 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 16 May 2020 01:11:01 +0300
Subject: [PATCH 16/38] v1.4.15

---
 modules/ui/regiments-overview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui/regiments-overview.js b/modules/ui/regiments-overview.js
index 0e374fc00..67099d352 100644
--- a/modules/ui/regiments-overview.js
+++ b/modules/ui/regiments-overview.js
@@ -153,7 +153,7 @@ function overviewRegiments(state) {
     const military = pack.states[state].military;
     const i = military.length ? last(military).i + 1 : 0;
     const n = +(pack.cells.h[cell] < 20); // naval or land
-    const reg = {a:0, cell, i, n, u:{}, x, y, bx:x, by:y, icon:"🛡️"};
+    const reg = {a:0, cell, i, n, u:{}, x, y, bx:x, by:y, state, icon:"🛡️"};
     reg.name = Military.getName(reg, military);
     military.push(reg);
     Military.generateNote(reg, pack.states[state]); // add legend

From 9f54b1e3f0f7384f0e88265f658de00067f22da5 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Sat, 16 May 2020 09:12:25 +0000
Subject: [PATCH 17/38] Added colour, biomes, adjustable height, and changed
 graph code to use d3 more

---
 index.css                       |  10 ++
 index.html                      |  16 +++
 modules/ui/elevation-profile.js | 223 +++++++++++++++++++++-----------
 modules/ui/rivers-editor.js     |   4 +-
 modules/ui/routes-editor.js     |   4 +-
 5 files changed, 174 insertions(+), 83 deletions(-)

diff --git a/index.css b/index.css
index 1cd18ea79..ac5669c5f 100644
--- a/index.css
+++ b/index.css
@@ -2101,6 +2101,16 @@ svg.button {
 	text-shadow: 0px 1px 4px #4c3a35;
 }
 
+.epgrid line {
+  stroke: lightgrey;
+  stroke-opacity: 0.7;
+  shape-rendering: crispEdges;
+}
+
+.epgrid path {
+  stroke-width: 0;
+}
+
 #debug {
 	font-size: 1px;
 	opacity: .8;
diff --git a/index.html b/index.html
index 7c0e1c5fb..4a64ad881 100644
--- a/index.html
+++ b/index.html
@@ -2134,6 +2134,22 @@
     </div>
 
     <div id="elevationProfile" class="dialog" style="display: none" width="100%">
+      <div data-tip="Set height scale">
+        <div>Height scale:</div>
+        <div><input id="epScaleRange" type="range" min=1 max=100 value=50></div>
+
+        <div>Curve:</div>
+        <div>
+          <select id="epCurve">
+            <option>Linear</option>
+            <option selected>Basis spline</option>
+            <option>Bundle</option>
+            <option>Cubic Catmull-Rom</option>
+            <option>Monotone X</option>
+            <option>Natural</option>
+          </select>
+        </div>
+      </div>
       <div id="elevationGraph" data-tip="Elevation profile"></div>
     </div>
 
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 073bf25aa..1d05db064 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -1,4 +1,5 @@
 "use strict";
+
 function showEPForRoute(node) {
   const points = [];
   debug.select("#controlPoints").selectAll("circle").each(function() {
@@ -21,19 +22,23 @@ function showEPForRiver(node) {
   showElevationProfile(points, riverLen, true);
 }
 
-function resizeElevationProfile() {
+function closeElevationProfile() {
+  modules.elevation = false;
 }
 
 function showElevationProfile(data, routeLen, isRiver) {
-  // data is an array of cell indexes, routeLen is the distance, isRiver should be true for rivers, false otherwise
-  document.getElementById("elevationGraph").innerHTML = "";
+  // data is an array of cell indexes, routeLen is the distance (in actual metres/feet), isRiver should be true for rivers, false otherwise
+
+  document.getElementById("epScaleRange").addEventListener("change", draw);
+  document.getElementById("epCurve").addEventListener("change", draw);
 
   $("#elevationProfile").dialog({
     title: "Elevation profile", resizable: false, width: window.width,
-    position: {my: "left top", at: "left+20 bottom-240", of: window, collision: "fit"}
+    close: closeElevationProfile,
+    position: {my: "left top", at: "left+20 bottom-500", of: window, collision: "fit"}
   });
 
-  // prevent river graphs from showing rivers as flowing uphill
+  // prevent river graphs from showing rivers as flowing uphill - remember the general slope
   var slope = 0;
   if (isRiver) {
     if (pack.cells.h[data[0]] < pack.cells.h[data[data.length-1]]) {
@@ -43,12 +48,19 @@ function showElevationProfile(data, routeLen, isRiver) {
     }
   }
 
-  const points = [];
-  var prevB=0, prevH=-1, i=0, j=0, cell=0, b=0, ma=0, mi=100, h=0;
-  for (var i=0; i<data.length; i++) {
-    cell = data[i];
+  const chartWidth = window.innerWidth-280;
+  const chartHeight = 200; // height of our land/sea profile, excluding the biomes data below
+
+  const xOffset = 160;
+  const yOffset = 140;  // this is our drawing starting point from top-left (y = 0) of SVG
+
+  const biomesHeight = 40;
 
-    h = pack.cells.h[cell];
+  let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, points:[] }
+  for (let i=0, prevB=0, prevH=-1; i<data.length; i++) {
+    let cell = data[i];
+
+    let h = pack.cells.h[cell];
     if (h < 20) h = 20;
 
     // check for river up-hill
@@ -62,83 +74,136 @@ function showElevationProfile(data, routeLen, isRiver) {
     prevH = h;
     // river up-hill checks stop here
 
-    mi = Math.min(mi, h);
-    ma = Math.max(ma, h);
-
-    b = pack.cells.burg[cell];
+    let b = pack.cells.burg[cell];
     if (b == prevB) b = 0;
     else prevB = b;
-    points.push({x:j, y:h, b:b});
-    j++;
-  }
-
-  const w = window.innerWidth-280;
-  h = 100;
 
-  const xOffset = 100;
-  const yOffset = 80;
-
-  var chart = d3.select("#elevationGraph").append("svg").attr("width", w+200).attr("height", h+yOffset).attr("id", "elevationGraph");
-  // arrow-head definition
-  chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z");
+    chartData.biome[i] = pack.cells.biome[cell];
+    chartData.burg[i] = b;
+    chartData.cell[i] = cell;
+    let sh = getHeight(h);
+    chartData.height[i] = parseInt(sh.substr(0, sh.indexOf(' ')));
+    chartData.mi = Math.min(chartData.mi, chartData.height[i]);
+    chartData.ma = Math.max(chartData.ma, chartData.height[i]);
+  }
+  draw();
 
-  // main graph line
-  var lineFunc = d3.line().x(d => d.x * w / points.length + xOffset).y(d => h-d.y + yOffset);
-  chart.append("path").attr("d", lineFunc(points)).attr("stroke", "purple").attr("fill", "none").attr("id", "elevationLine");
+  function draw() {
+    chartData.points = []; 
+    let heightScale = 100 / parseInt(epScaleRange.value);
 
-  // y-axis labels for starting and ending heights
-  chart.append("text").attr("id", "epy0").attr("x", xOffset-10).attr("y", h-points[0].y + yOffset).attr("text-anchor", "end");
-  document.getElementById("epy0").innerHTML = getHeight(points[0].y);
-  chart.append("text").attr("id", "epy1").attr("x", w+100).attr("y", h-points[points.length-1].y + yOffset).attr("text-anchor", "start");
-  document.getElementById("epy1").innerHTML = getHeight(points[points.length-1].y);
+    heightScale *= 0.90; // curves cause the heights to go slightly higher, adjust here
 
-  // y-axis labels for minimum and maximum heights (if not too close to start/end heights)
-  if (Math.abs(ma - points[0].y) > 3 && Math.abs(ma - points[points.length-1].y) > 3) {
-    chart.append("text").attr("id", "epy2").attr("x", xOffset-10).attr("y", h-ma + yOffset).attr("text-anchor", "end");
-    document.getElementById("epy2").innerHTML = getHeight(ma);
-  }
-  if (Math.abs(mi - points[0].y) > 3 && Math.abs(mi - points[points.length-1].y) > 3) {
-    chart.append("text").attr("id", "epy3").attr("x", xOffset-10).attr("y", h-mi + yOffset).attr("text-anchor", "end");
-    document.getElementById("epy3").innerHTML = getHeight(mi);
-  }
+    const xscale = d3.scaleLinear().domain([0, data.length]).range([0, chartWidth]);
+    const yscale = d3.scaleLinear().domain([0, (chartData.ma-chartData.mi) * heightScale]).range([chartHeight, 0]);
   
-  // x-axis label for start, quarter, halfway and three-quarter, and end
-  chart.append("text").attr("id", "epx1").attr("x", xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
-  chart.append("text").attr("id", "epx2").attr("x", w / 4 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
-  chart.append("text").attr("id", "epx3").attr("x", w / 2 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
-  chart.append("text").attr("id", "epx4").attr("x", w / 4*3 + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
-  chart.append("text").attr("id", "epx5").attr("x", w + xOffset).attr("y", h+yOffset).attr("text-anchor", "middle");
-  document.getElementById("epx1").innerHTML = "0 " + distanceUnitInput.value;
-  document.getElementById("epx2").innerHTML = rn(routeLen / 4) + " " + distanceUnitInput.value;
-  document.getElementById("epx3").innerHTML = rn(routeLen / 2) + " " + distanceUnitInput.value;
-  document.getElementById("epx4").innerHTML = rn(routeLen / 4*3) + " " + distanceUnitInput.value;
-  document.getElementById("epx5").innerHTML = rn(routeLen) + " " + distanceUnitInput.value;
-
-  chart.append("path").attr("id", "epx11").attr("d", "M" + (xOffset).toString() + ",0L" + (xOffset).toString() +"," + (h+yOffset-15).toString()).attr("stroke", "lightgray").attr("stroke-width", "1");
-  chart.append("path").attr("id", "epx12").attr("d", "M" + (w / 4 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 4 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
-  chart.append("path").attr("id", "epx13").attr("d", "M" + (w / 2 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 2 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
-  chart.append("path").attr("id", "epx14").attr("d", "M" + (w / 4*3 + xOffset).toString() + "," + (h+yOffset-15).toString() + "L" + (w / 4*3 + xOffset).toString() + ",0").attr("stroke", "lightgray").attr("stroke-width", "1");
-  chart.append("path").attr("id", "epx15").attr("d", "M" + (w + xOffset).toString() + ",0L" + (w + xOffset).toString() +"," + (h+yOffset-15).toString()).attr("stroke", "lightgray").attr("stroke-width", "1");
-
-  // draw city labels - try to avoid putting labels over one another
-  var y1 = 0;
-  var add = 15;
-  points.forEach(function(p) {
-    if (p.b > 0) {
-      var x1 = p.x * w / points.length + xOffset;
-      y1+=add;
-      if (y1 >= yOffset) { y1 = add; }
-      var d1 = 0;
-
-      // burg name
-      chart.append("text").attr("id", "ep" + p.b).attr("x", x1).attr("y", y1).attr("text-anchor", "middle");
-      document.getElementById("ep" + p.b).innerHTML = pack.burgs[p.b].name;
-
-      // arrow from burg name to graph line
-      chart.append("path").attr("id", "eparrow" + p.b).attr("d", "M" + x1.toString() + "," + (y1).toString() + "L" + x1.toString() + "," + parseInt(h-p.y-3+yOffset).toString()).attr("stroke", "black").attr("stroke-width", "1").attr("marker-end", "url(#arrowhead)");
+    for (let i=0; i<data.length; i++) {
+      chartData.points.push([xscale(i) + xOffset, yscale(chartData.height[i]) + yOffset]);
     }
-  });
-
+  
+    document.getElementById("elevationGraph").innerHTML = "";
 
+    const chart = d3.select("#elevationGraph").append("svg").attr("width", chartWidth+200).attr("height", chartHeight+yOffset+biomesHeight).attr("id", "elevationSVG").attr("class", "epbackground");
+    // arrow-head definition
+    chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z").attr("fill", "darkgray");
+  
+    var landdef = chart.select("defs").append("linearGradient").attr("id", "landdef").attr("x1", "0%").attr("y1", "0%").attr("x2", "0%").attr("y2", "100%");
+    landdef.append("stop").attr("offset", "0%").attr("style", "stop-color:rgb(64,255,128);stop-opacity:1");
+    landdef.append("stop").attr("offset", "100%").attr("style", "stop-color:rgb(0,192,64);stop-opacity:1");
+  
+    // land
+    let curve = d3.line().curve(d3.curveBasis); // see https://github.com/d3/d3-shape#curves
+    let epCurveIndex = parseInt(epCurve.selectedIndex);
+    switch(epCurveIndex) {
+      case 0 : curve = d3.line().curve(d3.curveLinear); break;
+      case 1 : curve = d3.line().curve(d3.curveBasis); break;
+      case 2 : curve = d3.line().curve(d3.curveBundle.beta(1)); break;
+      case 3 : curve = d3.line().curve(d3.curveCatmullRom.alpha(0.5)); break;
+      case 4 : curve = d3.line().curve(d3.curveMonotoneX); break;
+      case 5 : curve = d3.line().curve(d3.curveNatural); break;
+    }
+  
+    // copy the points so that we can add extra straight pieces, else we get curves at the ends of the chart
+    let extra = chartData.points.slice();
+    var path = curve(extra);
+    // this completes the right-hand side and bottom of our land "polygon"
+    path += " L" + parseInt(xscale(extra.length) + +xOffset) +  "," + parseInt(extra[extra.length-1][1]);
+    path += " L" + parseInt(xscale(extra.length) + +xOffset) +  "," + parseInt(yscale(0) + +yOffset);
+    path += " L" + parseInt(xscale(0) + +xOffset) +"," + parseInt(yscale(0) + +yOffset);
+    path +=  "Z";
+    chart.append("g").attr("id", "epland").append("path").attr("d", path).attr("stroke", "purple").attr("stroke-width", "0").attr("fill", "url(#landdef)");  
+  
+    // biome / heights
+    let g = chart.append("g").attr("id", "epbiomes");
+    const hu = heightUnit.value;
+    for(var k=0; k<chartData.points.length; k++) {
+      const x = chartData.points[k][0];
+      const y = yOffset + chartHeight;
+      const c = biomesData.color[chartData.biome[k]];
+      const dataTip = biomesData.name[chartData.biome[k]]+" (" + chartData.height[k] + " " + hu + ")";
+  
+      g.append("rect").attr("stroke", c).attr("fill", c).attr("x", x).attr("y", y).attr("width", xscale(1)).attr("height", 15).attr("data-tip", dataTip);
+    }
+  
+    const xAxis = d3.axisBottom(xscale).ticks(10).tickFormat(function(d){ return (rn(d / chartData.points.length * routeLen) + " " + distanceUnitInput.value);});
+    const yAxis = d3.axisLeft(yscale).ticks(5).tickFormat(function(d) { return d + " " + hu; });
+  
+    const xGrid = d3.axisBottom(xscale).ticks(10).tickSize(-chartHeight).tickFormat("");
+    const yGrid = d3.axisLeft(yscale).ticks(5).tickSize(-chartWidth).tickFormat("");
+  
+    chart.append("g")
+      .attr("id", "epxaxis")
+      .attr("transform", "translate(" + xOffset + "," + parseInt(chartHeight + +yOffset + 20) + ")")
+      .call(xAxis)
+      .selectAll("text")
+      .style("text-anchor", "center")
+      .attr("transform", function(d) {
+          return "rotate(0)" // used to rotate labels, - anti-clockwise, + clockwise
+      });
+  
+    chart.append("g")
+      .attr("id", "epyaxis")
+      .attr("transform", "translate(" + parseInt(+xOffset-10) + "," + parseInt(+yOffset) + ")")
+      .call(yAxis);
+  
+    // add the X gridlines
+    chart.append("g")
+      .attr("id", "epxgrid")
+      .attr("class", "epgrid")
+      .attr("stroke-dasharray", "4 1")
+      .attr("transform", "translate(" + xOffset + "," + parseInt(chartHeight + +yOffset) + ")")
+      .call(xGrid);
+  
+    // add the Y gridlines
+    chart.append("g")			
+      .attr("id", "epygrid")
+      .attr("class", "epgrid")
+      .attr("stroke-dasharray", "4 1")
+      .attr("transform", "translate(" + xOffset + "," + yOffset + ")")
+      .call(yGrid);
+  
+   // draw city labels - try to avoid putting labels over one another
+    g = chart.append("g").attr("id", "epburglabels");
+    var y1 = 0;
+    var add = 15;
+    for (let k=0; k<chartData.points.length; k++)
+    {
+      if (chartData.burg[k] > 0) {
+        let b = chartData.burg[k];
+  
+        var x1 = chartData.points[k][0];
+        y1+=add;
+        if (y1 >= yOffset) { y1 = add; }
+        var d1 = 0;
+  
+        // burg name
+        g.append("text").attr("id", "ep" + b).attr("class", "epburglabel").attr("x", x1).attr("y", y1).attr("text-anchor", "middle");
+        document.getElementById("ep" + b).innerHTML = pack.burgs[b].name;
+  
+        // arrow from burg name to graph line
+        g.append("path").attr("id", "eparrow" + b).attr("d", "M" + x1.toString() + "," + (y1+3).toString() + "L" + x1.toString() + "," + parseInt(chartData.points[k][1]-3).toString()).attr("stroke", "darkgray").attr("fill", "lightgray").attr("stroke-width", "1").attr("marker-end", "url(#arrowhead)");
+      }
+    }
+  }
 }
 
diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js
index 855519765..cf25f04f1 100644
--- a/modules/ui/rivers-editor.js
+++ b/modules/ui/rivers-editor.js
@@ -55,7 +55,7 @@ function editRiver(id) {
 
   function drawControlPoints(node) {
     const l = node.getTotalLength() / 2;
-    const segments = Math.ceil(l / 8);
+    const segments = Math.ceil(l / 4);
     const increment = rn(l / segments * 1e5);
     for (let i=increment*segments, c=i; i >= 0; i -= increment, c += increment) {
       const p1 = node.getPointAtLength(i / 1e5);
@@ -183,7 +183,7 @@ function editRiver(id) {
 
   function showElevationProfile() {
     modules.elevation = true;
-    showEPForRiver(node);
+    showEPForRiver(elSelected.node());
   }
 
   function showRiverWidth() {
diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js
index 98974f299..b34732e25 100644
--- a/modules/ui/routes-editor.js
+++ b/modules/ui/routes-editor.js
@@ -47,7 +47,7 @@ function editRoute(onClick) {
 
   function drawControlPoints(node) {
     const l = node.getTotalLength();
-    const increment = l / Math.ceil(l / 8);
+    const increment = l / Math.ceil(l / 4);
     for (let i=0; i <= l; i += increment) {addControlPoint(node.getPointAtLength(i));}
     routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;
   }
@@ -110,7 +110,7 @@ function editRoute(onClick) {
 
   function showElevationProfile() {
     modules.elevation = true;
-    showEPForRoute(node);
+    showEPForRoute(elSelected.node());
   }
 
   function showGroupSection() {

From bb0e57158772c0a4856fcbf544aa5029f69d2be4 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Sat, 16 May 2020 12:12:15 +0000
Subject: [PATCH 18/38] Changed elevation profile to use heightmap colours

---
 modules/ui/elevation-profile.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 1d05db064..9e090a769 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -49,14 +49,14 @@ function showElevationProfile(data, routeLen, isRiver) {
   }
 
   const chartWidth = window.innerWidth-280;
-  const chartHeight = 200; // height of our land/sea profile, excluding the biomes data below
+  const chartHeight = 300; // height of our land/sea profile, excluding the biomes data below
 
   const xOffset = 160;
-  const yOffset = 140;  // this is our drawing starting point from top-left (y = 0) of SVG
+  const yOffset = 70;  // this is our drawing starting point from top-left (y = 0) of SVG
 
   const biomesHeight = 40;
 
-  let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, points:[] }
+  let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, mih: 100, mah: 0, points:[] }
   for (let i=0, prevB=0, prevH=-1; i<data.length; i++) {
     let cell = data[i];
 
@@ -83,6 +83,8 @@ function showElevationProfile(data, routeLen, isRiver) {
     chartData.cell[i] = cell;
     let sh = getHeight(h);
     chartData.height[i] = parseInt(sh.substr(0, sh.indexOf(' ')));
+    chartData.mih = Math.min(chartData.mih, h);
+    chartData.mah = Math.max(chartData.mah, h);
     chartData.mi = Math.min(chartData.mi, chartData.height[i]);
     chartData.ma = Math.max(chartData.ma, chartData.height[i]);
   }
@@ -107,9 +109,12 @@ function showElevationProfile(data, routeLen, isRiver) {
     // arrow-head definition
     chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z").attr("fill", "darkgray");
   
+    let colors = getColorScheme();
     var landdef = chart.select("defs").append("linearGradient").attr("id", "landdef").attr("x1", "0%").attr("y1", "0%").attr("x2", "0%").attr("y2", "100%");
-    landdef.append("stop").attr("offset", "0%").attr("style", "stop-color:rgb(64,255,128);stop-opacity:1");
-    landdef.append("stop").attr("offset", "100%").attr("style", "stop-color:rgb(0,192,64);stop-opacity:1");
+    for (let k=chartData.mah; k >= chartData.mih; k--) {
+      let perc = 1 - (k - chartData.mih)  / (chartData.mah - chartData.mih);
+      landdef.append("stop").attr("offset", perc*100 + "%").attr("style", "stop-color:" + getColor(k, colors) + ";stop-opacity:1");
+    }
   
     // land
     let curve = d3.line().curve(d3.curveBasis); // see https://github.com/d3/d3-shape#curves

From bdf5c048a8bdffc60d6b920a23274e4241619f3c Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Sat, 16 May 2020 16:52:28 +0000
Subject: [PATCH 19/38] Fix for FMG/MFCG sea direction integration

---
 modules/ui/burg-editor.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index f58dee118..da68ad207 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -318,7 +318,17 @@ function editBurg(id) {
         if (deg < 0) deg += 360;
         let norm = rn(normalize(deg, 0, 360) * 8) / 4;
         if (norm === 2) norm = 0;
-        return "sea="+norm;
+        switch(norm) {
+          case 0 : return "&southSea=1";
+          case 0.25 : return "&southSea=1&westSea=1";
+          case 0.50 : return "&westSea=1";
+          case 0.75 : return "&westSea=1&northSea=1";
+          case 1 : return "&northSea=1";
+          case 1.25 : return "&northSea=1&eastSea=1";
+          case 1.5 : return "&eastSea=1";
+          case 1.75 : return "&eastSea=1&southSea=1";
+        }
+        return "&sea="+norm;
         // debug.selectAll("*").remove();
         // pack.burgs.filter(b => b.port).forEach(b => {
         //   var p1 = pack.cells.p[b.cell];
@@ -450,4 +460,4 @@ function editBurg(id) {
     unselect();
   }
 
-}
\ No newline at end of file
+}

From 63b5744dccdeed82f97e7d45ebf056fff47d3160 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Sun, 17 May 2020 15:35:17 +0000
Subject: [PATCH 20/38] Fixes for elevation profile and CSV download

---
 index.css                       |   4 ++
 index.html                      |  30 +++++-----
 modules/ui/elevation-profile.js | 101 +++++++++++++++++++++++++++-----
 3 files changed, 106 insertions(+), 29 deletions(-)

diff --git a/index.css b/index.css
index ac5669c5f..781728c7e 100644
--- a/index.css
+++ b/index.css
@@ -2111,6 +2111,10 @@ svg.button {
   stroke-width: 0;
 }
 
+.centered {
+	text-align: center;
+}
+
 #debug {
 	font-size: 1px;
 	opacity: .8;
diff --git a/index.html b/index.html
index 4a64ad881..abfdb0d84 100644
--- a/index.html
+++ b/index.html
@@ -2134,23 +2134,23 @@
     </div>
 
     <div id="elevationProfile" class="dialog" style="display: none" width="100%">
-      <div data-tip="Set height scale">
-        <div>Height scale:</div>
-        <div><input id="epScaleRange" type="range" min=1 max=100 value=50></div>
-
-        <div>Curve:</div>
-        <div>
-          <select id="epCurve">
-            <option>Linear</option>
-            <option selected>Basis spline</option>
-            <option>Bundle</option>
-            <option>Cubic Catmull-Rom</option>
-            <option>Monotone X</option>
-            <option>Natural</option>
-          </select>
+      <div id="elevationGraph" data-tip="Elevation profile"></div>
+      <div class="centered">
+        <div id="epControls">
+          <span data-tip="Set height scale">Height scale: <input id="epScaleRange" type="range" min=1 max=100 value=50></span>
+          <span data-tip="Set curve profile">Curve:
+            <select id="epCurve">
+              <option>Linear</option>
+                <option selected>Basis spline</option>
+              <option>Bundle</option>
+              <option>Cubic Catmull-Rom</option>
+              <option>Monotone X</option>
+              <option>Natural</option>
+            </select>
+          </span>
+          <span><button id="epSave" data-tip="Download the chart data as a CSV file" class="icon-download"></button></span>
         </div>
       </div>
-      <div id="elevationGraph" data-tip="Elevation profile"></div>
     </div>
 
     <div id="routeEditor" class="dialog" style="display: none">
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 9e090a769..209b6ba86 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -22,15 +22,12 @@ function showEPForRiver(node) {
   showElevationProfile(points, riverLen, true);
 }
 
-function closeElevationProfile() {
-  modules.elevation = false;
-}
-
 function showElevationProfile(data, routeLen, isRiver) {
   // data is an array of cell indexes, routeLen is the distance (in actual metres/feet), isRiver should be true for rivers, false otherwise
 
   document.getElementById("epScaleRange").addEventListener("change", draw);
   document.getElementById("epCurve").addEventListener("change", draw);
+  document.getElementById("epSave").addEventListener("click", downloadCSV);
 
   $("#elevationProfile").dialog({
     title: "Elevation profile", resizable: false, width: window.width,
@@ -48,14 +45,17 @@ function showElevationProfile(data, routeLen, isRiver) {
     }
   }
 
-  const chartWidth = window.innerWidth-280;
+  const chartWidth = window.innerWidth-180;
   const chartHeight = 300; // height of our land/sea profile, excluding the biomes data below
 
-  const xOffset = 160;
-  const yOffset = 70;  // this is our drawing starting point from top-left (y = 0) of SVG
+  const xOffset = 80;
+  const yOffset = 20;  // this is our drawing starting point from top-left (y = 0) of SVG
 
   const biomesHeight = 40;
 
+  let lastBurgIndex = 0;
+  let lastBurgCell = 0;
+  let burgCount = 0;
   let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, mih: 100, mah: 0, points:[] }
   for (let i=0, prevB=0, prevH=-1; i<data.length; i++) {
     let cell = data[i];
@@ -77,6 +77,7 @@ function showElevationProfile(data, routeLen, isRiver) {
     let b = pack.cells.burg[cell];
     if (b == prevB) b = 0;
     else prevB = b;
+    if (b) { burgCount++; lastBurgIndex = i; lastBurgCell = cell; }
 
     chartData.biome[i] = pack.cells.biome[cell];
     chartData.burg[i] = b;
@@ -88,8 +89,59 @@ function showElevationProfile(data, routeLen, isRiver) {
     chartData.mi = Math.min(chartData.mi, chartData.height[i]);
     chartData.ma = Math.max(chartData.ma, chartData.height[i]);
   }
+
+  if (lastBurgIndex != 0 && lastBurgCell == chartData.cell[data.length-1] && lastBurgIndex < data.length) {
+    chartData.burg[data.length-1] = chartData.burg[lastBurgIndex];
+    chartData.burg[lastBurgIndex] = 0;
+  }
+
   draw();
 
+  function downloadCSV() {
+    let data = "Point,X,Y,Cell,Height,Height value,Population,Burg,Burg population,Biome,Biome color,Culture,Culture color,Religion,Religion color,Province,Province color,State,State color\n"; // headers
+
+    for (let k=0; k<chartData.points.length; k++) {
+      let cell = chartData.cell[k];
+      let burg = pack.cells.burg[cell];
+      let biome = pack.cells.biome[cell];
+      let culture = pack.cells.culture[cell];
+      let religion = pack.cells.religion[cell];
+      let province = pack.cells.province[cell];
+      let state = pack.cells.state[cell];
+      let pop = pack.cells.pop[cell];
+      let h = pack.cells.h[cell];
+
+      data += k+1 + ",";
+      data += chartData.points[k][0] + ",";
+      data += chartData.points[k][1] + ",";
+      data += cell + ",";
+      data += getHeight(h) + ",";
+      data += h + ",";
+      data += rn(pop * populationRate.value) + ",";
+      if (burg) {
+        data += pack.burgs[burg].name + ",";
+        data += (pack.burgs[burg].population * populationRate.value * urbanization.value) + ",";
+      } else {
+        data += ",0,";
+      }
+      data += biomesData.name[biome] + ",";
+      data += biomesData.color[biome] + ",";
+      data += pack.cultures[culture].name + ",";
+      data += pack.cultures[culture].color + ",";
+      data += pack.religions[religion].name + ",";
+      data += pack.religions[religion].color + ",";
+      data += pack.provinces[province].name + ",";
+      data += pack.provinces[province].color + ",";
+      data += pack.states[state].name + ",";
+      data += pack.states[state].color + ",";
+
+      data = data + "\n";
+    }
+
+    const name = getFileName("elevation profile") + ".csv";
+    downloadFile(data, name);
+  }
+
   function draw() {
     chartData.points = []; 
     let heightScale = 100 / parseInt(epScaleRange.value);
@@ -97,7 +149,7 @@ function showElevationProfile(data, routeLen, isRiver) {
     heightScale *= 0.90; // curves cause the heights to go slightly higher, adjust here
 
     const xscale = d3.scaleLinear().domain([0, data.length]).range([0, chartWidth]);
-    const yscale = d3.scaleLinear().domain([0, (chartData.ma-chartData.mi) * heightScale]).range([chartHeight, 0]);
+    const yscale = d3.scaleLinear().domain([0, chartData.ma * heightScale]).range([chartHeight, 0]);
   
     for (let i=0; i<data.length; i++) {
       chartData.points.push([xscale(i) + xOffset, yscale(chartData.height[i]) + yOffset]);
@@ -105,15 +157,21 @@ function showElevationProfile(data, routeLen, isRiver) {
   
     document.getElementById("elevationGraph").innerHTML = "";
 
-    const chart = d3.select("#elevationGraph").append("svg").attr("width", chartWidth+200).attr("height", chartHeight+yOffset+biomesHeight).attr("id", "elevationSVG").attr("class", "epbackground");
+    const chart = d3.select("#elevationGraph").append("svg").attr("width", chartWidth+120).attr("height", chartHeight+yOffset+biomesHeight).attr("id", "elevationSVG").attr("class", "epbackground");
     // arrow-head definition
     chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z").attr("fill", "darkgray");
   
     let colors = getColorScheme();
     var landdef = chart.select("defs").append("linearGradient").attr("id", "landdef").attr("x1", "0%").attr("y1", "0%").attr("x2", "0%").attr("y2", "100%");
-    for (let k=chartData.mah; k >= chartData.mih; k--) {
-      let perc = 1 - (k - chartData.mih)  / (chartData.mah - chartData.mih);
-      landdef.append("stop").attr("offset", perc*100 + "%").attr("style", "stop-color:" + getColor(k, colors) + ";stop-opacity:1");
+
+    if (chartData.mah == chartData.mih) {
+      landdef.append("stop").attr("offset", "0%").attr("style", "stop-color:" + getColor(chartData.mih, colors) + ";stop-opacity:1");
+      landdef.append("stop").attr("offset", "100%").attr("style", "stop-color:" + getColor(chartData.mah, colors) + ";stop-opacity:1");
+    } else {
+      for (let k=chartData.mah; k >= chartData.mih; k--) {
+        let perc = 1 - (k - chartData.mih)  / (chartData.mah - chartData.mih);
+        landdef.append("stop").attr("offset", perc*100 + "%").attr("style", "stop-color:" + getColor(k, colors) + ";stop-opacity:1");
+      }
     }
   
     // land
@@ -145,7 +203,7 @@ function showElevationProfile(data, routeLen, isRiver) {
       const x = chartData.points[k][0];
       const y = yOffset + chartHeight;
       const c = biomesData.color[chartData.biome[k]];
-      const dataTip = biomesData.name[chartData.biome[k]]+" (" + chartData.height[k] + " " + hu + ")";
+      const dataTip = biomesData.name[chartData.biome[k]]+" (" + chartData.height[k] + " " + hu + ", cell " + chartData.cell[k] + ")";
   
       g.append("rect").attr("stroke", c).attr("fill", c).attr("x", x).attr("y", y).attr("width", xscale(1)).attr("height", 15).attr("data-tip", dataTip);
     }
@@ -191,12 +249,17 @@ function showElevationProfile(data, routeLen, isRiver) {
     g = chart.append("g").attr("id", "epburglabels");
     var y1 = 0;
     var add = 15;
+
+    let xwidth = chartData.points[1][0] - chartData.points[0][0];
     for (let k=0; k<chartData.points.length; k++)
     {
       if (chartData.burg[k] > 0) {
         let b = chartData.burg[k];
   
-        var x1 = chartData.points[k][0];
+        let x1 = chartData.points[k][0]; // left side of graph by default
+        if (k > 0) x1 += xwidth/2; // center it if not first
+        if (k == chartData.points.length-1) 
+          x1 = chartWidth + xOffset;  // right part of graph
         y1+=add;
         if (y1 >= yOffset) { y1 = add; }
         var d1 = 0;
@@ -210,5 +273,15 @@ function showElevationProfile(data, routeLen, isRiver) {
       }
     }
   }
+
+  function closeElevationProfile() {
+    document.getElementById("epScaleRange").removeEventListener("change", draw);
+    document.getElementById("epCurve").removeEventListener("change", draw);
+    document.getElementById("epSave").removeEventListener("click", downloadCSV);
+
+    document.getElementById("elevationGraph").innerHTML = "";
+
+    modules.elevation = false;
+  }
 }
 

From 7410c9e0b48621efd4841a51a59e2e59b020798b Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 17 May 2020 23:59:08 +0300
Subject: [PATCH 21/38] v1.4.16

---
 index.css                      |   4 +-
 index.html                     |  21 ++---
 modules/ui/heightmap-editor.js | 152 ++++++++++++++++++++-------------
 modules/ui/routes-editor.js    |   8 +-
 4 files changed, 107 insertions(+), 78 deletions(-)

diff --git a/index.css b/index.css
index ac5669c5f..b49a05581 100644
--- a/index.css
+++ b/index.css
@@ -1028,10 +1028,10 @@ div#regimentSelectorBody > div > div {
 }
 
 .color-div {
-	width: 2.5em;
+	width: 3em;
 	height: 1em;
 	display: inline-block;
-	margin: .1em .2em;
+	margin: 0 .16em;
 	border: 1px #c5c5c5 groove;
 	cursor: pointer;
 }
diff --git a/index.html b/index.html
index 4a64ad881..ad3f4e323 100644
--- a/index.html
+++ b/index.html
@@ -1883,8 +1883,8 @@
           <button data-tip="Display brushes panel" id="paintBrushes">Paint Brushes</button>
           <button data-tip="Open template editor" id="applyTemplate" style="display: none">Template Editor</button>
           <button data-tip="Open Image Converter" id="convertImage" style="display: none">Image Converter</button>
-          <button data-tip="Render heightmap data as a small monochrome image" id="heightmapPreview">Heightmap Preview</button>
-          <button data-tip="Preview heightmap in 3D scene" id="heightmap3DView">3D</button>
+          <button data-tip="Render heightmap data as a small monochrome image" id="heightmapPreview">Preview</button>
+          <button data-tip="Preview heightmap in 3D scene" id="heightmap3DView">3D scene</button>
         </div>
 
         <div id="customizeOptions">
@@ -2674,17 +2674,18 @@
 
       <div id="convertImageButtons">
         <button id="convertImageLoad" data-tip="Load image to convert" class="icon-upload"></button>
-        <button id="convertAutoLum" data-tip="Auto-assign colors based on liminosity (good to monochrome images)" class="icon-adjust"></button>
-        <button id="convertAutoHue" data-tip="Auto-assign colors based on hue (good to colored images)" class="icon-brush"></button>
+        <button id="convertAutoLum" data-tip="Auto-assign colors based on liminosity (good for monochrome images)" class="icon-adjust"></button>
+        <button id="convertAutoHue" data-tip="Auto-assign colors based on hue (good for colored images)" class="icon-paint-roller"></button>
+        <button id="convertAutoFMG" data-tip="Auto-assign colors using generator scheme (for exported colored heightmaps)" class="icon-layer-group"></button>
         <button id="convertColorsButton" data-tip="Set maximum number of colors" class="icon-signal"></button>
-        <input id="convertColors" value="128" style="display: none"/>
+        <input id="convertColors" value="100" style="display: none"/>
         <button id="convertComplete" data-tip="Complete the conversion. All unassigned colors will be considered as ocean" class="icon-check"></button>
         <button id="convertCancel" data-tip="Cancel the conversion. Previous heightmap will be restored" class="icon-cancel"></button>
       </div>
 
-      <div data-tip="Set opacity of the loaded image" style="padding-top: 4px"><i>Overlay opacity:</i><br>
-        <input id="convertOverlay" type="range" min=0 max=1 step=.01 value=0 style="width: 11.5em">
-        <input id="convertOverlayNumber" type="number" min=0 max=1 step=.01 value=0 style="width: 3.5em">
+      <div data-tip="Set opacity of the loaded image" style="padding-top: .4em"><i>Overlay opacity:</i><br>
+        <input id="convertOverlay" type="range" min=0 max=1 step=.01 value=0 style="width: 12.6em">
+        <input id="convertOverlayNumber" type="number" min=0 max=1 step=.01 value=0 style="width: 4.2em">
       </div>
 
       <div data-tip="Select a color below and assign a height value for it" id="colorsSelect" style="display: none">
@@ -2695,11 +2696,11 @@
       </div>
 
       <div data-tip="Select a color to re-assign the height value" id="colorsAssigned" style="display: none">
-        <i>Assigned colors: </i><br>
+        <i>Assigned colors (<span id="colorsAssignedNumber"></span>):</i><br>
       </div>
 
       <div data-tip="Select a color to assign a height value" id="colorsUnassigned" style="display: none">
-        <i>Unassigned colors: </i><br>
+        <i>Unassigned colors (<span id="colorsUnassignedNumber"></span>):</i><br>
       </div>
 
     </div>
diff --git a/modules/ui/heightmap-editor.js b/modules/ui/heightmap-editor.js
index 872785557..f574f84eb 100644
--- a/modules/ui/heightmap-editor.js
+++ b/modules/ui/heightmap-editor.js
@@ -3,13 +3,13 @@
 
 function editHeightmap() {
   void function selectEditMode() {
-    alertMessage.innerHTML = `<span>Heightmap is a core element on which all other data (rivers, burgs, states etc) is based.
-      So the best edit approach is to <i>erase</i> the secondary data and let the system automatically regenerate it on edit completion.</span> 
-      <p>You can also <i>keep</i> all the data, but you won't be able to change the coastline.</p>
-      <p>If you need to change the coastline and keep the data, you may try the <i>risk</i> edit option. 
-      The data will be restored as much as possible, but the coastline change can cause unexpected fluctuations and errors.</p>
-      <p>Check out ${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-customization", "wiki")} for guidance.</p>
-      <p>Please <span class="pseudoLink" onclick=saveMap(); editHeightmap();>save the map</span> before editing the heightmap!</p>`;
+    alertMessage.innerHTML = `Heightmap is a core element on which all other data (rivers, burgs, states etc) is based.
+      So the best edit approach is to <i>erase</i> the secondary data and let the system automatically regenerate it on edit completion.
+      <p><i>Erase</i> mode also allows you Convert an Image into a heightmap or use Template Editor.</p>
+      <p>You can <i>keep</i> the data, but you won't be able to change the coastline.</p>
+      <p>Try <i>risk</i> mode to change the coastline and keep the data. The data will be restored as much as possible, but it can cause unpredictable errors.</p>
+      <p>Please <span class="pseudoLink" onclick=saveMap(); editHeightmap();>save the map</span> before editing the heightmap!</p>
+      <p>Check out ${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-customization", "wiki")} for guidance.</p>`;
 
     $("#alert").dialog({resizable: false, title: "Edit Heightmap", width: "28em",
       buttons: {
@@ -61,9 +61,9 @@ function editHeightmap() {
       changeOnlyLand.checked = false;
     }
 
-    // hide convert and template buttons for the Keep mode
-    applyTemplate.style.display = type === "keep" ? "none" : "inline-block";
-    convertImage.style.display = type === "keep" ? "none" : "inline-block";
+    // show convert and template buttons for Erase mode only
+    applyTemplate.style.display = type === "erase" ? "inline-block" : "none";
+    convertImage.style.display = type === "erase" ? "inline-block" : "none";
 
     // hide erosion checkbox if mode is Keep
     changeHeightsBox.style.display = type === "keep" ? "none" : "inline-block";
@@ -963,10 +963,11 @@ function editHeightmap() {
 
   function openImageConverter() {
     if ($("#imageConverter").is(":visible")) return;
+    imageToLoad.click();
     closeDialogs("#imageConverter");
 
     $("#imageConverter").dialog({
-      title: "Image Converter", maxHeight: svgHeight*.75, minHeight: "auto", width: "19.5em", resizable: false,
+      title: "Image Converter", maxHeight: svgHeight*.8, minHeight: "auto", width: "20em",
       position: {my: "right top", at: "right-10 top+10", of: "svg"},
       beforeClose: closeImageConverter
     });
@@ -978,15 +979,9 @@ function editHeightmap() {
     canvas.height = graphHeight;
     document.body.insertBefore(canvas, optionsContainer);
 
-    const img = new Image;
-    img.id = "image";
-    img.style.display = "none";
-    document.body.appendChild(img);
-
     setOverlayOpacity(0);
-
-    document.getElementById("convertImageLoad").classList.add("glow"); // add glow effect
-    tip('Image Converter is opened. Upload the image and assign height value for each of the colors', true, "warn"); // main tip
+    clearMainTip();
+    tip('Image Converter is opened. Upload image and assign height value for each color', false, "warn"); // main tip
 
     // remove all heights
     grid.cells.h = new Uint8Array(grid.cells.i.length);
@@ -1001,7 +996,7 @@ function editHeightmap() {
       d3.select("#imageConverterPalette").selectAll("div").data(d3.range(101))
         .enter().append("div").attr("data-color", i => i)
         .style("background-color", i => color(1-(i < 20 ? i-5 : i) / 100))
-        .style("width", i => i < 20 || i > 70 ? ".2em" : ".1em")
+        .style("width", i => i < 40 || i > 68 ? ".2em" : ".1em")
         .on("touchmove mousemove", showPalleteHeight).on("click", assignHeight);
     }()
 
@@ -1010,6 +1005,7 @@ function editHeightmap() {
     document.getElementById("imageToLoad").addEventListener("change", loadImage);
     document.getElementById("convertAutoLum").addEventListener("click", () => autoAssing("lum"));
     document.getElementById("convertAutoHue").addEventListener("click", () => autoAssing("hue"));
+    document.getElementById("convertAutoFMG").addEventListener("click", () => autoAssing("scheme"));
     document.getElementById("convertColorsButton").addEventListener("click", setConvertColorsNumber);
     document.getElementById("convertComplete").addEventListener("click", applyConversion);
     document.getElementById("convertCancel").addEventListener("click", cancelConversion);
@@ -1030,12 +1026,12 @@ function editHeightmap() {
       this.value = ""; // reset input value to get triggered if the file is re-uploaded
       const reader = new FileReader();
 
+      const img = new Image;
       img.onload = function() {
         const ctx = document.getElementById("canvas").getContext("2d");
         ctx.drawImage(img, 0, 0, graphWidth, graphHeight);
         heightsFromImage(+convertColors.value);
         resetZoom();
-        convertImageLoad.classList.remove("glow");
       };
 
       reader.onloadend = () => img.src = reader.result;
@@ -1043,37 +1039,35 @@ function editHeightmap() {
     }
 
     function heightsFromImage(count) {
-      const ctx = document.getElementById("canvas").getContext("2d");
+      const sourceImage = document.getElementById("canvas");
+      const sampleCanvas = document.createElement("canvas");
+      sampleCanvas.width = grid.cellsX;
+      sampleCanvas.height = grid.cellsY;
+      sampleCanvas.getContext('2d').drawImage(sourceImage, 0, 0, grid.cellsX, grid.cellsY);
+
       const q = new RgbQuant({colors:count});
-      q.sample(ctx);
-      const data = q.reduce(ctx);
+      q.sample(sampleCanvas);
+      const data = q.reduce(sampleCanvas);
+      const pallete = q.palette(true);
 
       viewbox.select("#heights").selectAll("*").remove();
       d3.select("#imageConverter").selectAll("div.color-div").remove();
       colorsSelect.style.display = "block";
       colorsUnassigned.style.display = "block";
       colorsAssigned.style.display = "none";
-
-      let usedColors = new Set();
-      let gridColors = grid.points.map(p => {
-        const x = Math.floor(p[0]-.01), y = Math.floor(p[1]-.01);
-        const i = (x + y * graphWidth) * 4;
-        const r = data[i], g = data[i+1], b = data[i+2];
-        usedColors.add(`rgb(${r},${g},${b})`);
-        return [r, g, b];
-      });
+      sampleCanvas.remove(); // no need to keep
 
       viewbox.select("#heights").selectAll("polygon").data(grid.cells.i).join("polygon")
-        .attr("points", d => getGridPolygon(d))
-        .attr("id", d => "cell"+d).attr("fill", d => `rgb(${gridColors[d].join(",")})`)
+        .attr("points", d => getGridPolygon(d)).attr("id", d => "cell"+d)
+        .attr("fill", d => `rgb(${data[d*4]}, ${data[d*4+1]}, ${data[d*4+2]})`)
         .on("click", mapClicked);
 
-      const unassigned = [...usedColors].sort((a, b) => d3.lab(a).l - d3.lab(b).l);
-      d3.select("#colorsUnassigned").selectAll("div").data(unassigned).enter().append("div")
+      const colors = pallete.map(p => `rgb(${p[0]}, ${p[1]}, ${p[2]})`);
+      d3.select("#colorsUnassigned").selectAll("div").data(colors).enter().append("div")
         .attr("data-color", i => i).style("background-color", i => i)
         .attr("class", "color-div").on("click", colorClicked);
 
-      convertColors.value = unassigned.length;
+      document.getElementById("colorsUnassignedNumber").innerHTML = colors.length;
     }
 
     function mapClicked() {
@@ -1123,34 +1117,60 @@ function editHeightmap() {
       if (selectedColor.parentNode.id === "colorsUnassigned") {
         colorsAssigned.appendChild(selectedColor);
         colorsAssigned.style.display = "block";
+
+        document.getElementById("colorsUnassignedNumber").innerHTML = colorsUnassigned.childElementCount - 2;
+        document.getElementById("colorsAssignedNumber").innerHTML = colorsAssigned.childElementCount - 2;
       }
 
     }
 
     // auto assign color based on luminosity or hue
     function autoAssing(type) {
-      const unassigned = colorsUnassigned.querySelectorAll("div");
-      if (!unassigned.length) {tip("No unassigned colors. Please load an image and click the button again", false, "error"); return;}
+      let unassigned = colorsUnassigned.querySelectorAll("div");
+      if (!unassigned.length) {
+        heightsFromImage(+convertColors.value);
+        unassigned = colorsUnassigned.querySelectorAll("div");
+        if (!unassigned.length) {
+          tip("No unassigned colors. Please load an image and click the button again", false, "error"); 
+          return;
+        }
+      }
 
-      const assinged = []; // assigned heights
+      const getHeightByHue = function(color) {
+        let hue = d3.hsl(color).h;
+        if (hue > 300) hue -= 360;
+        if (hue > 170) return Math.abs(hue-250) / 3 |0; // water
+        return Math.abs(hue-250+20) / 3 |0; // land
+      }
+
+      const getHeightByLum = function(color) {
+        let lum = d3.lab(color).l;
+        if (lum < 13) return lum / 13 * 20 |0; // water
+        return lum|0; // land
+      }
+
+      const scheme = d3.range(101).map(i => getColor(i, color()));
+      const hues = scheme.map(rgb => d3.hsl(rgb).h|0);
+      const getHeightByScheme = function(color) {
+        let height = scheme.indexOf(color);
+        if (height !== -1) return height; // exact match
+        const hue = d3.hsl(color).h;
+        const closest = hues.reduce((prev, curr) => (Math.abs(curr - hue) < Math.abs(prev - hue) ? curr : prev));
+        return hues.indexOf(closest);
+      }
+
+      const assinged = []; // store assigned heights
       unassigned.forEach(el => {
-        const colorFrom = el.dataset.color;
-        const lab = d3.lab(colorFrom);
-        const normalized = type === "hue" ? rn(normalize(lab.b + lab.a / 2, -50, 200), 2) : rn(normalize(lab.l, -15, 100), 2);
-        let heightTo = rn(normalized * 100);
-        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increased one
-        if (assinged[heightTo] && heightTo < 100) heightTo += 1; // if height is already added, try increased one
-        if (assinged[heightTo] && heightTo > 3) heightTo -= 3; // if increased one is also added, try decreased one
-        if (assinged[heightTo] && heightTo > 1) heightTo -= 1; // if increased one is also added, try decreased one
-
-        const colorTo = color(1 - (heightTo < 20 ? (heightTo-5)/100 : heightTo/100));
-        viewbox.select("#heights").selectAll("polygon[fill='" + colorFrom + "']").attr("fill", colorTo).attr("data-height", heightTo);
-
-        if (assinged[heightTo]) {el.remove(); return;} // if color is already added, remove it
+        const clr = el.dataset.color;
+        const height = type === "hue" ? getHeightByHue(clr) : type === "lum" ? getHeightByLum(clr) : getHeightByScheme(clr);
+        const colorTo = color(1 - (height < 20 ? (height-5) / 100 : height / 100));
+        viewbox.select("#heights").selectAll("polygon[fill='" + clr + "']").attr("fill", colorTo).attr("data-height", height);
+
+        if (assinged[height]) {el.remove(); return;} // if color is already added, remove it
         el.style.backgroundColor = el.dataset.color = colorTo;
-        el.dataset.height = heightTo;
+        el.dataset.height = height;
         colorsAssigned.appendChild(el);
-        assinged[heightTo] = true;
+        assinged[height] = true;
       });
 
       // sort assigned colors by height
@@ -1160,10 +1180,11 @@ function editHeightmap() {
 
       colorsAssigned.style.display = "block";
       colorsUnassigned.style.display = "none";
+      document.getElementById("colorsAssignedNumber").innerHTML = colorsAssigned.childElementCount - 2;
     }
 
     function setConvertColorsNumber() {
-      prompt(`Please set maximum number of colors. <br>An actual number is lower and depends on color scheme`,
+      prompt(`Please set maximum number of colors. <br>An actual number is usually lower and depends on color scheme`,
       {default:+convertColors.value, step:1, min:3, max:255}, number => {
         convertColors.value = number;
         heightsFromImage(number);
@@ -1176,6 +1197,11 @@ function editHeightmap() {
     }
 
     function applyConversion() {
+      if (colorsAssigned.childElementCount < 3) {
+        tip("Please do the assignment first", false, "error");
+        return;
+      }
+
       viewbox.select("#heights").selectAll("polygon").each(function() {
         const height = +this.dataset.height || 0;
         const i = +this.id.slice(4);
@@ -1195,9 +1221,7 @@ function editHeightmap() {
 
     function restoreImageConverterState() {
       const canvas = document.getElementById("canvas");
-      if (canvas) canvas.remove(); else return;
-      const img = document.getElementById("image");
-      if (img) img.remove(); else return;
+      if (canvas) canvas.remove();
 
       d3.select("#imageConverter").selectAll("div.color-div").remove();
       colorsAssigned.style.display = "none";
@@ -1206,12 +1230,18 @@ function editHeightmap() {
       viewbox.style("cursor", "default").on(".drag", null);
       tip('Heightmap edit mode is active. Click on "Exit Customization" to finalize the heightmap', true);
       $("#imageConverter").dialog("destroy");
+      openBrushesPanel();
     }
 
     function closeImageConverter(event) {
       event.preventDefault();
       event.stopPropagation();
-      alertMessage.innerHTML = 'Are you sure you want to close the Image Converter? Click "Cancel" to geck back to convertion. Click "Complete" to apply the conversion. Click "Close" to exit conversion mode and restore previous heightmap';
+      alertMessage.innerHTML = `
+        Are you sure you want to close the Image Converter? 
+        Click "Cancel" to geck back to convertion. 
+        Click "Complete" to apply the conversion. 
+        Click "Close" to exit conversion mode and restore previous heightmap`;
+
       $("#alert").dialog({resizable: false, title: "Close Image Converter",
         buttons: {
           Cancel: function() {
diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js
index b34732e25..78c84f8dd 100644
--- a/modules/ui/routes-editor.js
+++ b/modules/ui/routes-editor.js
@@ -101,11 +101,9 @@ function editRoute(onClick) {
 
     elSelected.attr("d", round(lineGen(points)));
     const l = elSelected.node().getTotalLength();
-    routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;    
- 
-    if (modules.elevation) {
-      showEPForRoute(elSelected.node());
-    }
+    routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value;
+
+    if (modules.elevation) showEPForRoute(elSelected.node());
   }
 
   function showElevationProfile() {

From 22b4c49e8acd5a8ec625ed24b7227ef1b69a2470 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 18 May 2020 00:04:01 +0300
Subject: [PATCH 22/38] v1.4.17

---
 index.css  | 6 +-----
 index.html | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/index.css b/index.css
index 30cc3d9e4..0fce363ca 100644
--- a/index.css
+++ b/index.css
@@ -2103,7 +2103,7 @@ svg.button {
 
 .epgrid line {
   stroke: lightgrey;
-  stroke-opacity: 0.7;
+  stroke-opacity: .7;
   shape-rendering: crispEdges;
 }
 
@@ -2111,10 +2111,6 @@ svg.button {
   stroke-width: 0;
 }
 
-.centered {
-	text-align: center;
-}
-
 #debug {
 	font-size: 1px;
 	opacity: .8;
diff --git a/index.html b/index.html
index 4b6989817..02f547f03 100644
--- a/index.html
+++ b/index.html
@@ -2135,7 +2135,7 @@
 
     <div id="elevationProfile" class="dialog" style="display: none" width="100%">
       <div id="elevationGraph" data-tip="Elevation profile"></div>
-      <div class="centered">
+      <div style="text-align: center">
         <div id="epControls">
           <span data-tip="Set height scale">Height scale: <input id="epScaleRange" type="range" min=1 max=100 value=50></span>
           <span data-tip="Set curve profile">Curve:

From b3f83bbabdec5c9957080b87cf657cac37d815ca Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 18 May 2020 00:50:57 +0300
Subject: [PATCH 23/38] v1.4.18

---
 index.css                   | 2 +-
 index.html                  | 2 +-
 main.js                     | 3 ++-
 modules/ui/states-editor.js | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/index.css b/index.css
index 0fce363ca..5308deed4 100644
--- a/index.css
+++ b/index.css
@@ -114,7 +114,7 @@ button, select, a, .pointer {
 	fill-rule: evenodd;
 }
 
-#oceanLayers {
+#oceanLayers, #terrs {
 	fill-rule: evenodd;
 }
 
diff --git a/index.html b/index.html
index 02f547f03..c3efcd132 100644
--- a/index.html
+++ b/index.html
@@ -2870,7 +2870,7 @@
           <option data-form="Union" value="United States">United States</option>
           <option data-form="Wild" value="United Tribes">United Tribes</option>
         </select>
-        <input id="stateNameEditorCustomForm" placeholder="type form name" data-tip="Create custom state form name" style="display: none; width: 11em;">
+        <input id="stateNameEditorCustomForm" placeholder="type form name" data-tip="Enter custom form name" style="display: none; width: 11em;">
         <span id="stateNameEditorAddForm" data-tip="Click to add custom state form name to the list" class="icon-plus pointer"></span>
       </div>
 
diff --git a/main.js b/main.js
index a2b40674c..1e44a5589 100644
--- a/main.js
+++ b/main.js
@@ -343,7 +343,8 @@ function showWelcomeMessage() {
     <ul>${post}
       <li>Battle simulation</li>
       <li>Ice layer and Ice editor</li>
-      <li>Route Elevation profile</li>
+      <li>Route and River Elevation profile</li>
+      <li>Image Converter enhancement</li>
       <li>Name generator improvement</li>
       <li>Fogging style change</li>
     </ul>
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index 2f1d5800c..de0da9e97 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -215,8 +215,7 @@ function editStates() {
   }
 
   function editStateName(state) {
-
-    //Reset input value and close add mode
+    // reset input value and close add mode
     stateNameEditorCustomForm.value = "";
     const addModeActive = stateNameEditorCustomForm.style.display === "inline-block";
     if (addModeActive) {
@@ -244,6 +243,7 @@ function editStates() {
     document.getElementById("stateNameEditorShortCulture").addEventListener("click", regenerateShortNameCuture);
     document.getElementById("stateNameEditorShortRandom").addEventListener("click", regenerateShortNameRandom);
     document.getElementById("stateNameEditorAddForm").addEventListener("click", addCustomForm);
+    document.getElementById("stateNameEditorCustomForm").addEventListener("change", addCustomForm);
     document.getElementById("stateNameEditorFullRegenerate").addEventListener("click", regenerateFullName);
 
     function regenerateShortNameCuture() {
@@ -264,7 +264,7 @@ function editStates() {
       const addModeActive = stateNameEditorCustomForm.style.display === "inline-block";
       stateNameEditorCustomForm.style.display = addModeActive ? "none" : "inline-block";
       stateNameEditorSelectForm.style.display = addModeActive ? "inline-block" : "none";
-      if (addModeActive) applyOption(stateNameEditorSelectForm, value);
+      if (value && addModeActive) applyOption(stateNameEditorSelectForm, value);
       stateNameEditorCustomForm.value = "";
     }
 

From cfe92dc60e33c5f3ccbadfaace761376a9ae52ac Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 18 May 2020 01:09:37 +0300
Subject: [PATCH 24/38] v1.4.19

---
 modules/ui/tools.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ui/tools.js b/modules/ui/tools.js
index 20b649775..357163b3d 100644
--- a/modules/ui/tools.js
+++ b/modules/ui/tools.js
@@ -158,8 +158,8 @@ function regenerateStates() {
     tip(`Not enought burgs to generate ${regionsInput.value} states. Will generate only ${burgs.length} states`, false, "warn");
   }
 
-  // burg ids sorted by a bit randomized population:
-  const sorted = burgs.map(b => [b.i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]);
+  // burg local ids sorted by a bit randomized population:
+  const sorted = burgs.map((b, i) => [i, b.population * Math.random()]).sort((a, b) => b[1] - a[1]).map(b => b[0]);
   const capitalsTree = d3.quadtree();
 
   // turn all old capitals into towns
@@ -194,8 +194,8 @@ function regenerateStates() {
     if (!i) return {i, name: neutral};
 
     let capital = null, x = 0, y = 0;
-    for (let i=0; i < sorted.length; i++) {
-      capital = burgs[sorted[i]];
+    for (const i of sorted) {
+      capital = burgs[i];
       x = capital.x, y = capital.y;
       if (capitalsTree.find(x, y, spacing) === undefined) break;
       spacing = Math.max(spacing - 1, 1);

From 408578455be032970985ac548777ce4abfcf9a88 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Mon, 18 May 2020 09:21:42 +0000
Subject: [PATCH 25/38] Fix for elevation profile labels

---
 modules/ui/elevation-profile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 209b6ba86..f816ce075 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -49,7 +49,7 @@ function showElevationProfile(data, routeLen, isRiver) {
   const chartHeight = 300; // height of our land/sea profile, excluding the biomes data below
 
   const xOffset = 80;
-  const yOffset = 20;  // this is our drawing starting point from top-left (y = 0) of SVG
+  const yOffset = 80;  // this is our drawing starting point from top-left (y = 0) of SVG
 
   const biomesHeight = 40;
 

From 8618449a2162a9a23cbb979749ed24ab34ea671a Mon Sep 17 00:00:00 2001
From: Daniel Mecke <daniel.mecke@cunningsoft.de>
Date: Tue, 19 May 2020 19:17:34 +0200
Subject: [PATCH 26/38] Added neighboring cells in json export

---
 modules/save-and-load.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 607e1d7eb..573333194 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -351,7 +351,8 @@ function saveGeoJSON_Cells() {
     data += "      \"state\": \""+cells.state[i]+"\",\n";
     data += "      \"province\": \""+cells.province[i]+"\",\n";
     data += "      \"culture\": \""+cells.culture[i]+"\",\n";
-    data += "      \"religion\": \""+cells.religion[i]+"\"\n";
+    data += "      \"religion\": \""+cells.religion[i]+"\",\n";
+    data += "      \"neighbors\": "+cells.c[i]+"\n";
     data +="   }\n},\n";
   });
 

From 94b40ad97afb0e21ac112ea8f2293bebc450551b Mon Sep 17 00:00:00 2001
From: Daniel Mecke <daniel.mecke@cunningsoft.de>
Date: Wed, 20 May 2020 21:28:24 +0200
Subject: [PATCH 27/38] added missing square brackets in json export

---
 modules/save-and-load.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 573333194..77da271fd 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -352,7 +352,7 @@ function saveGeoJSON_Cells() {
     data += "      \"province\": \""+cells.province[i]+"\",\n";
     data += "      \"culture\": \""+cells.culture[i]+"\",\n";
     data += "      \"religion\": \""+cells.religion[i]+"\",\n";
-    data += "      \"neighbors\": "+cells.c[i]+"\n";
+    data += "      \"neighbors\": ["+cells.c[i]+"]\n";
     data +="   }\n},\n";
   });
 

From 5642004a53e6b3e7073318bf7034df2ad0a49d17 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Tue, 26 May 2020 01:33:44 +0300
Subject: [PATCH 28/38] v1.4.20

---
 index.html                    |  4 +-
 modules/military-generator.js |  2 +-
 modules/ui/battle-screen.js   | 81 ++++++++++++++++++++++++++++++++---
 3 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index c3efcd132..9be8fea08 100644
--- a/index.html
+++ b/index.html
@@ -2508,8 +2508,8 @@
         <button id="battleAddRegiment" data-tip="Add regiment to the battle" class="icon-user-plus"></button>
         <button id="battleRoll" data-tip="Roll dice to update random factor" class="icon-die"></button>
         <button id="battleRun" data-tip="Iterate battle" class="icon-play"></button>
-        <button id="battleApply" data-tip="Apply battle results and close the screen" class="icon-check"></button>
-        <button id="battleCancel" data-tip="Cancel battle results and close the screen" class="icon-cancel"></button>
+        <button id="battleApply" data-tip="End battle: apply current results and close the screen" class="icon-check"></button>
+        <button id="battleCancel" data-tip="Cancel battle: roll back results and close the screen" class="icon-cancel"></button>
       </div>
     </div>
 
diff --git a/modules/military-generator.js b/modules/military-generator.js
index 009b4b0de..f0821400a 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -304,7 +304,7 @@
     const station = base ? `${r.name} is ${r.n ? "based" : "stationed"} in ${base}. ` : "";
 
     const composition = r.a ? Object.keys(r.u).map(t => `— ${t}: ${r.u[t]}`).join("\r\n") : null;
-    const troops = composition ? `\r\n\r\nRegiment composition:\r\n${composition}.` : "";
+    const troops = composition ? `\r\n\r\nRegiment composition in ${options.year} ${options.eraShort}:\r\n${composition}.` : "";
 
     const campaign = s.campaigns ? ra(s.campaigns) : null;
     const year = campaign ? rand(campaign.start, campaign.end) : gauss(options.year-100, 150, 1, options.year-6);
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index de9882f29..70375f3e7 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -11,8 +11,8 @@ class Battle {
     this.y = defender.y;
     this.name = this.getBattleName();
     this.iteration = 0;
-    this.attackers = {regiments:[], distances:[], morale:100};
-    this.defenders = {regiments:[], distances:[], morale:100};
+    this.attackers = {regiments:[], distances:[], morale:100, casualties:0};
+    this.defenders = {regiments:[], distances:[], morale:100, casualties:0};
 
     this.addHeaders();
     this.addRegiment("attackers", attacker);
@@ -260,6 +260,8 @@ class Battle {
 
     this.calculateCasualties("attackers", casualtiesA);
     this.calculateCasualties("defenders", casualtiesD);
+    this.attackers.casualties += casualtiesA;
+    this.defenders.casualties += casualtiesD;
 
     // change morale
     this.attackers.morale = Math.max(this.attackers.morale - casualtiesA * 100, 0);
@@ -326,12 +328,79 @@ class Battle {
   }
 
   applyResults() {
-    this.attackers.regiments.concat(this.defenders.regiments).forEach(r => {
+    const battleName = this.name;
+    const maxCasualties = Math.max(this.attackers.casualties, this.attackers.casualties);
+    const relativeCasualties = this.defenders.casualties / (this.attackers.casualties + this.attackers.casualties);
+    const battleStatus = getBattleStatus(relativeCasualties, maxCasualties);
+    function getBattleStatus(relative, max) {
+      if (isNaN(relative)) return ["standoff", "standoff"]; // if no casualties at all
+      if (max < .05) return ["minor skirmishes", "minor skirmishes"];
+      if (relative > 95) return ["attackers flawless victory", "disorderly retreat of defenders"];
+      if (relative > .7) return ["attackers decisive victory", "defenders disastrous defeat"];
+      if (relative > .6) return ["attackers victory", "defenders defeat"];
+      if (relative > .4) return ["stalemate", "stalemate"];
+      if (relative > .3) return ["attackers defeat", "defenders victory"];
+      if (relative > 0.5) return ["attackers disastrous defeat", "decisive victory of defenders"];
+      if (relative >= 0) return ["attackers disorderly retreat", "flawless victory of defenders"];
+      return ["stalemate", "stalemate"]; // exception
+    }
+
+    this.attackers.regiments.forEach(r => applyResultForSide(r, "attackers"));
+    this.defenders.regiments.forEach(r => applyResultForSide(r, "defenders"));
+
+    function applyResultForSide(r, side) {
+      const id = "regiment" + r.state + "-" + r.i;
+
+      // add result to regiment note
+      const note = notes.find(n => n.id === id);
+      if (note) {
+        const status = side === "attackers" ? battleStatus[0] : battleStatus[1];
+        const losses = r.a ? Math.abs(d3.sum(Object.values(r.casualties))) / r.a : 1;
+        const regStatus =
+          losses === 1 ? "is destroyed" :
+          losses > .8 ? "is almost completely destroyed" :
+          losses > .5 ? "suffered terrible losses" :
+          losses > .3 ? "suffered severe losses" :
+          losses > .2 ? "suffered heavy losses" :
+          losses > .05 ? "suffered significant losses" :
+          losses > 0 ? "suffered unsignificant losses" :
+          "left the battle without loss";
+        const casualties = Object.keys(r.casualties).map(t => r.casualties[t] ? `${Math.abs(r.casualties[t])} ${t}` : null).filter(c => c).join(", ");
+        const casualtiesText = casualties ? " Casualties: " + casualties : "";
+        const legend = `\r\n\r\n${battleName} (${options.year} ${options.eraShort}): ${status}. The regiment ${regStatus}.${casualtiesText}`;
+        note.legend += legend;
+      }
+
       r.u = Object.assign({}, r.survivors);
       r.a = d3.sum(Object.values(r.u)); // reg total
-      armies.select(`g#regiment${r.state}-${r.i} > text`).text(Military.getTotal(r)); // update reg box
-      Military.moveRegiment(r, r.x + rand(30) - 15, r.y + rand(30) - 15);
-    });
+      armies.select(`g#${id} > text`).text(Military.getTotal(r)); // update reg box
+      Military.moveRegiment(r, r.x + rand(20) - 10, r.y + rand(20) - 10);
+    }
+
+    // append battlefield marker
+    void function addMarkerSymbol() {
+      if (svg.select("#defs-markers").select("#marker_battlefield").size()) return;
+      const symbol = svg.select("#defs-markers").append("symbol").attr("id", "marker_battlefield").attr("viewBox", "0 0 30 30");
+      symbol.append("path").attr("d", "M6,19 l9,10 L24,19").attr("fill", "#000000").attr("stroke", "none");
+      symbol.append("circle").attr("cx", 15).attr("cy", 15).attr("r", 10).attr("fill", "#ffffff").attr("stroke", "#000000").attr("stroke-width", 1);
+      symbol.append("text").attr("x", "50%").attr("y", "52%").attr("fill", "#000000").attr("stroke", "#3200ff").attr("stroke-width", 0)
+        .attr("font-size", "12px").attr("dominant-baseline", "central").text("⚔️");
+    }()
+
+    const getSide = (regs, n) => regs.length > 1 ? 
+      `${n ? "regiments" : "forces"} of ${[... new Set(regs.map(r => pack.states[r.state].name))].join(", ")}` :
+      getAdjective(pack.states[regs[0].state].name) + " " + regs[0].name;
+    const getLosses = casualties => Math.min(rn(casualties * 100), 100);
+
+    const legend = `${this.name} took place in ${options.year} ${options.eraShort}. It was fought between ${getSide(this.attackers.regiments, 1)} and ${getSide(this.defenders.regiments, 0)}. The battle ended in ${battleStatus[+P(.7)]}.
+      \r\nAttackers losses: ${getLosses(this.attackers.casualties)}%, defenders losses: ${getLosses(this.defenders.casualties)}%`;
+    const id = getNextId("markerElement");
+    notes.push({id, name:this.name, legend});
+
+    markers.append("use").attr("id", id)
+      .attr("xlink:href", "#marker_battlefield").attr("data-id", "#marker_battlefield")
+      .attr("data-x", this.x).attr("data-y", this.y).attr("x", this.x - 15).attr("y", this.y - 30)
+      .attr("data-size", 1).attr("width", 30).attr("height", 30);
 
     $("#battleScreen").dialog("destroy");
     this.cleanData();

From 957bab32c1882e834d3124017f070124bc8fb074 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Fri, 5 Jun 2020 22:21:32 +0300
Subject: [PATCH 29/38] v1.4.21

---
 icons.css                   |  29 +++-
 index.css                   |  10 +-
 index.html                  | 112 +++++++++++---
 modules/ui/battle-screen.js | 299 ++++++++++++++++++++++++++++++------
 modules/ui/burg-editor.js   |  29 +---
 modules/ui/options.js       |   2 +-
 6 files changed, 388 insertions(+), 93 deletions(-)

diff --git a/icons.css b/icons.css
index 73e3c3b5a..4a350cc89 100644
--- a/icons.css
+++ b/icons.css
@@ -266,7 +266,34 @@
 .icon-die:before {content:'🎲';}
 .icon-button-die:before {content:'🎲'; padding-right: .4em;}
 .icon-button-power:before {content:'💪'; padding-right: .6em;}
-.icon-button-skirmish:before {content:'🎯'; padding-right: .4em;}
+
 .icon-button-melee:before {content:'⚔️'; padding-right: .4em;}
+.icon-button-skirmish:before {content:'🎯'; padding-right: .4em;}
 .icon-button-pursue:before {content:'🐎'; padding-right: .4em;}
 .icon-button-retreat:before {content:'🏳️'; padding-right: .4em;}
+
+.icon-button-shelling:before {content:'💣'; padding-right: .4em;}
+.icon-button-boarding:before {content:'⚔️'; padding-right: .4em;}
+.icon-button-chase:before {content:'⛵'; padding-right: .4em;}
+.icon-button-withdrawal:before {content:'🏳️'; padding-right: .4em;}
+
+.icon-button-bombardment:before {content:'💣'; padding-right: .4em;}
+.icon-button-blockade:before {content:'⏳'; padding-right: .4em;}
+.icon-button-sheltering:before {content:'🔒'; padding-right: .4em;}
+.icon-button-sortie:before {content:'🚪'; padding-right: .4em;}
+.icon-button-defense:before {content:'🛡️'; padding-right: .4em;}
+.icon-button-storming:before {content:'⚔️'; padding-right: .4em;}
+.icon-button-looting:before {content:'☠️'; padding-right: .4em;}
+.icon-button-surrendering:before {content:'🏳️'; padding-right: .4em;}
+
+.icon-button-surprise:before {content:'⚡'; padding-right: .4em;}
+.icon-button-shock:before {content:'💫'; padding-right: .4em;}
+.icon-button-maneuvering:before {content:'💢'; padding-right: .4em;}
+.icon-button-dogfight:before {content:'🐕'; padding-right: .4em;}
+
+.icon-button-field:before {content:'🗡️'; padding-right: .4em;}
+.icon-button-naval:before {content:'🌊'; padding-right: .4em;}
+.icon-button-siege:before {content:'🏰'; padding-right: .4em;}
+.icon-button-ambush:before {content:'🌳'; padding-right: .4em;}
+.icon-button-landing:before {content:'⚓'; padding-right: .4em;}
+.icon-button-air:before {content:'💨'; padding-right: .4em;}
\ No newline at end of file
diff --git a/index.css b/index.css
index 5308deed4..0ee3007d3 100644
--- a/index.css
+++ b/index.css
@@ -969,12 +969,14 @@ tr.battleCasualties, tr.battleSurvivors {
 	font-size: .9em;
 }
 
-#battleBody div.battlePhases {
-	position: absolute;
-	background-color: #fff;
+#battleBody div.battlePhases,
+#battleBottom div.battleTypes {
+	position: fixed;
+	background-color: #ffffff30;
 }
 
-#battleBody div.battlePhases > button {
+#battleBody div.battlePhases > button,
+#battleBottom div.battleTypes > button {
 	width: 3.2em;
 	display: block;
 	margin: .2em 0;
diff --git a/index.html b/index.html
index 9be8fea08..824e00af9 100644
--- a/index.html
+++ b/index.html
@@ -2466,19 +2466,81 @@
 
     <div id="battleScreen" class="dialog stable" style="display: none">
       <div id="battleBody">
+        <template id="battlePhases_field">
+          <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
+          <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_naval">
+          <button data-tip="Shelling phase. Naval artillery bombardment of enemy fleet" data-phase="shelling" class="icon-button-shelling"></button>
+          <button data-tip="Boarding phase. Melee units go aboard" data-phase="boarding" class="icon-button-boarding"></button>
+          <button data-tip="Сhase phase. Naval units pursue and rarely shell enemy fleet" data-phase="chase" class="icon-button-chase"></button>
+          <button data-tip="Withdrawal phase. Naval units try to escape enemy fleet" data-phase="withdrawal" class="icon-button-withdrawal"></button>
+        </template>
+
+        <template id="battlePhases_siege_attackers">
+          <button data-tip="Blockade phase. Hold the blockade and wait" data-phase="blockade" class="icon-button-blockade"></button>
+          <button data-tip="Bombardment phase. Attack enemy with machinery units" data-phase="bombardment" class="icon-button-bombardment"></button>
+          <button data-tip="Storming phase. Storm enemy town. Melee units excel" data-phase="storming" class="icon-button-storming"></button>
+          <button data-tip="Looting phase. Plunder the town. Units strength increased" data-phase="looting" class="icon-button-looting"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_siege_defenders">
+          <button data-tip="Sheltering phase. Hide behind the walls and wait" data-phase="sheltering" class="icon-button-sheltering"></button>
+          <button data-tip="Sortie phase. Make a sortie from besieged town. Melee units excel" data-phase="sortie" class="icon-button-sortie"></button>
+          <button data-tip="Bombardment phase. Attack enemy with machinery units" data-phase="bombardment" class="icon-button-bombardment"></button>
+          <button data-tip="Defense phase. Ranged and melee units excel" data-phase="defense" class="icon-button-defense"></button>
+          <button data-tip="Surrendering phase. Give up the defence. Units strength reduced" data-phase="surrendering" class="icon-button-surrendering"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+        </template>
+
+        <template id="battlePhases_ambush_attackers">
+          <button data-tip="Shock phase. Units strength reduced" data-phase="shock" class="icon-button-shock"></button>
+          <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_ambush_defenders">
+          <button data-tip="Surprice attack phase. Units strength increased, ranged units excel" data-phase="surprise" class="icon-button-surprise"></button>
+          <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_landing_attackers">
+          <button data-tip="Landing phase. Units strength reduced" data-phase="skirmish" class="icon-button-landing"></button>
+          <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_landing_defenders">
+          <button data-tip="Shock phase. Units strength reduced" data-phase="shock" class="icon-button-shock"></button>
+          <button data-tip="Defense phase. Units strength increased" data-phase="defense" class="icon-button-defense"></button>
+          <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
+          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
+        <template id="battlePhases_air">
+          <button data-tip="Maneuvering phase. Units strength reduced" data-phase="maneuvering" class="icon-button-maneuvering"></button>
+          <button data-tip="Dogfight phase. Units strength increased" data-phase="dogfight" class="icon-button-dogfight"></button>
+          <button data-tip="Pursue phase. Units strength increased" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+        </template>
+
         <div style="font-size:1.2em; font-weight: bold">
           <span>Attackers</span>
           <div style="float: right; font-size: .7em">
-            <meter id="battleMorale_attackers" data-tip="Attackers morale: " min=0 max=100 low=33 high=66 optimum=80 style="padding: .1em"></meter>
-            <div id="battlePower_attackers" data-tip="Attackers strength during this phase" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
+            <meter id="battleMorale_attackers" data-tip="Attackers morale: " min=0 max=100 low=33 high=66 optimum=80></meter>
+            <div id="battlePower_attackers" data-tip="Attackers strength during this phase. Strength defines dealt damage" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
             <div style="display: inline-block;">
-              <button id="battlePhase_attackers" data-tip="Battle phase. Click to change" class="icon-button-pursue" style="width: 3.2em"></button>
-              <div class="battlePhases" style="display: none">
-                <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
-                <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
-                <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
-                <button data-tip="Retreat phase. All units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
-              </div>
+              <button id="battlePhase_attackers" style="width: 3.2em"></button>
+              <div class="battlePhases" style="display: none"></div>
             </div>
             <button id="battleDie_attackers" data-tip="Random factor for attackers. Click to re-roll" style="padding: .1em .2em; width: 3.2em" class="icon-button-die"></button>
           </div>
@@ -2487,16 +2549,11 @@
         <div style="font-size:1.2em; font-weight: bold">
           <span></span>Defenders</span>
           <div style="float: right; font-size: .7em">
-            <meter id="battleMorale_defenders" data-tip="Defenders morale: " min=0 max=100 low=33 high=66 optimum=80 style="padding: .1em"></meter>
-            <div id="battlePower_defenders" data-tip="Defenders strength during this phase" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
+            <meter id="battleMorale_defenders" data-tip="Defenders morale: " min=0 max=100 low=33 high=66 optimum=80></meter>
+            <div id="battlePower_defenders" data-tip="Defenders strength during this phase. Strength defines dealt damage" style="width: 3.2em; display: inline-block; text-align: center" class="icon-button-power"></div>
             <div style="display: inline-block;">
-              <button id="battlePhase_defenders" data-tip="Battle phase. Click to change" class="icon-button-pursue" style="width: 3.2em"></button>
-              <div class="battlePhases" style="display: none">
-                <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
-                <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
-                <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
-                <button data-tip="Retreat phase. All units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
-              </div>
+              <button id="battlePhase_defenders" style="width: 3.2em"></button>
+              <div class="battlePhases" style="display: none"></div>
             </div>
             <button id="battleDie_defenders" data-tip="Random factor for defenders. Click to re-roll" style="padding: .1em .2em; width: 3.2em" class="icon-button-die"></button>
           </div>
@@ -2505,6 +2562,25 @@
       </div>
 
       <div id="battleBottom">
+        <button id="battleType" data-tip="Battle type. Click to change"></button>
+        <div class="battleTypes" style="display: none">
+          <button data-tip="Field Battle: a standard type of combat" data-type="field" class="icon-button-field"></button>
+          <button data-tip="Naval Battle: naval units combat" data-type="naval" class="icon-button-naval"></button>
+          <button data-tip="Siege: burg blockade and storming" data-type="siege" class="icon-button-siege"></button>
+          <button data-tip="Ambush: surprise attack" data-type="ambush" class="icon-button-ambush"></button>
+          <button data-tip="Landing: amphibious attack" data-type="landing" class="icon-button-landing"></button>
+          <button data-tip="Air Battle: maneuring fight of avia units" data-type="air" class="icon-button-air"></button>
+        </div>
+
+        <button id="battleNameShow" data-tip="Set battle name" class="icon-font"></button>
+        <div id="battleNameSection" style="display: none">
+          <button id="battleNameHide" data-tip="Hide the battle name section" class="icon-font"></button>
+          <input id="battleNamePlace" data-tip="Type place name"" style="width: 30%">
+          <input id="battleNameFull" data-tip="Type full battle name"" style="width: 46%">
+          <button id="battleNameCulture" data-tip="Generate culture-specific name for place and battle" class="icon-book"></button>
+          <button id="battleNameRandom" data-tip="Generate random name for place and battle" class="icon-globe"></button>
+        </div>
+
         <button id="battleAddRegiment" data-tip="Add regiment to the battle" class="icon-user-plus"></button>
         <button id="battleRoll" data-tip="Roll dice to update random factor" class="icon-die"></button>
         <button id="battleRun" data-tip="Iterate battle" class="icon-play"></button>
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 70375f3e7..b53789efd 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -7,16 +7,19 @@ class Battle {
     customization = 13; // enter customization to avoid unwanted dialog closing
 
     Battle.prototype.context = this; // store context
+    this.iteration = 0;
     this.x = defender.x;
     this.y = defender.y;
-    this.name = this.getBattleName();
-    this.iteration = 0;
-    this.attackers = {regiments:[], distances:[], morale:100, casualties:0};
-    this.defenders = {regiments:[], distances:[], morale:100, casualties:0};
+    this.cell = findCell(this.x, this.y);
+    this.attackers = {regiments:[], distances:[], morale:100, casualties:0, power:0};
+    this.defenders = {regiments:[], distances:[], morale:100, casualties:0, power:0};
 
     this.addHeaders();
     this.addRegiment("attackers", attacker);
     this.addRegiment("defenders", defender);
+    this.place = this.definePlace();
+    this.defineType();
+    this.name = this.defineName();
     this.randomize();
     this.calculateStrength("attackers");
     this.calculateStrength("defenders");
@@ -32,24 +35,81 @@ class Battle {
     modules.Battle = true;
 
     // add listeners
+    document.getElementById("battleType").addEventListener("click", ev => this.toggleChange(ev));
+    document.getElementById("battleType").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changeType(ev));
+    document.getElementById("battleNameShow").addEventListener("click", () => this.showNameSection());
+    document.getElementById("battleNamePlace").addEventListener("change", ev => this.place = ev.target.value);
+    document.getElementById("battleNameFull").addEventListener("change", ev => this.changeName(ev));
+    document.getElementById("battleNameCulture").addEventListener("click", () => this.generateName(Names.getCulture(pack.cells.culture[this.cell], null, null, "")));
+    document.getElementById("battleNameRandom").addEventListener("click", () => this.generateName(Names.getBase(rand(nameBases.length-1))));
+    document.getElementById("battleNameHide").addEventListener("click", this.hideNameSection);
     document.getElementById("battleAddRegiment").addEventListener("click", this.addSide);
     document.getElementById("battleRoll").addEventListener("click", () => Battle.prototype.context.randomize());
     document.getElementById("battleRun").addEventListener("click", () => Battle.prototype.context.run());
     document.getElementById("battleApply").addEventListener("click", () => Battle.prototype.context.applyResults());
     document.getElementById("battleCancel").addEventListener("click", () => Battle.prototype.context.cancelResults());
 
-    document.getElementById("battlePhase_attackers").addEventListener("click", ev => this.toggleChangePhase(ev, "attackers"));
+    document.getElementById("battlePhase_attackers").addEventListener("click", ev => this.toggleChange(ev));
     document.getElementById("battlePhase_attackers").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changePhase(ev, "attackers"));
-    document.getElementById("battlePhase_defenders").addEventListener("click", ev => this.toggleChangePhase(ev, "defenders"));
+    document.getElementById("battlePhase_defenders").addEventListener("click", ev => this.toggleChange(ev));
     document.getElementById("battlePhase_defenders").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changePhase(ev, "defenders"));
     document.getElementById("battleDie_attackers").addEventListener("click", () => Battle.prototype.context.rollDie("attackers"));
     document.getElementById("battleDie_defenders").addEventListener("click", () => Battle.prototype.context.rollDie("defenders"));
   }
 
-  getBattleName() {
-    const cell = findCell(this.x, this.y);
-    const burg = pack.cells.burg[cell] ? pack.burgs[pack.cells.burg[cell]].name : null;
-    return burg ? burg + " Battle" : Names.getCulture(pack.cells.culture[cell]) + " Battle"
+  defineType() {
+    const attacker = this.attackers.regiments[0];
+    const defender = this.defenders.regiments[0];
+    const getType = () => {
+      if (attacker.n && defender.n) return "naval"; // attacker and defender are navals
+      if (!defender.n && pack.burgs[pack.cells.burg[this.cell]].walls) return "siege"; // defender is in walled town
+      if (P(.1) && [5,6,7,8,9,12].includes(pack.cells.biome[this.cell])) return "ambush"; // 20% if defenders are in forest or marshes
+
+      const typesA = Object.keys(attacker.u).map(name => options.military.find(u => u.name === name).type);
+      const typesD = Object.keys(defender.u).map(name => options.military.find(u => u.name === name).type);
+
+      // if attacked is naval with non-naval units and defender is not naval
+      if (attacker.n && !defender.n && typesA.some(t => t !== "naval")) return "landing";
+
+      // if attacked and defender have only aviation units
+      if (typesA.every(t => t === "aviation") && typesD.every(t => t === "aviation")) return "air";
+
+      return "field";
+    }
+
+    this.type = getType();
+    this.setType();
+  }
+
+  setType() {
+    document.getElementById("battleType").className = "icon-button-" + this.type;
+
+    const sideSpecific = document.getElementById("battlePhases_"+this.type+"_attackers");
+    const attackers = sideSpecific ? sideSpecific.content : document.getElementById("battlePhases_"+this.type).content;
+    const defenders = sideSpecific ? document.getElementById("battlePhases_"+this.type+"_defenders").content : attackers;
+
+    document.getElementById("battlePhase_attackers").nextElementSibling.innerHTML = "";
+    document.getElementById("battlePhase_defenders").nextElementSibling.innerHTML = "";
+    document.getElementById("battlePhase_attackers").nextElementSibling.append(attackers.cloneNode(true));
+    document.getElementById("battlePhase_defenders").nextElementSibling.append(defenders.cloneNode(true));
+  }
+
+  definePlace() {
+    const cells = pack.cells, i = this.cell;
+    const burg = cells.burg[i] ? pack.burgs[cells.burg[i]].name : null;
+    const getRiver = i => {const river = pack.rivers.find(r => r.i === i); return river.name + " " + river.type};
+    const river = !burg && cells.r[i] ? getRiver(cells.r[i]) : null;
+    const proper = burg || river ? null : Names.getCulture(cells.culture[this.cell]);
+    return burg ? burg : river ? river : proper;
+  }
+
+  defineName() {
+    if (this.type === "field") return "Battle of " + this.place;
+    if (this.type === "naval") return "Naval Battle of " + this.place;
+    if (this.type === "siege") return "Siege of "+ this.place;
+    if (this.type === "ambush") return this.place + " Ambush";
+    if (this.type === "landing") return this.place + " Landing";
+    if (this.type === "air") return `${this.place} ${P(.8) ? "Air Battle" : "Dogfight"}`;
   }
 
   addHeaders() {
@@ -78,17 +138,17 @@ class Battle {
 
     let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment">${regiment.name.slice(0, 24)}</td>`;
     let casualties = `<tr class="battleCasualties"><td></td><td>${state.fullName.slice(0, 26)}</td>`;
-    let survivors = `<tr class="battleSurvivors"><td></td><td>Distance to base: ${distance} ${distanceUnitInput.value}</td>`;
+    let survivors = `<tr class="battleSurvivors"><td></td><td data-tip="Supply line length, affects morale">Distance to base: ${distance} ${distanceUnitInput.value}</td>`;
 
     for (const u of options.military) {
-      initial += `<td style="width: 2.5em; text-align: center">${regiment.u[u.name]||0}</td>`;
-      casualties += `<td style="width: 2.5em; text-align: center; color: red">0</td>`;
-      survivors += `<td style="width: 2.5em; text-align: center; color: green">${regiment.u[u.name]||0}</td>`;
+      initial += `<td data-tip="Initial forces" style="width: 2.5em; text-align: center">${regiment.u[u.name]||0}</td>`;
+      casualties += `<td data-tip="Casualties" style="width: 2.5em; text-align: center; color: red">0</td>`;
+      survivors += `<td data-tip="Survivors" style="width: 2.5em; text-align: center; color: green">${regiment.u[u.name]||0}</td>`;
     }
 
-    initial += `<td style="width: 2.5em; text-align: center">${regiment.a||0}</td></tr>`;
-    casualties += `<td style="width: 2.5em; text-align: center; color: red">0</td></tr>`;
-    survivors += `<td style="width: 2.5em; text-align: center; color: green">${regiment.a||0}</td></tr>`;
+    initial += `<td data-tip="Initial forces" style="width: 2.5em; text-align: center">${regiment.a||0}</td></tr>`;
+    casualties += `<td data-tip="Casualties"  style="width: 2.5em; text-align: center; color: red">0</td></tr>`;
+    survivors += `<td data-tip="Survivors" style="width: 2.5em; text-align: center; color: green">${regiment.a||0}</td></tr>`;
 
     const div = side === "attackers" ? battleAttackers : battleDefenders;
     div.innerHTML += body + initial + casualties + survivors + "</tbody>";
@@ -161,6 +221,30 @@ class Battle {
     }
   }
 
+  showNameSection() {
+    document.querySelectorAll("#battleBottom > button").forEach(el => el.style.display = "none");
+    document.getElementById("battleNameSection").style.display = "inline-block";
+
+    document.getElementById("battleNamePlace").value = this.place;
+    document.getElementById("battleNameFull").value = this.name;
+  }
+
+  hideNameSection() {
+    document.querySelectorAll("#battleBottom > button").forEach(el => el.style.display = "inline-block");
+    document.getElementById("battleNameSection").style.display = "none";
+  }
+
+  changeName(ev) {
+    this.name = ev.target.value;
+    $("#battleScreen").dialog({"title":this.name});
+  }
+
+  generateName(place) {
+    document.getElementById("battleNamePlace").value = this.place = place;
+    document.getElementById("battleNameFull").value = this.name = this.defineName();
+    $("#battleScreen").dialog({"title":this.name});
+  }
+
   getJoinedForces(regiments) {
     return regiments.reduce((a, b) => {
       for (let k in b.survivors) {
@@ -173,10 +257,31 @@ class Battle {
 
   calculateStrength(side) {
     const scheme = {
+      // field battle phases
       "skirmish": {"melee":.2, "ranged":2.4, "mounted":.1, "machinery":3, "naval":1, "armored":.2, "aviation":1.8, "magical":1.8}, // ranged excel
       "melee": {"melee":2, "ranged":1.2, "mounted":1.5, "machinery":.5, "naval":.2, "armored":2, "aviation":.8, "magical":.8}, // melee excel
       "pursue": {"melee":1, "ranged":1, "mounted":4, "machinery":.05, "naval":1, "armored":1, "aviation":1.5, "magical":.6}, // mounted excel
-      "retreat": {"melee":.1, "ranged":.01, "mounted":.5, "machinery":.01, "naval":.2, "armored":.1, "aviation":.8, "magical":.05} // mounted excel
+      "retreat": {"melee":.1, "ranged":.01, "mounted":.5, "machinery":.01, "naval":.2, "armored":.1, "aviation":.8, "magical":.05}, // reduced
+
+      // naval battle phases
+      "shelling": {"melee":0, "ranged":.2, "mounted":0, "machinery":2, "naval":2, "armored":0, "aviation":.1, "magical":.5}, // naval and machinery excel
+      "boarding": {"melee":1, "ranged":.5, "mounted":.5, "machinery":0, "naval":.5, "armored":.4, "aviation":0, "magical":.2}, // melee excel
+      "chase": {"melee":0, "ranged":.15, "mounted":0, "machinery":1, "naval":1, "armored":0, "aviation":.15, "magical":.5}, // reduced
+      "withdrawal": {"melee":0, "ranged":.02, "mounted":0, "machinery":.5, "naval":.1, "armored":0, "aviation":.1, "magical":.3}, // reduced
+
+      // siege phases
+      "blockade": {"melee":.25, "ranged":.25, "mounted":.2, "machinery":.5, "naval":.2, "armored":.1, "aviation":.25, "magical":.25}, // no active actions
+      "sheltering": {"melee":.3, "ranged":.5, "mounted":.2, "machinery":.5, "naval":.2, "armored":.1, "aviation":.25, "magical":.25}, // no active actions
+      "sortie": {"melee":2, "ranged":.5, "mounted":1.2, "machinery":.2, "naval":.1, "armored":.5, "aviation":1, "magical":1}, // melee excel
+      "bombardment": {"melee":.2, "ranged":.5, "mounted":.2, "machinery":3, "naval":1, "armored":.5, "aviation":1, "magical":1}, // machinery excel
+      "storming": {"melee":1, "ranged":.6, "mounted":.5, "machinery":1, "naval":.1, "armored":.1, "aviation":.5, "magical":.5}, // melee excel
+      "defense": {"melee":2, "ranged":3, "mounted":1, "machinery":1, "naval":.1, "armored":1, "aviation":.5, "magical":1}, // ranged excel
+      "looting": {"melee":1.6, "ranged":1.6, "mounted":.5, "machinery":.2, "naval":.02, "armored":.2, "aviation":.1, "magical":.3}, // melee excel
+      "surrendering": {"melee":.1, "ranged":.1, "mounted":.05, "machinery":.01, "naval":.01, "armored":.02, "aviation":.01, "magical":.03}, // reduced
+
+      // ambush phases
+      "surprise": {"melee":2.2, "ranged":3, "mounted":1.5, "machinery":1.3, "naval":1, "armored":1.3, "aviation":1, "magical":2}, // increased
+      "shock": {"melee":.8, "ranged":.8, "mounted":.6, "machinery":.5, "naval":.5, "armored":.1, "aviation":.5, "magical":.7} // reduced
     };
 
     const forces = this.getJoinedForces(this[side].regiments);
@@ -215,34 +320,119 @@ class Battle {
   rollDie(side) {
     const el = document.getElementById("battleDie_"+side);
     const prev = +el.innerHTML;
-    do {el.innerHTML = rand(1, 6)} while (el.innerHTML === prev)
+    do {el.innerHTML = rand(1, 6)} while (el.innerHTML == prev)
     this[side].die = +el.innerHTML;
   }
 
   selectPhase() {
-    const phase = this.getPhase();
-    this.attackers.phase = phase[0];
-    this.defenders.phase = phase[1];
-    document.getElementById("battlePhase_attackers").className = "icon-button-" + this.attackers.phase;
-    document.getElementById("battlePhase_defenders").className = "icon-button-" + this.defenders.phase;
-  }
-
-  getPhase() {
     const i = this.iteration;
-    const prev = [this.attackers.phase || "skirmish", this.defenders.phase || "skirmish"]; // previous phase
     const morale = [this.attackers.morale, this.defenders.morale];
+    const powerRatio = this.attackers.power / this.defenders.power;
+
+    const getFieldBattlePhase = () => {
+      const prev = [this.attackers.phase || "skirmish", this.defenders.phase || "skirmish"]; // previous phase
 
-    if (P(1 - morale[0] / 25)) return ["retreat", "pursue"];
-    if (P(1 - morale[1] / 25)) return ["pursue", "retreat"];
+      // chance if moral < 25
+      if (P(1 - morale[0] / 25)) return ["retreat", "pursue"];
+      if (P(1 - morale[1] / 25)) return ["pursue", "retreat"];
 
-    if (prev[0] === "skirmish" && prev[1] === "skirmish") {
-      const forces = this.getJoinedForces(this.attackers.regiments.concat(this.defenders.regiments));
-      const total = d3.sum(Object.values(forces)); // total forces
-      const ranged = d3.sum(options.military.filter(u => u.type === "ranged").map(u => u.name).map(u => forces[u])) / total;
-      if (ranged && (P(ranged) || P(.8-i/10))) return ["skirmish", "skirmish"];
+      // skirmish phase continuation depends on ranged forces number
+      if (prev[0] === "skirmish" && prev[1] === "skirmish") {
+        const forces = this.getJoinedForces(this.attackers.regiments.concat(this.defenders.regiments));
+        const total = d3.sum(Object.values(forces)); // total forces
+        const ranged = d3.sum(options.military.filter(u => u.type === "ranged").map(u => u.name).map(u => forces[u])) / total; // ranged units
+        if (P(ranged) || P(.8-i/10)) return ["skirmish", "skirmish"];
+      }
+
+      return ["melee", "melee"]; // default option
+    }
+
+    const getNavalBattlePhase = () => {
+      const prev = [this.attackers.phase || "shelling", this.defenders.phase || "shelling"]; // previous phase
+
+      if (prev[0] === "withdrawal") return ["withdrawal", "chase"];
+      if (prev[0] === "chase") return ["chase", "withdrawal"];
+
+      // withdrawal phase when power imbalanced
+      if (!prev[0] === "boarding") {
+        if (powerRatio < .5 || P(this.attackers.casualties) && powerRatio < 1) return ["withdrawal", "chase"];
+        if (powerRatio > 2 || P(this.defenders.casualties) && powerRatio > 1) return ["chase", "withdrawal"];
+      }
+
+      // boarding phase can start from 2nd iteration
+      if (prev[0] === "boarding" || P(i/10 - .1)) return ["boarding", "boarding"];
+
+      return ["shelling", "shelling"]; // default option
     }
 
-    return ["melee", "melee"]; // default option
+    const getSiegePhase = () => {
+      const prev = [this.attackers.phase || "blockade", this.defenders.phase || "sheltering"]; // previous phase
+      let phase = ["blockade", "sheltering"] // default phase
+
+      if (prev[0] === "retreat" || prev[0] === "looting") return prev;
+
+      if (P(1 - morale[0] / 30) && powerRatio < 1) return ["retreat", "pursue"]; // attackers retreat chance if moral < 30
+      if (P(1 - morale[1] / 15)) return ["looting", "surrendering"]; // defenders surrendering chance if moral < 15
+
+      if (P((powerRatio-1) / 2)) return ["storming", "defense"]; // start storm
+
+      if (prev[0] !== "storming") {
+        const machinery = options.military.filter(u => u.type === "machinery").map(u => u.name); // machinery units
+
+        const attackers = this.getJoinedForces(this.attackers.regiments);
+        const machineryA = d3.sum(machinery.map(u => attackers[u]));
+        if (i && machineryA && P(.9)) phase[0] = "bombardment";
+
+        const defenders = this.getJoinedForces(this.defenders.regiments);
+        const machineryD = d3.sum(machinery.map(u => defenders[u]));
+        if (machineryD && P(.9)) phase[1] = "bombardment";
+
+        if (i && prev[1] !== "sortie" && machineryD < machineryA && P(.25) && P(morale[1]/70)) phase[1] = "sortie"; // defenders sortie
+      }
+
+      return phase;
+    }
+
+    const getAmbushPhase = () => {
+      const prev = [this.attackers.phase || "shock", this.defenders.phase || "surprise"]; // previous phase
+
+      if (prev[1] === "surprise" && P(1-powerRatio*i/5)) return ["shock", "surprise"];
+
+      // chance if moral < 25
+      if (P(1 - morale[0] / 25)) return ["retreat", "pursue"];
+      if (P(1 - morale[1] / 25)) return ["pursue", "retreat"];
+
+      return ["melee", "melee"]; // default option
+    }
+
+    const getLandingPhase = () => {
+      // ⚓ landing / 💫 shock OR 🛡️ defense, ⚔️ melee, 🏳️ retreat / 🐎 pursue
+
+    }
+
+    const getAirBattlePhase = () => {
+      // 🎯 maneuvering, 🐕 dogfight, 🏳️ retreat / 🐎 pursue
+
+    }
+
+    const phase = function(type) {
+      switch (type) {
+        case "field": return getFieldBattlePhase();
+        case "naval": return getNavalBattlePhase();
+        case "siege": return getSiegePhase();
+        case "ambush": return getAmbushPhase();
+        case "landing": return getLandingPhase();
+        case "air": return getAirBattlePhase();
+        default: getFieldBattlePhase();
+      }
+    }(this.type);
+
+    this.attackers.phase = phase[0];
+    this.defenders.phase = phase[1];
+    document.getElementById("battlePhase_attackers").className = "icon-button-" + this.attackers.phase;
+    document.getElementById("battlePhase_defenders").className = "icon-button-" + this.defenders.phase;
+    document.getElementById("battlePhase_attackers").dataset.tip = battleBody.querySelector(".battlePhases > [data-phase='"+phase[0]+"']").dataset.tip;
+    document.getElementById("battlePhase_defenders").dataset.tip = battleBody.querySelector(".battlePhases > [data-phase='"+phase[1]+"']").dataset.tip;
   }
 
   run() {
@@ -253,8 +443,16 @@ class Battle {
     // calculate casualties
     const attack = this.attackers.power * (this.attackers.die / 10 + .4);
     const defence = this.defenders.power * (this.defenders.die / 10 + .4);
-    const phase = {"skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3}; // casualties modifier for phase
-    const casualties = Math.random() * phase[this.attackers.phase]; // total casualties, ~10% per iteration
+
+    // casualties modifier for phase
+    const phase = {
+      "skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3,
+      "boarding":.2, "shelling":.1, "chase":.03, "withdrawal": .03,
+      "blockade":0, "sheltering":0, "sortie":.1, "bombardment":.05, "storming":.2, "defense":.2, "looting":.5, "surrendering":.5,
+      "surprise":.3, "shock":.3
+    };
+
+    const casualties = Math.random() * (Math.max(phase[this.attackers.phase], phase[this.defenders.phase])); // total casualties, ~10% per iteration
     const casualtiesA = casualties * defence / (attack + defence); // attackers casualties, ~5% per iteration
     const casualtiesD = casualties * attack / (attack + defence); // defenders casualties, ~5% per iteration
 
@@ -264,8 +462,8 @@ class Battle {
     this.defenders.casualties += casualtiesD;
 
     // change morale
-    this.attackers.morale = Math.max(this.attackers.morale - casualtiesA * 100, 0);
-    this.defenders.morale = Math.max(this.defenders.morale - casualtiesD * 100, 0);
+    this.attackers.morale = Math.max(this.attackers.morale - casualtiesA * 100 - 1, 0);
+    this.defenders.morale = Math.max(this.defenders.morale - casualtiesD * 100 - 1, 0);
 
     // update table values
     this.updateTable("attackers");
@@ -308,22 +506,37 @@ class Battle {
     this.updateMorale(side);
   }
 
-  toggleChangePhase(ev, side) {
+  toggleChange(ev) {
     ev.stopPropagation();
-    const button = document.getElementById("battlePhase_"+side);
+    const button = ev.target;
     const div = button.nextElementSibling;
+
+    const hideSection = function() {button.style.opacity = 1; div.style.display = "none"}
+    if (div.style.display === "block") {hideSection(); return}
+
     button.style.opacity = .5;
     div.style.display = "block";
 
-    const hideSection = function() {button.style.opacity = 1; div.style.display = "none"}
     document.getElementsByTagName("body")[0].addEventListener("click", hideSection, {once: true});
   }
 
+  changeType(ev) {
+    if (ev.target.tagName !== "BUTTON") return;
+    this.type = ev.target.dataset.type;
+    this.setType();
+    this.selectPhase();
+    this.calculateStrength("attackers");
+    this.calculateStrength("defenders");
+    this.name = this.defineName();
+    $("#battleScreen").dialog({"title":this.name});
+  }
+
   changePhase(ev, side) {
     if (ev.target.tagName !== "BUTTON") return;
     const phase = this[side].phase = ev.target.dataset.phase;
     const button = document.getElementById("battlePhase_"+side);
     button.className = "icon-button-" + phase;
+    button.dataset.tip = ev.target.dataset.tip;
     this.calculateStrength(side);
   }
 
diff --git a/modules/ui/burg-editor.js b/modules/ui/burg-editor.js
index da68ad207..b129df881 100644
--- a/modules/ui/burg-editor.js
+++ b/modules/ui/burg-editor.js
@@ -316,35 +316,12 @@ function editBurg(id) {
         const p2 = cells.p[cells.haven[i]];
         let deg = Math.atan2(p2[1] - p1[1], p2[0] - p1[0]) * 180 / Math.PI - 90;
         if (deg < 0) deg += 360;
-        let norm = rn(normalize(deg, 0, 360) * 8) / 4;
-        if (norm === 2) norm = 0;
-        switch(norm) {
-          case 0 : return "&southSea=1";
-          case 0.25 : return "&southSea=1&westSea=1";
-          case 0.50 : return "&westSea=1";
-          case 0.75 : return "&westSea=1&northSea=1";
-          case 1 : return "&northSea=1";
-          case 1.25 : return "&northSea=1&eastSea=1";
-          case 1.5 : return "&eastSea=1";
-          case 1.75 : return "&eastSea=1&southSea=1";
-        }
+        const norm = rn(normalize(deg, 0, 360) * 2, 2); // 0 = south, 0.5 = west, 1 = north, 1.5 = east
         return "&sea="+norm;
-        // debug.selectAll("*").remove();
-        // pack.burgs.filter(b => b.port).forEach(b => {
-        //   var p1 = pack.cells.p[b.cell];
-        //   var p2 = pack.cells.p[pack.cells.haven[b.cell]];
-        //   var deg = Math.atan2(p2[1] - p1[1], p2[0] - p1[0]) * 180 / Math.PI - 90;
-        //   if (deg < 0) deg += 360;
-        //   var norm = rn(normalize(deg, 0, 360) * 8) / 4;
-        //   if (norm === 2) norm = 0;
-        //   debug.append("line").attr("x1", p1[0]).attr("y1", p1[1]).attr("x2", p2[0]).attr("y2", p2[1]).attr("stroke", "red").attr("stroke-width", .2);
-        //   debug.append("circle").attr("cx", b.x).attr("cy", b.y).attr("r", .4);
-        //   debug.append("text").attr("x", b.x+1).attr("y", b.y).attr("font-size", 2).text(rn(norm, 2));
-        // });
       }
 
-      const site = "http://fantasycities.watabou.ru/";
-      const url = `${site}?name=${name}&size=${size}&seed=${s}&hub=${hub}&random=0&continuous=0&river=${river}&coast=${coast}&citadel=${citadel}&plaza=${plaza}&temple=${temple}&walls=${walls}&shantytown=${shanty}${sea}`;
+      const site = "http://fantasycities.watabou.ru/?random=0&continuous=0";
+      const url = `${site}&name=${name}&size=${size}&seed=${s}&hub=${hub}&river=${river}&coast=${coast}&citadel=${citadel}&plaza=${plaza}&temple=${temple}&walls=${walls}&shantytown=${shanty}${sea}`;
       openURL(url);
     }
   }
diff --git a/modules/ui/options.js b/modules/ui/options.js
index 5fbef6a87..ec7001975 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -71,7 +71,7 @@ document.getElementById("options").querySelector("div.tab").addEventListener("cl
 
 // show popup with a list of Patreon supportes (updated manually, to be replaced with API call)
 function showSupporters() {
-  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords, Joshua E Goodwin, SirTobit , Allen S. Rout, Allen Bull Bear, Pippa Mitchell, R K, G0atfather, Ryan Lege, Caner Oleas Pekgönenç, Bradley Edwards, Tertiary , Austin Miller, Jesse Holmes";
+  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords, Joshua E Goodwin, SirTobit , Allen S. Rout, Allen Bull Bear, Pippa Mitchell, R K, G0atfather, Ryan Lege, Caner Oleas Pekgönenç, Bradley Edwards, Tertiary , Austin Miller, Jesse Holmes, Jan Dvořák, Marten F, Erin D. Smale";
   alertMessage.innerHTML = "<ul style='column-count: 3; column-gap: 2em'>" + supporters.split(", ").sort().map(n => `<li>${n}</li>`).join("") + "</ul>";
   $("#alert").dialog({resizable: false, title: "Patreon Supporters", width: "30vw", position: {my: "center", at: "center", of: "svg"}});
 }

From 5e09139c86adb5389d8146d7b3e8bf6d588ea24a Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 6 Jun 2020 16:10:46 +0300
Subject: [PATCH 30/38] v1.4.22

---
 icons.css                   |  4 +++
 index.html                  | 15 +++++----
 modules/ui/battle-screen.js | 66 ++++++++++++++++++++++++++-----------
 3 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/icons.css b/icons.css
index 4a350cc89..2ccbb190d 100644
--- a/icons.css
+++ b/icons.css
@@ -288,6 +288,10 @@
 
 .icon-button-surprise:before {content:'⚡'; padding-right: .4em;}
 .icon-button-shock:before {content:'💫'; padding-right: .4em;}
+
+.icon-button-flee:before {content:'⛵'; padding-right: .4em;}
+.icon-button-waiting:before {content:'⌛'; padding-right: .4em;}
+
 .icon-button-maneuvering:before {content:'💢'; padding-right: .4em;}
 .icon-button-dogfight:before {content:'🐕'; padding-right: .4em;}
 
diff --git a/index.html b/index.html
index 824e00af9..d8a46d184 100644
--- a/index.html
+++ b/index.html
@@ -2481,7 +2481,7 @@
         </template>
 
         <template id="battlePhases_siege_attackers">
-          <button data-tip="Blockade phase. Hold the blockade and wait" data-phase="blockade" class="icon-button-blockade"></button>
+          <button data-tip="Blockade phase. Prepare or hold the blockade" data-phase="blockade" class="icon-button-blockade"></button>
           <button data-tip="Bombardment phase. Attack enemy with machinery units" data-phase="bombardment" class="icon-button-bombardment"></button>
           <button data-tip="Storming phase. Storm enemy town. Melee units excel" data-phase="storming" class="icon-button-storming"></button>
           <button data-tip="Looting phase. Plunder the town. Units strength increased" data-phase="looting" class="icon-button-looting"></button>
@@ -2493,7 +2493,7 @@
           <button data-tip="Sortie phase. Make a sortie from besieged town. Melee units excel" data-phase="sortie" class="icon-button-sortie"></button>
           <button data-tip="Bombardment phase. Attack enemy with machinery units" data-phase="bombardment" class="icon-button-bombardment"></button>
           <button data-tip="Defense phase. Ranged and melee units excel" data-phase="defense" class="icon-button-defense"></button>
-          <button data-tip="Surrendering phase. Give up the defence. Units strength reduced" data-phase="surrendering" class="icon-button-surrendering"></button>
+          <button data-tip="Surrendering phase. Give up the defense. Units strength reduced" data-phase="surrendering" class="icon-button-surrendering"></button>
           <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
         </template>
 
@@ -2512,17 +2512,18 @@
         </template>
 
         <template id="battlePhases_landing_attackers">
-          <button data-tip="Landing phase. Units strength reduced" data-phase="skirmish" class="icon-button-landing"></button>
+          <button data-tip="Landing phase. Amphibious attack. Units are vulnerable against prepared defense" data-phase="landing" class="icon-button-landing"></button>
           <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
           <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
-          <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
+          <button data-tip="Flee phase. Units strength reduced" data-phase="flee" class="icon-button-flee"></button>
         </template>
 
         <template id="battlePhases_landing_defenders">
-          <button data-tip="Shock phase. Units strength reduced" data-phase="shock" class="icon-button-shock"></button>
-          <button data-tip="Defense phase. Units strength increased" data-phase="defense" class="icon-button-defense"></button>
+          <button data-tip="Shock phase. Units are not prepared for a defense" data-phase="shock" class="icon-button-shock"></button>
+          <button data-tip="Defense phase. Prepared defense. Units strength increased" data-phase="defense" class="icon-button-defense"></button>
           <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
-          <button data-tip="Pursue phase. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
+          <button data-tip="Waiting phase. Cannot pursue fleeing naval" data-phase="waiting" class="icon-button-waiting"></button>
+          <button data-tip="Pursue phase. Try to intercept fleeing attackers. Mounted units excel" data-phase="pursue" class="icon-button-pursue"></button>
           <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
         </template>
 
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index b53789efd..e2ad006f2 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -37,11 +37,11 @@ class Battle {
     // add listeners
     document.getElementById("battleType").addEventListener("click", ev => this.toggleChange(ev));
     document.getElementById("battleType").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changeType(ev));
-    document.getElementById("battleNameShow").addEventListener("click", () => this.showNameSection());
-    document.getElementById("battleNamePlace").addEventListener("change", ev => this.place = ev.target.value);
-    document.getElementById("battleNameFull").addEventListener("change", ev => this.changeName(ev));
-    document.getElementById("battleNameCulture").addEventListener("click", () => this.generateName(Names.getCulture(pack.cells.culture[this.cell], null, null, "")));
-    document.getElementById("battleNameRandom").addEventListener("click", () => this.generateName(Names.getBase(rand(nameBases.length-1))));
+    document.getElementById("battleNameShow").addEventListener("click", () => Battle.prototype.context.showNameSection());
+    document.getElementById("battleNamePlace").addEventListener("change", ev => Battle.prototype.context.place = ev.target.value);
+    document.getElementById("battleNameFull").addEventListener("change", ev => Battle.prototype.context.changeName(ev));
+    document.getElementById("battleNameCulture").addEventListener("click", () => Battle.prototype.context.generateName("culture"));
+    document.getElementById("battleNameRandom").addEventListener("click", () => Battle.prototype.context.generateName("random"));
     document.getElementById("battleNameHide").addEventListener("click", this.hideNameSection);
     document.getElementById("battleAddRegiment").addEventListener("click", this.addSide);
     document.getElementById("battleRoll").addEventListener("click", () => Battle.prototype.context.randomize());
@@ -136,8 +136,8 @@ class Battle {
       <text x="0" y="1.04em" style="">${regiment.icon}</text></svg>`;
     const body = `<tbody id="battle${state.i}-${regiment.i}">`;
 
-    let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment">${regiment.name.slice(0, 24)}</td>`;
-    let casualties = `<tr class="battleCasualties"><td></td><td>${state.fullName.slice(0, 26)}</td>`;
+    let initial = `<tr class="battleInitial"><td>${icon}</td><td class="regiment" data-tip="${regiment.name}">${regiment.name.slice(0, 24)}</td>`;
+    let casualties = `<tr class="battleCasualties"><td></td><td data-tip="${state.fullName}">${state.fullName.slice(0, 26)}</td>`;
     let survivors = `<tr class="battleSurvivors"><td></td><td data-tip="Supply line length, affects morale">Distance to base: ${distance} ${distanceUnitInput.value}</td>`;
 
     for (const u of options.military) {
@@ -239,7 +239,10 @@ class Battle {
     $("#battleScreen").dialog({"title":this.name});
   }
 
-  generateName(place) {
+  generateName(type) {
+    const place = type === "culture" 
+      ? Names.getCulture(pack.cells.culture[this.cell], null, null, "")
+      : Names.getBase(rand(nameBases.length-1));
     document.getElementById("battleNamePlace").value = this.place = place;
     document.getElementById("battleNameFull").value = this.name = this.defineName();
     $("#battleScreen").dialog({"title":this.name});
@@ -280,8 +283,13 @@ class Battle {
       "surrendering": {"melee":.1, "ranged":.1, "mounted":.05, "machinery":.01, "naval":.01, "armored":.02, "aviation":.01, "magical":.03}, // reduced
 
       // ambush phases
-      "surprise": {"melee":2.2, "ranged":3, "mounted":1.5, "machinery":1.3, "naval":1, "armored":1.3, "aviation":1, "magical":2}, // increased
-      "shock": {"melee":.8, "ranged":.8, "mounted":.6, "machinery":.5, "naval":.5, "armored":.1, "aviation":.5, "magical":.7} // reduced
+      "surprise": {"melee":2, "ranged":2.4, "mounted":1, "machinery":1, "naval":1, "armored":1, "aviation":.8, "magical":1.2}, // increased
+      "shock": {"melee":.5, "ranged":.5, "mounted":.5, "machinery":.4, "naval":.3, "armored":.1, "aviation":.4, "magical":.5}, // reduced
+
+      // langing phases
+      "landing": {"melee":.8, "ranged":.6, "mounted":.6, "machinery":.5, "naval":.5, "armored":.5, "aviation":.5, "magical":.6}, // reduced
+      "flee": {"melee":.1, "ranged":.01, "mounted":.5, "machinery":.01, "naval":.5, "armored":.1, "aviation":.2, "magical":.05}, // reduced
+      "waiting": {"melee":.05, "ranged":.5, "mounted":.05, "machinery":.5, "naval":2, "armored":.05, "aviation":.5, "magical":.5} // reduced
     };
 
     const forces = this.getJoinedForces(this[side].regiments);
@@ -406,12 +414,27 @@ class Battle {
     }
 
     const getLandingPhase = () => {
-      // ⚓ landing / 💫 shock OR 🛡️ defense, ⚔️ melee, 🏳️ retreat / 🐎 pursue
+      const prev = [this.attackers.phase || "landing", this.defenders.phase || "defense"]; // previous phase
+
+      if (prev[1] === "waiting") return ["flee", "waiting"];
+      if (prev[1] === "pursue") return ["flee", P(.3) ? "pursue" : "waiting"];
+      if (prev[1] === "retreat") return ["pursue", "retreat"];
+
+      if (prev[0] === "landing") {
+        const attackers = P(i/2) ? "melee" : "landing";
+        const defenders = i ? prev[1] : P(.5) ? "defense" : "shock";
+        return [attackers, defenders];
+      }
 
+      if (P(1 - morale[0] / 40)) return ["flee", "pursue"]; // chance if moral < 40
+      if (P(1 - morale[1] / 25)) return ["pursue", "retreat"]; // chance if moral < 25
+
+      return ["melee", "melee"]; // default option
     }
 
     const getAirBattlePhase = () => {
       // 🎯 maneuvering, 🐕 dogfight, 🏳️ retreat / 🐎 pursue
+      
 
     }
 
@@ -429,10 +452,14 @@ class Battle {
 
     this.attackers.phase = phase[0];
     this.defenders.phase = phase[1];
-    document.getElementById("battlePhase_attackers").className = "icon-button-" + this.attackers.phase;
-    document.getElementById("battlePhase_defenders").className = "icon-button-" + this.defenders.phase;
-    document.getElementById("battlePhase_attackers").dataset.tip = battleBody.querySelector(".battlePhases > [data-phase='"+phase[0]+"']").dataset.tip;
-    document.getElementById("battlePhase_defenders").dataset.tip = battleBody.querySelector(".battlePhases > [data-phase='"+phase[1]+"']").dataset.tip;
+
+    const buttonA = document.getElementById("battlePhase_attackers");
+    buttonA.className = "icon-button-" + this.attackers.phase;
+    buttonA.dataset.tip = buttonA.nextElementSibling.querySelector("[data-phase='"+phase[0]+"']").dataset.tip;
+
+    const buttonD = document.getElementById("battlePhase_defenders");
+    buttonD.className = "icon-button-" + this.defenders.phase;
+    buttonD.dataset.tip = buttonD.nextElementSibling.querySelector("[data-phase='"+phase[1]+"']").dataset.tip;
   }
 
   run() {
@@ -442,19 +469,20 @@ class Battle {
 
     // calculate casualties
     const attack = this.attackers.power * (this.attackers.die / 10 + .4);
-    const defence = this.defenders.power * (this.defenders.die / 10 + .4);
+    const defense = this.defenders.power * (this.defenders.die / 10 + .4);
 
     // casualties modifier for phase
     const phase = {
       "skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3,
       "boarding":.2, "shelling":.1, "chase":.03, "withdrawal": .03,
       "blockade":0, "sheltering":0, "sortie":.1, "bombardment":.05, "storming":.2, "defense":.2, "looting":.5, "surrendering":.5,
-      "surprise":.3, "shock":.3
+      "surprise":.3, "shock":.3,
+      "landing":.3, "flee":0, "waiting":0
     };
 
     const casualties = Math.random() * (Math.max(phase[this.attackers.phase], phase[this.defenders.phase])); // total casualties, ~10% per iteration
-    const casualtiesA = casualties * defence / (attack + defence); // attackers casualties, ~5% per iteration
-    const casualtiesD = casualties * attack / (attack + defence); // defenders casualties, ~5% per iteration
+    const casualtiesA = casualties * defense / (attack + defense); // attackers casualties, ~5% per iteration
+    const casualtiesD = casualties * attack / (attack + defense); // defenders casualties, ~5% per iteration
 
     this.calculateCasualties("attackers", casualtiesA);
     this.calculateCasualties("defenders", casualtiesD);

From 7e25012e0f71cecb057e6219d3c5607059ae5813 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 6 Jun 2020 17:13:13 +0300
Subject: [PATCH 31/38] v1.4.23

---
 icons.css                   |  5 -----
 modules/ui/battle-screen.js | 38 +++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/icons.css b/icons.css
index 2ccbb190d..eab23067c 100644
--- a/icons.css
+++ b/icons.css
@@ -271,12 +271,10 @@
 .icon-button-skirmish:before {content:'🎯'; padding-right: .4em;}
 .icon-button-pursue:before {content:'🐎'; padding-right: .4em;}
 .icon-button-retreat:before {content:'🏳️'; padding-right: .4em;}
-
 .icon-button-shelling:before {content:'💣'; padding-right: .4em;}
 .icon-button-boarding:before {content:'⚔️'; padding-right: .4em;}
 .icon-button-chase:before {content:'⛵'; padding-right: .4em;}
 .icon-button-withdrawal:before {content:'🏳️'; padding-right: .4em;}
-
 .icon-button-bombardment:before {content:'💣'; padding-right: .4em;}
 .icon-button-blockade:before {content:'⏳'; padding-right: .4em;}
 .icon-button-sheltering:before {content:'🔒'; padding-right: .4em;}
@@ -285,13 +283,10 @@
 .icon-button-storming:before {content:'⚔️'; padding-right: .4em;}
 .icon-button-looting:before {content:'☠️'; padding-right: .4em;}
 .icon-button-surrendering:before {content:'🏳️'; padding-right: .4em;}
-
 .icon-button-surprise:before {content:'⚡'; padding-right: .4em;}
 .icon-button-shock:before {content:'💫'; padding-right: .4em;}
-
 .icon-button-flee:before {content:'⛵'; padding-right: .4em;}
 .icon-button-waiting:before {content:'⌛'; padding-right: .4em;}
-
 .icon-button-maneuvering:before {content:'💢'; padding-right: .4em;}
 .icon-button-dogfight:before {content:'🐕'; padding-right: .4em;}
 
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index e2ad006f2..6bf2e0c7a 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -61,19 +61,14 @@ class Battle {
     const attacker = this.attackers.regiments[0];
     const defender = this.defenders.regiments[0];
     const getType = () => {
-      if (attacker.n && defender.n) return "naval"; // attacker and defender are navals
-      if (!defender.n && pack.burgs[pack.cells.burg[this.cell]].walls) return "siege"; // defender is in walled town
-      if (P(.1) && [5,6,7,8,9,12].includes(pack.cells.biome[this.cell])) return "ambush"; // 20% if defenders are in forest or marshes
-
       const typesA = Object.keys(attacker.u).map(name => options.military.find(u => u.name === name).type);
       const typesD = Object.keys(defender.u).map(name => options.military.find(u => u.name === name).type);
 
-      // if attacked is naval with non-naval units and defender is not naval
-      if (attacker.n && !defender.n && typesA.some(t => t !== "naval")) return "landing";
-
-      // if attacked and defender have only aviation units
-      if (typesA.every(t => t === "aviation") && typesD.every(t => t === "aviation")) return "air";
-
+      if (attacker.n && defender.n) return "naval"; // attacker and defender are navals
+      if (typesA.every(t => t === "aviation") && typesD.every(t => t === "aviation")) return "air"; // if attacked and defender have only aviation units
+      if (attacker.n && !defender.n && typesA.some(t => t !== "naval")) return "landing"; // if attacked is naval with non-naval units and defender is not naval
+      if (!defender.n && pack.burgs[pack.cells.burg[this.cell]].walls) return "siege"; // defender is in walled town
+      if (P(.1) && [5,6,7,8,9,12].includes(pack.cells.biome[this.cell])) return "ambush"; // 20% if defenders are in forest or marshes
       return "field";
     }
 
@@ -289,7 +284,11 @@ class Battle {
       // langing phases
       "landing": {"melee":.8, "ranged":.6, "mounted":.6, "machinery":.5, "naval":.5, "armored":.5, "aviation":.5, "magical":.6}, // reduced
       "flee": {"melee":.1, "ranged":.01, "mounted":.5, "machinery":.01, "naval":.5, "armored":.1, "aviation":.2, "magical":.05}, // reduced
-      "waiting": {"melee":.05, "ranged":.5, "mounted":.05, "machinery":.5, "naval":2, "armored":.05, "aviation":.5, "magical":.5} // reduced
+      "waiting": {"melee":.05, "ranged":.5, "mounted":.05, "machinery":.5, "naval":2, "armored":.05, "aviation":.5, "magical":.5}, // reduced
+
+      // air battle phases
+      "maneuvering": {"melee":0, "ranged":.1, "mounted":0, "machinery":.2, "naval":0, "armored":0, "aviation":1, "magical":.2}, // aviation
+      "dogfight": {"melee":0, "ranged":.1, "mounted":0, "machinery":.1, "naval":0, "armored":0, "aviation":2, "magical":.1} // aviation
     };
 
     const forces = this.getJoinedForces(this[side].regiments);
@@ -433,9 +432,15 @@ class Battle {
     }
 
     const getAirBattlePhase = () => {
-      // 🎯 maneuvering, 🐕 dogfight, 🏳️ retreat / 🐎 pursue
-      
+      const prev = [this.attackers.phase || "maneuvering", this.defenders.phase || "maneuvering"]; // previous phase
+
+      // chance if moral < 25
+      if (P(1 - morale[0] / 25)) return ["retreat", "pursue"];
+      if (P(1 - morale[1] / 25)) return ["pursue", "retreat"];
 
+      if (prev[0] === "maneuvering" && P(1-i/10)) return ["maneuvering", "maneuvering"];
+
+      return ["dogfight", "dogfight"]; // default option
     }
 
     const phase = function(type) {
@@ -473,12 +478,9 @@ class Battle {
 
     // casualties modifier for phase
     const phase = {
-      "skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3,
-      "boarding":.2, "shelling":.1, "chase":.03, "withdrawal": .03,
+      "skirmish":.1, "melee":.2, "pursue":.3, "retreat":.3, "boarding":.2, "shelling":.1, "chase":.03, "withdrawal": .03,
       "blockade":0, "sheltering":0, "sortie":.1, "bombardment":.05, "storming":.2, "defense":.2, "looting":.5, "surrendering":.5,
-      "surprise":.3, "shock":.3,
-      "landing":.3, "flee":0, "waiting":0
-    };
+      "surprise":.3, "shock":.3, "landing":.3, "flee":0, "waiting":0, "maneuvering":.1, "dogfight":.2};
 
     const casualties = Math.random() * (Math.max(phase[this.attackers.phase], phase[this.defenders.phase])); // total casualties, ~10% per iteration
     const casualtiesA = casualties * defense / (attack + defense); // attackers casualties, ~5% per iteration

From 164f593b754889ecb5c8fcb91d9d505472928a4e Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sat, 6 Jun 2020 17:39:33 +0300
Subject: [PATCH 32/38] v1.4.24

---
 modules/ui/battle-screen.js | 8 ++++----
 modules/utils.js            | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 6bf2e0c7a..53b1e7391 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -608,8 +608,8 @@ class Battle {
           losses > .05 ? "suffered significant losses" :
           losses > 0 ? "suffered unsignificant losses" :
           "left the battle without loss";
-        const casualties = Object.keys(r.casualties).map(t => r.casualties[t] ? `${Math.abs(r.casualties[t])} ${t}` : null).filter(c => c).join(", ");
-        const casualtiesText = casualties ? " Casualties: " + casualties : "";
+        const casualties = Object.keys(r.casualties).map(t => r.casualties[t] ? `${Math.abs(r.casualties[t])} ${t}` : null).filter(c => c);
+        const casualtiesText = casualties.length ? " Casualties: " + list(casualties) + "." : "";
         const legend = `\r\n\r\n${battleName} (${options.year} ${options.eraShort}): ${status}. The regiment ${regStatus}.${casualtiesText}`;
         note.legend += legend;
       }
@@ -631,11 +631,11 @@ class Battle {
     }()
 
     const getSide = (regs, n) => regs.length > 1 ? 
-      `${n ? "regiments" : "forces"} of ${[... new Set(regs.map(r => pack.states[r.state].name))].join(", ")}` :
+      `${n ? "regiments" : "forces"} of ${list([... new Set(regs.map(r => pack.states[r.state].name))])}` :
       getAdjective(pack.states[regs[0].state].name) + " " + regs[0].name;
     const getLosses = casualties => Math.min(rn(casualties * 100), 100);
 
-    const legend = `${this.name} took place in ${options.year} ${options.eraShort}. It was fought between ${getSide(this.attackers.regiments, 1)} and ${getSide(this.defenders.regiments, 0)}. The battle ended in ${battleStatus[+P(.7)]}.
+    const legend = `${this.name} took place in ${options.year} ${options.eraShort}. It was fought between ${getSide(this.attackers.regiments, 1)} and ${getSide(this.defenders.regiments, 0)}. The ${this.type} ended in ${battleStatus[+P(.7)]}.
       \r\nAttackers losses: ${getLosses(this.attackers.casualties)}%, defenders losses: ${getLosses(this.defenders.casualties)}%`;
     const id = getNextId("markerElement");
     notes.push({id, name:this.name, legend});
diff --git a/modules/utils.js b/modules/utils.js
index a7c0328e1..7882f37a7 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -416,6 +416,12 @@ function getAdjective(string) {
 // get ordinal out of integer: 1 => 1st
 const nth = n => n+(["st","nd","rd"][((n+90)%100-10)%10-1]||"th");
 
+// conjunct array: [A,B,C] => "A, B and C"
+function list(array) {
+  const conjunction = new Intl.ListFormat(window.lang || "en", {style:"long", type:"conjunction"});
+  return conjunction.format(array);
+}
+
 // split string into 2 almost equal parts not breaking words
 function splitInTwo(str) {
   const half = str.length / 2;

From 9c8594e085a70e64dfbafa7045d8f95a8c1a9aef Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 8 Jun 2020 01:11:51 +0300
Subject: [PATCH 33/38] v1.4.25

---
 modules/military-generator.js | 95 +++++++++++------------------------
 modules/ui/layers.js          |  1 +
 2 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/modules/military-generator.js b/modules/military-generator.js
index f0821400a..a4b578e63 100644
--- a/modules/military-generator.js
+++ b/modules/military-generator.js
@@ -28,6 +28,18 @@
       "magical":  {"Nomadic":1,   "Highland":2,   "Lake":1,   "Naval":1,    "Hunting":1,    "River":1}
     };
 
+    const cellTypeModifier = {
+      "nomadic": {"melee":.2, "ranged":.5, "mounted":3, "machinery":.4, "naval":.3, "armored":1.6, "aviation":1, "magical":.5},
+      "wetland": {"melee":.8, "ranged":2, "mounted":0.3, "machinery":1.2, "naval":1.0, "armored":0.2, "aviation":.5, "magical":0.5},
+      "highland": {"melee":1.2, "ranged":1.6, "mounted":0.3, "machinery":3, "naval":1.0, "armored":0.8, "aviation":.3, "magical":2}
+    }
+
+    const burgTypeModifier = {
+      "nomadic": {"melee":.3, "ranged":.8, "mounted":3, "machinery":.4, "naval":1.0, "armored":1.6, "aviation":1, "magical":0.5},
+      "wetland": {"melee":1, "ranged":1.6, "mounted":.2, "machinery":1.2, "naval":1.0, "armored":0.2, "aviation":0.5, "magical":0.5},
+      "highland": {"melee":1.2, "ranged":2, "mounted":.3, "machinery":3, "naval":1.0, "armored":0.8, "aviation":0.3, "magical":2}
+    }
+
     valid.forEach(s => {
       const temp = s.temp = {}, d = s.diplomacy;
       const expansionRate = Math.min(Math.max((s.expansionism / expn) / (s.area / area), .25), 4); // how much state expansionism is realized
@@ -47,6 +59,13 @@
 
     });
 
+    const getType = cell => {
+      if ([1, 2, 3, 4].includes(cells.biome[cell])) return "nomadic";
+      if ([7, 8, 9, 12].includes(cells.biome[cell])) return "wetland";
+      if (cells.h[cell] >= 70) return "highland";
+      return "generic";
+    }
+
     for (const i of cells.i) {
       if (!cells.pop[i]) continue;
       const s = states[cells.state[i]]; // cell state
@@ -56,35 +75,15 @@
       if (cells.culture[i] !== s.culture) m = s.form === "Union" ? m / 1.2 : m / 2; // non-dominant culture
       if (cells.religion[i] !== cells.religion[s.center]) m = s.form === "Theocracy" ? m / 2.2 : m / 1.4; // non-dominant religion
       if (cells.f[i] !== cells.f[s.center]) m = s.type === "Naval" ? m / 1.2 : m / 1.8; // different landmass
-
-      const nomadic = [1, 2, 3, 4].includes(cells.biome[i]);
-      const wetland = [7, 8, 9, 12].includes(cells.biome[i]);
-      const highland = cells.h[i] >= 70;
+      const type = getType(i);
 
       for (const u of options.military) {
         const perc = +u.rural;
         if (isNaN(perc) || perc <= 0 || !s.temp[u.name]) continue;
 
-        let army = m * perc; // basic army for rural cell
-        if (nomadic) { // "nomadic" biomes special rules
-          if (u.type === "melee") army /= 5; else
-          if (u.type === "ranged") army /= 2; else
-          if (u.type === "mounted") army *= 3;
-        }
-
-        if (wetland) { // "wet" biomes special rules
-          if (u.type === "melee") army *= 1.2; else
-          if (u.type === "ranged") army *= 1.4; else
-          if (u.type === "mounted") army /= 3;
-        }
-
-        if (highland) { // highlands special rules
-          if (u.type === "melee") army *= 1.2; else
-          if (u.type === "ranged") army *= 1.6; else
-          if (u.type === "mounted") army /= 3;
-        }
-
-        const t = rn(army * s.temp[u.name] * populationRate.value);
+        const mod = type === "generic" ? 1 : cellTypeModifier[type][u.type] // cell specific modifier
+        const army = m * perc * mod; // rural cell army
+        const t = rn(army * s.temp[u.name] * populationRate.value); // total troops
         if (!t) continue;
         let x = p[i][0], y = p[i][1], n = 0;
         if (u.type === "naval") {let haven = cells.haven[i]; x = p[haven][0], y = p[haven][1]; n = 1}; // place naval to sea
@@ -101,43 +100,16 @@
       if (b.culture !== s.culture) m = s.form === "Union" ? m / 1.2 : m / 2; // non-dominant culture
       if (cells.religion[b.cell] !== cells.religion[s.center]) m = s.form === "Theocracy" ? m / 2.2 : m / 1.4; // non-dominant religion
       if (cells.f[b.cell] !== cells.f[s.center]) m = s.type === "Naval" ? m / 1.2 : m / 1.8; // different landmass
-
-      const biome = cells.biome[b.cell]; // burg biome
-      const nomadic = [1, 2, 3, 4].includes(biome);
-      const wetland = [7, 8, 9, 12].includes(biome);
-      const highland = cells.h[b.cell] >= 70;
+      const type = getType(b.cell);
 
       for (const u of options.military) {
+        if (u.type === "naval" && !b.port) continue; // only ports produce naval units
         const perc = +u.urban;
         if (isNaN(perc) || perc <= 0 || !s.temp[u.name]) continue;
-        let army = m * perc; // basic army for rural cell
-
-        if (u.type === "naval" && !b.port) continue; // only ports produce naval units
-
-        if (nomadic) { // "nomadic" biomes special rules
-          if (u.type === "melee") army /= 3; else
-          if (u.type === "machinery") army /= 2; else
-          if (u.type === "mounted") army *= 3; else
-          if (u.type === "armored") army *= 2;
-        }
 
-        if (wetland) { // "wet" biomes special rules
-          if (u.type === "melee") army *= 1.2; else
-          if (u.type === "ranged") army *= 1.4; else
-          if (u.type === "machinery") army *= 1.2; else
-          if (u.type === "mounted") army /= 4; else
-          if (u.type === "armored") army /= 3;
-        }
-
-        if (highland) { // highlands special rules
-          if (u.type === "ranged") army *= 2; else
-          if (u.type === "naval") army /= 3; else
-          if (u.type === "mounted") army /= 3; else
-          if (u.type === "armored") army /= 2; else
-          if (u.type === "magical") army *= 2;
-        }
-
-        const t = rn(army * s.temp[u.name] * populationRate.value);
+        const mod = type === "generic" ? 1 : burgTypeModifier[type][u.type] // cell specific modifier
+        const army = m * perc * mod; // urban cell army
+        const t = rn(army * s.temp[u.name] * populationRate.value); // total troops
         if (!t) continue;
         let x = p[b.cell][0], y = p[b.cell][1], n = 0;
         if (u.type === "naval") {let haven = cells.haven[b.cell]; x = p[haven][0], y = p[haven][1]; n = 1}; // place naval in sea cell
@@ -313,17 +285,6 @@
     notes.push({id:`regiment${s.i}-${r.i}`, name:`${r.icon} ${r.name}`, legend});
   }
 
-  // const updateNote = function(r, s) {
-  //   const id = `regiment${s}-${r.i}`;
-  //   const note = notes.find(n => n.id === id);
-  //   if (!note) return;
-
-  //   const oldComposition = note.legend.split("composition:\r\n")[1]||"".split(".")[0];
-  //   if (!oldComposition) return;
-  //   const newComposition = Object.keys(r.u).map(t => `— ${t}: ${r.u[t]}`).join("\r\n") + ".";
-  //   note.legend = note.legend.replace(oldComposition, newComposition);
-  // }
-
   return {generate, getDefaultOptions, getName, generateNote, drawRegiments, drawRegiment, moveRegiment, getTotal, getEmblem};
 
 })));
\ No newline at end of file
diff --git a/modules/ui/layers.js b/modules/ui/layers.js
index 4298ec177..b834c9d2a 100644
--- a/modules/ui/layers.js
+++ b/modules/ui/layers.js
@@ -1263,6 +1263,7 @@ function getLayer(id) {
   if (id === "toggleTemp") return $("#temperature");
   if (id === "togglePrec") return $("#prec");
   if (id === "togglePopulation") return $("#population");
+  if (id === "toggleIce") return $("#ice");
   if (id === "toggleTexture") return $("#texture");
   if (id === "toggleLabels") return $("#labels");
   if (id === "toggleIcons") return $("#icons");

From 02cb63b62485b17cb1edffe945acdd9bec82fb07 Mon Sep 17 00:00:00 2001
From: Evolvedexperiment <evolvedexperiment@gmail.com>
Date: Fri, 12 Jun 2020 19:27:18 +0000
Subject: [PATCH 34/38] Fix for features of all burgs regenerating when a new
 burg is added

---
 modules/burgs-and-states.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
index fecfffac6..b3083ac67 100644
--- a/modules/burgs-and-states.js
+++ b/modules/burgs-and-states.js
@@ -188,8 +188,8 @@
     console.timeEnd("specifyBurgs");
   }
 
-  const defineBurgFeatures = function() {
-    pack.burgs.filter(b => b.i && !b.removed).forEach(b => {
+  const defineBurgFeatures = function(newburg) {
+    pack.burgs.filter(b => newburg ? b.i == newburg.i : (b.i && !b.removed)).forEach(b => {
       const pop = b.population;
       b.citadel = b.capital || pop > 50 && P(.75) || P(.5) ? 1 : 0;
       b.plaza = pop > 50 || pop > 30 && P(.75) || pop > 10 && P(.5) || P(.25) ? 1 : 0;

From 52b6986a109158d7b3b3ff6f1fbeb41182fe3164 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Fri, 19 Jun 2020 00:00:55 +0300
Subject: [PATCH 35/38] v1.4.26

---
 index.html                      | 6 ++++--
 modules/ui/battle-screen.js     | 3 ++-
 modules/ui/military-overview.js | 1 +
 modules/utils.js                | 8 +++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index d8a46d184..e1130dc5a 100644
--- a/index.html
+++ b/index.html
@@ -2454,7 +2454,7 @@
       </div>
 
       <div id="regimentBottom">
-        <button id="regimentAttack" data-tip="Attack other regiment" class="icon-target"></button>
+        <button id="regimentAttack" data-tip="Attack foreign regiment" class="icon-target"></button>
         <button id="regimentAdd" data-tip="Create new regiment or fleet" class="icon-user-plus"></button>
         <button id="regimentSplit" data-tip="Split regiment into 2 separate ones" class="icon-half"></button>
         <button id="regimentAttach" data-tip="Attach regiment to another one (include this regiment to another one)" class="icon-attach"></button>
@@ -2587,6 +2587,7 @@
         <button id="battleRun" data-tip="Iterate battle" class="icon-play"></button>
         <button id="battleApply" data-tip="End battle: apply current results and close the screen" class="icon-check"></button>
         <button id="battleCancel" data-tip="Cancel battle: roll back results and close the screen" class="icon-cancel"></button>
+        <button id="battleWiki" data-tip="Open Battle Simulation Tutorial" class="icon-info"></button>
       </div>
     </div>
 
@@ -2743,7 +2744,7 @@
         <button id="templateSave" data-tip="Download the template as a text file" class="icon-download"></button>
         <button id="templateLoad" data-tip="Open previously downloaded template" class="icon-upload"></button>
         <button id="templateCA" data-tip="Find or share custom template on Cartography Assets portal" class="icon-drafting-compass" onclick="openURL('https://www.cartographyassets.com/assets/categories/templates.89')"></button>
-        <button id="templateTutorial" data-tip="Open Template Editor Tutorial" class="icon-info" onclick="openURL('https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Heightmap-template-editor')"></button>
+        <button id="templateTutorial" data-tip="Open Template Editor Tutorial" class="icon-info" onclick="wiki('Heightmap-template-editor')"></button>
       </div>
     </div>
 
@@ -3474,6 +3475,7 @@
         <button id="militaryPercentage" data-tip="Toggle percentage / absolute values views" class="icon-percent"></button>
         <button id="militaryOverviewRecalculate" data-tip="Recalculate military forces based on current options" class="icon-retweet"></button>
         <button id="militaryExport" data-tip="Save military-related data as a text file (.csv)" class="icon-download"></button>
+        <button id="militaryWiki" data-tip="Open Military Forces Tutorial" class="icon-info"></button>
       </div>
     </div>
 
diff --git a/modules/ui/battle-screen.js b/modules/ui/battle-screen.js
index 53b1e7391..91d4a5de6 100644
--- a/modules/ui/battle-screen.js
+++ b/modules/ui/battle-screen.js
@@ -48,6 +48,7 @@ class Battle {
     document.getElementById("battleRun").addEventListener("click", () => Battle.prototype.context.run());
     document.getElementById("battleApply").addEventListener("click", () => Battle.prototype.context.applyResults());
     document.getElementById("battleCancel").addEventListener("click", () => Battle.prototype.context.cancelResults());
+    document.getElementById("battleWiki").addEventListener("click", () => wiki("Battle-Simulator"));
 
     document.getElementById("battlePhase_attackers").addEventListener("click", ev => this.toggleChange(ev));
     document.getElementById("battlePhase_attackers").nextElementSibling.addEventListener("click", ev => Battle.prototype.context.changePhase(ev, "attackers"));
@@ -293,7 +294,7 @@ class Battle {
 
     const forces = this.getJoinedForces(this[side].regiments);
     const phase = this[side].phase;
-    const adjuster = populationRate.value / 10; // population adjuster, by default 100
+    const adjuster = Math.max(populationRate.value / 10, 10); // population adjuster, by default 100
     this[side].power = d3.sum(options.military.map(u => (forces[u.name] || 0) * u.power * scheme[phase][u.type])) / adjuster;
     const UIvalue = this[side].power ? Math.max(this[side].power|0, 1) : 0;
     document.getElementById("battlePower_"+side).innerHTML = UIvalue;
diff --git a/modules/ui/military-overview.js b/modules/ui/military-overview.js
index b720486f0..cc1ff0821 100644
--- a/modules/ui/military-overview.js
+++ b/modules/ui/military-overview.js
@@ -26,6 +26,7 @@ function overviewMilitary() {
   document.getElementById("militaryRegimentsList").addEventListener("click", () => overviewRegiments(-1));
   document.getElementById("militaryOverviewRecalculate").addEventListener("click", militaryRecalculate);
   document.getElementById("militaryExport").addEventListener("click", downloadMilitaryData);
+  document.getElementById("militaryWiki").addEventListener("click", () => wiki("Military-Forces"));
 
   body.addEventListener("change", function(ev) {
     const el = ev.target, line = el.parentNode, state = +line.dataset.id;
diff --git a/modules/utils.js b/modules/utils.js
index 7882f37a7..6b6810187 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -418,6 +418,7 @@ const nth = n => n+(["st","nd","rd"][((n+90)%100-10)%10-1]||"th");
 
 // conjunct array: [A,B,C] => "A, B and C"
 function list(array) {
+  if (!Intl.ListFormat) return array.join(", ");
   const conjunction = new Intl.ListFormat(window.lang || "en", {style:"long", type:"conjunction"});
   return conjunction.format(array);
 }
@@ -574,7 +575,12 @@ function getAbsolutePath(href) {
 
 // open URL in a new tab or window
 function openURL(url) {
-  window.open(url, '_blank');
+  window.open(url, "_blank");
+}
+
+// open project wiki-page
+function wiki(page) {
+  window.open("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/" + page, "_blank");
 }
 
 // wrap URL into html a element

From 2d00b3c25b1600bf2db873d104664482166cd708 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 21 Jun 2020 18:11:51 +0300
Subject: [PATCH 36/38] v1.4.27

---
 index.css                       | 14 +++++-
 index.html                      | 70 ++++++++++++++-------------
 main.js                         |  3 +-
 modules/ui/elevation-profile.js | 84 +++++++++++++++------------------
 modules/ui/options.js           |  2 +-
 modules/ui/states-editor.js     | 20 ++++++++
 6 files changed, 111 insertions(+), 82 deletions(-)

diff --git a/index.css b/index.css
index 0ee3007d3..57d0df7ff 100644
--- a/index.css
+++ b/index.css
@@ -1217,6 +1217,16 @@ div.slider .ui-slider-handle {
 	overflow-y: auto;
 }
 
+.overflow {
+	max-width: 93vw;
+	overflow: auto;
+	max-height: 75vh;
+}
+
+.overflow > div {
+	width: max-content;
+}
+
 div.header > div {
 	font-weight: bold;
 	font-size: .9em;
@@ -1855,7 +1865,9 @@ div#notesHeader {
 }
 
 div#notesBody {
-	padding: 0 10px;
+	padding: 0 1em;
+	max-height: 80vh;
+	overflow: auto;
 }
 
 svg.button {
diff --git a/index.html b/index.html
index e1130dc5a..0e129416f 100644
--- a/index.html
+++ b/index.html
@@ -2450,7 +2450,7 @@
           <button id="regimentEmblemSelect" style="padding: 0; width: 4.5em">select</button>
         </div>
 
-        <div id="regimentComposition" style="padding: .1em"></div>
+        <div id="regimentComposition" class="table"></div>
       </div>
 
       <div id="regimentBottom">
@@ -2465,7 +2465,7 @@
     </div>
 
     <div id="battleScreen" class="dialog stable" style="display: none">
-      <div id="battleBody">
+      <div id="battleBody" class="overflow>
         <template id="battlePhases_field">
           <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
           <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
@@ -3450,16 +3450,18 @@
     </div>
 
     <div id="militaryOverview" class="dialog stable" style="display: none">
-      <div id="militaryHeader" class="header">
-        <div data-tip="State name. Click to sort" style="left:1.8em; width: 7.4em;" class="sortable alphabetically" data-sortby="state">State&nbsp;</div>
-        <div data-tip="Total military personnel (considering crew). Click to sort" id="militaryTotal" class="sortable icon-sort-number-down" data-sortby="total">Total&nbsp;</div>
-        <div data-tip="State population. Click to sort" style="width: 6.5em; margin-left: -1em" class="sortable" data-sortby="population">Population&nbsp;</div>
-        <div data-tip="Military personnel rate (% of state population). Depends on war alert. Click to sort" style="width: 3.7em" class="sortable" data-sortby="rate">Rate&nbsp;</div>
-        <div data-tip="War Alert. Modifier to military forces number, depends of political situation. Click to sort" class="sortable" data-sortby="alert">War Alert&nbsp;</div>
+      <div class="overflow">
+        <div id="militaryHeader" class="header">
+          <div data-tip="State name. Click to sort" style="margin-left: 1.8em; width: 5.6em" class="sortable alphabetically" data-sortby="state">State&nbsp;</div>
+          <div data-tip="Total military personnel (considering crew). Click to sort" id="militaryTotal" class="sortable icon-sort-number-down" data-sortby="total">Total&nbsp;</div>
+          <div data-tip="State population. Click to sort" style="width: 6.5em; margin-left: -1em" class="sortable" data-sortby="population">Population&nbsp;</div>
+          <div data-tip="Military personnel rate (% of state population). Depends on war alert. Click to sort" style="width: 3.7em" class="sortable" data-sortby="rate">Rate&nbsp;</div>
+          <div data-tip="War Alert. Modifier to military forces number, depends of political situation. Click to sort" class="sortable" data-sortby="alert">War Alert&nbsp;</div>
+        </div>
+  
+        <div id="militaryBody" data-type="absolute"></div>
       </div>
 
-      <div id="militaryBody" class="table" data-type="absolute"></div>
-
       <div id="militaryFooter" class="totalLine">
         <div data-tip="States number" style="margin-left: 4px">States:&nbsp;<span id="militaryFooterStates">0</span></div>
         <div data-tip="Total military forces" style="margin-left: 14px">Total forces:&nbsp;<span id="militaryFooterForcesTotal">0</span></div>
@@ -3480,14 +3482,16 @@
     </div>
 
     <div id="regimentsOverview" class="dialog stable" style="display: none">
-      <div id="regimentsHeader" class="header">
-        <div data-tip="State name. Click to sort" style="left:1.8em; width: 9em" class="sortable alphabetically" data-sortby="state">State&nbsp;</div>
-        <div data-tip="Regiment emblem and name. Click to sort by name" style="width: 12em" class="sortable alphabetically" data-sortby="name">Name&nbsp;</div>
-        <div data-tip="Total military personnel (not considering crew). Click to sort" style="margin-left: .8em" id="regimentsTotal" class="sortable icon-sort-number-down" data-sortby="total">Total&nbsp;</div>
+      <div class="overflow">
+        <div id="regimentsHeader" class="header">
+          <div data-tip="State name. Click to sort" style="left:1.8em; width: 9em" class="sortable alphabetically" data-sortby="state">State&nbsp;</div>
+          <div data-tip="Regiment emblem and name. Click to sort by name" style="width: 12em" class="sortable alphabetically" data-sortby="name">Name&nbsp;</div>
+          <div data-tip="Total military personnel (not considering crew). Click to sort" style="margin-left: .8em" id="regimentsTotal" class="sortable icon-sort-number-down" data-sortby="total">Total&nbsp;</div>
+        </div>
+  
+        <div id="regimentsBody" data-type="absolute"></div>
       </div>
 
-      <div id="regimentsBody" class="table" data-type="absolute"></div>
-
       <div id="regimentsBottom">
         <button id="regimentsOverviewRefresh" data-tip="Refresh the overview screen" class="icon-cw"></button>
         <button id="regimentsPercentage" data-tip="Toggle percentage / absolute values views" class="icon-percent"></button>
@@ -3498,22 +3502,24 @@
     </div>
 
     <div id="militaryOptions" class="dialog stable" style="display: none">
-      <table id="militaryOptionsTable">
-        <thead>
-          <tr>
-            <th data-tip="Unit icon">Icon</th>
-            <th data-tip="Unit name. If name is changed for existing unit, old unit will be replaced">Unit name</th>
-            <th data-tip="Conscription percentage for rural population">Rural</th>
-            <th data-tip="Conscription percentage for urban population">Urban</th>
-            <th data-tip="Average number of people in crew (used for total personnel calculation)">Crew</th>
-            <th data-tip="Unit military power (used for battle simulation)">Power</th>
-            <th data-tip="Unit type to apply special rules on forces recalculation">Type</th>
-            <th data-tip="Check if unit is separate and can be stacked only with units of the same type">Sep.</th>
-          </tr>
-        </thead>
-        <tbody>
-        </tbody>
-      </table>
+      <div class="table">
+        <table id="militaryOptionsTable">
+          <thead>
+            <tr>
+              <th data-tip="Unit icon">Icon</th>
+              <th data-tip="Unit name. If name is changed for existing unit, old unit will be replaced">Unit name</th>
+              <th data-tip="Conscription percentage for rural population">Rural</th>
+              <th data-tip="Conscription percentage for urban population">Urban</th>
+              <th data-tip="Average number of people in crew (used for total personnel calculation)">Crew</th>
+              <th data-tip="Unit military power (used for battle simulation)">Power</th>
+              <th data-tip="Unit type to apply special rules on forces recalculation">Type</th>
+              <th data-tip="Check if unit is separate and can be stacked only with units of the same type">Sep.</th>
+            </tr>
+          </thead>
+          <tbody>
+          </tbody>
+        </table>
+      </div>
     </div>
 
     <div id="styleSaver" class="dialog stable textual" style="display: none">
diff --git a/main.js b/main.js
index 1e44a5589..86fab9fed 100644
--- a/main.js
+++ b/main.js
@@ -341,7 +341,8 @@ function showWelcomeMessage() {
     This version is compatible with ${changelog}, loaded <i>.map</i> files will be auto-updated.
 
     <ul>${post}
-      <li>Battle simulation</li>
+      <li>Military forces changes (${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Military-Forces", "detailed description")})</li>
+      <li>Battle simulation (${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Battle-Simulator", "detailed description")})</li>
       <li>Ice layer and Ice editor</li>
       <li>Route and River Elevation profile</li>
       <li>Image Converter enhancement</li>
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index f816ce075..813bec57b 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -24,7 +24,6 @@ function showEPForRiver(node) {
 
 function showElevationProfile(data, routeLen, isRiver) {
   // data is an array of cell indexes, routeLen is the distance (in actual metres/feet), isRiver should be true for rivers, false otherwise
-
   document.getElementById("epScaleRange").addEventListener("change", draw);
   document.getElementById("epCurve").addEventListener("change", draw);
   document.getElementById("epSave").addEventListener("click", downloadCSV);
@@ -36,30 +35,25 @@ function showElevationProfile(data, routeLen, isRiver) {
   });
 
   // prevent river graphs from showing rivers as flowing uphill - remember the general slope
-  var slope = 0;
+  let slope = 0;
   if (isRiver) {
     if (pack.cells.h[data[0]] < pack.cells.h[data[data.length-1]]) {
       slope = 1; // up-hill
     } else if (pack.cells.h[data[0]] > pack.cells.h[data[data.length-1]]) {
-      slope = -1; // down-hill 
+      slope = -1; // down-hill
     }
   }
 
-  const chartWidth = window.innerWidth-180;
-  const chartHeight = 300; // height of our land/sea profile, excluding the biomes data below
-
-  const xOffset = 80;
-  const yOffset = 80;  // this is our drawing starting point from top-left (y = 0) of SVG
-
+  const chartWidth = window.innerWidth-180, chartHeight = 300; // height of our land/sea profile, excluding the biomes data below
+  const xOffset = 80, yOffset = 80; // this is our drawing starting point from top-left (y = 0) of SVG
   const biomesHeight = 40;
 
   let lastBurgIndex = 0;
   let lastBurgCell = 0;
   let burgCount = 0;
-  let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, mih: 100, mah: 0, points:[] }
-  for (let i=0, prevB=0, prevH=-1; i<data.length; i++) {
+  let chartData = {biome:[], burg:[], cell:[], height:[], mi:1000000, ma:0, mih: 100, mah: 0, points:[]};
+  for (let i=0, prevB=0, prevH=-1; i  <data.length; i++) {
     let cell = data[i];
-
     let h = pack.cells.h[cell];
     if (h < 20) h = 20;
 
@@ -72,7 +66,6 @@ function showElevationProfile(data, routeLen, isRiver) {
       }
     }
     prevH = h;
-    // river up-hill checks stop here
 
     let b = pack.cells.burg[cell];
     if (b == prevB) b = 0;
@@ -100,7 +93,7 @@ function showElevationProfile(data, routeLen, isRiver) {
   function downloadCSV() {
     let data = "Point,X,Y,Cell,Height,Height value,Population,Burg,Burg population,Biome,Biome color,Culture,Culture color,Religion,Religion color,Province,Province color,State,State color\n"; // headers
 
-    for (let k=0; k<chartData.points.length; k++) {
+    for (let k=0; k < chartData.points.length; k++) {
       let cell = chartData.cell[k];
       let burg = pack.cells.burg[cell];
       let biome = pack.cells.biome[cell];
@@ -143,26 +136,26 @@ function showElevationProfile(data, routeLen, isRiver) {
   }
 
   function draw() {
-    chartData.points = []; 
+    chartData.points = [];
     let heightScale = 100 / parseInt(epScaleRange.value);
 
-    heightScale *= 0.90; // curves cause the heights to go slightly higher, adjust here
+    heightScale *= .9; // curves cause the heights to go slightly higher, adjust here
 
     const xscale = d3.scaleLinear().domain([0, data.length]).range([0, chartWidth]);
     const yscale = d3.scaleLinear().domain([0, chartData.ma * heightScale]).range([chartHeight, 0]);
-  
+
     for (let i=0; i<data.length; i++) {
       chartData.points.push([xscale(i) + xOffset, yscale(chartData.height[i]) + yOffset]);
     }
-  
+
     document.getElementById("elevationGraph").innerHTML = "";
 
     const chart = d3.select("#elevationGraph").append("svg").attr("width", chartWidth+120).attr("height", chartHeight+yOffset+biomesHeight).attr("id", "elevationSVG").attr("class", "epbackground");
     // arrow-head definition
     chart.append("defs").append("marker").attr("id", "arrowhead").attr("orient", "auto").attr("markerWidth", "2").attr("markerHeight", "4").attr("refX", "0.1").attr("refY", "2").append("path").attr("d", "M0,0 V4 L2,2 Z").attr("fill", "darkgray");
-  
+
     let colors = getColorScheme();
-    var landdef = chart.select("defs").append("linearGradient").attr("id", "landdef").attr("x1", "0%").attr("y1", "0%").attr("x2", "0%").attr("y2", "100%");
+    const landdef = chart.select("defs").append("linearGradient").attr("id", "landdef").attr("x1", "0%").attr("y1", "0%").attr("x2", "0%").attr("y2", "100%");
 
     if (chartData.mah == chartData.mih) {
       landdef.append("stop").attr("offset", "0%").attr("style", "stop-color:" + getColor(chartData.mih, colors) + ";stop-opacity:1");
@@ -173,7 +166,7 @@ function showElevationProfile(data, routeLen, isRiver) {
         landdef.append("stop").attr("offset", perc*100 + "%").attr("style", "stop-color:" + getColor(k, colors) + ";stop-opacity:1");
       }
     }
-  
+
     // land
     let curve = d3.line().curve(d3.curveBasis); // see https://github.com/d3/d3-shape#curves
     let epCurveIndex = parseInt(epCurve.selectedIndex);
@@ -185,35 +178,35 @@ function showElevationProfile(data, routeLen, isRiver) {
       case 4 : curve = d3.line().curve(d3.curveMonotoneX); break;
       case 5 : curve = d3.line().curve(d3.curveNatural); break;
     }
-  
+
     // copy the points so that we can add extra straight pieces, else we get curves at the ends of the chart
     let extra = chartData.points.slice();
-    var path = curve(extra);
+    let path = curve(extra);
     // this completes the right-hand side and bottom of our land "polygon"
     path += " L" + parseInt(xscale(extra.length) + +xOffset) +  "," + parseInt(extra[extra.length-1][1]);
     path += " L" + parseInt(xscale(extra.length) + +xOffset) +  "," + parseInt(yscale(0) + +yOffset);
     path += " L" + parseInt(xscale(0) + +xOffset) +"," + parseInt(yscale(0) + +yOffset);
-    path +=  "Z";
-    chart.append("g").attr("id", "epland").append("path").attr("d", path).attr("stroke", "purple").attr("stroke-width", "0").attr("fill", "url(#landdef)");  
-  
+    path += "Z";
+    chart.append("g").attr("id", "epland").append("path").attr("d", path).attr("stroke", "purple").attr("stroke-width", "0").attr("fill", "url(#landdef)");
+
     // biome / heights
     let g = chart.append("g").attr("id", "epbiomes");
     const hu = heightUnit.value;
-    for(var k=0; k<chartData.points.length; k++) {
+    for(let k=0; k < chartData.points.length; k++) {
       const x = chartData.points[k][0];
       const y = yOffset + chartHeight;
       const c = biomesData.color[chartData.biome[k]];
       const dataTip = biomesData.name[chartData.biome[k]]+" (" + chartData.height[k] + " " + hu + ", cell " + chartData.cell[k] + ")";
-  
+
       g.append("rect").attr("stroke", c).attr("fill", c).attr("x", x).attr("y", y).attr("width", xscale(1)).attr("height", 15).attr("data-tip", dataTip);
     }
-  
+
     const xAxis = d3.axisBottom(xscale).ticks(10).tickFormat(function(d){ return (rn(d / chartData.points.length * routeLen) + " " + distanceUnitInput.value);});
     const yAxis = d3.axisLeft(yscale).ticks(5).tickFormat(function(d) { return d + " " + hu; });
-  
+
     const xGrid = d3.axisBottom(xscale).ticks(10).tickSize(-chartHeight).tickFormat("");
     const yGrid = d3.axisLeft(yscale).ticks(5).tickSize(-chartWidth).tickFormat("");
-  
+
     chart.append("g")
       .attr("id", "epxaxis")
       .attr("transform", "translate(" + xOffset + "," + parseInt(chartHeight + +yOffset + 20) + ")")
@@ -223,12 +216,12 @@ function showElevationProfile(data, routeLen, isRiver) {
       .attr("transform", function(d) {
           return "rotate(0)" // used to rotate labels, - anti-clockwise, + clockwise
       });
-  
+
     chart.append("g")
       .attr("id", "epyaxis")
       .attr("transform", "translate(" + parseInt(+xOffset-10) + "," + parseInt(+yOffset) + ")")
       .call(yAxis);
-  
+
     // add the X gridlines
     chart.append("g")
       .attr("id", "epxgrid")
@@ -236,38 +229,36 @@ function showElevationProfile(data, routeLen, isRiver) {
       .attr("stroke-dasharray", "4 1")
       .attr("transform", "translate(" + xOffset + "," + parseInt(chartHeight + +yOffset) + ")")
       .call(xGrid);
-  
+
     // add the Y gridlines
-    chart.append("g")			
+    chart.append("g")
       .attr("id", "epygrid")
       .attr("class", "epgrid")
       .attr("stroke-dasharray", "4 1")
       .attr("transform", "translate(" + xOffset + "," + yOffset + ")")
       .call(yGrid);
-  
-   // draw city labels - try to avoid putting labels over one another
+
+    // draw city labels - try to avoid putting labels over one another
     g = chart.append("g").attr("id", "epburglabels");
-    var y1 = 0;
-    var add = 15;
+    let y1 = 0;
+    const add = 15;
 
     let xwidth = chartData.points[1][0] - chartData.points[0][0];
     for (let k=0; k<chartData.points.length; k++)
     {
       if (chartData.burg[k] > 0) {
         let b = chartData.burg[k];
-  
+
         let x1 = chartData.points[k][0]; // left side of graph by default
         if (k > 0) x1 += xwidth/2; // center it if not first
-        if (k == chartData.points.length-1) 
-          x1 = chartWidth + xOffset;  // right part of graph
+        if (k == chartData.points.length-1) x1 = chartWidth + xOffset; // right part of graph
         y1+=add;
-        if (y1 >= yOffset) { y1 = add; }
-        var d1 = 0;
-  
+        if (y1 >= yOffset) y1 = add;
+
         // burg name
         g.append("text").attr("id", "ep" + b).attr("class", "epburglabel").attr("x", x1).attr("y", y1).attr("text-anchor", "middle");
         document.getElementById("ep" + b).innerHTML = pack.burgs[b].name;
-  
+
         // arrow from burg name to graph line
         g.append("path").attr("id", "eparrow" + b).attr("d", "M" + x1.toString() + "," + (y1+3).toString() + "L" + x1.toString() + "," + parseInt(chartData.points[k][1]-3).toString()).attr("stroke", "darkgray").attr("fill", "lightgray").attr("stroke-width", "1").attr("marker-end", "url(#arrowhead)");
       }
@@ -284,4 +275,3 @@ function showElevationProfile(data, routeLen, isRiver) {
     modules.elevation = false;
   }
 }
-
diff --git a/modules/ui/options.js b/modules/ui/options.js
index ec7001975..4d789173e 100644
--- a/modules/ui/options.js
+++ b/modules/ui/options.js
@@ -71,7 +71,7 @@ document.getElementById("options").querySelector("div.tab").addEventListener("cl
 
 // show popup with a list of Patreon supportes (updated manually, to be replaced with API call)
 function showSupporters() {
-  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords, Joshua E Goodwin, SirTobit , Allen S. Rout, Allen Bull Bear, Pippa Mitchell, R K, G0atfather, Ryan Lege, Caner Oleas Pekgönenç, Bradley Edwards, Tertiary , Austin Miller, Jesse Holmes, Jan Dvořák, Marten F, Erin D. Smale";
+  const supporters = "Aaron Meyer, Ahmad Amerih, AstralJacks, aymeric, Billy Dean Goehring, Branndon Edwards, Chase Mayers, Curt Flood, cyninge, Dino Princip, E.M. White, es, Fondue, Fritjof Olsson, Gatsu, Johan Fröberg, Jonathan Moore, Joseph Miranda, Kate, KC138, Luke Nelson, Markus Finster, Massimo Vella, Mikey, Nathan Mitchell, Paavi1, Pat, Ryan Westcott, Sasquatch, Shawn Spencer, Sizz_TV, Timothée CALLET, UTG community, Vlad Tomash, Wil Sisney, William Merriott, Xariun, Gun Metal Games, Scott Marner, Spencer Sherman, Valerii Matskevych, Alloyed Clavicle, Stewart Walsh, Ruthlyn Mollett (Javan), Benjamin Mair-Pratt, Diagonath, Alexander Thomas, Ashley Wilson-Savoury, William Henry, Preston Brooks, JOSHUA QUALTIERI, Hilton Williams, Katharina Haase, Hisham Bedri, Ian arless, Karnat, Bird, Kevin, Jessica Thomas, Steve Hyatt, Logicspren, Alfred García, Jonathan Killstring, John Ackley, Invad3r233, Norbert Žigmund, Jennifer, PoliticsBuff, _gfx_, Maggie, Connor McMartin, Jared McDaris, BlastWind, Franc Casanova Ferrer, Dead & Devil, Michael Carmody, Valerie Elise, naikibens220, Jordon Phillips, William Pucs, The Dungeon Masters, Brady R Rathbun, J, Shadow, Matthew Tiffany, Huw Williams, Joseph Hamilton, FlippantFeline, Tamashi Toh, kms, Stephen Herron, MidnightMoon, Whakomatic x, Barished, Aaron bateson, Brice Moss, Diklyquill, PatronUser, Michael Greiner, Steven Bennett, Jacob Harrington, Miguel C., Reya C., Giant Monster Games, Noirbard, Brian Drennen, Ben Craigie, Alex Smolin, Endwords, Joshua E Goodwin, SirTobit , Allen S. Rout, Allen Bull Bear, Pippa Mitchell, R K, G0atfather, Ryan Lege, Caner Oleas Pekgönenç, Bradley Edwards, Tertiary , Austin Miller, Jesse Holmes, Jan Dvořák, Marten F, Erin D. Smale, Maxwell Hill, Drunken_Legends, rob bee, Jesse Holmes, YYako, Detocroix";
   alertMessage.innerHTML = "<ul style='column-count: 3; column-gap: 2em'>" + supporters.split(", ").sort().map(n => `<li>${n}</li>`).join("") + "</ul>";
   $("#alert").dialog({resizable: false, title: "Patreon Supporters", width: "30vw", position: {my: "center", at: "center", of: "svg"}});
 }
diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js
index de0da9e97..5740b1eee 100644
--- a/modules/ui/states-editor.js
+++ b/modules/ui/states-editor.js
@@ -446,11 +446,31 @@ function editStates() {
       pack.cells.province.forEach((pr, i) => {if(pr === p) pack.cells.province[i] = 0;});
     });
 
+    // remove military
+    pack.states[state].military.forEach(m => {
+      const id = `regiment${state}-${m.i}`;
+      const index = notes.findIndex(n => n.id === id);
+      if (index != -1) notes.splice(index, 1);
+    });
+    armies.select("g#army"+state).remove();
+
+    const military = pack.states[elSelected.dataset.state].military;
+    const regIndex = military.indexOf(regiment());
+    if (regIndex === -1) return;
+    military.splice(regIndex, 1);
+
+    const index = notes.findIndex(n => n.id === elSelected.id);
+    if (index != -1) notes.splice(index, 1);
+    elSelected.remove();
+
     const capital = pack.states[state].capital;
     pack.burgs[capital].capital = 0;
     pack.burgs[capital].state = 0;
     moveBurgToGroup(capital, "towns");
 
+    // clean state object
+    pack.states[state].military = [];
+
     debug.selectAll(".highlight").remove();
     if (!layerIsOn("toggleStates")) toggleStates(); else drawStates();
     if (!layerIsOn("toggleBorders")) toggleBorders(); else drawBorders();

From 79ebab87759a3e4b603ed891e6deb5d804b08b68 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 21 Jun 2020 18:50:13 +0300
Subject: [PATCH 37/38] v1.4.28

---
 index.html                      | 6 +++---
 main.js                         | 7 ++++---
 modules/ui/elevation-profile.js | 5 +----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 0e129416f..6b6e65cba 100644
--- a/index.html
+++ b/index.html
@@ -2465,7 +2465,7 @@
     </div>
 
     <div id="battleScreen" class="dialog stable" style="display: none">
-      <div id="battleBody" class="overflow>
+      <div id="battleBody" class="overflow">
         <template id="battlePhases_field">
           <button data-tip="Skirmish phase. Ranged units excel" data-phase="skirmish" class="icon-button-skirmish"></button>
           <button data-tip="Melee phase. Melee units excel" data-phase="melee" class="icon-button-melee"></button>
@@ -2534,7 +2534,7 @@
           <button data-tip="Retreat phase. Units strength reduced" data-phase="retreat" class="icon-button-retreat"></button>
         </template>
 
-        <div style="font-size:1.2em; font-weight: bold">
+        <div style="font-size:1.2em; font-weight: bold; width: unset">
           <span>Attackers</span>
           <div style="float: right; font-size: .7em">
             <meter id="battleMorale_attackers" data-tip="Attackers morale: " min=0 max=100 low=33 high=66 optimum=80></meter>
@@ -2547,7 +2547,7 @@
           </div>
         </div>
         <table id="battleAttackers"></table>
-        <div style="font-size:1.2em; font-weight: bold">
+        <div style="font-size:1.2em; font-weight: bold; width: unset">
           <span></span>Defenders</span>
           <div style="float: right; font-size: .7em">
             <meter id="battleMorale_defenders" data-tip="Defenders morale: " min=0 max=100 low=33 high=66 optimum=80></meter>
diff --git a/main.js b/main.js
index 86fab9fed..5265820a4 100644
--- a/main.js
+++ b/main.js
@@ -330,7 +330,7 @@ function applyDefaultBiomesSystem() {
 }
 
 function showWelcomeMessage() {
-  const post = link("https://www.reddit.com/r/FantasyMapGenerator/comments/ft5b41/update_new_version_is_published_military_update_v14/", "Main changes:"); // announcement on Reddit
+  const post = link("https://www.reddit.com/r/FantasyMapGenerator/comments/ft5b41/update_new_version_is_published_into_the_battle_v14/", "Main changes:"); // announcement on Reddit
   const changelog = link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Changelog", "previous version");
   const reddit = link("https://www.reddit.com/r/FantasyMapGenerator", "Reddit community");
   const discord = link("https://discordapp.com/invite/X7E84HU", "Discord server");
@@ -344,10 +344,11 @@ function showWelcomeMessage() {
       <li>Military forces changes (${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Military-Forces", "detailed description")})</li>
       <li>Battle simulation (${link("https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Battle-Simulator", "detailed description")})</li>
       <li>Ice layer and Ice editor</li>
-      <li>Route and River Elevation profile</li>
+      <li>Route and River Elevation profile (by EvolvedExperiment)</li>
       <li>Image Converter enhancement</li>
       <li>Name generator improvement</li>
-      <li>Fogging style change</li>
+      <li>Improved integration with City Generator</li>
+      <li>Fogging restyle</li>
     </ul>
 
     <p>You can can also download a ${desktop}.</p>
diff --git a/modules/ui/elevation-profile.js b/modules/ui/elevation-profile.js
index 813bec57b..c47c833c6 100644
--- a/modules/ui/elevation-profile.js
+++ b/modules/ui/elevation-profile.js
@@ -244,8 +244,7 @@ function showElevationProfile(data, routeLen, isRiver) {
     const add = 15;
 
     let xwidth = chartData.points[1][0] - chartData.points[0][0];
-    for (let k=0; k<chartData.points.length; k++)
-    {
+    for (let k=0; k<chartData.points.length; k++) {
       if (chartData.burg[k] > 0) {
         let b = chartData.burg[k];
 
@@ -269,9 +268,7 @@ function showElevationProfile(data, routeLen, isRiver) {
     document.getElementById("epScaleRange").removeEventListener("change", draw);
     document.getElementById("epCurve").removeEventListener("change", draw);
     document.getElementById("epSave").removeEventListener("click", downloadCSV);
-
     document.getElementById("elevationGraph").innerHTML = "";
-
     modules.elevation = false;
   }
 }

From 184966802f9be0555b13da9fc85682d6c05773af Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Sun, 21 Jun 2020 19:09:52 +0300
Subject: [PATCH 38/38] v1.4.29

---
 Fantasy Map Generator.lnk | Bin 0 -> 2304 bytes
 Readme.txt                |   5 +++++
 images/icon.ico           | Bin 0 -> 200117 bytes
 modules/save-and-load.js  |  27 ---------------------------
 upload.php                |   6 ------
 5 files changed, 5 insertions(+), 33 deletions(-)
 create mode 100644 Fantasy Map Generator.lnk
 create mode 100644 Readme.txt
 create mode 100644 images/icon.ico
 delete mode 100644 upload.php

diff --git a/Fantasy Map Generator.lnk b/Fantasy Map Generator.lnk
new file mode 100644
index 0000000000000000000000000000000000000000..1e1f20124b03a3e63bebe5c0f83cf3ac117927cd
GIT binary patch
literal 2304
zcmds1TS$~q5T3Q4T1|8pOe!*$V68A0SBPr!vbDG0TJ^_WL*$42TYq$|y|DiZDx~=k
z-SkC~Feu6{QW#NCJw#D2K|ypwDIzj^34=nR2Yab+b~7V{E`(4AzB6-X=FB-WXXbc`
zNSBp@ndo+6Cie@wo=o7=N-sI9^`p9;eBsl$XO`L{`h=w}Y5#3*)n!qxG*<P<G+_%G
z2A}CEzp(JQjV$|m^Ru6-eeLf4-MvxUef_08(or6LxMjrNV`BQq$LSH>=T67nJ7uG~
zGULvi4&x|%`N^8_eMFi*WFSv4F1G9<Dy38sus0%|*H~kL&9Vl*%aVlk>{ML-kUSKm
zIEmCk*h<;plRhs?jY9@<Z>jWe@pV8XfA!iW9qnZudktg?m>17FOmIH0L~c?j3||Uq
z)J6qV0WJ#aAr*3!Vpzv10!p-$>Zyo0XCu<^UK5p9I$gCLR*UGbfS+V6UD7}=Yx&f5
zeH=?Y@cqzsSP@B>8sNQ^EYt-5A=(3z<p9$a0Pkd40PxriaE=!MQ*}$;8bHZmlWR0J
zrpaPdc18j%AvGM=<Yanfw-SykT3bPd5-sqkVKt`2BQZG`Zctk-P4N&8O2_H)oOdZA
z2ic&jK~^{i8h8<Tk;#c%1n>r-M1JB4&G#=O|3*f)&dVtrVF<6-h#PYpLEJxr{9C?q
z^++VLda{-?ilMYODoQLGNUreeo2ELtnhrY$DlfFJ9@k&n|L}C+)s+e3*;PVDabHHm
z&-4;nG8O*sz@gPA`3fh^*FSic8_rIq)OVkFH@p_|G(IdB;1Zp?IFe0~$%b~GLhUZ@
zXzrABUNbY(&L!Zv;1e!c;Xswe5H-J=2`}kKoqNIk_?o<j?K7CM12Z26ug?P<z`5qY
znv(t}#;c=ryXyJUM?H|QWCISM6qt|NnY(WJ7DSr>zUbxbkn>_sR2&lRmNO---8qmq
zv4IHOd~a<&P&wte_WE&#fA9hKE1d#(qqlbK&B5z++isXT>zwz7U+#x|AscXnHXs>c
zu23p$7QDg+&?2Ew*ea~YdZRGYD_M}+1cy)zc?q=Jq50EZ;nR~N3&pw!^<=K`xvHh=
zDtEcpW&Y*%4=IhRCI<tNum#hM&wrJg@k9B@Mb#t$Rrq_#QP(aq|K*?RXMf1Qn!o?)
G-d_Mq^>MWT

literal 0
HcmV?d00001

diff --git a/Readme.txt b/Readme.txt
new file mode 100644
index 000000000..6760d7eb6
--- /dev/null
+++ b/Readme.txt
@@ -0,0 +1,5 @@
+Azgaar's Fantasy Map Generator
+This is an open-source software available under MIT license
+https://github.com/Azgaar/Fantasy-Map-Generator
+
+To run the tool unzip ALL files and open index.html in browser
\ No newline at end of file
diff --git a/images/icon.ico b/images/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..78e496d037820bb8b0bf1361ea251ade312019e6
GIT binary patch
literal 200117
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%0Ddbx0Ch1nSx_Hw4CBc^6joPCSl>X3LL
z#${8e>4RX8V0jXqIyV31*HGycQslTn!OD+4N#|q7Df*?yL|Q4`A9#}Jp*y7gAy1u5
zSUmM8Gv9d{6)B3fKBM!i#0QRGH{OQ+70kgGuv>Fpa%>M@wQ`N`nb5Ec<eM;QcYtH+
z-b?IdUaNhsw_Ai{AM8P@#;YdYSDm~|D{Z&wAFiXC7{y*HMUx^D)dZ^!t#-uz_v(KH
zf|`zrIvPFOWe}f0x33cq-X$`=%FUs!<$B)_*v(-?X`$~FrShgDD|1BiUEKLEF_MC7
z7dAQe!Xio)_zE;WoTrpe#Z}4|-K;AV$@s-b%7r493JG$+3aRT7MhI4UYiA~fse>ig
zUQd`>5>_55=)?+Tyq4ZpPchf^{QbhhN?SP8^^@A#@S+s87^=?%^x;BJ+x2hKh0x!2
z;h%J*6;rYQeO7v;z6_G-;2Wo7;n`z3ufL!01Irmj0mcbK>oY6cM*E3`AmS?tRUsgy
zAXPCv@pT1UQSjYA_$+1aD2zgteuuBfScy?g#g03{Qj0<*WFHz;fl3W!A<P}>u<~Kc
z!IOtLa(IF5p>XY7kGFsIUFbL*M{)Ww%)%ig?xJmkSw7F|XWt{=%$R-o7~PhkkO(O)
zv(GQEU8c-^{81=NZv5>(Bwp#V{FBcy_0d!GKL0+`kIhl!2gq+;0kz;^{s}bQ+DhK>
z0h6o#PTH}XRe!5^f8&x9%YHquMX}F9psI<xd%>8nqDXVbQcw0VCa7u)U_WZ``0rH+
zF`Qc$&e&P+pn0$6VSe~8f992`xrE{7h}HK8Fnx%qxWiz5mBSxdL2JW8>X=Q0ckadv
z3tzEUB@u)7*C}&Lba0mB)C%#OA-9T0KYozKg{V#;Poi;~TSnL_^*tfr#Doxvc)G9m
z&pi&Yl`Hy%uj<o@Jjf=ZX-AIkjOOBdhS^2O%)A%$^cn&Rl?d0a84e%uvgc_7SMc*R
z_(5TD$sG)=cQK->@BoU;37dugw*(Wt8|$D3q(XUf|7RKGxJ#>8o)_MFFQz^1m}&`w
zkjymS(td#p|7jFS6j9|}Xr+nJB*AZrFq}R*hn`PyrI0(HkY%*DXj(>Lbmc|_qLA^j
z>7LXD3yGI;Yef<N>VNtTW)|jn<oOe<7b%BNcX8sl`*siMu7DLpw-BcgC5SsfG}k4&
zw94jJ&XQf;#O0RlFJ5Bs=1oQy)`*YIGx*y3<mdaiJYoBbXHZiKbDug*x-vum&1*P2
zh0==+btKgQzs3W*iWKe}nq$}BcT76!3)MwG_XF7W1MBX=EhhYK$Gv^O)Q+-WyH2d!
zf@c3ANS=*_X7{vM?pcgfZF!6zA~mR3U2hWp5w#=lpx=J=E=hX|cl&FUt9Mxb*kPQG
z$*hn&#hYu9XYsWSlEn1>@LhU;@E)oYGyOe}(|PtN(c($mQ;yjK1Dv&psCwtFcKd<#
zlOxh0ryOq~l+N#5;CHq%SOp`|^oc2L>C0b9B@^zm3QGs=8Nq1{;=I;AfP=X<M6s~G
zq3CqIlvck0qje~4HeN6XWvIgApflx&wI*}EhQP2KgN5Kt{73;x)52e8Jqwx&p>0-R
zYovJc=@Dn%O;~)Xr~$q0+>x{ha$cGwiE!3~fw{F9qlk>bh^A!{oH$lT16=9qdJ7^x
zdZA<QCS}$yt}ZMrT7xq}YC;V_fi%{{k>#iU_kWspH^QO$wZHj~IsD9%Jp9lxY<`U>
z?ok%gXk{CNKBpWmqNe816b$cNV{rZ*%;E~fGuZbo5+9f*d-smd|5%K1#c{ItdSqu`
z1F@*iQAi&_%8E=j8C6qzO~m^he;j&&-_AWJx$__3KBC6y03WE25A=ikALi44^)s(z
zs{_t`;TBOO%s<-Z_@8~A>8DpPVGEy1gg5TQsLcUe-?+lYuf9(9-WKN352Mrq*&FBB
z{LQx!13&ty4l}x>u)dbP31*GpC&-}GjZ|9S6B8<B6yjBWd^VjzYt8EFh%2wZ&)lJ9
zZ<-?*?din5!q6*)TNfghAG5g9XAtVJOGgT(<{a<65wm#2F%x@|Q0Y8^K9>re$OCFk
z$+)9kMcWugWf1GsRe3F6Pj55xg*HX`Xh7yXcfrqp-_Ks5Slv*(cOhYV&M`MLCii%`
zF-2q)HW$A1wF^wobP?lIg-6zgMaG-61Dmsv7dX+isaPd(W!6VbDyg!WM3Wfk<%%Mh
zoCTT!&D9IrTsptT^6>?VU^<TaFuyp@u@{e0^atE|`wY_u7RX1f9RxX)pvwr&w~*l~
zI!%#$1VxW%d7AXt98M{cgDqm0lij#QJl}%ulPLEn=%tWr(eP`l2Tn*lyJtsbC-ZO8
z>}ryDCV*hId)&C!J(ICIare%@mwV7m{;AyB>Js-@1dW+mNq#r`Pl&SAhQT;dXGfCK
zo)%HVe{TBwP67pCe6LAm&vY+SY^NQL{KONS_;+4l>C;c3B8?ps^m0EDH*Lh~ue{Cm
zfAkFoZ})MX6UfOI8J2SlI|s2RK0@;NWANH#;-U<NMLdt+I?ul^#1{gsd~JgS5t2}~
zR{Wq&G|VQBb|gfx;pW-%{L{bj4>9c)4oH-*>U+I!$OZ1))Jz|=80TFFt$dbWVKwVR
zO|CSpDPgz;7q>NcN1B#_>DW;Q6_7OYqbN0wRQug>SXy$a3Ud0C=iDmRGR1bOxzy8~
zS<_tWYn)T0f#@<UG}gdZzM69OLd?>P@YE@bIG+!ogWFL$N9N%6-2wl@-~KFTUcc!>
zY>k&xI*S!Yzbx^Yfl_NFMuDsq1qyXLQg!q~1-AvfODqneDB``Zzr)}C|NI77zaY`j
z8(5zE{%3gj<)f6FBi1i&)1I3pA9m}JTumMwGS^($LPZ*43*xx~6dBu}J%_%V@zBpa
z&EcPVnu9;|7>u@IWN|vF#Z!0Ca4Xb%_whk@@x9KU#00$G?<Xxddsqh2oZn9Q|M$Gt
zF7R(R9eGl__qfFP-}h1ds9CCe_uqW-FMZ~f?F^#%w)cyJAYXN_ZY&haV73R`J-bGH
z@=1pAaePV)7*${;A=YiSu3ur)%Q*VnGPd-b{yb0~Js02mr&^B_f_BKY;r-{?*lYe-
z>o|6NnbV*86ayUMyjt$Y$g=_0Mv9wnMRbmPOCvUZH?J07QIHKSYd0d6kGdLvSxBK1
zc`{Hx*Nm*<<cx4~Dn%(v;rz~CNss&NM@_F(^ovR^&0`I*9y10@QCJ1P^ZA5FA1!&}
zWXasT!v+N&qhaJc7r`h+W*zf034h{ypJL_Y9L{=xvK1L-<Bl&7O0~E<=F*5!>C2~A
z3PzD8Xe0XfRcRFttpv-<FSvzuES)^c_k8DLtgIw-v}3!_<klfp^ZWnRH`(lWA$=BG
znjPb%0_Oxl=@nFK7W8q<)Es(t7P7}#@2~ON=l&JX{OBjJ&e1+HOSzRZc>g`3nF6GP
zR;CV<?*Qy!GVh<pXM26uoWT1q;nbvSGU2+D(De!TZASQ1vs3%c*xlzeXt}jq;G}uF
zXIsL3#|YxY{x_fV?jzb5g$lK$3vu$WLo3BX%Omnqlsxi-CotkT_Xn@jIr1_CHBD#h
zO=R;1rn`h1-sbT0iyV3R80&q{5R8>K*GHiowZ#uy?eN=b<2h6vvQE)2y=bULNF&Aa
zvgXp35Gi3)dZb%vVYCquB?gHV15qez=|m+_$P65g;M!X)PQ93uJH=AlvDgweb1&27
zLSjlOieYAO>G*MZQ(ZHgB=pLH+XG9YJ^0rT(Euk^32_%{5-89fOgy~gD9ZpwhN~7K
zk>J)qv)FPNghA;@rea)}(Si^w;|0={FD{A*({aq8ESO1rW@EpQ5UucwKpF1ei9As#
zQXardv?5CUg0`+S=~SCoytcZC(AMzCLE(*uQbreA6fVZ>Q4he6F+uFCCuQYr$UsFA
zo$eG#s{{QZX0}Z>C}_WQf+>@dU%iXl_%gIwDE$oL+O>tTV^Hq3ne7MA-N#yx`(1CZ
z<9;|q(`DJS4f}--#ypS*>dRiw-~lDa_PVtB#9#Q#E6(}CAK<g*R8XVs#zGwQ1!67G
zj=B2zn<PsMAR4pwHtmm{qTJfzrJp>>cm0VYl-;<Nvyl)qH%iEy3OiR28IAnvHO4i(
z?AOrxA{L4A%D0h*p@q%NFI1)YFkLB{!AQ~n>N<(uB)`2)<}}kwEn0~;kMG>nL~TcR
zMi>=})3e^xuc`qnrE5TOvlLQO){&IWT+z2eHxlMsG1mrVjXji3Gb$AhO<}!$L1q=X
zctO(lt{4_(9dR;FNUI_RX&Rx8hEni~%+$3IERNJ@=94Zcp8|{sMF>g8+OU>cM%EVz
zP1`9BMaNh#Xae;!MtOHC3c7}=_IVKETrDs$6$?kFgt-LTQyHKC*Ed)>)?qN1rk3?m
zV+#Pnj#q=&KI=`KC7teY_+ZN2Z(e3}d5g}ohcO7P6LZ9;R!E;XOn&|ruE@~(5E6td
z>ibL@*potn_xS0JB%|i87tCrs3H{$InlK4S+^0?BXocK+?xaRb<A=Na@*Pc_BvNuu
zo807U?&^PSWz-GcwE(>Q=YQ%ICyffXGB*7Mm}^O$Wq0&wo6**Y+h^BlwFan`F#Uax
zlRR@2H`T_NAd;cHzv`8SsuJJ2j`ttv_`xsABh+aGN)yV0c>t|K__qqp^}bI~A|&&4
zW5L7`SI)f87yi4yMY7dKUoFYryu{+;^Q^tS%G}9WMq8T98gyHDV$qTqsmVo=9vAZv
zrRhe(a?4M;n?qHn5Z@dMHwGmd4{BNz8~IpDtdc5ELzbaMac5N{+R>S6YQt)jGkp2C
z-sIw$+Z=!D5St^&tR{_o?0+$BaU`9iRAVNXR+>UeB5hcTX4oi3^c~#1qxpaTx4*;U
zY>U~0vuFvl>*jb9g$uO<v=X|JVJ<Zk;z+b&Ch_dE%nA!jv*hJEXTNckspWYhQ&N_3
zz02Jbnrnvb5L^-C^l5af!{FR`T8}Q1%p{aUpTViyG3lulMz6k$>%W7J@1mm?;yU9P
z`lR`@*JRxBS;NOw;~2w^(BJMwU@tR&5)k<yZQ2p~oAj`DPE-kgxvHp~^+LN3`Db^V
znySC`1@7(tJz>R0v!a>Au`vuPw}E)mNgPHAgHm(5ubD|5v4LSB<l80M4RO&C+^y>r
zs{@#AGvBdwoY6Ua1rp~cM&Z<0>DNIL3XAr06?Qgn&N^o(wldO%lzwTMiB&CRDS_ir
zW!<%O$y3jr#QvEdK&>ufkG_Dq@Q0lJ`)`mB3bG4p+}#||UO7&G=@|XOG8dGH1YggP
z5WAm>9ml3T>K;YHunc~+f>ec~ng&uO40E5VT-N~*f_CC~r%!@=;{vd0lotwhV%gr#
z(7Gzr=_lu%q2^$_q#MOP>rbnoD(s(6qCH0-r$i}5X@!M(#e46r(;t=;&SwYaWw6%N
zSUw!_%0U`vM}}A%a%ah`1ofpVqTu++fBSjboilv?w_ayvZkkLzP0ee+&*8KEhS+?G
zXz>W^zjK!8N1sNwViJL(bf|XB>`%Oa>t*!6a1Lj$082cO9s5Cn!TTNeQyYGe`>6*#
zz3Bop_&XEtJ7KZ<0BsULS7J5yODYmDKk?Up{FTjYOllE<PVC662ik_EV#`LfVqaM%
zPh#xtEryqFqNfs~Cy(&_LynVEmhD21`+#>Nq6o55)z4cg7?#R^CP5^_DXcQwx_pzL
z`_KOYiw6%db7YCE@Y-sHQ$ZvoFbWBxon1v|ae?b!yFnxy*#0Kb{4vadCz0MZ-}vn3
zSYLae6F>L~Zmd~WraWc0ss{l6Sx?1|g*2$_I3aU>VhX~r)Sh#XVlMG6(ONc^1uv{`
zUt|boyYQ`dV;+0BD$A-!lE@cUQE=k)0Zu-7oT4o2m%Y-~9G`A`7MRu~R#ED)I7Flj
zMtPN>g;s(T(APPO4?o4!;u15hyl#(#v2B9u)`=ADNTch@L_*6%i1TU3i)l)vHN(<U
zSj%J2EVFp9!|PwXii=KARX*M^2=DR5cRJI$6CoQ{nR;r4s1p-uA&wP!zr@V7(OS{_
z>P2+=IEv){e(j`jTn(r{YRRwNF2#QLYfds17HDXM?Iz6F=0X#~1}fk)K(HEiJ%ZhB
zopkN$W!K=Ts>6Vl?jM21eot7jVF8#I|E-^TWf*otf=X@~{79`pCx+gew@`x&H`Rj0
zX%2n(0Gr>siH&1aY$&>2o>;Noq)@`phM}eum#!I{5sZQ9r1E=J-5y_K!0$$_>1p)*
zK^}hgB!VLktU#|FI5ux1?bCI|39W-uT>6dkw7ZrQpFYj%*Dpf3PB|)w(v-z`iN#Mn
zMj|;&Z5MXu@zXrevCJpJAXp~3^C7iV3z=x{W;)1mDH82{_N~HCCL1WKI#@I%inR^R
z+M40$aR=f>RKN1u-{jqMj)xzg^CiT^)x@Gm3#VriQWasv;gpb;p8Z$WCCUB&3ZI13
zNnke8w5A;IUV;l(BDP1G&I|!WttuRA+D7~WpvKC@v5A<8QzGMY4@87sX&ICXjN;n4
zO)g)~5PcA9%?^^=o?ujMifW9xg-J&o`M!rKa*HU1-5hcI7ha=y{|<xKub|@th&cj5
z{pg+nzS|_9xS2J4lZFehL-wnl{JSo)I})(_o|BGy+SG_LC^a_8cVDPB;eA`i>D_84
z_kUN{Cby~Sdrfcw8WVnp3$%w@5p89fy!1YJD7;H67OaH~!|2_+-2Jt8*h~dU5+3@Q
zr-)9>V$+1-`)jPfwaP;WpC)}`fx{igR-stS1F<89TNfjiKbqsLpJ0`b;`<`uo{Fu^
zlXo8b$Z14Maw|Be7@|T&-pVf?`-`Q6cvSF_zw!)4x5MmW%I(WTVpq~WGEMw@j`uHI
zME~qR<46B@KT1^O6d^2G6&RgQ$3C)A8l!yGqSPp6mE(HfQ;-$H)xP1xlw~>=dKRJt
zhIfT`S2ZmS@iOSuHcvd`qZvkl<c?Rr^acZy@dJPA1Z7d8Lb%Z9HbCJlg$c6ZPH-kc
zbcG#^EdeJkWJ_x1;)D}3j=@tocWy;oT#GoZEm??A+#MNuIous8K6w=K5P{H2QP`4P
zmEfSSax!P@D1!#xyP9+TY>)YqXHe?7pqylPa$EMa00c~n(XAd^XYSBCwLo47y4R<?
zo1xRg5ciS%7^<oPe-E&?&*X0|K+XH^2ElfKe=>GuCZYe6z{dS1WDQ<6%*cCw+qkc4
z?7&snFZiNruN&^!rf|*OT>6kZQ>j--<6ca%0K#Ej__u!YmFgaq_{MC@GAuP#Y4WR^
zlsDGNj(?iS_1O5@d5(R@QI-!U47UnC@$Ws!%P-G!yC-ZEnoHZ7K?X?z7cUq(ZO80_
zkJGmU9-#2M=4P(hEDS?pY=~QzrKk8BJvNuRv3DCPWgew`n6Ii_l+LzDQ-xSZa(apB
zM;5vLhnFa}B1WSg>$lc<;v=VNcfIKgc%K~q`%dKB*NyxH$s59(Ya>OkfGi;YYq_SK
zI<DQ0_{KLAuC7Ha%#_$tv9;OZ_22vzzWH0f&&R(1BRE?SrJ5%{`caalQyg9%)rD7L
z4Uf-R9-219W*ie0B}69n!$&bLL52@Ej)#F_CXSg+OWwY$=v&31CFg54pxDU#qL!mL
z+_toh2PC!j;6`B`E|en|eDYH}g1bXFbb5jB`|%aN{yW!6Sj842;!YQ9_0A2hxd2q4
zmJ-}(mUN}V?a#f=)X`}=OC8#WXSnl)i<qes$moP0_>IN<o(aC!ZoFgX-bt+4QRlBI
z`&HT46XxeVgoM2gX<SA%p|)l_CIEmtWYEU#Rl(v`YXAF9G!2@mwz~;MyLS8fdF<g<
zMAhOD8PA9-L%6OCsb<O1IYfi81B&TW#OpU0-rC~OBlCRMWAn7N<=TcLGBD`DTW?0R
zA{b?g?v!x)u>xl`hq{iIfwjE3YHM7-<lV2m&f}kW8VLdy3NQba7*FcWT>Z$rww@ak
zh(sVSg{fH32Bwtb{V&~Q?Hjj9pMHVEQ!}(%cUfGD@ovd@L9Db2Mi%BG#h`RVS_M*(
zrfU@QEn&ORwMKzb!aG+Cw{B{ld9EPs2-a$!ldm!kxhEK8rzxyw?^z4)o+&taqVySv
zggkxm;mtWrJ;@!=Q7s~=YZnD|;3{-!7?&gWH3^nmZN!Y&9Kj%mJe2=7+7FcNT=BUZ
z5yz%1A6ks6YT^F+;z?O~>G=kk^=eRH873WG{>g_p^ZU2RE}kb|O2~#M(5eLGd`hp@
zfxxnBl<JaVyGxWtHOn({j&!j_*}sj77Z5A^&bNIJVW*z_gyWC3<X1RH>g)bd>wP`g
z{q{U2Sur2<8HDRc_45#)9Typ&0Mkx{{zym`I;g1*(d}1J2M*yPVRp)33&&<DjEs*b
zJFWQ2*Hccvko$$pdf-Q#&-}YR^jU5@v<kIiZGDYD_$R-`%A=3dI+zk+K@_<iTP1m+
zYZs~+SFd9BN<7dQ8^^RRc=7uVGj(@^^WS(2v6k=sPhKRB6=m*f)>YwPF?CGE-UW!X
zw?J~|v+EMAcC6(h4ncbazaP<>E=k&8%g_)Mg?2ph!f_u$%q)>nY;0JR7M2$w&qAhO
zz%bt3Ff64dh4W_pbexiCLm46frPv^ZB4|;y-w6IXMmt`;nK5%nIBFf2&l^@wx{!sb
z7zD6&SSYUbG*8c2B4e-usrI5Iqp~E@ilOx&Z(_v%u5UU1^dhHUKFA;Z{WDy6^#XGT
zwkTDH;qU-bc<@eXpY(<EA&1JrQ=&i{^3@*Gk1TO_3tG<|W9zf$&?ZOerx91)7pVTA
z$31}8q>1y#anJiMAdQ>3ecJRvk3H^JZ|b`#*Y`QhhyUD9zEWABQ4qDzDB7{Z;<L@P
zv-IEVQ_ej>G+4z+!PLol5Ks4AFEsC7GmJ)x_JR+g=}7G;qh%Umpem>iM_S0DE{}iW
zV<Zc)uV5Rv0ZKtD@@8xq%9qz}pBiTciV$k?c{CnTXt69mvqaq0%pRQL$V<!QBS#T(
z6ePq#6YWjzQ5p0CW8bbsYpe(*UL<5H@?t1kh2QCKuK6m*-6`rFFxH+l6p14*L&aeQ
zMW$IFz;qk58Ph%mm`faox;m62cVuBgv~)}<MJ+}mfKgHSdu0&-)^K6FV5<;TmW5Ye
zPdIwogR$FIvswD*ZJl56Rx{y=dGAK~g-D08WQy4M1=%^@R}_p2!8u|2NSjt1)9L1{
zU%p91j_%H&l_POyiKj={QlaBMQg*^KZV}BSY`yg!Gao)iRzP%MmhKZPjNW`7Q6rRD
zK&m1-O+fAeO!0e!L?)TN6KBY-dpyX3u!HjuK4^k~6T^19T!1~I5fkU>zHQp=T1<!_
z+~Wf6ef_8k7b(Cwjn#tILT-H?Z=?ik3<^W3Qlf<uT>RX(IP}sAt%WXv<LXVr_C?Li
zam%1kbTp*e)#4h7aRerhH*7=WODkA3$*j*<DMe8fQtR)R;(@tHRr%w-Na>)s_vKdU
z(4~MXArZ&1j~*s+Fz8ua5GGMN@CtyfLeUW&fXFI6Sl3BaN-0w9IMRhXBe>j$GI!Ws
z#QbrGIKhg>C?VEDY9J53ZN(FqTl8l9H{VG3$jf<MO(@ci^;~mi-7ysj-9%A3A+rVT
zC?a>3+?DlUZfWSK6sI&U$b~0H^ZY{0)f*YxBiIJM`1zEqfYHc@URMs4teg;xQ(W4L
z_>HS2KX6Eq;TYwXR;1|_;_E>wUs*}S(TNn>g+ZKScCN+z4<ALxn)u)iUj4=Mn2oz=
zr5M=)wYGuQSBU1izzUE9g4^1rwbZ6HpE9^zP?mzqEUvVeG{F_R9*yDv9U=nzh2wU-
z_hwvO>Ob$9RlCz@_ret>g(DmKBIA-@lP1${(vKSNRy%g(T~-12nWX!)X-7t3Q&g1Q
z5fFBIEsg7$@BH(hc|{pT)H1}W#*K=a1K?2T#IW&|tJt-iI4ZE$-(>FjBczWVpx=WF
zXCl_G!@?;cnF6tjnN;fB{v@i(Y)LTLy+RLlKYW?1T(^8WFW#!q%ICX}N`($N?bMZW
z#?Q4b2m(aj^q_Q(!YX1BZ+SGHrD437h<GruS16vEcSK4Db6nMgqey$V;96fZ6wTRl
z5mR%D`B{ez%2sJCWJATJI}vxc6#ao_y{{Q;YDSsj_J-luQc0@=I8_sxtW#{}nwuld
z!Hy$R9``84QaW3|H}92)!m0=*79~*PNMnuBIh2NlBPB)4apHvK*eS<>V~&lUVz8lU
zPy6evWs07)T-u8G7Z+kIFq`@`UF*b`G7ki$<(6=AN|=cq*R~b9v^@U!6bs*bn$AiB
zGbzvhrRT^Ci;5$%TN~)qhj0<l-8SXw73_4I?!hVMW;GjMxkRxh!1E}Rq4Wr8zmKw@
zRCgzyHgU4<1pcc3Yq{^ecD?<~|4D%0r0*(Zwh?;VDg9MV_+|vax6_M$NFDmC3&HNi
zQP{Ul<LlPoYp_VvZfj$A=x_G|@X`<ez$<#H&Dw9DW&72uY`<{}ms{E==8;fE){ROA
zuV2BK9;bfh84i5U3AQe8bMu1GK9;cfkhjMbaAexjj{Hs?hcej}-@R65so$ld9Sem?
zIr}T0XZ5Z3nLGWEHx~YX#Qk}!BwK#piG9vFvE-h2U+UJrzpA(Qd#_iryUFerB{nHa
z95zSPNVH}Kg5Z&i0W26E17knf#z2NOfZ#>2jhT@=l17wBkrYL-DK6b)cfV#YZ>_i1
zt9`k*?!M%n5pmA(A15L+Zr;4Ns+$8ifW)oJh>YdL`Tfps`To8?#K28Zz9gvl4k4#4
z9`5^Yl8uKzc#@TOAM)NGeUFJ#XAr*ge}l9_FiVrlG!;1vjJlWND@$T5d$FM6JNRl}
z8~R$%j2(udp#>jY3%LATj7{8t2R<|!@ZL>D5sU7_UKh-+pdlr_7Od__j-S!4t+*tO
z)VmjvQXw!E7)rhy871Tpz6l5^5!MNQY+W01EezVaj!X4Ga;ENarX(qcmW6`lUc<FZ
z3Pa24T@N+sKukqtS?ws+I)ai18(m4whpB=|Ew8MDvm~+tBU~SdqGy>cSnA5~-nykc
zTcLJt5``sEK99a}2d^@ZwR1QcaEY)@Ona5`^CyU<Pxt$`X<u7$u3T>m(|w4LI|$vx
zMw<vPLIgEzz8Z0K^~(fcj0}&>r;k1GG5Zct0C_nVFaYr!eu4e_v-p4JKI}8wpX8qQ
zDVveQ#+~yC5QSb)^60#Ahu#Mpc*o8{e~13vZPe$_I%JhLRG(U)bY%f41)iVq=<7FG
z`}TeOa!93q6<eyJt>JV{Q}Qiw%8#egbcqlGF+jGtZSdD-iq+E79zr_B*^QmAI$0BR
z)|<TbkKbhRi>Fxp^dd>1NHXw}aLqY90ZJ+Qod_?zmI2z4q+YN?Won!f$i}m$9oR^b
z_8&CRid}O~fL84A{p)R)2E;<tv!Eme&$72=xO+d~rRO88kOTM7OIw{=3DLWP#<qu@
zh_PDWdBOpbG9{h9FJFqZJ-b`?<;eSz$aGFQUwyb*TN+V>6oTic;rAcdw8go=F9-@H
zOJ_q8ELaK%dPZWcKpTU^^4hA$y_V!F$Kyc*6YI1kJ8Lc4l_FDBhjQ#BQ1d~OkVF!p
z1ZSrWy=SM`yt#=#ai4bM7)n~q?lPt476>jc(D;K7X@2KE!Lcitts4|BN>q80*7qMG
z3nAf&8p+-^rn`mkKZVt~o`RX#D;SbqjH#hNFx4N2D0~vkLH5U{slR<zzSw`@Aosst
z_=gL5-by&6KxZ`nZ^705%V7{KYo$H%{09u2CqNXcpZa^h{Oal--9gqC=tV_{T8MUo
zs1>8EK$Jtr0Vo7W$?`vYlg7s_{F5)RwQ-lXe&e^f{0m<oP)S<8>T>vAA;6}D8dAE(
z9|$`re{^viXKHpM%j}gi9DDXOaiYOwSawBktH<)MzXydWcHZ6ul~BJtOA-yA$Yq5r
zwfP$7K6ND>u;KGoeUqABj-<q<pT3rZ0;EPP38X_R_O)x?>7}L2n?1=&$HfL}bC%m5
z`!rT0%|x=d;qlZ92}vvmzz%8M<P%sF(2FI_7A)WMsZUzMz>P!3Uui5HuNVrR9Q@x{
zM+ffbtbu`fYe|LQjiEb!*tUGK02>`gf!2%#eI?mj75HV)VMu$skLq-hl@N<Sd5ZHB
zn%ROG)NB|eNi*Wr|Lw2Q?pZE8cM{)ftcAsr=ILom*)uE_HJ48KTzaa`2XC#@X)2I&
z&IJfN=;kJ}Qlxx&hVHdxtUQkHZcu)Dp6cf>(EQVT1jlCS-(P3qFJ2*D-NouALQP{c
zlGV{fV?OsUa-<jIHj(?-L;fCNZf6UW7|?rXZm3{?eShBU&&-73iDarpM7j(fTA;(2
zdxD%hky9?&^V{L`j~#{4bLSPnOJDfHtGjQnVcL6yg%+}C(Jc*)gtvd=8`LN2l+Mk9
z5bS>EHoXtG;MAw-$vOp9q`7*FnaOFEuGA4}Bal#A-u_pANOf+SQoTrITmg+Fa|=@6
zRt_74^rHl$HBkbIktEtRDcOB<nPjt%o_z@~TBlsrOkJ8zIRI@s=8k7DHlSnIiN^(n
z1m(bS5;)<PbQ3YSA8m&tBZOo9l|oQd4iDi;*y&4FI|`Mi2?NhEIb$f)E%!h2IdL{Y
z`Dr&L>6C_-S{R;mFS%USY;Sv<JQY)|I)tN_u4s<>%LO1OLzmrf3!S?+U#Wqz%un)6
zks2(CNd^m|CnW_Xm<VG|R4nz-5Ecy6OO~78jcKmjru~fv?7aREz1O4m!f|eW=MG=K
zpeU97K?4|L1$c^uvnM%m`3#Y?G$J=fB~Q>vT+xvhf{mu+cmKsL9(>qBRi46H-)TTK
zi7aTkZ+?X7B<N-bbQN#1NblpDM9U3qw@b3yp!n=DiqD-OJTXb@yC30Ir$I|(spYt<
z<E%1qzXjl|$3vjB<G??8ff&2mj+}!GAZG`-C2^DmFj9uQ5B)cS&f8}J9C}ZdeeK0E
z3n&eKWwc-Wf`CV5Kt?u66hUbkuQoyH!YmU{O@S?w)ShOqu|iykkjkTddz<#3-9eoH
z1Q8*==@9fE@brtHVER)_^!f&4A@l^gopAf!BYJx+j1_b?W0!{#f=(=GM3P85<d($+
zp~}9~awbJb`M$;WW4a%%qB|a<vx_=*jJ1z6Z~nvY)8FkOQ!1P+t){grDUOmMi*VV?
zx}geZ;txPTDPvB$f=Xd2DoZmKZ1ofxXhcv_F2Wxh>8d4-L-ExrFuUkX`Z#T=?$C)g
z<yIIfYAGe>FT_-;VABAnPG5{KT;=6@S8}gm=o{mD1E$EfZjz)ff*9O)){G=EdRWAT
zvl!Y*LQiWJiUFRK94i^VcE;!LUM{e_{4Rg=fB5g{H50t4Q#7vcviuuw@WX%julcY4
z{_k<RTA@}@%oROC>3HgvF3wV&me@3v*f)Z`C{+>y+K~Vsp8M)qPCh+>jNV45w!0^7
z(e3l7>6hu<>S6lx$jSt^e;PIM8Iolm<SfVlf1-c|s%Iw&j!&RF*AV_2=#4jl57@^b
zGY}BLq5gAzbswyphbV+YR>ysc0XIMQGw>dAvT;GUTn~tW#qv0-g;d)d2Kvbb{Os6k
zjk&#%O?~li{`{-kA8aC~F3`XI5xtFwWT%B+Y%@Q#L}_t`@bo0Q8`HnOLR`9n6_TP_
zf&K<(fAx91l0qkrl1l-i;&I^<&oHrACuwVb?f?9bQIqpbAD<yg>|jDGVN=dPs01!<
z(1~3gz7+0!OjIzfCT!fssA-tJi0!P?_+X8xixbF7h)yhnaI76t!xxmL7&!M)TgTfM
z+k7#`FlAElErCjf(>k*5qH^{B7RLi9({y2=1fgfSb<ZcL8+_lrR&8A{(WJNlPl(+7
zag#?mPYP)rL8(YnoSuY<(4`M!<GB8_)h&?HRRh`~D$pq|I{<u`fg*G1#5gTDveu#f
zlrPxcFl;<5aO}ca4AanFCT`R?cIpCN?D5f^ZRSq~1m%!s<lMI?aTSl!p?-+8U@sQb
z16P?j8CrIGf}o_h_`(dY{rVjWm02uBH^KZK$?k`!S^-%)iP^ml<{>hi!RRIMXOLb*
zy#9#l7cR5++HHF8Kce)^5~UYU(YvvZ@GpZdFlaEEo9vcD5N}82(#J*mvn>a-8Pe=$
z+;F4k6bDbZ&)nW$n{R)tmS3s4JlgVWl=3X^0*tc&4pRV^uD<eW+^|ID^Z2rZX*D?c
z*Po{K!7`Lj)BWIMj1+X=e1MKTboCUzXkqWXPk3d4^3{2WGzBk31lsgLJ&}@83S>~{
z)a3<a7z|9G#0XlEL#tsO0m)9^mAv*7*G@b#3Ncxx`0Nrkib>YGBx)X8TSCTLEPvw;
z#S?Y9gqTF&2N}FH6AI^Xxn>;h8YcDqvp3<VU?U-1#voG*fwXwat?Wv`R$rjfk#sCY
zf|W;-atT!6091iwP(@ktvv>mo7_kz=3{m!-6s}!3IR1t0zF;pBRDDaJ(m<Yc<6_dW
zlVZ?k4S=HZ9Z!I9NJm#a=@hM}B)*XJBF(2iF~y0~MZWvZWs<#zgryKwP*6C-{D}(p
zZ|w2lUW?1GOuIm%b>m=+Q*KH^D{*6YuPM3L_SozRrV5tnisaw@_IrH&U;aCmPF_W+
zX%G@2Z{SVDNTo@3?ooPr3aJvJwQZy~i?9at7AD%G|G^5~4^~hUOT-V?=)S*#EH5GK
z!qBD8Sx2Lj|G=al74H1LQB!+VSTbRC;DSR0DR<zQh9B9z%7OJZ42nO#<yUS;79}20
z0E0(3EDd^?3zSy?ul&l-zuLVYq00*xzm6C0(BEhfE>2*Y8|bb^Zy9VaLe8B9<ssLu
zQ8-&=^2?X$w;jl)5*SLJi<m2!(LB2rU{hxo5n(`_SYn;!*fUE&(u~sb)wESuKcx;&
zOqw%QitbwvNLoI&ID_gfWA-+v%!O1h%@Wy={;s4jF{JOdILktaVP#&ygJ$F?ysRZ%
zrQQE00yluY#I2&;#Fa%)1eUG7Br!vw4W(tfFX{IMQD0E1yFg!*wl(i1g6X0egsw8b
zF;fPRDFnxSEQ|zCVU0!zC;Za|K~F<Ffo5zF822pc`<J-F9$$Kci4j{fP+;1)vG-F`
zJ~kGqE$1&xGJDG7nHQ$`%YS2@<=b0qFW;r#uTh<x;L)uuwjOTt%I6pGjmzj1({^el
z&$8EdD9Ok=fYw%5a=#_H*YNPB>Lj-e#nKW&)(}=8Siy8#2v6Znl_*@8r~AP&DqO_c
z3HPqTSyX8P-PXvUiq%&UVFg*7MA#G9v|4pAuf=|*n<r}cao9HQn9%^CyQmYev8+G2
zAB~vhgP1`U1UxK9f7m?@gkKEzkx|eOpFf{oAA7!W&uKtC{qkpDwL1+=={N?3DIG&L
z?*ee<m#?t%_Byf<qFWtIr-^JlM7P>he&QVdOa&5$YcB<k!=~tEd1Pned&057bRuVl
zJE9HO3S8TigHS*xc4DiIBud=Momj_DC<Juhx<_p0pjbg}e8AG@7dZZNmyq?4wf6;+
z7ajF>VgyAWioWCX&-(gB+I8iLwamRUcMk;xwJ?V;Ovy}5y6QC|XMQW06$F7c5<JV+
zLxq^I^plkHFl{8_r|r5(nR$gAW^Y6q{PR7@#)BRH$$$GBEKW^PU#f$#T$(U=5;l8|
zpCC#LYKmS;KPEhiDj>Exodl3rL!4Rw+PdBcAc&2lbMvGi!J-pGeYU{NQjyT}dFIn|
zEFP=y-W&JW+1No?&G9RfJpFtfFSR&g;~J%E3wyB~l#ORW%vcMIQmnkQ$=Vxtn3{hY
zYzas}Pa@<jR)KAI>AZUf5uOH)JMMY`LR)N7M93)+lL(t&bqKlwS~KV+kSaQnvjCom
z?|=0Banb)&Ao7O|Nk4`Gz=IaRFs+wY2sY>bWl4d3LAu8RfKmcN%YF+W9|RoS#v#Ig
zm<5m{DN#=?J^QMex{MZ%sny^x;%4P8ou*;x`32gyHYlH;X7;B}u=mb7{=_7mx9$=?
ze*)<_FwA5@y9|JGzPn6)@<uGvW*~0W^-}A#=sCD?l!AF2DTs6pG?m5kEJ{gw4;yU%
z+8dZQP&tM`p}MzN`uWQkFW}beFniS?tQ?qEf#=NUETEXVZy5wP8wr&){1DE!C&k)3
z6eQFFlcvN{6AnS&NEg^lglptsVf((KG;MO3A3;BX*^+yEzDoNeN_Ss{6pW;Szzf(}
z-Q)Dtlay;A#yV_*wrTtHH1L!dK{v7V5<^M(cuLTT`}B<_PJ@9;I;wG#W<WAHbJlM#
zN-TZjI0cGAqK(BzaQSSNpZ?2>Tz$66gNM6Zc&fsQ(^cZcGF4F6G$mT~ovG=iK~ZaM
z+H6&@6$R|P{}%6k>n&<CWsF+J7fT={)&`JFVeJw!IFGRPVLd|zvdR4WoCPg}9gJrl
z_s)m~@Wd-=UeFlXC&v6H`yv&<gQOpsWap%O5Ztqa9uWDC$Ukz+FH*BJX8~9aT0mpF
z9*+h=$2_OH{FVRJtFf$uu!Cui@-c-)^u{ioo2wlE`Abw^T4LuLH__fSX5u95ZczKo
z3Bqbfyw#yT?P1bJnf}0kmb7BA54Vt4O1+dXUrNUl;0BqrL82fmNP6!-qJ6i8J^3lL
zD4~)rcIPhb`%Rh;HNmk(!g}Hwi3*o$Oj3qpC7d8+MMDP1&u6XUz;nmDdkS5m*0C0+
z{%@RCC1xekJ?-k<yNRT)T@Xx`1l^{fw<8HA1xe~U6g<nRs;Hk*-~a%C07*naRHF+A
z$6}<dbfwm*RbUOMP;ljw7bsRdFwSD?Chi`pfgLPLE;uQOEEGLS$#XURB2yC5nf=Lt
zaKddmZKswP7Yy{$F|G#zMbASBX!R3%ea*yl$g{7^vanPkt2<0=)~*~vCGnMIH|?e1
z6rCWll2*@9J9(O=r!TSn;m2Hm`}@qyokw{!gf*!!J8t9*5_4c>IxJeB3Vk+zGsd4o
z(R7F4-p5|g9)3(do+KD|?3e_5J}{U6?O^x8;|?(Yjtx-m|56+h1U#@E7F^5}z{OAh
z$FGXq3vpo$52K3M@**m}$Hdh+n(wZ$`_>v__5#-U$j&l)V~^cGyGQHWw+R<2ROZVh
zde~~K6+67Uu@3%f?68Wj;HAw!(t?`4b^@zX0G>c$zYiWED2C9wyGL(3#)QY*T?&ae
zT}1{Je(>x69NXJw@l#i@iHk*KQFvnoC7(f=Z}xC1TWv_;$r7eQCwLt#9XpU5j*v+O
zpl{@04Eq@$fk+#0Rs>c<=aI#q5(onc&aEhV?!b)Be9#R!a|MLKB+0;n%v_AbI3kk7
zxYz<&z%V^#BJk*H?fM1?Qj$-1lI$4QO3k3sIhJTkUpts{Gfvox60|ig>tWq~glk!r
zWiAZXH3`LmqY^8a2n-8F2QqRUiQRqm4AhR-nLV>e<E;jhCr-N7<9XtbCkRXpv}4X9
z$b>y3{dl4lTBE_e@v?N_n9RMA8F1%N&cEz;xz#_foHB!9VC9Ug{)e{wGQ;o3xBz(<
z2!712$LXe?`phrAI{Mq}STAZI+bgslcG$bNg*^Qnv7K_Wt5_r2iLs^t<q10P-NQdM
zNmva?v?bERjy3&s<;)m|loS+{MJY?HC0#9Z7yt))kkWM(PPCx;{t9Au85tO~KZVvc
zw4H*agL$~g)Qjh!=p!+XNys{)&zYi0BmUVyLEt$PHX9iwoOvD_L2R7`VbkyYv~tj-
z-B*loaNs0;amEOwv;+cz3UoS>{<fe{b8ZB}5sJjA^2;}jb@2q7n=@JP(p}F&+Tg?v
zR(WGH3&+yehN|zNz>&5@sqm}Rl1YpUBE}|lVba)3X7#v!2vAURPy}V{&~F_!LluKL
zt8I#(NCS<vzy%rIK3CQ(w8l=9sZ`4Byz?>D#R=kW(Y@CJGwc`v&9;G1<jv`v0A$hb
z(f!%P7GwUMuc1FA7&dU_8FEYvQ_Gpqj^4N!+0VXv8p!fKh4TdWE39LXW&HE!gP=$H
z|Klu*k$qzoK&JhbHi*4@On%`Uy*pcoVhyb-uFst;V@q?G;w&CM{oQ4%pE!doNV597
z&~t&aZo*&!XEc|-m#)GhvjRl=F2taxpfwgzD-k?%0s@J?eFIZE=hh{mnV3IG*-Pl&
ze8icbIL67Eb|$^B%$D3;L}tiIAcdnTw>E8Yp0037YOxrkD;7!>kW54O8t3=>($Y#&
zN;8qI;Es0NT8MpU+?NFN0*qj{Cz-2ge9s+V(uSUp_4doJ7EZ7-enLw|%qs9w2(?aE
zf>44Lu2(>)B#k(GZjlP4>kZh6#o#<iZu~Po1Z`o$rAml%jU^8(76Vxut~{=q4W<f~
zg`#Dys9EnS7R!doAmOv0s1ipp_dk4q^iDhT|8Wud`~^paC39=?Y`=$1`f)3sIAq@#
zVafaKhezvkfrYU}LHkcJ{yEvdQs;M$Ya@nJz%qybIMi!8YOHhDJb<AvNR-eZd`u8R
zSjQ#_wJ)4SY~LIxLV-bOM?@b-4gT!A|DM}_{0=hk24%W&+FV1YfisgXfxhQ_Qfmdi
zG_C+By{S-{G*AcKNYd$n^cCeR^Qck*->hPlB#5tL9(|ken8)d#I>}s7<4Kq)8ID(6
zpv(0mWYFW!Q*MRL3UR=uZN7(E)U`#kD9ivrl$flZ!3q5E1=~S6aW8RY&{Ba-T+}|&
zpoPzOe*HD>eY}bn$drc5`R0j{gLs8VuceJ3vC=7obWGyZ#8fiH!%2%kvKz(h_G6@Q
z&|Ivgpd<w)DJfTgW!Vp4voPQdG)Q{JxITjE#K`-ra1ei|q(sSKeL@y9DJsj)oapnZ
z`GlWb)Xd8c_pfbIT|9|Ro5DQNc8Jut1$iXLe$>RbN1Xpj?tvrDvF}1hT+BY^=Nxj1
z$Bfm!j=xVhtYfchbCh6ipQNO=F?T*9C>H6@d;(Lfv;9Xm5W-+;7xq27Mc~oHt4#3x
z%b&;Fl|vH>*Sfl=vlZB_yh=FuYhooqC}`r-?O2R9_`VrhYpJj9d@w^GU6#R!3ZC62
zdbrGUfA2-g(?tk9da<UE`rDCl8HJ9{O?vBk6>5{>6r`n-_Aw}U?l?c~wp#XGEr7O`
zZc1XRQ)QNcd6Lu@Yer%q)KWp^m`}7R2u}-4HzDdptlYa#b!pc5YGU|&nctrn5DZ&?
zyW$>+ga3%(f(XboixHbt87V=OxD$1?rKByPk`$F<sbpAbrxfagAgEhCv~l!bMd{Pf
zF`i5tj!N*9Pi!qVg&{*;-qHrILhOrOW!#EM3}Gnw?zgwN@m`<m^a|CPKEhul?uLg?
z*gVn2V<+)p%W7_t3&ywA8h2eW{F(fbZsc+I$&*RwzT*xj1bk8*dgybG8H<4nFvwLu
ze22p2I;P)5SxZtrg<tc~<;%pu>>zh*ElAJct-p(D++^a^Jm-J)8FZX-(h1j2JJKSJ
zL=V+mE0(mi&&oR+-2F%2#b26$*{TEO7)z9raAt5_zvL0!Sfl;XHnw(#pn0FlQo!l2
zoW{fko!Auin)=>p&Q+%Y6e--Qr<6$3WzdZ!yM5P!EL1iv&T#^+wS)Wm655GG;$jhf
zohcKyRCXdsqSNwXArQ)E_1e4q@!$V%DK|8Jsm9!~fY1EJ7nwaafsS?BF3k=8AUl!@
zXKaQ+Qjua9jCF)65<5UPN-|OvF>tSBibC|HE4V^J#S57X1RFiavnYgh{SB1s!?0MA
z1WJ)ugT<yTL4CgbQ~!WxE=+Uc>^wR#gBIi#OVJZ3AqNU@z|&%FTHoN__uR=EpZnPv
z{IJWz8x4Z;JaI1^q{v1sjWL>L|E|ZO-NeYh$4SglruZO^my<@Dnc|}n#N79WeQtuy
zop2ERdz=*S8wWe~7%PP9_>+#qps*+%o58uqjl<}^++Uf$3!gnqw?pw0Cn-LEie%*m
zO7GDz=ZGn~CJqB%Nw^kaon5AW<x@=k+*3&Df)mC<oVdxDnanPqF6k!{D<nxPqWLGc
z@aJY|e)BqJqe*+ENh|_{bkTf(uo7S!n$@r0Kvbs*<vMq-zlp!lMQUeCmwih$H0i{!
zgV>1@Sw8_stl5bj`DQb6wAm_sIjz{G=d>Npzr?tPrYajf!2n>B7(pj?LXa{02mv;V
zXnkXwGoSlOw4S2<_4ldR9;VkvXy>9R;ewF9G)R%PZ~`l>6MAJ)f#v?P;}TS<g%I1}
ztk!ma7oe<$Ur9?*DSV;ukaUxnc4GF;18v})4+Db0Rrj^xm{7VZzs;Vcn;8D9|J~1W
z`RYlm)`QvwY}QLbx{A(hScG#Egm5XwEX$#_r954wwm5-K1PDo?wnI>OfDjU!pQxjg
zH4CtawA?kF{D%g-V1Ixyf6n~pFyYHtV_8e}Oz9jv(WoTlgx_Z6z5<bUdp`7j4|U$t
zXO|<N{4k9K0S_q6ahAtu{3DBtWyecniIYkElPB5xt+xr5>Xe>eKyF>fSIr#AC3g|!
zmKuM$h?YKk9S4-jgw9$hD3eC^Q>)D2IP_n?589&VU&5La+yC+h?ELGu*n90J!dC>o
zK!qOb@80Bh{)_*Hh%&nLEIOK@+u7j<-+7->s3`lEl5g=Cf{!wv+E_t11tKLz5*tY)
za+rH(Eu=oOl(e)5+F(72M$$LZfqhal+?R$x4uvt%ZWN7$$O?MOXY1}BexNvZ;V)30
zxQej}p)k(nAWQ$Hq^IdyPy&>)Y%Rl$TariX@ZL2=za^-L?t0n|!AM?eZ6qUP7g-sv
zFQKawmOC+fQ9?&+O5P9`5c*J^iTU2!1$HCNjfUWR>yjHy#ZF7G)fAli%yTSL<Wb8h
zE0e}R41!jy=_LkVW`Rt1USGQGj;91lS>}sS_YCchCW-s(th`Cox`A%rLDW{jsKYIQ
zjQZKyL7T55tNzAKc$3?A*fHtvv!WlF;T5t&Gcte!CrK@UT#7Pp0a!B((j9ug2kt5B
z_G@#55bk4*9kTrnE}1nJ&5g}rK7!%U=U10M^GmOaf%dc{Y7y1APxsmydbf|L&JxLa
zhCrdAN|7potrfyE6R2{C)@iCO&BeR4R2J-V8d4kSmXvNp_xcLDbRJQuA_^5mWr^te
z9s0|gOrD*fZxx%rdjs2xnK=EI5TcD~K4NzM4E458I2SOvRK}#Hc`KH*lN1_jpp#^*
zgQ>ns^U)SpE^H7aea-IMYwW)9fVDR_5d}$Qu1ra4dRh!tTAc!cvS-f_d%akqjih&f
zm+e3J7#U2H$XP_ZjBV|3?x&CA`QD%sEK?w{9rinH#qh@41?G+$I(r_qDx5o;ATrJa
zT&prqx++B_vQp;#i<Gs3Mr_zkVb^||6_7YMu}#y66D7fe4T<ML7`j$sp78kQzy3CV
z`ujiRna@ARW=pfuQA`FFUs*P~l0X`|+GQqcflD3Q)V1)WOzF)m1?hMRJOr06SNWO$
z=oqD%<b}_N?5tQC8*3m>?(YhG2-ja`0UTQAepGaSbOAq13G7?ghp9Iw`?;XasQI7m
z8%fROdH)W*-*NYp;}G2U{Oo`Jp>oQN*SKdn>=|>Lmmer$!J3F<;YG4F!<b;d>7PHR
z6|U-!G{>B3sn`nFqAEq*WqtjGbpE#y7JsphD*52INTM>xG8RdAJfw5|yL6WqnYiS$
zECZHi&mp~S?Ct}EY9WdNw(B9|1W!WWxZ3ni;{4BcoV7b2G5}{$c9qr!_`bk;idM(6
z`r1QmH^KNd61&FC)mc~cVk~APf}I$dQjuG9?3O^=>9hH7-$PWEFyU!b`!;s(F3<hS
z1;SF1MC-g2w=deB1t^OJ%b8=EXjT(QS8L$s(29|9=|Pz@WwUt_>y#QDQn<5w6<y;5
zQm5Z(<BGL}u+&4#*0y4HD#42-p3oe7?jn;*v$T3i+C3S*zwQw#H?|dDkr+p``m-k_
zp|bR}i&3al0hK%lS#C#e&WH$nCHU%BkMlqNlbfur^$~?vuw4ZzXU2?~UxWGjq(Q&`
z88`7H0YvQKtL|fd_G8`eQT6`W_9Tr?a+@dh{x5{E=p@{Cw`0d%2yDND>2{f0@QHnm
zQ3e$#V(TNUC63+ivk0^gX+GGa@%_6b4GVJtnSpDqz-JS6vc~+=Q*^ap?r*(9@52@L
zzJ3j?VD|5R9_xEp0hf<;XtXsJSLBlz20nXV3*xkuRW@ETC5=YX>n7NpK3nf?qNi(2
z|J7&M`8V%kIt^wopKx^FW;h<;G6J!d1M(1nqB69Q7;PZYn4U-IKcKa7i!cAzuQ0z<
zrr${haUH=B320J5cG(H&^__cEk{KqzjhjgO5^5t5N>EZ}$N`XRa~22}3(&c1DV%#^
z(_$heosy3YOwVZEy&kZ1N>fmlKx(c&yFhG@(e5T>kf2^7(?FwxC>NE(47|S+@x^0R
zHhNvxrN~-h3%$g3SkBx&0EHmYhDV!*sBIDI`>1dMYc7LKT(Hd8;oxLbjG-?+c21AY
zp^w=&dR!Lh&&>Zk-FKFX$x<5!f(N;K%oivPa`QF~Jc}Rgp0aC=aQ)@Sz#W#WCpfI2
zDBGT(%d$5Xz#tB48262I(@Fr=V1o%{ZJM1Q+~>kq&(n_;4_;rV{jh;pn4q*+CGi7-
zdf>PLl)*|z!YP_v<lJfEI6#Oby+2J`oh8`4P2*t;J733k`UL0anEdPI!8<YS2rC@@
zS36d&$}iVoLf}mHY+Rj7U}-0kPApjaH#g8bJ^DL6{P_kmzxpz=ppcy|t8Z>|=F6v%
zae}XKX+GQw4Sa{L(^iti2H%6(Fkv@Q$mtrAHT;PJ#l`c?&6ntRGTLGWk$z95{`%nF
zEQ!i0`oPCEcyuee7+?)tyRx+JK`L9Bb>nC6e$2|^07C8<u=LY;Gdro-YD!|^=+t_N
z3n?0Oihytmqv$yoB@L>$K&TbmZ1|Loq3>HBwFMKQV7}-$10AoR!v`d3x^cUmP<rVk
zmoLw=d+iZx?<J_BghXKR!0Llh?c6gQ*q&si8wq$FeO%_#9|0i9vl1UhN@~QQ59yD6
zPX}BFd+`6_aSwI$b+R*hNB-F2m~K<_PnfJCdUr9c2r>5*QL;!_E3@_H1`|JVp1teq
zto+u81XGhFZ>-QNdd@#QR>wvOYO;jh=@PHCAdavzXK+U9Fo+VwTf{ws>A9$RVnD_k
zRWA|W-gL55Em86`A8mQAn~`w!1liaa1O?B~PSc5CF-Ee{6v$G@_MJ7Ft(fUjh3boo
zbl!PLyxk={^9q|cf55G8E;IMy0zsUvP7*qOOKWW#Tb!WRXi%7|6KR2xhI&O}e&sm=
zsfmTpWYHi@ghCK!R$Ds1Vx9imWG1|TzQ#*jjG>W|flP*$f--FPBoEt)i*-#w+LU_C
z1>L|EBpnFOj=c12LF*-geySLauv|Fb<Lw{#JpFu(5rRm&<|Y|2s7<W}Hw12lUhOy+
zsFT1-J3&|vV+94@^2KBBht0?-r%oc+=?m^OTui7o6W}kE!IM1r-rM-{JFdlhHAMRb
zh|glX!Po`piMAinw9XXpf!`lx{^zn_2P^@@VW7Z2-@T8kd&vLp$GKGcJ8#@xn+8Ly
z^zh9ldas2SMA+ss^%oYfy@b6R*YOJ*$Y_J<uUw$D)?wv0uj8M8j$U#MZ*m)SAB&;?
zXbt=VW<%ilMa1MhR!NMQM5#6yjTRL=)giufjVoWf#KLpam~Kq3C}}4iVyDH%?|+D@
z1kC;?FCm2M2S~v~coN-<09T6arDeYDI2YToLnvwCOr0CQ^-ZQ<`4q)xj<NOYZ{f`?
z(cO)C{fEDgJz0cjPI1E57~`PAojuDp|H*GtDplE8Tj!_$%fF2`70~KCH$%x3N^CSI
z$_cS{fj4mEDEaQxnd|6iy#!4>q;ChavJp8&Q1T>uk^A9|hN7q8R8`{%C#c3+Vms`&
zNJ_+_Eh)lr_)a}xNs#mt=fd>0<je_6H!@ti=2M=u_`U;gRVLGnhj!TyB?U2pN4t{7
zrX;8f{9;HsOfa!U8ka64m$Ax|R3~ZXqvmUbHJm(Er1!ZcCYQ=cPte+ndGO{V;^-r+
z_q4;oiyvcdkF(exbF4VbjDFlXa+GAlx&#hp%bxVUk5T}6=<m4u&9)!mx|sq{Pkkz_
z1sDW41yU%KY*FA5V&gVS?qItOj{nRV=6>P~)pJwqzW$JCb(8S?422g?P^o+D{_r6p
z(WsJ7oJ?ax0b`2T$|9mNfnTc-ZLZ;Y0#iMX3i@#S`^f$VB0PmB_h4^@bHDlm{Z^cs
z--1F2?bQywJ3G+V2w&kJo1{>XEWh?1H@^8gCti69jHZ}!0qphVpu^B0V`*G|x_WA!
zr57(U_mk&Hb~^06b_-E?9wocXOa@&1J71!4Z-=1jJ4kOL@I%4E<qI5t;R5qlpQbQd
z8o-^Cw5*vl7}nKL@|>WV)Tb0;*w8eqB(w&Ml<aK?`mtnY(Gn*vTOox5A!STN7ROM$
z(|2h~DJ&H)O}D1fk`?$U(%yvW1o5Q-34svwjGMHHb?2L`8j3~1`X20UE7~2wqX!<v
zs-akN7D}ODxqDsm=$41lg5Cqo!*6_ty&rC2lZ3+YDM|sHt0g2z;)H=Ra3uyVk{?JY
zC`ZFK`|LFJlNE}`%1mCIpmt`0o$IR*bkN;-5GF0k8JY0;3cArrKboRHD)pEBe3W!^
zkO>%(u2J(p%liu_GlQ4PcsJ(YHAo|kIoD&vwa62FO8c1ej!T2)uQhVaPyu}UmtM^a
zzwh;txBmk&-a^tLJU`9+*Ir=qC(fWN71|v`V=tk7ZIxhgj_6^+?jOB}Uo9~E3s-2~
z-GGfd`2A%}WdUmyzHFc#d><Vz^YO!P)7pE)oNu7Dj(?(tR|^pR9pa>d)H@viiDR_8
z4oi=4ARX21v-9>EHcF_ya-70+fl3IE-n~WC>9O?eMG7*e(U&wLS5%X|XxB&25_*nz
zKr4wiQ$zTkLk#Y8NY*}vc#}e{M*E{jG`?|@_G+7{mzD-LaZm~Iivg9XB7rn?Vwsxq
zHm%fy&~rTynz5u3Sgdg6vNA)>4c?)<Gh-ds;G_F}dU1>5L@6cQNSD;X9B}4;PYc$&
zf}4Aado7QX6+=PUK^kyhft+>VprI0UQH5?I*iC89Gy)mG#FSum!7wpnn3~gk^q$As
zreb45^8PzM<!McDToBGlV4ENQ)8B%A8P*glzxy5=Ey=y=6tdZ2cGeNK`qEMhEH&RU
z8Mv;)Mdip~b~~>1ThupfwFPmZh>i@68_S5o0>XHQv*#Qo<f9Yb9{et!jmxL__7i@L
zk+A%|3<NV3df`&62U~L;aZluwO+J8?rT?<DVjlD}D*WTpiQ~rUkg;+KAhSNDPtd)C
z2n}<;{37*NPEx)&3vq((8KT%lroB=?=dF9#(i!>_&l2*$fnAoSDZYFfRSxL9yNR4$
zz~bR=zYj9z*x&sUGjof~pE!?qqDuSP3dQG+5kJ_*s(EZ>7QJ>Kajb@{mk@S{W0&<3
z#n}SIXOC0AI*aKi1SCvdI?c>8mk83%zRgIam3uH-G9ZS+q%9aNT~IFt0)+)d{o)i<
zOH5sv!7nQs*IE=#T_Rpxp>}=(zY?U8>P&mO0c-c=0DRO>T&;i+(iK#tZPOhQhD=eB
zPD#Y+3+-q@I~G*y0dM^A_ju!9eV6j=C3c%34Fh4x(V7o93ez};m&Oi0y^t^wxbtW4
zH)A-0G)|DZN?9F-Cmca)D{%!(+3$)e`KL8b-_0ypl0@KDEQ@C~swn97UAr-_TA{RT
zn4W(I>pz26T&8?+mi9)M_y5@k#8PthsR<PB{mB$^Sx}axvSBK;+;1!5v{s{=NaDm0
zE>+pN-@$C&!mE}sQEBL-k5d5SR=)fs9~W>NJ>BT4D8`+1^guEAD{}h>EA(LsYxLA&
z>=z^VlbZg2o;2u~OJrX;7eF|}B~(q!%KJ=x{v6)vS>nFIMh;<Tjia!V0%V}*Uf&?O
z|A0cUhb$FoFYj{W*I(o0Po1Xw@eX>+5EoB@wy3fP?M=Ej*U-x?I@h<bT2uYfMZ#ls
zdbc*A+d+CgXz#N4bC*#VD!#+68|#FwxHQ4~*RQkp-YU}<CJ??yvum+k!+ZbkHG)Es
zV4{+C?R6!`vqekbK`)I5L}|J(8vsvQgc1}Mt5l9v!CH3TSw&1=MDHxq>uKtjXI+GP
zV6D0ISe$~6x>;8sPh#VQep{o2VR6D)BB3&PISjl3+Hu-yOhB`5m_ND1$rnzsbg{&C
zPte?utbFW&1Xa+)R;E}AML*Jf>6Bv}a^$71Hb9CY;i<9EN*q^VWZcISf<Ot%o+Xs9
z7YnL^tBw@u!x?J{m7o_35+A(4VJG%Fa)A5`iUJW7XkYsXRoOu|+vsMW{`GZA^9$Vl
z;WFz4%wC+JA{AB9rO~z2${umz;tZa2-I*<dlU0|CE(P$neqoB0m0fzxJ)&sgNAr0{
zg@4~loBLi2`3{7!Bi2Cv$60DFC&8(J4?7Z(63!gK_B+mE$$$o98h+TprHAJmE8jmx
z8q@+ZWs(vW)a6hA(yIss(!&y<Y>&>(WrC#%L^;Gyi%YU16^ScQk+l*kR9M|1S?gmb
zuW;-7*D3ePnB@j`>Nwie5W=8s6;YYP?CxN_8JN0)ee?mQlOT&BwV%F7>$MvQWiX8%
z!PCd6R$Mf^llBNyp<?4t@6vi_lcb?A8=Fi$zd%2c#GNJ&zxxhT$Bq%s)v(488%aBI
zY&wB-q#Ri`!<SI-4Fx|PY3uxPYYaiXM1OUU=<bIUPu7`w@fdzR9Mm*qWI>5>oB|ms
zCZUJ9z0US;U8D7b`>@gC)Mpkku^AAHWOQIz4ML<{vl0L=6qF~+^bHh>f{9r}{g`2Q
zSFv(iK>>;rKCL_3Jp7#-=ys3#@iIN@=($2=srk;o?<6**26ri`jLXPNYkOtdy{PKD
zID#)-j=vhXUIvj7T%ORBeOKmtvSzrkt?<>5$4?bKY(GJH8r>7v*kaldnh?`y5q$0<
zZ(M8fhyT-S-1^oofAG&A^5Pe!2ulIhI_sz&xX#1p>V|Vw%~H{ze8J5R+uXm^N7!Qw
z`tcnm=m+xYBT69uUCx~vUC~8m;*W>uLC&-vbo$NJXUH+`!9GPb&IK?zvp&^8W7&Sk
zp$ZvuzN7Z#gQ_`qLtXjIFTEPJZzCUli0Z5%7SCeWA0kQtg;P^_XnbXf5;17CjRjFJ
zP`EUQH(RCq)(Ud&Gz;_dh>dkbb%Dsg2sTNBqZVU4M<Al=E?Vx-Ao?-gcRnImtRo5@
z{SQ}>l>!q#d76IYRwF4~6uHs&h*lf)@9Yqqyh!)qI+51+CuXoBVCM2A<Wvpcvjfzh
zNC82S7I?}I>M9(b-jxT(Mh^URfxz<xTsVe0HOthCi<B11#IYST9L)qE!x?08g=l$?
zy+8a2S(+wpMqK{#9OZ=yo;4UN>7?z*GQtxn-E;Mm;jGq%0fm}d1q2iYg=y%mPtkg~
z%<Aua1fs<IuWzz=I%NKM)nU(5>asYc9<x9{g<wnR1X-meyq-+ko+pmpEJ;hGCjyJ7
zTnaLfmWjYH5n8Ig;bBM7izNbq^cCB$-J|#MCP`P5>~#t1K60u=I3uZi_AJ5KIkx`f
zZNB&a{SA(t{Y8{AbaceCpPVM{I|k`cS_+<1gpLT+@fy^oJ>LJ`CSlzt?o=62ijCv?
zvm<|xS`E|v1FA2aWqHu*9|Xn7l{*fVMa}}qVrNIP{qFO_Glgb{m4q;`0EF4k_n#4o
z9(XLv(aLW`;bf2EjE`X@r@H#tzw)Zw`k2DiNz{x_eElPW^RrBR;eu<ul~(s@JtXyT
zzBH~3w-eF1_7G94llbQ`^-E}P4osX1iycJ4tr^~!RR!X3k)Q;f@4b)SPLSmZgqJY&
z%5hhcD=nUK0leL|AUHRR-P$95xK42549)MpkD4yw&lEv`U-YPW39Y_D>n!^0BH~%U
zzN|~T6@mm8#LF6k#Ia%PR)c7xjW<;yC<iE$q)KBLWHV_CFeRa>J=&{nw*QCkqb3(I
zrb<w3@Z7Ilq1SZ~;5ZFPO424E)}5>78)l1kKm-z{CC7dWnU1upR|tY4zx|*8J(7=G
zOrF0?WL~6F-zMs`xcuA%1~H%*OSEGw?xiTmtd=2AX&@5EL)eN0eFHt6LY{?mjYQKF
zTs?5Wshz$gGLjQj!)nI`WM!aeeXve^e-CS5;j8C3{k5kFpI*d2w@5fs!m|n0nF*Hk
z0u;|snl5nfjgOgG2$(-nL25f-DH3VNB`I9|p)^&ZAS@rf^?<NCkLk;OeE|*&?j5NB
zL_QUplavE=U%88n3iSx~KG%$jv1Fflp&TfIOaKNy+<zZ=w%_!8M|M6Ehg@sSn8@r=
zb7@O;<ukwds_Lv@mBsA!@sCe3@ue$lzV<$>w6TQ%TW~}ULT1c0IPQSJr}>8;Vnu-@
zIF(Y(BnYd=`a^>nhxGZSNzmRDvO0mCJcU$(cx9RDCypb0Maeh0_aNx?45h2bNH(^K
z?yTZ3lo5eP^9K)Ty|YY^M9e-t%WlJ|ysSxxv5wVOXH7YMg^e|IB1AcGY{p7rnmxAu
z)it^wuA$c(Og}s8ns-X)V-Ma{#_@-slPK&?hxkDg>dzzh-sI%ZT}I86=tmC1n{odk
zhDymX54oUR(YF+Q*AjiB?a@y}S~DR~1&_{0tF%AbW%}$HM7IOcBSd(d_WC-PUanCp
z1_Wv9u$vYwxz5WBDocfR{DEPbu<sAhhyo*q%~Y(l^t7Opq-3P&Y}$(?kD6`~5T2y*
z?i%cMnE&}pOgwiC-Hj;PgkEG^w;y4Vp<?I5O=R;HCYVO5n0m=@_UUO7tp`?`vCciR
zR?tiY&Az}C1Ma`RhVCm669>UTnMH6^z;Bf6Z?Jou0vJ6xLjlbTYW}DUOE9`4UwwDL
zC9%%*ALbzsD1ZU%cg!Ol5cZ?K8`*z=>I_hqU-{)%{R%*tWUGT;^Jv>GzWWdVCEjkp
z^hA;Jr77YFY`2H?eNYnHjgi*SefI&BkCEs}l#CGytWoKNKRh&<DFLt;Sq7s}d+#&z
z#naR-PD7Ho=&*JLIH3<oWZC_r>-2AKV)_ZwfAeK*t4HUpO}xd^wBEhP?naOB^wcoO
zr&3bQQ~^XN_U<-W{TFYs_9yq4du|p}Dv`vN%5;Io{RZ)R2cb1nFCR+<U+hcMW^=+A
zNzW*vI~(+G>>`6nlJ-OVvWKV^k<y|9h1Sl@wm4;yq`rS-QX&uI^5dQdTV1!x27x4$
z39Y+L)_?B<CQrVCAJ&jz2XE3N+HO%OT0Zxa6{^)jN|qsA3p3$5_rxi&q??ZpAEC)e
zO)ZI*4ynj6gAf@xXxP$DT!dbx`TLG`Tnd3S)Mi5}pE%CMnF-ES`b-vFfl=teM8UFD
zF?fOC<uA?A?^$;4t)cw|TFq^q|Mc`g_%*IsY~MJg<GLeT>XRXH6tQxrh4SaYB(8YK
zs@w$P=rq`<t3PhX0R@m-LPx9qM$UcEbr?DQ0VOaJjT=z_c~>I;XyT}IKfyi+ImqD%
z_9=i*|I({5(^yqPH11P)Y8q~Js7_sBvL4`17pYvDqQBK;<JaE7L<z-(8r#414&68J
zqPr4ZI*o{TQCsh#k}YgFjU8WRa6k!Ux=tVv{T+m#P`NaVj!eoW=X}FRD55)CH2(As
z;>4$sau*r(D4v?6^WiSK`aHhfCR*F3cySgH`mQiYWHidoYN1$Q{h$2+yji@-X|~?J
zP4U7UGEgMi;xE+jXUbGReVR($Psu?UFbQYEZ&M0#M<gPl+ePo(Muu~=)+Ot&-Jp55
z!R+&M4%crTgRYb|t>t%5o}`r9LO?;nT34a1p!wb^kAC|DcCW1?!T_zVVt4O=>LR=V
zv$KQMhF%}eUaU|p`BW>4&6X?k?Z?CUZE?XzZ~@Ul*BYA^2q6aCh*9b~B_;(TS!Yp{
zJi~O+VkDfb8tPLavF}q5hDbxRFA051*@Jpu2$f|rFcbnwWMJ)$Rief&Qo__ri$vC4
zvz1njda0|n-4i@)IgU0N8E$@i6=Vx5?gPt+QWc^iLr}#5>3+NdFgY!L0J=94G0Y@t
zjA?)9`gT~(KW~l<ZYq_4G!~I}CnRGY>v0Nz@%v>~WHh1xJoiWA#Z64yB3P`_{@#6R
zVUZ*@OnzbxtOLu~UPAZv`{>;+rqRVtTt$0z5I+9iyA(gMK(exjXuMCq{1VnAkA+2A
zoO$Z29g_AY6K5}z#3nUeQ%-*i%9H4O8_0<X;<$=mzd-w=ckt>(Y}`R@eFxp^F!R@*
zM@&`-Wr9vpPW$Y6m7?+5EkrLy9A6;r&*AOeVfVXtnElEn$4gi*;J<i`f-*><)8LxR
zVMjR<h$Lh9wH7&BqxK8Wv-4{|L^nNT{b@w9LFIT2>nY+yBXH@jIPEXsr^Kh;pfRXm
zGBEhQVDr`<tv|YsoV<earw}5>CK}2Y5&jCv<|<x&0>3=XpZ?wrzVH`k@Ra2r{U5K<
z?w9zhf9DkSsVdE`-B%r`bMs!{0;7%$BLy-gHm&J*nE-*?x7U~K^nAK~OSf%V14=db
z+n#{Pq;Tl;cxP2O^jf!LsGOYOrT_JdL@RBIlL0-U==Th<QB*xwNqDcVm<}!N1n%xh
zR=a{?smkQb(~f9$>IAyor}Os5DD_I(U;Pk4fc<U0Y`)@8j!eG1<m9D?p%Ta;^ad4w
zhb?cT2)xn5wB@iZ3oZ^g|HlOtAGaOpHyk|H0f7J`i+CY)zW))TFauH{bi~g0mZ?5F
z%jP$4VeA6_Y#rO!0i!Wf7cnv<Xs=@9M@)S6IS2y!*KQ-G7O>iXd>OX|i^SLKNUy`<
z=TBigk0f!=?MaIt2<%pqwQt;pnP;(DVQdlEUL$UHnfTl(@L}>Rmk_fxdN<agpCEmS
z@ZIt&3jrJd_C4C)Uq+pNfv7i$v@xQ5oaD~OM6E8xbF<ErPRlzp1mFJ2;oh-HR|jn%
zirlX9l?7Vg{QzIA;n#gG{PI&sV_XVVjxH$9RL{8lv~k5VK`4k<_Gn(;#TPs1&OJ=)
zHfm-D6PK}e22q^Bun1J~>>i!YF8}(!UnSDBnAqdnzkQd>pPWM#J>rx$Ew&I!2E?fu
zGcaj1ysZUY<N7m5VF%`TY$UB1;sn+oN^~S>?J4%Q6q7T05E#walG?GLpu`~P8Y$md
zKfa<kS0t?Xc*aojT`RMmP`tSraA!-h*;7mx4Ld!FkdnqmkMd*zuN2UDV;O`+Z#R(T
z8a6HtV|P!O2HS`76JiATlUwx%Cmx=}rU5K5p#A!BQ*&bfhyCWhJ476vR@^@wpX~dA
zOD=}bEK&vF?pI({1v$A$QaXh$&LV45NV`t5)uVfJ4;C+ime{>zbRU$|h_&0;?h2)s
z&met4<M-Y})K8MA1+eC^$}1ZJBPXEofTR=SpPM7<yFm;CP@%JFx8Hn-2`>(!8Nv^s
zy~3%#@dDwQX=35g_?>s@y?KxJ`|HH9rFOc8P!i!untyf=YZRt%0bxuU`0|kDdE$Gw
z2qy!I$0|r;obQhl1|{>olbq^Ok~D4Qp*(>}p!@whBwJ15Mvv*woMif34U;DNGnzY_
zMxz|pUWQT}zTc9voH$jWc)Z5s)3eOZmDqgH#j1;7Jv@I4yZa8RxQC8ULwA*xJKIdm
zFVN~;At+RdI~$z(#014!Ff1F#frQGw3-%=@D?N9se@8n;pNx#P<h!<J(*@(`)rFuo
zWvNcW%%Wv?*I7ozqO;PHG?3RzV+RXmiz@is{?-b`iI9a^pHLX2H57e8q3j`0JbZtX
zySF-27i&au%Hv=ps^GEu8}GC8XAkK-*v5(lk{#ukqoQL6OP>#!XLdN(hk_4jm*3GN
zbCLYqO721dA~%<_clHF6`@qeNKWLw?pHKUZ%Px#lE{9Yw9yAE{`%K>OYl{&+#s;{?
zRsyYygnmftqc!BkPZ4*@B%(?%s}T=BKoy&mUtFMj?Ga|HMQfvh=@+o`XCOIT__Ldm
z36R#ktGIzNeacVGqGJ~sj*Ot+gwD6`k=$HG6{{GBM+7V)tROleH~!I|G4<Czf%GNG
z@;0Xa3B2e!p$~)}HZmj~!_0sDB0GQZ0nx)h!<3%IiUPtIw5TCHMQ^=B8HEsLVE#Hr
zTz5Z#=K^+)Yy@JfFr6N%6w?2}9hyIQfOqUu*xn7ME1EzGI@u($xs<ShtgE*}-??iD
z+<84AnZG=N@jX7i*F;AK6-TIG8NG88Sq?FYYbRb?nnubgc6Lu9Wdf=LNgKZ!k{F9g
zi&Tt-nr|qkRfLMPmjG$!BN&k2)_s@zpA4*H{V@W%Hsw{c1XgftDdygX0bx}m(s!+`
zpxy8=p`m3I`uq2}^^N<e-?_uYT!G7f;S@`k%JgHwYyb2*8#kJ?V}<H=Fh6UkK68vl
z&joI=meR=z&CLQzJp~aU4fNCTR4oJ{Xm6NW8<}L5v^p_swIy;d<8cY|Oz6_IoE5p_
ztUXBh@dV@>qhucdHYL&>!~n8u=C1$5q#t91Uz+s!vn{L8O4HF^{^0Ci&OLSC^t_YE
z;~{aUf)E<4CXowx^(|DzVA=`EW{YIA%k<ZtVQ=qa^v?U3(sNj)$0|W-8TxPlRw0uc
zl#kV@ER|_RDfhe*B%3X|Ke!FWvoN)Qjg(6X8BJn}_*0i*_g&%#yXf5>))NTb!$duT
zdLdn9U31PvDoPg@=w5%DAh<*9J>}Yf$p$EiEcvurmU8Htdt%f6h1MbE%EmHLFvJG>
z`1E&sZ2!jFh;jinS#%U<!XTueyV0ey({n7GX-Y0@2x4$LwxGlyz2#bwyUEtq5MYQC
zjeo4p<i$xExBm>iYpDIDt3=mViCZ;9-_Y1wa_>yUu3)J30kfy7lxIpro!G7FxbD8r
zgf#;oP~SMTpc0NEM;H(aCIUk%5$r_HDhSfJfKAh3v9<&SMS0q=`Ee?M25d@Ctc^!Y
z#5BKkoAT5p{K6!yy=C6`jfcEjPLRIO?(GI<vP*sDi$v{JntyVG!qp{2>Ym8NqGoCc
z^$@%WA~~Gwp1~yVf%K5}0*D%7-13@V?6Q=m%zd}d1;`zfnG7Sjc}!+e9AWw&lzR4)
zZ|8-1|2=1v-}_O7Vt9(9NKg)QJBE?P1J@h40GThIp`t{Zthd%;y&A?8fNVt<D5>$1
zReE=}i0`f=&U_vl_c6T&b3gwyt+#IARSIZR-Iu@3R=+{qMKH*jim*(yc9%$mc*iF2
zvFJ4NpFC=iOuURu(xlelVJyfJwC^HfL;DA}@urWHcqfq20}68$f|C=N1cayPKiFmK
zcizQcJdd`guu=jNW!Ip;LH!qAzzBgK#jaG%SG4;sotC8o6Jzl`L5yPMU%rF2Rp|Ao
zzOaaQe1iTv?;^a2z56Y8KHOsR#f8+Ju(<`uDHYd@!(};KrotT;D0e-h4R)f)%#~?s
z&n_UJK1t!k6rGPZh#qYbPL;4pK<3R`p@^b{>O{naPcLA!NkLG8P#PvfmkLSJUX8IG
zlAe0P0dhRy%9&fS+?Ps~LU62N20*AtgI9raJ)tmRp$uvYyeSCl5_@Zv*MI-tQ>+y6
z#8rf>gPbMWYhqO&b#;O_e*Hfn)gINLK;gMrif3mqiE-qmQsDWL-PdlQ>JcJd0Aa93
zBEvmwyoo;(V5~;P(`5KLk<KY+;pZH;0fFaeYA>G>91)b!y!;S9bI^M@Q~}r_=x1E&
zKn!{Q<zc@5VUhnMqW=3*e|g0-ng+~*fRa=J<UkK1&7Db=V1)-pxMm>RuR~~9{Kco}
zu5}Q7jVM=0?%bvKXb;;;uxbjUDhD*P)FTfh-F1vAqLL=UkMS=bb4u7k?}JC!o<_^1
z)B?$AW$B@Mw|M){evieMpF(sXE<b~i2HU#N%x6weoi5SX?m<7s>~!d_?4kW<$$G4#
z6iV!3JG=O&rmzopc=XTT#&r7>&d)ixtQN$5(Ct1V^r?oHpdeZQ<69X29FiT9c0~MO
z8)Sf}z6j;h#Jel_Arwzf631EaPz)*v4Qa0d>jcj!co&&SjEk;Y?Lb6c=ph0{pbVAc
zRYE_ZbL(TQDuApF>e>sXfbH9NnLJ%)cA<diM?_kpJc%b<iFMD|0mHErE<G7|mYQej
zr)<SpoP+e9Yk{R8EmNVx@bC1~;v^v{_yXm*ipW4gP?Csdn`F7g^wdwMnJ)`kqG}~{
z;{h{&;Tg{T%q!Fib&`IU$uD1YkZe1Q3)QAWgePg=-A0NNPSHspYgVzz4nzTxQ=onD
z48n+gaxM3n?Ti(G0}5aq?mq|q$huyQ70|I;PT7nI_|O0u-qVrn$Kw=$IDG%U)L&i^
z<YdURxay!hP<C*BAyKx4+ISCa5i@%Mt3yn?%luz?p2C@FikF+T-+BN&cV68sqi3$5
zO%ajW`TKnS(ZEe+))@<7o&L>x1aIF(w_++UpQ3kX1A^lmbh5x&gJ6+~sd>C&k-pp`
zh?nV$^T?=Ax0zr+T4UqucOceG{ne+zM96**?fY1Ke7Q{g;10#7XKDV<d&GNvRMDfq
z(n9D2Ar#X0=)QiF?YCE%`CG5xD}jE01+P}Xv_3@CXNm6KMowJBR8C+b*Dt}FUS$3I
z519MRDRjDWX2Cd-E>j{Ur;H7R3Y0X1RVt8%P`YD`u~Zf8^aZ8)kjbxI<Qwm8ptVRl
zcNnmSC@NAuc7pHy(+_!fu|m|boO`Oy=YQoS-L6Q3j{<28+6ZO}t^tZR!nFfS1yBhm
z%$~3*52CXel(aPCv=cCvQeY`6s0J=}fq>Ar?9CUb7w4eX!#2Yd&u=ij3Zi<9&0qUI
z#fwXnKX;arI0HhaH4PbT+0m9c9VEeq5bj};N9e`|LTeiR7S&20MGY(7#uUoP?o%M5
z{gZ5zL}YXuN1l<%Q>FxdM7G@@XFJq`5d3)NKRh;tsIGkKmtGaZBcuMyV7KnK0@1vU
zUymuCED_!Q5YO&l`h5ydFQJ8`dS;5+%O{!o!g==ISwVUW#A0fn@DH^5sL7K3TR7Li
z1T*-uMd!VBqWfEP-noYmb!_omE@itvFKhe~vtfs+Pb}hHoTvSR>l9}Cm|mCJFP&rk
z5AP7Kwh*4Ab8Xd`kmY#{1;Wxj;(PB=|H@^|UYDfl%-*o(Ats8HFVDFyMmrt0{`ETu
zU!j+GF*`l(e*G3+d6Gi?INk0^MEN}0PGfcUa28}0)7_-Gy2s?DnL$u0qZRknFawa`
z;D<p+kqVkq8lH4Sp+(Q4gr%_)@$v86MpdR!UWgTb8tjp1>P*ZTy1glSyA6(CDY0;V
z3MC8*M>=W|_{wnufQ#U3(#pp4ok#(Jbl1yj3Oy+(c@DSGj9huKCm0m-2$3=>mkN%m
z{i6@@f)fmB<1NBWqb5RnA3p#cQM)pSGzlv0eITVk1(G-hz15<9V*?8J(0dOFPlePz
zbAsASXL<cMe}nGMJ!VfDY$&k39b^S;e*%FyxX9;Sfc)x{H~mLk04au4as&7HuoC6b
zc@0C*Q8sr+ej*3Ab;RmFPCJZ37mhOjM-@WuIn|Yye&N-maRbp@$5#yqCotB-N*`$r
zYUeuDpSnQhlV=If&Z3(w;zv#5m2JA$*AYdZ!hDs^gFV_myo)T=(XzhJk`TFT=S~07
zJgqQ>#GgY<EFwyC*hFKiXE8P$L2G9IjKmAt*zQBBFP+5O-J^LULYJRGMGr~3n&8qr
z>~%4T0o_B*K80oqFj!MS$_~k+b>c@&<l-}!<_0s*Pjmd|FVXG`gfRs50wy+&%+w?_
zZ>>^3b(wB*g??N_2#rM`3ms(i2w9R~LaYf<RfT@^fbykTf|8$3B9~n-)(K%gFq_2-
z5+es7o~)i<;uM6Ejt5W`1Cq@Zx~&I<0a#gc7OWL?+OsGTqI>r#RTS_2=?XK)tIW>%
z#EHWL)B^W*vf6lw6JUu;Q~DW+N!qGSrGB-NmWj|Quq;5Du_uG0Xvb5?ZcOv;9&iqX
z9;Bj$wb=d?GVG#CF_o)}*x3302!Zq^?T1ZvfByrF@~D0B0%5IycV?FAPhZBHt|040
zPJH?*3(s7pcXyk@Vin!jB#jv5&*lU#t^3O`0Q<B;PI^Xi?t^-N%OD6S#KGhCP4az;
zCNGpCcd1;nk6ghInQ|E`w2WWj#o_w~=N*GP$bwPATGXYdUwZXhzxfZi`k9xYvxTq<
zPxkS5K0qa_SP@bC)F}i4f2v6T-WIwc(3KYuy@c*Zx9D%SX}oqD71oK0SICF>WsI{f
z@~xW0$iH)UEo_S36Ct)ZgVo+J@Rw=PftFTy<`LL7g-@TOd3}rM_8MMYp*OcEUY;f1
z=+OIk1Fu>^&Rivlr?F{qjx`<x^Waxd6LpgA9A06D-S@9iUaUdAj7{Nlp)#~S-hhdh
zkp6KJT?c8LpJ^>Zc!<5Xk!BNG8;JM;h%&0!A}qw5`iaHC0wB|rU$$lWcbWD8K)4lo
z;KHQ?C8a}&S!<C>FnzAh;tR9X=8G(U?<4$~IySDPDMgKyV9h#>ErakRH@>^f#h0ci
z78G*@K|x9S+9{(@2||xS0Z;}FR%F3(F{qjpLf}iwT+uLBbhKZw5$r`GO}hz<CuzRB
zPVZ3{=^sa=z@x!pWi4_#AzFSwaBLD)D>#>;0Bki`{p}CXahd4B1|%`%Pn|_hIhH6Z
z6bj4MuU#YAX`)-2xUI2?M5$*$r%X&{#OfR;sbe6r`&?@KgsHjwsWHPqW8MNtBd&QG
z!hy9tD)hO^*|7&4vTtBn7@G$6M?PuEarP5+^|Sx!t0$%=sK0W8@Z3DzYaihi+k_{p
zSYfEVbP_o~L83u7`ZT`&0e1Ql+MhrNGk9U0`2Is=p-xhH4lA7SXJ)@ks59)el6A+;
z{*GovgiG@YYf>VFoF*GQu#4|XFTp(en99qG_@}0rcxsMt!l(WI9STn`Qhi~OWT%Vp
zJX(*|Xh#uY@x(wu4RQTtjIIF&Tj*0_o$$reh`>X5E(XxNyGQ@_7E*6QSj4D$E~qPz
zK?02j)c^8T$}gRy`|dKT;9>0q(e^`1=VmBRgeWWULJyOe0YQgKA1_IT#3=;V`PZhY
zNGYw02c+(SO@Rf<lQ37OGFM{jjgJtu3N|T&um~-Y>KH*u(OlbP=Heuu|EX!J$_4(6
zwG@=ZmjazOvkcOGN!m>)t7FKfX%+-?_2ffhk)^U>qo-)4EI&dDI_q6}E8AGJMNlmg
z_qGYj79F`lDf%T0JIG#}=_}I&%DFjlCt>@C5AcF#km>}{_A1S9y+`-06}lg+AQMCH
z&L;g^ZEUZEEL}o$&VX4QG!Y$`^<o^^$B5MCg@3^HmtSO$;QBj6uVDADw!@Q+SO7;s
zee<_FCT2Nm0p#6n@^Uj`0pwk2b@_9D<JH2%1pW6vr0~o!iqD;({E3r<7v?Ekm_trg
zFxnuLL~k|deXtF)XRwKr>O_^1)ftR8mzI_8zh40eJ@Unv)!$kWp(W^CCkav%;l9Bb
ziDV*Bb_dbBi*EGjz59q{WgD?HMfua`h;D4qeC-bXds~FHBG<n69om~8Gk5k&SQGD8
zo`WETM^QXL2MN=kJ%vWncyE>FTgwE;DpX!N1tpK@<}GA6g%w%9dkfmf3%BXLeUsj;
z4d_~$jYq_-4eBQ*sK2;`mssBX-9Kgb&Mu2rme7ew>BJcz_OkZnCJhW`3Pu2d5@{=N
z*9Rd;d$jaoOZj+})gP|ns}QXxar7V(BPF4IlTUy3G(Y#Xc|2TqpA2qla=9%j1c8(o
zEP)ghl+)8mnm*48qXw05*_{bjWVBRqv4O2_>Q>BDC|+8i|6q;IgF6Jp2Hn;s6N{3l
zRd>JjiuBiSGyU=jD2AX7UZ`lV_lfuJA*mzfBF3A>3yy)U5p6!Ae`f`6_97xa1CewK
z&mhN~n<@v)<580!7nM&-wPmie$Ix&%#OybRo^Jd#AnhESTlt>^>wlQC8QK5%Gwnwi
zs%M`4;;TZpu)S^kg$crQGY+^CnSr?ppgckEtq17c7*jfqMd0Z!GH#=(Vdc;!kx6E5
zaIj`OuO;)N;t5oH1-o?vUpBD8LW+(WNo5Q)u)*3gqJ9!&9r_8~J1u%2JS4n4N9#{-
z0uuyFmq>Qo9DnL3m^t}XlBj#YdQ%c)(gG8c?A~Mg*-7L~o%P>%ht3aI(0dRqZ&H2b
zH2!Rb?gtMsW*$_^lVB}YSgc(_RE|S&62TtV-u@0o!2H}iwWnwBe2=X=Ybfb4cVQ7@
z%)tM*I3L>}*z3E_#7d=EnXH;oIG%uEZ(;WvFOWR?!8#jnu0iFJb8Qd^*+w8K7I)cx
zxWyN~vOuCCkWTouaolj)Krby)8JLj5U8k2AJYfgIk>|#c(iJs{Gz%|)siI}O@7kvu
z1hU{!xU$5_r;7Y<{;OwcZSU~$2Wu#C(go^*03jnbzIz?hi6~AMh>Hcv&n&U`og1j~
zB(_^a5n@e%FlA(P3^B8a*r^XJPJ}D?IhyHbRD#Ic;=_pl$W%KLk$2#)$^HMJ3y^my
z+-1ky;8Cc;{Po7{&qzPSVJ^VF2LtuOOBY|&txYDra)tUc3z$d`dd>|}qMoGx@hY9~
z-$hJcC8kQqCSvO?MC(3YZHh$Hkj5gl9WU_X9wxht0EI@hKBDs3v&3uLND*P=RL+Xp
z|5k*x&d1dfV=GXaLQTyg+V=@(t5iOHmd$JLvUck_<%ORijy#Nx4=7tnNN?v2qOJER
zD93X@_ZKhGy}3c-hik~i&ti)wkj;;<#UkNUf#&z`LAW?j00W9>3|0$lR6-UesMQ1$
zUKLd-F!A&pUO{m3>M5o#EYR;Ic)~d&G6;w@^kT;n>`IIUS<#Rq`yA4XXBI=C+;z(#
z>}~aFuJ_QL2gq;%AvUnBcadI?zI~R)`Wm~PCYP>GAq0d{qEoNj)dkoTlw`320^utB
zBAt<;Iz^GyG{BHrO{CpGVl9!<G8w|%rlcNbkZ$<d7eaci7QgcVYCx60Ys(bEr_izU
z`Oy+o9pzW)+}~jP{bi;<dxq}yRrcO*pw!tx3Qh=|qLmiW^9He;;p&&q=?{Z|2W{!x
zDwM;$>|2%DziZ#b8C~`FndR0sHpzaIR~$Kl&&;J5tDo|Vq&Q^X$U>T>^9P+-@|rsD
zLXZ6QX8zhIu-f7kd`y(M>O18iqOlRK<u`(4wSg#9iTx>rw#eQl^5it(`5BsDe~aSO
z6sCHbxL;3$cKisPN(Cf+bZd|JQ5jYCiI#5>EKU>I8iyrtovS5KwuyN324sBy$EQ#W
zlO*##Yj3~D@vC5k8FL1SiPpID{x_MpxX9VR`&Wn?ZMvlbNwJTR1`*!|?=q%zp6J>G
z%-JcVA7K3eeaKx2&tN--TKODma*Ydr=LKwR(21pQV!%b$k<i{X-1z$Ma`KZe5geaG
zTQhivt|PD+Ffm0&;-zK8)~2jM*3#-i^};mIo}c8}KYoX#`#yA<RG*q-=fiF0PTr&$
z3*Pu<i<iC>GgtTM#t9W)G9btlWI>n|yOOsvV03QzGMi-1ZSe$nzM-!r1qEL`9uGP+
zZTAIjt@!qDuhMVENHv8d8JtYS3hXRirAoZ@I=k05>EGBwNCT0d`jGo&Zh(G#(kV8a
zF~d|~o|A7>$R2m%1LnWwN7)WN{ga&L$HgR!v1FuF65;t6odw3yK!I@PrBooKB{(q!
zNe7`_t~uG=CRnUedhs;1pSg@IYgl{Rwct4{cX`Bc7+JzQ{wewoA#T-C$6q26^<hu6
zeTNUtRgu0dYa_g=fZ+5r@!f4~qse?>j#obS3&e4M{8g<%6>D6)@&cz9uadNSPz=$1
zgLi(8iJyH6+gd?%-$8~2qOBgy@7@7bz)H0*uj|ey5Xz$DHH3W=dUq)-)tms^VS$qi
zrnxB~OowJO!AN-kCZ4t1isCd_odyIW<I-+f=cG6hSYz-!#q@KtB%3=deDxBi|N3)G
zJ~c&B=<xJ2C4S+5ah&<O=eYlEMoA_qdM+*ycoHQniM4dJ``DBnh(V0P-Cu0L2sr?d
z#p!*y`RSO3MS5J(vuw5n^7sTk0>8e3HF7vdvOrO<gf~6M=D&KK_D6dJwTp*KL{5Un
zEtE(8C{uLf@bM$(e%z_{e~~JeC)|!){U7(k5x~-uJ-$8g%;LZN(|>96wdw*_@g{^t
zYw5bt`ikiN6&m0C06q6p80ix>eh7X{?dP6B%~Uaa9d`c5?;#eRChkuo#;&+W+?#PF
za?)7LAnlUNg~$w-I;;iA$}|xcY5Nd2k!)bL)=^U-rt2XluaG1a4(oU<tU;m?{c8v>
zVe+rONYZeGCxxevlib~8_v;^^TM<?Zgl|#RC3J8hC5LbbJgG(MqrZnWZ7%-J=SgCX
zDg}d<Vc9!CK&a9Hppmru3Z%hg5r2`H_~wA$4Fau)Eyn_7DW*04QbDV2=xq0?oTy==
z1Z!N*e`#8BwHCW7O>6Nym<l}<F7lnE%ZjnE*-r=pg(oHLjvh1%%_{8j0dXZ<3}vT3
z<l6V7!!fjCS0QMzZ1)tl;PKY~^bza#EHs}*$o~E)wiO7~$NG;TI)=~%K<^ibd|^!b
z)66n)RYduDa)|Wgs^Jb0eWc?*b{prL4+Pd6Ox<OCZ&Ie&!9mY?mj=!Leb_Zb?mL<L
zcRqw6(uzMPMEjrrz@s0u06gC_jxj~KmuW0SDHYe?Wh+6n(SY(2)&opTRQnXc+8-d+
zo2XiW-QRo*t4r9p>>?3QVy5J7Mx?@I#Axs)?|YdM4VGfRjlfU@uY_R<e`y^nHKsCy
z?TJH`ksC*eMj?uy#Eai%{U3h^;f0u9M7^)+{NMq}PQ=uI^faZjQ!M{KzK5xvLPQ|?
z+t@-4jKWF>WU-=-Oxgt10KMBs;EbY-;3S)8amvP<7%)Po`C(VJr&Ba=q-9D)<`8;H
zIBP6U980dm5^IOdQ)ybYT9VW%C6tZWv2GcTtl;*#A?gU8o=Vwx`<9Y4gr0Q4-c<Q(
zWAS~($8S93{;e&3;x9i(mP{W|OXud1uN<p!CX6m^nXwPK7=t#BFF+bgdA3UO)@}UR
z`^fgOf#qqfOaEFOB9gN%qMr%>XzDAQKEgRDHm{XPe>yg@p03haa4r=Jw-DIj%Q<Y~
zii4*bn*Zs}Q3_uv(z0ALs3a6);sS>T$MfGE(id@HbmX6TM2lsBrqOYcAn=uImSNJW
zwCu#H;1Sk*!h(WsgfX70zXp7j@Zo!J(r#=*Cnjlh5XYWHivr?D^oI@`<9%Bu{Mk#(
zCSy8Mu2F+Q*oZipBI(a!d-k!Gh#Oyv)tbb+h&uiP^5iG+Pn@Csy*nT+vaD#o{*ZX1
zh0q2s=pef9L+gjg-FJ|FTI66ssR@#;4$HS&EdS{P?*G<@m@vTihtXvvvpMKULH&&9
zQl>Qm**tPV4wtD&1BSb8MI(~*B1tFhKbZaAT1z*ER?kJ{6)uZYQkJ3z_0XnPo@FW&
z6g-&@r$FL9v9Sc6<oeAm-hA^qvGC|>*Un6*_msT~&y)B;07|8~ayP*e<GL>e(lt5_
zm8I?*NHkMVO*8w#5)a<|BQ|%x3zV=*5tQy>%of6=DZR(cp>cZ!jKS>NF-ILa(~jPb
z0_XggryP6!qg;VZDLkQ=9VYw$QcBnQtEVO1MA1upgi^?YV($+=<iY>t8$9~&zDw`^
z7FLx8tAVhB$aHBu+Cq6Cl*D$TwB+px2E&;B{#W+zVM2WWM;sh&E38Ack7!U~4MIGg
zjc72?>1t(7h_+McUVsQEffAHo!0G~}lND;0W>FI%@vYZUg$}d-%P*s5EHb(QMj@ra
zG_O;9=>(OTBAxqtG_LP)`=7o=XS)wl4D#st(o#=k<ea2wzLYm0wFG?W1X^pivRX47
z;vu5i(up0Fw*i)$ij9t<*_RZQrJD#o+V+?XV5uaT2o<4HSZgu3)yd%e|D>1jv%mNp
zzxwyTMlaG>BOJWfrhI=A3O=me+2U_~?f=e)-+Kt2Ph#W%e*zixxqGigALc^M^t{jU
zube@itg^j!o65pXO!9qt?FV?l$JkmAw1Tt`;<ySpo8b}$V6m)WO)dj93OhA+NXI>x
zD;c0F<>E8LHrxm2>;BX2zbETnj2Za=*4RNDYryxHnNa&Ifsr{WMy@+9R3XwfU&f@$
zZ`kHc7(4hJ#Ve>j@i%_y)hLk|rD%QkJ~w~wdsG)|6y_({`ors>CNaSr!Uj;C#Tp-B
zU00hE=da>D+$L^Eh``6}En|wOIFbr1Uu!)E;dfx)X!;@>pR~J)D=!xNU&xOdz!8}e
z$drdg>jE}Bj<E$i*+TDa(_7x7_plA6d5GEsQzd#IuR`G@)>e>758JuL+*dBUPPeb$
z$D92$(WBdFC7HQAiA~%j9T1)hC+u!ma;{BoNL)G&60KY`J|z~>LQ<@FR0G%cyr*4f
zp}-fkBUf5$Eo^iYeeHsVQVP!04Fws{j1yvO@TAi^t^!cfP8`#3EF2CYwk}l|D(7}6
zk&>4L9!dtBdipe8K@E5YJ!z0a&`<s8*t*(<wXP)5&_i(g<x8Agn5Mb9#+esqdHHWY
z&Ca{)wD(#B<p9kl!q&#W&%6oja)ZN^+P=9kk}n&f_|6uOeEThVgs_aw`{(EG$Y%h3
z&I$cKuD_9aedzohb3L2iH-hos_r1ut4@XX#h1Nh|LZ8NW@6dhyJ~zJg8Xx`UH;8){
zQ3w#d239T*SFd7{N~%>{%~?;*(f3Py^dG*(<X^agPzk<x#6d?WyXcseJ-_d;W3r%M
z3OJD_r$rHu7x-}s0QPHF!M=NPSn>#nF~xJ}UP81NA(cYa&mjC7JOBPIM6r%ZX258y
zA0RwQuWM=D*+CX6Smhzg0c$_JMo~$Ez;))yD5Zu0KIcm(X;ohKePSHC&ZY>!fe9`J
zdb`7i|F1WBbZr$`3Q4S_5qoT|$IQ%lh)|)8L<&bhiiN$%P^FBqhDd7$1>nMst^3|h
z+CVyvzP=GeR?vtX=U<#c-D_o!FMaKk6sAIqae>J!b=XOjQDPk#N!d3{hZav*s>(23
zwOsj`B|i1HpW)n>PY_D@>@S}~cXnv3zfIiy7$cixu2uHFvPIsl`spfXZCYz`hy^g1
zOZn)T+h<cZ$=clNJZ`>>7!(IAfRWYT8teT2+`P7V;U5Pq%AePcd`50(K;V<D^c-OU
z9Pv!*Q~&wbUhQ04q4@_NBF=n*a~D5J#TWSJXDEN-ILT%Mv-~c$bODhCWzyicl#>4L
z3d;|#F(C@D*9Q|~f|>DgfKhM)In6XWF!|4bm|+-&axeeK5dORZ7<C8p*2!Q#DTK0!
z_#sn&@hN&YSFwr2sH>>bNwi&ZebR)&Q+JV7nE1k38sEA}vNMJ7=jcY;y#K>*(0(^z
z{-qNXYCcKYYCVrv(Z+S&Ar1CnQ|j?Fkmf5xq9w+H=PO!&a-II2E^F`Zvi0!>_2(Dp
z$AYzg{x%Q)&2@?@Mx2;VU5B&>pn_NCEPZQf#R)x)qxh1}|L<$(T<A1q+0_!2n#O%2
zXeUk)taTKjvP^jijYteq>e{-Rh9vDo)J?k#c>>znaS9fc`y`2_8VaUEO;u?sQ$<dG
z`WT=4+8G|*Zh)tVo0GtPi&AFFI$Qk*?<_yrbJ8?m1Gf9-liWA27+MkI=1V>pcOV!z
zX3pm4c5WU&wuRVHb2J}owCoQi9s)W#)S5}p<ymbgJ+(meV4L{iUHUR1SS%pxMQl5Q
zBtdxo*tCjC63VBa<;6l1+bp4Lry!hQU;pj@Ik)Ut_2DbOO(WkKBy(^`z8EPR-@(d~
zLXLA81`9|TBfB5CcH^y>#@j2H$Y84_h$FNR2pq7-T7wbOh}I)a-x9AjP}3*TeM_bA
z5}*3wIYja{xBiFMng7yxYL{mbm?4fKO}#29*j=|Iv0~zcL8U%ioVa{^RyAm>btTND
z0Iz%z(|wPPZ{MT86Jd>|Bf8jj;!t|2A1(#l-c_hXVx=as&J~F)?8TNqSd<cY*0LK3
z_9E#}hyw%=DNaDrGjOY+XcY}7Du&f=h7@$oPko@RaTbP!ok%(wF*!sO)_m8Dw41oP
zgSclXl^pp-Snz0W_b{@9XNnl~{>A-Cf?$U*<&KjDdD!peVZS<Z=h#gic8bGdW`_v>
zzVH5=o3vJ-iXOGkUm)4tLKOpg*SG1uevf3MNp!D)oqfe|d5uIsg|#GYiLQT^Bzzj<
zEn<>zf6m?h`R~#S;mR9L){^-!;a7Na3*W3Gl|fjsU(i#_#Uc?_x|Lm#Hm5x3c!>yf
zdj(bNQ+(kVz4w-pwOL5!$nw6{NJp0jkW?_8n5}>FHdr5Yh+n=%y!G#}_Bu)Nb9D7Q
z_kR0h;z$oBg)8iHR*kfV(zHNo!-Lm6wzr^{sB|0@%5yEmtg%df?FIZ9f!=+KXsgfO
zn>)l0``o*GgWEUWr70vf4Scy~sSe@U(uPK)VE{LF#&7~O`p}46S0IzF<~pC>POaQ5
zzOd4fyuGDZZYwr=iiyxr^&N5QP?fqr`Gwn8PLVYu*KTa1E7|P}cl{V<mTI&&*0B05
zMD_ci1J`mcFBtiid7psfBx=-8ALZZsv8Jcp_h;;uOZPddy(3}^hn#+7Iu0K>vpRm<
zEypsXu0H$8SIu6R=4&?)vO>T95?<LS`sg~*!%eiDLx;y4W_!dG8-S^DpwR=*IL<5?
z8K}X&(eLsjl3}RFnf=x&38i|_d<)y(L?oLCWkJ=_)ipa#;(1%x)(SFy0Qx>sDiC!S
z6v|y+NR3yB&`nLU*+Z7gSgvBNqb8SO2Whq;+D3*|7rBlfP`W%1{RrLOB-z@a_LJu^
z-7dDZis@R)r+hAb`2^jz9;}9b+QU$%%sa&iOJUB^S@j+Gs3hq=Y+z!8S1q8mK@@y~
z)6)cVCCp9--I)MYpz0Y;effE&{*nVDNn8UGmt7DP%Uw#!H7*r61*mX+0JU{liGJz=
zU^4~jvIN>n3>k5}`#v^;IHfyVDmf_gUM%s_L3av93_v^9I;GOr4iTB8&0Cdpe!5O9
z<)sQIE>CjuQkDB}Y@n(JrP|04Ous<JfjC?x^Go93Wgqa>ZQc~mLOzFil85>H86xTs
zuD^YAJ%|54ED)C$@O{@kWRv64dWX3H<F=fBR2Rw@UX32^B7+)9;i5C4Z5a`k5q=q~
zmXOvG$m>{t8mlFvsJgs+bZ`*ucp)FX@iG6;w_%cc%nRLj9))ioAj631|KyYOKU#LZ
zxcu3aZFhK_vbPa>gX$~C*;={F_3!@yODA7O;|*K^_g)ovbEtA1Q8<RN$J3yWKm}dw
z=9{QO1Jm39Wl`Q5vZk2*#ph_fw}NiX;8i3-CQSU*=V^WGI;t39nthCh;zAY8u+y;e
z1+At;h8|WMgfG#(KJjXgWNnY_fB!Ds57&q`JNU<4TX5+s!ebLyV=>#SnD!R3GKE>+
zqkn6I(uoOd=wlMMnqQpJJUgAFmZy7jL0VL!5d(qf>6DI44BcD@qI1}VsP8%J!Zl!Y
zAR;T63|(v^HYvHN6?np8aA2VPG?2m)8Id#Yof6PSprl}GK4j)pl~!WuudET4TQqk!
z@WK-atr!q*3}#_&9%U5YBl9W$ew`d2g2)>c(0zhxQ}g}cydFm9AH(*01fTz?9vj^+
z_L;RKa+8;*an~G4H>zhp`Po->=^}A(5o~I<NHD4jvW9HDf#}>s76oGcebnR(Iw_5X
z)(%fRas#89YD|!CG~kC2xm4f4P91+a0ay=IfatG4;L-hH3o-RH#svE+#=wFsA^Izn
zzId79OqKSBo7AVDb$I-d`xPq2uKy6Cb!52=Ny)w3LKn$8Q@{FIDzBWO|G`a?od(li
zy+Y^KHr;m~ASw%3b&2HBhv=OS$z}&8K8X#c*}3*Um9vwC69tTMU2@}H&F}x8{%`n^
zV*0t$B#-u3|L52E-f#XI55E64OV9iqh!R9QOg_Ir;5+F|B7=W?lH!#GqB|Q{JB<jh
zkZe6bce)f#&p6=)=F5f?HIvGSBfdydSIGf5MT+EetUtc8gT^5`r2|)`BLDCI{XgZ#
z53Y0dr(Yn6^Z<d{*H8;w2BGRZ!qKcVvbG|1cTxr<kp>HM3#ymapcw1&@^NG-otomp
zPakLLCr`2Z{YUI<zeU$<P*mq|Xu;7XXhisP5X`LBKNF$@L?4GK0g?V_kW$MB``mY<
zL?3x>&9U2ILB&zGCQD|(Fsd&`WGR;hd@RXG?mFtlU;NouldT>UCK(VPYNsuf>0<Y8
zQheql6JNPRyc=UyR}tm<P_T~Lj>>iBl|??sFBrCA%Jj$)E5Dme8ri#vZ9GIb+r;;F
z@aE2vFozfoUJ4L4Kt#&~OLe4?6t^{|a2#ug3Lpy%$<955-=*@&Q$!!VhpeSN4-*d?
zZP35HPT~9vGVrh(de=9IZ){@=r@^0gMK4ldTk8k~^qNS&fbDPLU0y;~0+Lv`egq|t
zg^No}KX-;g;Bo&q-UlYB)GsnUe-&SyhQcFC(@;D)fe{`?xFm!GcK^*==!QXrC$LEw
z;nj&B-oQUr$Dc0aVR?2gW-2r!>7YoQiEpexDnZe6)<92Z6l8)>Ike$kU(!e<E9)>Z
zdyJ=^Tcj{qLu-u`8F{J81nfqV#7gSEWBKufD+<z<0d&}vIy>t?r)Gvh(ARR1acISo
zM$gjjTB0an`o&{h|IXXoy!HlXufBxt`KhpvhRt*T&MWkRyUKxmN0$7K5y)|qa(~D{
zF#f0`estKr>`}($^hXYS;&_7qb>-BvubS`#)~g`2-6xO6Q}}*N|IQlGgIy}0IZgM?
z+n~x=e?Rf(aNu&b%{ag0z)c(sz73+*h$l$(Nkp`Zh;LH;>`DA%HR9zh#N>HQ<R5em
z2iFkvuDwg|_AZo8VZ=nL0CRq#77qQ=T?1dCTNc!*l)hRbO0(G3D(xTKqjzHqf4WFx
zd7FpJH<>y1C6dH3<5=B6m~CeN(@zs`ZqdJcoAQe%37$Dl+_#vt2S9(Vg?-Rr?T_y9
z=nrqBx7vvE6k+u$K`@Om7A5b~TiIjx&+cR6goWp4>GXiWBU#xY*-VgC0Wruzi0P~n
zo}b2>DpLzJpIMC4w6z$lDw!plaRa*Uz*(LgeBlIoyDt&ea^tSx)Ws4L^EFJOhkm^k
z^tGU)-Krm3LB)rX=Qsm1f8V4LfnjB#%fZK1(obB<)28RjIx21MSRUQ?Sl^N?edcLS
z78lrl@BymiBXsScKxR4r5tDe|lpJR+=kfLjgx`)}N3!48;di-tJ=Qh;QMvwdt3RY%
zf0=ch>b-GXe+T3$kFL%=n|kW>ORowMA)|Ga*aL5ptY1Awpw%3*G6#*j^xj=YRF7e*
zXH(+E{Eg=Z@(2{)q2@nB6X#Hb-?+^RRM<uIHo;f)-g|_cx`6J_g3KD73?DcROCdv-
zE|im(FlHVrbedL9&A6=A-IP%!pZM-|#N^W$Q$|P^)wSA31k;Gh0$53SQc-+no{zuz
zEf!}d5tRxy4pFKBW{>jcE}%k1@1r$L6rs1e_=`1E;L+b`vHXu-qrKWjRqD{~GxPZ~
z=*A|dy9{z3YYnIxvO0?@6w%wOl*@|B>1mqpuhDsT8IlN9H|VWZOlyP6vy;?5d!D4P
zS*&QDosQ`wE{-E%0DV=$rYu2DA!OvBN?3%DZ1g0F6|^JhZ1~JBB<U*YewPmhTLeK`
ztkg`LRpqBNX5GZ`2x=?n8R>veW|*PK<SBD0MCx;IHx<IV?#bOoz=z-dUHY3XCZ=A5
z#KW<U=I6_P7a*hE9#{aQ!MhPS`N6bXZfD-?PA8R35qBA~@Ue)(L(Kef_b>qd3>3zA
z7eD}qx-y46mwM@!f9};_F+>$LdVLov3s~dt8+=QM@FtPv08=`Pjpae%KPtd?lm$SB
z<q$)JANEMIfB!Ws)|3$840>w~RlPtW7D1T(d~kUMWepG@ylHe2fJlZYQNw_YR2WyB
zW2m7@vtaA)ak9v+uvp_EYy}bTK(fc;&p*rQPrgFuqdS=0Wo+*uwzrGz^eH`mjGf<p
z8&O=qniKRt{uqC*gts(_ZO7=nE;iB-$EaF}Ia9!!ogliqft;*k`vt7_uu%a)9n-zd
z`a7H4`rf+)ZH;La5ni8(pMMUs)5O}C`p-XyX?AFJEI)N#Q&aBQ`dZLQ1fjGPJXgZo
zH)(THX(@OP^=Aicz_1-lR#z2;0@NmqD;`VRi)BQmnOsE%5OQ#xvgZn#BIC$TyIN*q
zI-Ca#snQF+AxW8$rG!XHN>!i$!6d{F`q*YnY2qyOgPeb!uF@lM0Krg52UF|7{LJ0R
zfw^b1RLEEh;EAZdMy&*L*BOUx$O-H|s;@&VfU&{9?0k94Bd-9y@DKirSBsYx=&$V2
ze`sKG7O6YP&|-8kJ>Fnsh!N9RJx0MCg@if`os_Nme@=v-AWLTlSns$i3uZ+4M-+hL
zesg3N4*M_Cl~B0aYMH7_YeBlfHWc=oj@k94Pt<vvKmND>SDyOn7f5=7jeqe2sxO>i
z=F4Z0b7d+o9HaJ?%XHsgA-cDN@Sej`Lj^th_Z}jv1-!)?rB9ro_R|+pWsms1HNO2X
zejT$LbNZ7PY2A2;EX}*Xw@kaq2A5F<kB?seJwh8&secwLx9PrlholulZ0NpopVqhU
z;6L2ruY7HhsPCS4voGl;t}L<cI~Z`1M*VdfgVCusrv$8bC0z}V9(YVI7<?~ny_K&1
z*|-?%0(-`0i9hEGlza%4i~8>+a{mH`>xWQCS%E|8R%&0m;}a{0I@U2!`4SUbmOgWa
z-iHnPjdes|5xPFO-T_qLz}g(nm$9buQPFp6U1s436syPt|49&qqyE9D;E(nFb24-o
z(r=tn8|%)b@Agyw*)P2+x-s5jjp*(Qtgj)XWo%;`6|EvYFw%8j-IwRjm**a8b{wJr
zMvf7};fzE+xB8@;8R(8dAy3}bKX9+PJaA?*IiL|k>hc4FCm50Y+@?_e17@ZcSo+Ef
zG=6Xg(=QW0T4mzJ;{=zE;gth~lEmu`qK7?fVbLLT{5gmpU|TW8XO|Fx!mKyg`K`CH
z!92&${RG9J1sZg-fedPn2z6i&CP*{Ev6Gi5PtKyvBtlFfygD$0C@*341m4UE8tWTO
zoGLKAP-3+$(o`FR2BF#H&0bN~voMR+uXa5;TGHAUluH)BDAKOecHd$+gyV};7A+>l
z8-%G95K8E$t9vd$4?^GxL)mxAMWv>-RRK4@`3Bd%{zJ~Ze1*_ANUJH#myw~RbN3E~
z`Z07ja5Q3!yvI@58vQz7>BpGA#*CkrVw6jO!%>BBh-EQm--u2c%k?)72XNSPAK}`l
zr$77oS9gE!1KQucjqQP~)xmTrfA%ENtq0(jvEKClfZwR8aTqEoyV232o`HsTY$h(|
zms<{=bQ`C!_kH(xx5V1ilp0MPWwZJ*(Nt?KN=;KLOPa6W#k88J@>OKXu=DNfblzP?
z)QW_26*})cB;Ey~7M$7WYv|sl`h`n0|MX+_e)~PzZ#)36f-If~Rl=XB;+YUrIf3m?
z59nV6nc_1*6{~9q<6IJK2_Z_@#0M&<IH1w_h}GLoF8t(4`ms%O`;LI5pBDOu$_--n
z*h)A`FDYQQU}+|To`SV?#l*BhYqvVfbme!w4#hy=4bDySm0+gmR`W<Z?g@)?IkH#c
z`VH6=CFtTX8rPaUvVvAy5qL2RPo1J5HPTxAi2~El%(M6Y7M-1&$VH22Oo1@_FeI7z
zKFBT|CVU5?{QG}@;AcX(f}fEb{J_09YQE-Af7o2kz8Xs)lDnb9EP`<iMkBYSE*3Am
zYNZeJSFq*d2vNZ7EIZ$>4Yq!D;M*M#q#q@}pA-IpA4A%7ksnd;M;~fbdydi6M+GKD
znt2e14dhXm7hsHswF}6J36K@6sDqtGR%)0oL^tkGx;TgOC7q8~A?YH+8q#ZF<8_kF
z4thIAO+Je(#E`TQ{yL)j5R+7h`=_u`!NoO(ai{$gBpb$b)g?pVNkQM-;LRWW9zXjx
zp6A@98CrcyVq753SZKzQdT0nzPA|)F(Ua0y236lMTd=H0g6&NY-!l{nVnAHt*oDP_
zNh-@OBt|e(FjND}R#&D4MuNU^aU@TICmgl7Ql!Kr3<8Cb5w!a-d92E_FP)+yV*=@D
z(1eAguQ~haIiwNn-dsVLQ;<@XXTjXTT*DszUJnR=eu5n`zq4R5?92U+?H_p5e9bZs
zqdIG!MIiS7J2hnlM_h}M>x{8Lq+NI!Q+uAIH-m_}nAK}kzjT@K+!Qv6QZp~zOvX|%
z67+jQ5|2z%TItF##bW?IM{c8~ya)E1@%NP8Z?*zTos~_B{T%K;$|fv=7}G6d?GnN$
ztQMGP22r>Ovd-qezlL0zWa_IIk--MGyNv10Aj&5(jRgFw=xB;$uS4PT9CQEKXTS$x
zdWe)|WuLxf7yufp^wP1h1}cRb&t83n6IV}?U??cpfYYR@HX$I=>8kB04jsNAJB@`-
z;tGRmp<rSm;m#c&<z*$r&QeHh*4@Z`vj1=QC7mQQs%*+UH5_W4n%A**%A@ERl(19-
z!+g<jenPWUNKkPfg+W_Kn_lz`^+2OMMXwX%g(b3FM4Hfbe~mr7)c0{jABKZOA8EPo
zDAC8D)6c$K`VsSWoZ*}kerYnokC8Ip?C)d9J_h7GN63lPNr2HlU|cVH-%>m`NB8<V
zvNDeq{{HmB=t>HQXvc%|aX`9Y?7r?RKhl;rmGWBiz(9&a?`x2<$&^t>(~~8%f5h9#
zBFoN-FgXRCj%o2c$!5UX|MOe)@9a|j#0hM4AE6##qYD`SGZ+(sO;Dv8z4upH{%`&m
ztPkNyH;r>)iGg=><nw1Q+|ZAYF?;GN|Kb1h5mC>zB&+!jv#--Rl)-fKKC(;|j7qQ3
zPvE(!gwLKyC|YPX+@&J}8i!}d7Nl&_37{PdZtQw4q7O*dDA0|6Y84tJ62~Uo(UP6M
zq!URZ<5Gz8B~2v|lzqWc$x!xP<z&HwLK35QyBHbf#%R9<Fd*VMY@EhL;j<T+1wzt~
zmHXRz4N!k$V_f6j35PFSWZ9^+*-U!9!H{PEmVzS}tE|#ca^yVmkOI%_p$lb9atyC~
zkB$HSPuz=~dCI}e{+ye|X|v4LcQ^QBuD1D;{yBc0ZGWCq9LVU5xhEkkCMhC{&m*fF
zbZ;+1vIat8cRzx#jSNp?ToW#Acoq?yL=_`Y78`{ik^?6ePx$--u*RUmD&6hdtgUoe
zI#<E=5_Gz98|&b^4hP{LOfmG$jmcJT7o@vV7eudg`JJ~zUU)&%*|U&H3Y9ccjytcf
zhAkiy1ACEVy6DVvFI^gybbJJ)=Z~}l3rV131Untqb}Uqm70C*i3LM{{u@+AWHoBHX
zTau)QpN`GGx%U6>?I?=8$CUyfwLOXH{}_5c_1w#!e^u<gi)h?Ov5Brciw(|WO6M`D
zpEj0a7>*7C=6(JYfMI2d>qq?f!hhIm2M03~qd(17wiLu9aw`=_`E7^X#z47dk?+wU
zWPT`w!Riu-6Tmj5r>2<rxu<D;?*?*m0UIfITq0aYWZ~M2ySCcH5Uk8qHXi!2?dW}2
zl1`0ay2tDP_68STo@Vh_k-bEs)1^N)f}(PWy`pDR81Rrh7wMXTnDog@W%zhUa_b$R
zUQ4q2z@t<&6w5Y6@}<0nq&*JPTPdXJ!z|tCNnACe1SLh<65XXIlhk}Q)}ae~+EI#a
zN0R#u$#z$=-1gYsP1ye7GD4q5>Y~GEh@4AzSYU2+oGc7jMKj+fJ5S!KvHRDb{pH0Y
zbLcQdJ?{PGzLw*Vey|S*@K_6ATwr`;Q&-QOdA0hJ7pc5(oao~RKmqO5+{DZ3XdlOT
zas-RdFy)rz_kRqZKd;4(3ius?IT)n+2GFYPJ~{Y2kJ&Pd=85hp|Ftz(AtAmGI>Kn^
z-&jL>5s2Be4#Mucok1Bb16e+pPiD-0<X*S{kQ&J(VYtKAy&YEX_qhM|F4Gq$Qu=y9
z!FTAuiNHndQ#3FZ2xLl{Vg(vY0L)B)KW~{_FasAaEa!(_4CKh*0*bZ331cs1KZ?`9
zp|iAy{SGo_p`lCSX0bylx|oIIRRmE8(Vc{7?E$iX3Zb-%U5T_w>A2|lm~s056?bMo
zk{sz_|3zfh+1=B}oSY$NNRB9yJKRINT4UvvZ9s+%2@tFotzlS@4Z}|Y^q>bp&(a@Y
zz)uFO2Sb7YL4L6%+mP2-9b9{<UG7Tea+g|OGu+|aGu<=YJzZU0Rhb!~hsel^jEc<4
zs%}yN%yd;{WW*O=T;Kf_2)1@8by2E{3G%G|gs7J*gj9|Wo{c(M&EIQvGL4375<tq+
zr&zgm0kPU8IY`mc5N*e$o@@{g>}hpep5L9g((&sFBrBRIv<>!UE6_O(8{)!L*|`Us
zPLZ9@qLNb_e)A*NfAKTuYzNuDJ2f=%VV~hOyb3;!0tbQ6kc=g=e}&<Ao$EhLc;_$f
z@b;hHM0Q)yj=6snbN5Jc>oCf*2J50Zli(w_e$*x|;ESs%FRx`BO$1N(1v(OpnI;Cc
z$z_Ew68?6lO}jOP+pce8JS56zvNjY)vHo+5L@fkao>fR`qeak4vGUpl1R47DPQixE
zo!Ob&c>(#4rEKe@{mVxB`4o#xZav}X`VKsNg6M9dI%g=0{_7A}xB2u`xTZxlDKxha
z=Wmsyw&nmRs2?lNwvAY!&Jseu(w8bBoC}{*jA2X*mAnGoJ_oOVh!9)o$!Ur(J0aMq
z=*MMasKIeAbW0A;aPaUa8ICt-OUdd>r+ILHz@PuOcNpyrh^1tZ2zDpNP9IFt5UtE6
z&9wP_l9`ZUmsb^C3H=Sl!)?jOKZ;0G7$z`QGI#!o811LL^*{cK`#Te|Jn`t1nz3oq
zOhOtr9J)<bV}%~W#0Xbc+Qx=KYfUFotZv3cu>kh5A;oK#TX61l^E05ZXQ?So*85U>
zVh)fCENK~?y~N=44|)9h4Me9?4xX`O$wfK{rIDGaB|$1nD8IlAIi+fEa7$9jtfKz~
zDF91~%ZBG;brFd8DMBh_YYW}^JSy!@S+1(Sjw$#oSd8^;*nOW%zwiQQubtu1gOs=b
z=Qp_dSma4dG^5O9Dh7xwiJE8pNtu%6se&u38LL}x>G_oI3hZthDY;U{y;lp!hKle0
z@i+PKqdi6{DzYLaxjh0xlVrJPU@mw}@(9U55!u)#u!)3mQBIXWMiGPW-)Ay7LLVAG
zkfrgoK;liY==(L#3bu02nyxKX>%49Z|N7T|M`!zoMC+Fr>&pl|o|+xnTx(S>zJbU+
zIJW$SkZsZNXl8Hxc{jh4hYbu_SXlU#9D(NWP&FV;^Q%+7J^W_e{=9s38k6x?kH1BH
z?hL!v?{Vtfm(kgl@kp%eO9X(LhbO0=79g@1vGD<&?trVm@;Q=3(``%Iy*5!Y=3+Oc
z8<|CTzL(LGqLdqOtSs@Q3rC+!8z-WBN0OVnf=BPQxcE~FH369>w0bcD==FN6M@MYN
z2|FV>WdktMe3h#lHPa<$2{$XMX-Un&MCR6ukP6B0>4Y2q`Fn`&XNd>vAhT-f-je2}
zU64Pt!ag^@UcRo1mFBFS+DJda3&(lpt)1cksG`38oPWNc(YEgf8EvrlWVZ7NvGoEY
z{Tza^$B&eS9ia{6O8JeEf^g!r&j+Bg%v;nxTs~3?;h#tDFDUSH@mqX$VVc*>jE%Mg
zv5#EsbN*lb1FpaSCLjFZe-VpW3-X!1=HZEX^#oDxfOLNs`dua?<IDeasClqGrbWi-
zUPdP}8%-%lGNaDxM<!@!l1ET(OJlgBv_=ZWN?Y;jM#ih>6lbm|w%?sFxcQLPTSNA4
z?xKXGogMN_XJS%|V<i7lOap{idjmV}NSd@_?a0WaY=YI5mS(l3>9hoGm2&vkcZs?Y
za@51760e*V*Xqv2pPe5!r(XWK(EGdAeofqN>z)PbX~9(Q@Bf1-bx^1J^Edw-c0dxh
z(W-~gDcXdObRg2xzn(q+)Dgl^07aG+*Sc?!&0l3P6(ak6n3`DlEh+GGN%6w+u5Ls6
zmXf~3qyo_yAlq%!_>iCd&40(`a~II7*AXf%@%^=Z&9j8Gbqc&1om|`*5UUZd{mYk-
zt%yk`I7&>4@$0)WgNcdD*Nq_2kmm3!iwq?D6B92mj!a6qOi7XqGOc-OHRGk{6cc^G
zS34K^r&qti`iF<y`_{)KB4&`tsc~HnS|l`Ck*w3$AjASzTPCmJskWxqvVwV|7wNZQ
zt)=+r58mO<_jVA`D@ESQ#<&ug8&~L=lwRh&DP>><ny%Gf5Z6_6qM2RSj(ALFPI|A<
zzdF9(my^N#iz6>mY`sE~tr4{oBE3zd9-(DaR*%691)wdbpD$FI<?4@R`4@j;N~f4J
z_z+bRwD1FMuasj5{A~AHP`1tXn{p4xDyjqlkwy(KlI<Sw@b|yN(YNoj^89(y2e%OI
z9TTqH?a%MaB^~Q-o6;>~aiACvE|94fkKTGjr!5$aauuA^B#GemVZ=rUy0MAdlWIY#
zG$RGO6T$w(BnEjrHY&V{G6_REkzuzI1?PGh*Dk>X!D?@lNJ!SV+N4TxdmvE?R$>dc
zF%3RSjr(s$Dx}b~rLj~LQm{8Rfk>n@(TyW%!j%o~AF_MrfcDB&7~~FXRZ{m#%1BJL
zFLs?+6iQJz0lI-cW~>T*wX8cQ{$FQZ7hdq1l7*lDuaVj>v@RQL#pvaq{<ps!wZ_Qp
z?<0=xA%+jliQGPIgi?VZ19qcHORHIa|74_xVYSE%DIJ(dm^x<^{J&FQv+x1s?s*aV
zvG(OKyCJlM_Bph^gpw(}mwH5}x}@7r5%HM<4?<V;wW#{YSr|gKp!bNlrP=z-83rTE
zb_z6-Lt>sJE%YdZwxop-(n$e#4kHvMP5ItL@^oSvHn{>RHegG@)@GZ(dE;IF^nd>)
z_aE$Y;U8V0)r~>JX4k|A94m8(945w*=qNRgNso^No!A@**Y{#>AH<Bc;B-e}qBs~E
z|ESwS?~i$W`xf!q5jxqLzYaq;vzV=9savVa>tEE&YbDhhk{5~c*SblZuDdy;|Gae&
zC=yciqz8=I`r1#?d-WMal$&t*hBc1uv*lM1I*^jNVR4NXT%?r*HuJLx+x%`a%ViKD
zORfc201J+^hA1KO&1Xw$9FGdpFem4<0G;;Gsz(&XjNf}e@5R&TWE-syjoWIa@RRbb
zGLIcmDkovhvexYZBHCd8`Yz-B5ocEv>-~&47LXc?x;K934Sx66zD+ht*iRzv4kLc>
zI3~@ht6?hh9Dycir^pR*MwwCXb)=@%lDz!o3lQ~q`5!;W#`(U{3JLi5z<32-=w+<L
z+9XF6us@PK9-2TU*Y_g6bFa<gQG`U3JRK9oQDM~6?n#7B`O>dkrPGsS!&Rh;ym_Gk
ztK^aY%IdI~lKl2_oweV*`Eu8`dm!gTi|^zU%<dbaV4G&+t|+lF(bdR)pZ#yVN4h_v
zwe{RAS?Q>!5P8f#JDTHc{!p<S-}YM*Z@_HSD$;K`fnPA7!@S#e<~Gpb28B%$q0u@+
zCz~j-$KL<>5u&q-h}y=}%)Ke9vQYVOxb=K>k`^Gx=*im%BBIp}qcLpsG^?>@YejMM
z<6RE^>;tqCJpbw{iENRiaF7@ZzzE5W`c8;EL$QW5GpvoknEl2Pbji5#(i;Efw_c&Q
z8guVy!bcNX82a2BNM78~?2IIl)QmGpEOnl%K%=xYQHPXb=bJw!`QRb_pTEK@U%kM1
zqWJLZx4HS<2dHt%C~L9OI!&6YDN1TLg@Y)cZMB-M!2C+*bLCvjr3#(tu&JJ#t|fm6
z4F!F5#YjzbO4k1@Jbo8F9+2!lMQj=}%a3+avPxTq-}iYGUp3<L{BzpZ5Vr7J61HM|
z{w)$}s)-uW9cxg(tI@0><ZIB)Px`Et->88U>rK=<n(751HFBJC`Ilcooj=V{l5tk1
z3=@IK6qm29^XQp1`hziF{MA<(YDt#qLbKG9<_5QC+9aotwnu_gOEx-+Oi9w*f^d{V
z+>S_-jI%wsv2OygcBSS_&lvxVGZ4ta>^Q<09K}+RWf2cwzsc~gZy`3G=f*c~^TOv&
z^ZI{!hrw<F{mZo1GUDMn+0csy)MT=C^&_bis!rP9WZp%^_eD#H>hRf$C0THD00@mr
zTST1>t<80^-F<}ICr#H1<B<{%bPSTC66n(B`A9F4!sddcLQ!4VFf2B4uJpYTa_7M)
z0(AqED71o<JoskJ=;&iwogPti7L_@NfKOspO?c(4pn)#5Hn{iZ12+G~d6J1{II$pV
z4n@qxU-${cIH7&6k4_U-Td+Sidj3=yx7t`3DLsG?8uF0ev4GvN;C^c41REWVN+8Qm
zjm@rRqpjKOC`PHd{Lc0@J41sEDIm>Z*ILl)Xii-_%jo@w#1Zt@+D!ISMtcb|`f1{)
zEi{@~WQ$p6`6RoKKF5zm&pQNkgWtS<mb$P{!s;+kB)L7a77{HXeX<Wx1UWw?96m_q
z2}6!$W#uEp=aE8cz5srWg<t-%>-n{W%Fk8x&A=4eXd&;&0#-fMaryEJhmx{mD1<>$
zp!JZOAN>jMz5R#C)*S>gEGMZu?L`14oeRz;60!0u<LlduZ$IJmdhX$8K~5B_msVN1
zy2;MIA{Nk%bUx)qNvyRtwg5sSg(gvkpWhuz9vw->%0%-qEQ0YJI7%hE6Uj!~492Dt
z2jk+q(t>^~k1~uZrmrV6qAO=<pY4+!-r~;nhx~`%{EzIb39*nUnIfXJItZV?#{Ay{
zcmhf`{-TQi4msWU^AMP?>DsM1u;%%<xa!?wkpBSjRLGa0I@gFcE|Ml|FxDpiy>j#F
zEzv_rk{uL^I4ZQd=5h^$hT^s_xkfHXu356*QD}r=hHBQt7YG%6`0PPcG_5@<MuTi=
zHaDK*%0K%&!@s!>-9CcNymA#x?r%;dS8G#LQE<40?49S~fB7!ge&chjytu*ONRwv9
zXzJ<M1P94-$^I}Ej8b?yF=YBAGp@dCZC$dN874-W-;Ll@+XQFLa;G6{7NT<DtjgmE
zjxtS>8JFN*WFq_sV3H~J#)6|PV(;sJ%jE6>@!A*JTus>;9kCX@3KNMGx$SGQN$b{{
z#i4K}nzGujm<#R5YTWj{eyVPN|B!Z-P`MCzW(`?5?3#AqC>1|^n7>{ZEQRHSX>USy
zxSHFfJL6mS#`gg~skXE#&EZLvna#g+BQ&N$3iorZQL@dst!J6sJ3zEs2)%(qH&d}z
zTqxyNHRu!}e}ew$hqPDP^g9x%GKPuf{z1fGBABFt%NrSSevl<fFiy>Z5KE)>lX9A5
z!<rcgrk;JBoFxDg^Dh!Im$#Xi15d_zWMYSSo21Z=jAfugkPRmc|Mm{?$}7l&HMCG%
zJ^wXSnlQ~zT!RY{Ktu&D{moyVBoY37nYGfOzGx!HIu0f76gd;ISL(v~d};NbkE9Sk
zJtHWYRqvHmeUw#wCt%@MsQNUES@?xwBKoSN08B-HZlCtT2J|>aoO+dPS0H*O`)}>$
z_me$T#A%$m<>n1#5cgYr_YdCX_75MUg&>iU(f?~fC)RXg#pAI#0i-ZpjWak*B;8oi
zk&e7I|8E+(+C=r)PasvYxOh{gIm#q^W5F;n@dzWS=tK&oO(2nR3I`L2+LGOG{TRd=
zBH09)f>5N{I7gtEVXbBa%%x4QOO}0898TxVs{Pz1re7-5e(qc}u+E%O^D(Oitfho~
zR_2%&Ry^fP^9ADi?w^F9uS#%L%Cs8z>osRjXPsX);+O)z;@ok`@TCQQ4mqOh-<d(J
z?N1mIU5)x6K94>EL0SWo{msFnXDnp}S_L_4-Ju0&`5MFB9lrmEKVswJDY_R{8Fx<+
zy>@~1u8FyqX7G3{=|-9-hY_vZK=jE`#A;iiG48rT2wF@-dmB?<L;jnUC5sI{QAWil
zFhW2n1ntPE1!V+lJxM!`j0a(-gHU5*spnsc1%90!QF-G}#|_Nb`&-g{u9KL5k(Jg!
z^&%@?Q`SX3P%P<RwZ?2C(y0_;sTVBL8qx?Y${Xo8o8SHmMnBQh8*`3<PXU|K2xV=h
znfe<nDex<dFYM>4%|C}KnU2%B`TbkT@7JX^d|3!)0|}iXM8)PW3AQ{ux;kv%ccYN8
znEunl6-4VQYV~s*9`@M&V94N&>umq`A9C@0WHgewYxqiAv)NZ@4RI_P$ru$Gqnt!Z
zwAM_NW|HYV<adOU0+}Zs5g4)`VFGwq>sF;<l)>GBL<z$ZJpBGcKKi3~7;O)^@K2s6
zlDnwRV~i7(g9p3$wJ77H#3MV%cH^6Q6oBE&#gqaF3E;H%Pt-i~Hve?q^;`;|cHxqb
z&$|7dBn4n@2yyHNgX*f%bLS|ZW8hPKwM?e%K#HYE|KcRBVnga~{(ug@e7IG^GShDz
z-h4Q!ZWhaMdw8_BzRqDP1X+~ZG-kUAVzACcZ-J1+y#a^U-z2%UOZ(g^F-FiQW5J~@
z$-Qx#kADAcVwDho<svIrHaSodsRUa+#ZZ~(zJr|sTWiqjM0DFRvK?{w)a-&-P9c@R
z<B=rOMy>ea@4dz7?u4kl%E5<kBH{=UwUBZ;Zs89kbQ2divInDZy_sf<gQr?+zb11R
zYQAcn%tVXQ)Rqt{easSTa`m2Vc$wlmBvb*}AlN}c>C^=yUeK)97TM^H1;*T<L4DHw
z+D04Tva(+ncA*h6HAKR=NB7Jb-u=rveBoDLLysm9N8I}V+w5--*?M+`$;}<&%~Ra?
zukX_T%mvQ<+zY67#O_$q??AG1$os$d4x1~QNfgmL)#2rT{v7dhr%|JnR2UD#G!una
zVBCp#^yfF2JWA=F`2up>CllM|kZSc1gFe%|Z4Gc!x}8PYfU2%4OdWlW8!GN3OU5+3
z@(Gt%__yG)MKt`arnqcv`F*jJh2Knj?vGVki4(E#bGoXcgh~L~wwmB<{?Xsqdd;;%
z0JIjgPxVNi?7<{OA`mUf^}o2!&aJ1YR-aC9g(SH~>)e3JgX>70fsDzNCdnf1{K<Pn
ztxcYeFC*5*Om^<_#_#@!Fa7)1SbuSoY+_;vW|`@;6GJ*yJbCK@t&J;)K_4X&BwGfs
zM59sR;nd!UdS;CN)56+s27v)-{}QDnTd17}RZVq-rv8L(f5>w*oVY&i7)9uS_MyZA
zEZClH)8&_H$+-rz?F;%UjFs$oiXTK(I}WgQ-CMrD>Jb!%TcQa$>GY=&#Qg&fZr$hA
zUwVO7JCCfCYM%MhCQ)mPwY7gpTYnkGF{Ckibi~02kCELLQNP9RTems9dqgarCr-LV
zJL`ziXK8gex$(_AJbd>FPwpIYv^OD&L?JuvtV+&(^)l(fJ#=T1ljDw9eIDr@JY*f7
zp#l{yzh8^3V{Ev&^8n?|@4FfM21h5j`2nJ9U;gFaUh2&dSv8OB4<W<RLP+hm=OJcM
z>pn#_d?7^o;g(8$<Eh=8$qESkf?>RU{JAgGO>U`f1>c{4F8U1_kc8Hvd*KKWtsNMS
z*m!x1s1+e1NoOPC$N%ppaqkp5jSbt7bfE{s_dh1x9}@T5Y=8ZI;?3s~gAEXwiKL?x
zbh;ev-D39#J8ZvopW)4Y&V1!LbZQ2sGfn@(3VUzgCZml^Poed6fyt(R@cyL{;u>r~
z4;)zuhV-AIocuK&qSh+b*YpC=_3PiC(|Od#318OYYrpnK%?X?kFd=6iS2Z;c0m4zk
z<Q)`5nOaWZSCHO5&Z;(;4_D{_@Fn(DYQ9k40cn5vg$6h;4vFvqAnnaRZ{8{>5d*h?
zzF_?HJ48`R?^K)d;}J=!Sii8wQTierZWQjnQpf0(Lz2Ne=+S_9V~uF^GayFx6w0+Y
z5oqJdPj|v(^gUkurK@bbb`CW$!k(xdvHj*<?*88!#Oh}u)3bRgN_Ys3$r)UQhp2UM
zbMyKYD$=UHs={nltpD<t-)VmU00-(xL_t&<sGIy67QxRual$vhE%DNC`XsggY=LIb
zMeZqskYh;AX3nUSLY!@*<}eEO?Y{d76ifCuIv{IsVWJRe#36J#Um#8PnH;qdtAdV<
zNmYaxwb9NfwM^l#M=Sm!oc%GZWN^Q1n=fp=ykmJ36K$U3@!JnL^^>QI^`n%gcVQJK
z3A(KiSpzxDf>L?Q_gf7~BX&>Cc~*HC%`c*^`%hu>!y*U3OeEF7XF+uYVVLq;&btMf
zuAL*)75FVE@t5uw3sc=j3_13c;1y-PaRsSX^c~WORN=4+CbzD|sr4K8C;-9q7OTWk
z?f9q9OlT^N$U4N)d2|LMHRM5RuQg#sGPx>2DkG&HTtyF*vDou=gk|zj0xdJ5!L#h|
zeuv@hJyu@WLZ=ETB|ATO0Bffa`z?f=%vZ<Fj7v|m`l#yN<$Cy8cA!yTRTsH;`xlNr
zQckH@Dqw2Ds(peNNc~;w2I>^vzfwIl{Wr&<$7Bo=$V@ou#~g$1-vyj|>>(+u4yoGR
z!L+|R{;LM2qHiBh!M+;QaobTfSCGh4o>9||9|gAxru?tj4BB})kGLd_6HAfZcLoE>
zQvHF>ECAN%EGCZ6bLX$_5OrgOgrkEo`|mzNrq7~9)@=S4nO7@oa@>5e@%`Ms{59|P
z<wxJ~E|*4xZvdvMxtKe?6DTLAqHg5LM_HZgTk|bx+%toxMbmYK8g0nNl=!_mRn@e;
z2bfj&b?$9Db`sw>zP@p6r#RPf65qse;_K_gB~F~!maB?wi6T0p_g-h14h#%^U|@zB
zrkpwjP?rFSA_M|~C@K{7UQtE8S?l|~Ywvy7b7lsRozIW=v(Gs*3~1g}-u15aUpx7G
z9n(I!xz|4(>ixanzxdnV9haK*-CkdP<gY$4YD~-LJ~s3B8;@V~#UYRUZNWENZn%5&
z%k%fAfAI&^SN`q$zqfDEmVe!KWaQz7InO-(g-bp@dDh#ne|+U9%CEoT(fii_=Ze$s
zesk0ZADw#ZN7f#n_PsA&S9;gCKlz96j{o~!C%=<zIR4M=@9y1j;U%Y^?fA2=U9x1>
ziywUbvB$pqjpJh<efquB!1{YXnDv>j{p)l0eCzQK{(SQLrx(5ONa4Xf|8?^ZH@^3&
z>3?$c>%aG<hwuL4Q-9QP;OS|X6kqVovhQtQ@XA+5@A~%L@10D%@YyHdx?oh_-@o(D
zTQ~2mJ@V&k{`v3MCpV70=j%Uyu1~+uSCtO^e94VNFM9Lxv46H?TJy+9{&?T`cR%%$
znf<r_+1J1Px2Fa@{mQ#r-g*0j&;GddkN)kZvP)jL^wx|1uw~VSlM_GevuWG+W=;I#
zlK-*OzWezF`!9I@vafvor;pZlT)cg4zq;bStM>oJ)rEuY^}#3B96h<~$kN)&zcA*`
zQ|~<V?TwqRdvIExOX^C${|9|CpL@Ar#rG%A_?Ky?K7YgI|8sZmsz=|SQ2qIfk6t-{
z^|wa-{AZv4%&E_Bx%x++?z{Lz>F>|F{-^(X*AG5l`N-v4w%yWqWXs*RZC`TtgWvg^
z-#q^htG3P9`sAnIJYMqU@BU}`pPcyE+Z8K*eR|NZ#=P>8BiYOMm44~_$Dcp>i=Y1G
zx*t9K<S&2z*>s=XLneOuncx5Pk57EH<H#RPzijP;*Du-dPyc7gq3y$G>^q83pWJt7
ze*34Je(?R1Loca$c;la}{iBW9f9SV!^~eA7vb}r$^Z#u9gX0amChysH<-Olt`-O`~
zeCh20ZT~p1s-XDr?)wIP=aHYRE~&ipolmaa+IPn@>$aWx<{$j|t*f8z`>&^XAXItt
z1N%07bH^vv&sx^+Pe+$t`s@!He_+>s^2$@k%09St+WyP_E_v*+%LiR`_|ESR`nzu}
z{Oa|O&Uz=cp#90&qu)<_?Q6T%E<OBTlXm@G`O)Y5{Ic|~{`aI$ym)NJ*FQhwL{0mr
zd;R3tTTi^z=Y|tsT>GVCd*6EP|K5Dlw0Cd(_}VA_^S(bh*);Kz!&86rmlyrz!e1r&
zzPhmF%7sJcU-q#BO<(zX#gG1e)L$LC^?^^^J+Aea&pz|nKbrNu=Q>9J=<O4qzIb=P
zlFvQyzmkL6SKQQA(O&VR|5tls_LY8f?r;2D;rIS(?3lZk9({9G?cX(D_K6u6Oj^71
z-+%Ozp`Yn>!AE;P@r`eM>C5A%SN_HDQ<Da5*}e25-~QZJX1-mr<WFy@I<WfC_fCA}
z$>XE{aL8o?#^3(fXZKZPU;W0b3-9=saX0@eIpxyR*L~}<amg?L+vIPLZXGfBuFAi@
z{++LF_|$)VuK$6fBQ9Njd&S%}CEsp;qUImJJaW(9{OjV0pMK{{^*8_O7k~MgqZ_{W
zmB0SSV_&)L*%zud&Pe_5U;W|Vee8|eSDyO6)xVjwW%6@R{YBkBf8y~|_y1naFQ@H3
zG~++s`S?G-|35~oz3Ik|cPAWr_}|8U_NC2_e)9C_`=@?>`Sh#q{K$W9{?zVI4*#1;
zJ8t@ahbJz3f5EH$zw^}#|9tI*TQ`30BPZW@>ib{Y_t>a6+LI$U{=*jsZff4O=-{t<
zeeTa{zi{n{Tfh4+b>IB)m6vS2^yP2W-1@Cg{o%*T4}a&Lb#Fa%`6YdSa=N{u{kwO*
z`oTrz|1$pFN#B_GLcc*j9P!61vhQ!Hd*sA7k2W0pTJ@ff4!Xa*_S5i;!T;l@^{tO}
z{8jDBJ627-cJXI=e`Wrw|MN@#YjWz~{l6;QRdDR$KO5b=y#33cJ+-~}1tUKA_(lKm
zg?oQ+*OMc+j{L{x{;T{?dY|sU;EUhc^!Bp9_@_-<CKbK?^?4V5=ayNM?rDDX#b3Yj
z+^Bs!l84s+>ECZ(H{tyo9^Cp*U%Bjm{`)tce`?D=d~D(;+t#)gmCpaoWq<$gGamT<
zfvN9YRP!IF=1<-?=JCI||JAmy7tefu_&bO8ee^%-KmS0}MW60_^>_L<_5F*fpZlB7
z|M^W{`Q(JD-@p7LMbq1^eD?B1U;6kXQ@^tEIv#L$+vooJ>)-nN;P<XwTU&PD+v`5|
znLn=o)CYa9duiFHI(Glvp%KmB-~N8_+O5Bs_-|hr(*Mh^{oCZPo_^rVU!9%##x<3b
zzIy62Lt4Mw^vK_TbmPn?FS%&&zK8$ui~lt6F9uFq_xvUAeSh3@<G20OcfS3zPi(to
z^!f)*Za@6Y^Y5JA^qZ$Io!;k9%l@+Twa<R<&=<a1`Ul_m+m?_1<LCM;{|Nv4#ZP|u
z<12r3Ma4hxx=bH@RR8~Lz2bi#{m7nAf5flg{YO61I;M|xdyVGvQGL(<8hN?3c5`J%
zTyDDbwdi$r7_W!tU;QjQEbqF4_uXAX`&nj4aAjk!Gei3Gd3X)xo_`JEv;1oypK+xJ
z4zToqZm#}(7Qg!OzTd#k*X6tquaxe62U@C6ch?|353k<bqpKIM<JV<_EP3hRvtPgB
z>%ZjE{dc(9#`b`JWEUUS4nnNsw$KHC*+duo`Al|kJ~ja6!aY4WxJR}S+(Z0j2Ok1|
zw}JD)U$)>jkY@)m8;~t@#(zMFdvuRs-;)hs4`;Q3U;p>vFB|C54rCv)fe&Q|XO9I@
z9B4gXJLn+>$Obz5e-syfI~z!M69-bViManquk&pnAOCm^h`)~fKe|Ww>#i7p@8@EH
z;=pC#+*2%&4g3ziuRrV9<Li+P^k@f)2YLA*oA<uc*Od$MVnKv^boZR_-w+2n`@d`;
zhJSt>Q2bZSKUW?Q&hdB<;U2%|=YpPW0Q@`W1Tc={FWe*i<9R?aAf5|k3;FgC*}!j^
z3);qY#y+xxZaKl2-XAUwjD$a&FDK|?2Yt^k7brG#;s6o;(LH7hQ9g*U&$k1;_ZSfJ
zfqWZ~JqYv226(ObkP+??C&;$}@qjM)D?jAfKz<yE*+I_#yTf0x;djUdj=yZ+L)k$r
z7K}azN9+dwhzmw{j|W}w4>`j5@B!IC$Ojb*I@?1x_{$Dt1JONh4>=pi^ZzIoMA&m*
z&!3w+cepK-{Y5qq-Gw=?lU(8go&7)J2cZqbvF|1h<naIhArJi4_=^w7zt5HfqObY)
zod+lA$p(aP+z!sd2hPd~Bma-zBkZHQ;}5q~J#dzqAOrrT!~0w7U6r<=a+I|UAZA1{
zKzG?ec=cQp^biALz8`Uc<fZ4}gTEyY=!E}o69>BC1wGnCH?bh%0-f&N*+G77a26Zr
z?EiUrAdY>^|I^^#IH;esz!y?Oi0K3QbFu~eehoMaZ}9==gWMbW{za=NTK4dKYuGZ+
zmh$~w@DF1^clalJM>!z6ha4b^1+sxWE|`kqe?A9@a=>q41Kr{uw}W$VL+6Xcg0phL
zcpNw%8|V&y|BN^gj|FG3fwOYLJR3;!zI@Cet7<H;g==Tqf?@qFI{;e%<Fe8Htzhb4
zOAHF|PZATB^0i{@B)PBLGKc0{b#|6jV>{`~`JNtPK-Zd(+#sx7CkW#}gne|+w*lTe
z|LYF_xD9*=E_hb_&w~@>>V*hn?q{`yIR3Hvpp*aiR2L4<<Ajkds1D4tg|7Jb90$^1
zSvqg5rSGe^HP<e(^4^zOJ$NqQ-`aBXbW84>Wo7&wEpUtZgD$t4t4l4he}QA4JzQZW
z69##F$cP)pZ6KBd9RH9Dbk+vs|L3m@oRteiwZMmn18w7b2i!06`R?waJ`mLgIn2Y@
zkgF9UjQ~z~RvVD5$PPwz<^<<w1Lv<1#ckkBP9T=6CJe7EKAz=uNfG$pTW8I8)?35Q
zg*JQaK&z@AZ`r*w!MV)Vv`)9m^#!)}rj?dHUSp|y)>!(^<(55IWD6FIvgQ5yTIqnx
zZIyVaaF60Zm;-Y7^FHOVKc5qZF+g=e<o~+obAfn0h|haYi1We^X#;H&!2fr!fw(Q4
zv4ivEg?adQss|JUqN}@n5a)xuZpA-a^J2gm%)74%8io7VAy!&2%o?}Mw&d|zOWnJ{
zT5p|ZZTn_e=Ey=zA6eu$r|+q@)X92F-k-GOeF;k)TWjgNtGQNL_CS%<UQ=LAH_fq1
zY@ieV-EcwGgJ-P?<M?-D1943t#|eH*8*u#3*9M||aGso?M;;i<6<$Nca{{k(xStjO
zSR5GM&niasw-wy;^FU++(LFN+eB`5GU%*oxTkdJFR$_SDEt4(f_%~VRK(S@+s0eVs
zbD5>@TJCr!?@w9c;mwwOAY;jU8!b%?NZq}f@8f%pEVd2UP~|{kAO4?>{67zWj{{xs
zSNxChz;nd_@qiHTZt>UGlmpI#2MGVfxZbvS48PCu(g8kXKFH4jvG?c90g)Z#;oof>
z=r#rfHjsj!_xaTiZMkBCVn9A0(0i_2KA>-~l=rKersBWEb9_8|M+q@~E&iRd)Lknq
zeRK)$g)P`~PoCW1xF;UIl6#sf>$V{OPv5!J(uWq33yN)V<xuiKUmJSy58(u{JdkGx
z`Tif&10TW$!aUF;{^ywogntb<Ojj>uBG@YycsvL-q3-xV6bE9wAQ$^%__s<gj4(dy
zU0OnCF3_zFbi)f<<@4aaVJJB#!oQn55XV2o*A??S_D%ukDz3%0uxgwoPc#Oxoj9Mm
zw~2UA=XqW}@7E(&S<B;F+(wcooA_*#|M|?pGRy8SwATG|t#r;HD;_z>7T1>8>VcQr
zhQZX5Q7nk@!R~6pE-@e;2O=I2s|l3{y5#?O9ykvkxDl*NW(~H|2?MPo!alm6ix&w0
z$QHm|Hjsq_Mw~#eb-4|Q6P`;iIv*Q|#eueAec|Z+ZO$ZWsn8B`^<g)0AoBkd@xKCF
zT2edNu}|)rYcu(|mFvqb`Cu08u>-|{6YH^uW=lMFy){3z)0!T--d0^#L)^#bv76-m
zX-g3w9RGcDt#$8oYr1~2t!gc{)PqS|xp|SzE16_X1Hw2E!(VwoSJLCY{9ad-2V!yH
zY+N9Qe?tBa_R-z*gFZV)4#-aGV~hA*ECZYNxc_4Vt-@b9A;S4QV}XA^e<q3vZV$49
zb7{p<jL5Tth!5mqL>LDu!Mt?pKr5w2Z<Sq~OCyTqft5oqx4IjOtabMk&;6N`b=LC4
zHfw%nkF`8`vn3wd=>DC2u#L}e@~_q2xYkxLDz~Ov$Q6nWiV@`h6gj|i1l%x9?(o-q
zt>y0ZRyb-1T2arsK%5J9)`)wk2V@Vi7~rpY@0`%@fgMErz<UE{i31DyU2mMws|)tI
zJfK)`t~e0IfLK0=Vn8Pw7!}5X2<M*eiW5E9Kx7LW_<HsF(boUc3oHTm%jRnXXUhfn
z|NP+tY{Rxf;`UsR-7QaS#m9G9^Qk+m`S~Nk>t}AWmPfC%<|l6g?*`k@I?Ix6E3A2U
ziQ9*2fYh;dUKgZJHoys+!ni^HI8kru6YFe2)kIqZ*UZ&}`8<Fa5ZOTPo{I^g4V*0o
zC@%>2c-)V_J_ipd9MRvFjlTTs_@8e+2y=hj|2_VPpXYKxPq@cF&%-~mhX{Y&OGfpx
zs=>sm_&kx~zOauj`FuBgpkXBX&eHLgx?{dA?wDbTM>Yrk|J*@q*7fW@uKn)&sk>HM
z>(yuh2j>y%OROqA!I}=^^TPjlgg=-cUmv{ZvowE3yfSn9JS#>Y>M}DD%LU>BT{WTT
zv(N^Fb7Th*7l`iQAH{v$#R;PKZWm|q|HX@k*~0QGES(qoJNbWv|M|p%Zfrm?;7mOD
z@8g6EspSeL46tT&gxoxl+d>Tg2>ZAl@Va5tAe-C2uhni}WVQQNga4Jp{=Hzo-(x`2
zsl(Rv{89Kot7Wg5Xqnw};rP^qhZk7g%|(`g|49$<>)vLs2UFAtUPImkN1%Sl94xi$
z?Q^Y)g-`WEl>=gVARm9#ggL*DzYg(_u#fH$_TfG5|J`!J9&Dg=%0QbpW3Z(s^y$j~
z;<(3Odz~0^zq4_I81BM9iUqkia86FxwI=X5fbXvX=cTKLTM6}cl>7Z2@x#dfqdcH{
zXah|n2Uub86sy?<&%3Y1S{}Q>n&k6}{m&i%cd&oqF7p3%mbsZ6aqSFv-V(3z(}yel
zE)B?QLSYYARO}aD^n5_QsF;zty$JnqhLvHXfgYed5VHa00&vf1gL(LOstJXAem#KS
z=k&oa2SolKw+DaS0~c(??^`GLwxXGX>4EgKj#wNJAI#^3L2VfF!k(~?K0g;9z&_54
z6UO*Jmb_4f-<QrAVl%0)65!o7qOUE73oaN;jS+G~j|XuZ2<@Ql3jQp<-~8|mmLRta
zN00R$_iqnlKeq6~5li1(4vy6JhZhGLk8~c_gH~EX_$%ML?<?=43%V_&of{+{Y<JsA
zo@lUw$yb0sxT}YlkAEx<cuf#$L(T<+cm5UmzwY@lKsF$o2(NB!ATJIq!v|ZY^tG~y
z18m-uLDoL02h8LC?|Gotxq0DP@XzIh^WcP8;(G$zQ`{GVUrlnXmB9NO$>DRj>fiwd
zW6*Nv4YBpag;wgqp739f9gLYZ!jezj6ynrI+`lcrU9q1_aX-Dk(lUF?gFH@+Ck@cK
zJvl$|P={kJtyngY5bh7O20!mUYJmH(2jv33H*<Wo&6_(K{PF!9{;?Pk!{2#8ULNQa
z10q|9Y#<N+fCmbHYJl!~gxzq#+SC{;nKRgC5gQA~^|uZ9ZjXMSX9KNn2gCy59Ql0y
zy&FCd<$+vIi1WU@*A2WcoJ4<a1U=W8L#)1StTk*LXVv(58}=}7#vrS%9brY-LoJ_4
z$B+)(s(OIfkOJ=({%nHJTJ##NaMtuumVA0U{(mj}4&MLVfe?TEA6t;Vo7q<2b$$ws
zU%ejJc~$Gd?GorfiASyu>OXkD@_qs>KvxFNKWzc^C|n`AzZCvI)>d3WzbW$noDFoZ
z3Ao>f{h_XW0BqwqAhHAbd&C3W_k$X+69<fHf;|6U-#W&MCi8EZ0`B;J$HZRN3>P?`
zIN<s~WD{rM1Px>QT1Ive#)D2Zp>hB^VWbtefp<D)11%%^*r<L#w{^{9th{8H&Bw=A
z*Nvop>u1Y}_tkYHtf763RV}{4Mh(8$X3ywnwW=M60rkX+D=zu56%Fle#j^(43~HUl
zRl{uE_BG`9yPeyM>o=+1Q|>=S+<$rxu{>efn+ow?`g~sFso%#Xu1{Up^7vM_5xw@D
zue`6Xp$SL}&fHdLZTn|gamgTCjjrmmBN6VpN3Y|$V8{bp6UvJLXSAUn@E7(m8;JOy
z@b6*+!at@7&Et2t4qO7C?`13HZ!^&^@gH%4^Nj`03-W!R_ldE6tpFb_97~NJvw?R0
z&IMpp4OVS#1L6XG{Cy$uyiHmWR~0^841XHf=SS8wx}P=ie#M#*HgEbMTe^IhYd6((
zqpWb^VDKGai_wDG@%u%}31iV-Z=GW+s)t(vd1CS4%We6}5!SkIPJp?`dwgE_zjO@j
zcT@M@;(0s0tIX2J@O$-yr1hMrbDk%SNP19GIY50t^1E!r>pk@iz(0HAWb3$QoDJ)D
zi8Z1B=H`ea>|^-54&0q4ATAhkfioImi2pfafMP+n@xPlGFn>Zn+cX*d2j6ewnvR}Y
zRyx$`CIot5gn$0M+xoB@ov0Pe*TBzalAl*&TTu+if`4V@6*hM^zDj(EJ}(zPgNr!!
zV7Ou97{_|if?>84Tx+nInP9vYTd0^n(t9qM{Y5rw*+8qmX1a~N_!m~%>q09hre$_d
zx3*mqta0OLn@<j?L-Sj*Y?!t08t>fCYd!Hk@qOyOmM3?B?KY3^nR^>-BE6g}Ga-ua
zEuJfG_I#oE@0?#6@ySMy0qO@PsRyO`v_4pCGv*Gp!e3n&_&)PuZUde04|snUT_}tL
zQGdWS!CX9u;h%2<Vf>HsfO7$2Lc|Aq;({f!2iwB&_~w+}@Zx^fET2Uaj{ANb`#A23
z|N2^|Jb;#%&jnh>_qC$AgRKY*9B2H!VI1=k;5@3&&mI3LC#(S16^aSi%3AKl)bDH2
zrxsTYw<2^t<@xzV@D=pCggDwAWtL$EuMPb@yMMN&JI0U`MtO{A+d0lsTgF)_{eju^
z<Q6U*YOOmbSlbRhKgO&_82g)ExYJ*&4pd%ud>?AJ^vP!L1&HT0J$HxOjDHQTmxSjf
z?+t1I*+=r;7HdA%VoTDCjE6i}Et;QZ2cvnxF8KEkHNhU{h0aS8it@ki-QXXO|4~lJ
z*+IwyI`&Mq3b2{W?>2EQyc$1^V_#1ks8`(XAr}b$xJ~$Lj{|(JKgZS1)dJqpd&PUj
z|H$Vf>@$2m6COH;c)tv8*G6q1JIH{4S<w)i54W!&2CQ&97zXYY;Li-6`t^HeTifQb
zmfbVcTK6!&v3s)BXGU2GoNvy!fj0Gu%WTx3ORRl2`0pHVZO60L^3ri@eDSC?DfX-0
zfBZ)0go#J43ABIL2CjFTP;N*(dQBMjg?$U!P&=GoSBIq^+hoNB<82A~zLojFjOKwO
zzvnJn$ekO=#Q|}^&<^r)Ku?-Lzy-oM5XZk88^~cz-0y<Fasf7w-ZsIC!F+hHpIQ^Y
zzcOOLrb$6RU=uN6;7|UG|E?jn0UwUyK!kVX|9am!281?o7ETyppUeFr2av6l@b@hs
zR;(ZwG^suX|0OGjTRB?Q>XE%|)Yx9=YiO&7n86G2cO9R+p4~UwXSU?y8#+c)I}EiA
zTMMWg#@VXIN$`b9*2<N6Vy7iueZ-nyxz7@>Jx=~V?s{)RG2pT5yw9szAn_bM0QG;!
z4eA5R22?kAeWyAPeX#kVYi!Z_QY&MYC=2ev+%UK@E1C+i&c%W#_eVD1_@BiFa<O0Y
zqQTY429yWn`w{*z9w_`H{wMsS*EzcYf6ccgZlFhz9%(hrW35Qs3B9EQPEa-EVymba
zVkK~=jnoAZ{?T2y=lg#bI|ySy&iC`*hjBphpdPGO!#kI*9%D1m^`uQJ9w`Qt77nq+
z%SKuW`JnNp0-wFq>}`fRD|4VE(AsXB&1-3HvpmMP-NJnKJ=E>Y<|t1nE@bx=kS7YP
z1%FS!@r<>+_LwDJf6|&?K4~rL_t58c9{Aktw*H9&HmzZyC7#~lys+g7^8e#oi49j;
z=2*4ODjG!Ze2f*(pJKJl3^&K-$^9IWd_Fuw;Qk-Qg9!WReilurQyz%fg6hCvemI7G
zWCOWefW64i!9Mc;gx<%ltbS+ef!#LK+Haj=n{J<C73A2CDZQ+`|0Pz}PENok#0?|d
zySqm*q03zy0nD?+kMzVK7j&`(aBrkWSU9Aw&7($`+@BcVGR7+5`BltxsQy<TC?oc-
zzj}uIvgdsHz3@k4cb%2_3&nuob%D?DwPM@CUb>BDJk+xnR}f!sg8R3;bkdSwFZ^3x
zz1JqzEw;odX+VJv*z)`#OR&&NHG!^{C(#Uu52*(dwrJ&4E9(7AYXkEJwEb3{6=0UM
z)1@;3ex8KSBkW`MR3}Y9xgd5)7mB!`aM$bb%Hb~GkFIzw$l)Kx2E~Ms3wob8hJPEg
zj+%FD-7}qD_*Bo2rPSD)z<=IEIP|u0R*XK>IytHlyV^k(T-Sk7hI^-+Kzz_l*?f3h
z`RqYfQA{izi!H@sz&h})Ah&0>j<Xi{hxpwr`Z9&&c;yJ!3HhD{#DU6{aC!N@u-AMZ
zc&@r?h9&o$>Eot}1!=yX#x~N-<!F8@gND1Tc9Ny{6<c+BrmfxA>Kb3mEBAx{Q^WxB
zz{@AB<&}HD9v#57VCn*C0xul(ywLnCvEj*`^a{uU^z}=~D~>t%w}Sh8H0c`p%9<z6
z*+7^J6azBK1tIo+m+$jFX9H)60nr(<u6hu55#b-@fXEK?KFkI3_ip1qpD$T8($d?f
z1alB@<Mv(StOTsu$o=KxIpZ{mvo4c5YXSNGzlfSlHnLp4nwJw~4@=;3l?$)1Mb-40
zF8zte1KEJ*`aZv~>C<{!Z5r-D-cP_2rR^?WGThQ3Cy))aV_(aL!3~Or2lF;}F}Fp3
zwPs6!CH9uM?<=l*KA=bEGn>-uc%1dx&4pG5pC}kLfZR5~W=|OI^?%Fh2TfPgi|{|?
z|5qLebOGr=VBd7=h&56hczqyU@MJLax&GKywut&8t9TF3UkmQ~_iB!+)0x81_k$P^
z)_^hp?@|-QZ6Kx#I~P<8$m<Vv;sFuv(LELef*P=M+>dg=27I<0f6s0oZymRcw{~i#
z4V%U=69ATQfUL9uVnMs^J>-BCHNXOLL_65W@y~$$LbzKII?S4ekv0eYt$h4IoA|2>
zY$N%=;{fqNIG0WvVoldhveM}TZEXwndc{ynq6Z0kaX`(f48G`RHh$ox<oI%%RyoMB
zchi%LdNTA|(}$VY7WR4_>bB|QYv}V&v}Sr+8FI=p&iSm^)gJP`N5TJLf89(h5C@R<
z-+by&E(S;&)Mu&}v$xH%hK_NzU|oe3Oc~{VUxlWys%avzWu8@(4YfwJ-e%5@tiv`|
zs`ni6!H@?;HGyJ4E)JZH2Po!a3(f;%1JRYUg|p;<7#EE4e}sE<AA8XcZ9e^f@%~~o
zlbXg+<ba9Pu$*rK*Anjf-FHm6EU*LFK<MM~I1ts0as2gKHGbx%30A_-u0ne)l@2hh
zmvw|WAk96E4J^cdlAN{a*f)(@?+U9XX0(bMg8y>ji{eKq^+3hA0hYXDp=ItQpC2Ix
zcyDH9pwGJv(4WO7lG5xsr_p?HxfM?xil)qr0QfJK{y$+DzI_KdU;O`p0Dm-~p!ZKN
zfVq#LC#cu^T;mh3sK0WWm7^gxfop0g^)f%JbnX!5KId5CmI5oq7Uq+;7B3m*zsJh*
zq0AZfw^h=B$qPAukH>%rd+7msEx*s_0Urkccpiww0M`U#c|XFxWx{1v%glGj)Lyn}
zS}!Y`G0;}78)Y-7n^kjVcTcmW)g!Hm9N=+4u^=xF2>WV$v;+<(T}O5y>~$^W_g>dA
z$@$#;ieXmFtieRi%B<$|1lq!Ea!eUEHh27BYrGyFa?2E(MlPMjduhMvaRFawh9jy*
zDB=6lx5N3A-^u@x|4X0u*GHG)t7!G;wac33pfS_)p?=XhgZ2E(f;r=D-M+NX`HAOw
z>{tIsvtPP2_wzJ-k9uGFuHuNehUR`6&=;$yOLT@n=gpUL)n>+pTywhBZ=7h0sz!J}
zt-fuHEnG9erjG87y%E#+Uf(Yg$6l{<_=m4O2k<(wf$s7^EEk;h3}F}isTm?02>XK_
zQ$xQ7S8@J&@<9{*pJn9ob=e6%UpX6G7mUY-nG?w60x*vJzYhOhx^kE$ZyayM`1{5X
zf5nNh7hPaQv$5&P^q9+rTTObBt*jkoOTo4SyIX-BlokxOIq<vc4e$^2nN@2?kk1RP
za@Axj2fMj^tsafI1`JoX&GH=Y{4Siu2xczTtHB0zCP(x52g<B`*;H#Ju4oU*3hIZ2
z4P~}`6TN$Se*xa$4ECD+@Y>F`{XpMWo#%Ok7$beD^+2H&!cUUeldxY-ELw_xs2A0`
zb0Ru3+QNZ3a3^>nvA>FQKok4)vIMWI(X_-BbNgk4IoRiFf^Kafj04@_pNsu*P7vmS
zDF5r8kH2bw2!HO%2_4fe!}o(r*e2n9vIE5faqx1q;rRt{_oAVe;cK}VAU*)T!n%Z*
zoY*?W^G10wza#9yV*vTTigP6kiG!LkES^ihW<TfYc1|JJ46r6JO~3;dq06@IMw8h;
zj~t7JLp)V3Z`d@!bxFm3&H0oqAkV`2yrxsGC(Z}`S@mV<)1bfCT{n+ee)Qj(5%iMK
zo9R7hW@zrXE6{wH<7duGbzG3=;dxK(4zwP8Kk@h$*LQrbml>W6^+J|;?$)cuSo`MD
zHe>81Rt@f}!GF%kfi?&(ThhOmtzJLUbtU}{O8IxH21vjQr(-J(VeI#sz-=J(^K;_g
zeGKTN2XwN7Zt#~4#5n-=&>jBm*g*SqbbGEDV+Ptf{J$DpW|8OS;m_)sERerO902>s
z#R2S~ir?{ut0&_F6R`v8VsIAzDPl=QDd#M1o8;Pm(KPDFeKW0b^LSe@7M}=ffKqx8
z>X(YYt9J9co|v0ucCr<}TD<5AD;|J8#5|7I@$zpj@5w69t2Zl+{=iCREyh@q*j0ef
zts}OSjTmGJ`bFB&(R326R%bcTca{G&>+QNOdY`mk@BKW)nGXH@yOvn?I%-Dpewu$r
z_SRX}bo)vxTR7Qjwym}ndH^fhms)A@XiIII<a1s%sc}|DZmY#Un!rD)`XF8p=IVhw
z|Bv!OCq1Bh{PSx8X#(e*5sBMC6azv{NdCW^+^QLX+2pmg*(p{&gMKYOy+~)mro!Rj
z;zfMcMoh^0e`o{J3B?^-cA&eWA+_$CWy|WuTa$7EoS=-_qJp@Yx{;pCj;Z9zsn&cg
z{E|Gbo<b@8o@Rc}ZF{Go-DtkH)P3LUIDYriYa6LY77)J|EFK5%3v<5D*@L}$@AToD
zw#~8G%!6qrG)-JtjnA*8?kKFBXC+m|R$Mxb9v=F>W;ejwxgNQ`Np-z?eh**eJWqYx
z%$_34TsN8i;hf;#BR<LBk)Yp~xv#;R4>2!#jI*FREAjxJNn>J;IC;w~TT(O5Du{QL
z*nsQ6=ZpV`uz`3CI4Ay59*Eh1$AA$3G@MUo|K?W?vB5w2k=1RSYMKd3TszK|F<-f8
zA{+-lRh^iRz1}M(RKwBhHcfFYS$cAE`!vUOKDl5%*e~PfuOz4IjHT;L*ueViSerWt
zj?oJC`2NC*D|pTCTzZ}~U2!h*ZZm!KV&Z7wXnOnA#DC3Uao)nu>f-x8gUQ@Y8$WYR
zYO)nlN3JGs%_eS5$N$zGqo@1Y1D1G-GacymuI&^59e?S)>iLrEqkg{6^l6R<oiMS7
zf6HCu81?^k5o6ZxU2AiR@k=sG$sNI;bxnvrQ@6j-7WC`GOnN^{QXh2kec3_i|E>*(
znov{^=4yjD7wAC`$kl@M1B8EPU7(vhkk11`4xs$M4Bs!ICR2{C&5p4wxmh?VmP-#P
zllDgp*pwgp!G0s3Eyu?f6KAW?<~@FcUB|5xY%w`~F7=RbuW1=;Z3mf&ar`+~Ev=Tb
zlIgv3(c@=XdiM+~XNz*f<_WIf2KpX(06vf;Zj@msWz*@!pJWz`Ih&-gAlFNeQ6HXX
zlMs8P{gbbE&$0{u{d=|;y{B}_aNF?Io*>sheJg&hb38W%9A7<O;V<7;{HO2h`YyR4
zeOI-$-!{!=5!Y4_%i50=TRUe3GrOkJe}E71vuh3$L%dF8c95SVPFc3B(3*uiu|J2s
zFz+D-NE1A7{PXI8NE7Uezw9B;284eU2lP730m458j%!8{hvCW1SJ6MEcOo6QjdM{=
zo0++q#d*eo7uq!Dt;GMt4I7EuN%Y`y_3FWQCclrWB_jgAC5DT)%_CngTBh1)sx51z
zj=UXBUj3Kb!5xh@OTXUjfSjS8UDFNJR?CK4YB!(D|EcfPt7+Xc!`9S~uo?Wknj1ND
z7tPx;Z=qRh=Yr&f%pte|XL#Fgq`$iboY>1%nO<cr^zWLb@1f;4V*^2rhra*fU4gDg
zt*0}cn(t^<EMO)$%fGpevwW46!@Lfj0S_vn_gI@8YC|vmnUyY>ZHbrQj;a;00qKP6
z?zsV*V~#>OKf*sh|HooLkD6fI|MfZ^17riSdLZfvxF&QyTrd^~B27^FU)-;FD*2tB
zdE0Hw%#d?C_QKh)|7GJjV=;}n&@0DNtHHsT4Jk**FQaBFXAWcGf}yr@0{ZUaQJkUX
zyaPR$G(NbBvsudL?YytK4qgDKmtXst7<gV3W7MN*+A`hB;Ed9M8g3B&^mVWS)dD)7
zCrvWDle3yfmViG!SDn3P{z9=Jb8M9rE+1;C8{m)PYj?;N&<5xYCppI_?3-Rh*O$H{
zUDxsA&S$|{?yS%9X-->bxTW)`AJV>Oij|N<=7W6&|D6SsMp)B{c58tzh%>5wkS(h2
zNMnB$HRa45(k~JAx+3hOdp9wli~oxQL_8p}1IIs)3lj4qP0;;6mjlog-462nU%nsr
z|1bvR>OX9tmRe0U{(||#Y;6V~x_yqx?#qe))y<Qr1L3szeLEa*2^!DPUteI$nH`%&
zUap-;f4*+IbNB3ldA0zZM_PWz9dm6$2|DjlYBimY#}>Rlzi*D`m*m!oR<(SDRf2oz
zJZ278kbjPX+x{}n*r}%z_VMUV$(HoHcK_FT3!lGl;atXAYuO4%N9Rqkqr<s7I-s<G
z1ZOv0yZ8A{{GS-0_f0R}Nvyxw?I?K?jb}eIo41f}w!=TSlS8hWVClBeHn`W1ZQ=Y;
z)_Cg@Ykrg%q5Pr#5B*=&5$Olm6>;xc_CL)<U%>ap`OXLbC=O^wBrgYa(S&6O@fjh-
zfFALWxIl=%@<4=rKK^b4Vf_#OiUXUbU22I*m)T12Et)yhR&g&T@2+Z`0GDT86aA%(
zx~&{esIzw~`78rBXvHQ<C!^Qnd#dBt)Q`0F%-&?dx%CLXEWf8-_xvpEi7zYG4zYnh
zzQ9&DjIt&C+~GqmvetW+!R=PsqRb?lzL4ML9%6y|`N|Q@`e@d|=kBzB0lwukSSL4t
z89iOu1~r*xwRLv4$^BeDPo1ahIbyZ^UvYr1wLFf_^AI!Kx3J&gPWZ$<A;;6XJ^rn&
z;z38qQ|$iHJa`NGfab$A_oK6(iKErb$&O)Gaw5A&&~hAm;h$#%k^e{cC=TS+g6HM|
zc`+cK2Rg<6SpNTz_-_pDK=;jDt<r-_(6^3OSp8K~EV*T(YdjsdO|_2Or`tSgMCnAT
z0Tyz0AbC46`{wbU6E@yDp52Ix-48Q52kH4-{!bo&r`2CS8=Ze7bKN6t3jN--*HJ$y
zmP&8std)N6`o8q;nN~o2C_yg@_HM9yh4?S5gBi>g^dx39yspPDRo_v|2e}!{ea1J$
zUwvKg?V$To`=|C%(>;E*B_G8O9?ZCA>>9G_IcmQ2)9^#_24+P(ZfH*Q#k;NU@MfD=
zz`vbZvkkoE_u4yo#s*?JK)6R&oC}7p)7`{?E;+z?0I?#E14djx`9IPCI^Xm1KrH`9
z+F-}@OHEfJn*I`M0oVURJ7|R$ETpH^j=#Dt2gi1PsQd_5C@<q&6TRCObm4jEVl6ug
zY+S!zTOFExvG{k%cy_8a;9KlbkzN<gYpJ%QPuF^2u2naVL;D|M>$WbU#-^6n_wu{<
z{IB@Ga}qs?K~~G$K;a}b=KI0l<3MN!oV&{2RA#9|Yq0^H+2<TDe9mWhbe>cBTD~u?
zCjS=~ct-E{T53P%HsJm%cdoI@8^{^_{W=rowE%Ix<<&>&3EoSO@S$9vsO7c$ZTY@y
zt!NCIC7M#SZ{`g4G5?QvK!ktf`|*1i2fQ{U_vbWWUTbzNHy_|OK<qz@4Me@c4>KRq
zG2>Een{k<y%^YNv=xlZHyN%=l<%2BvFXmiDD}7JZVrjU0Mlqdu+y<AgC>d%CsQnh8
z4<&Cz1BWxrUpolS)Z3=@{)H{b&cOfKsROt2eQ9BAje4}I^|SCipR?Eew9Zg^3<zSd
z&+_p1C2uXTf`Pxbd4qac^GST4yzV$_7Z3B7$-~ryN4V~&4X}HHGd<$^n&Sy^PrUYo
z_xhXhU*GX?FZJG|@O||E1bMyg-W$mo^nuh5qz~-(mrgJjaDw?z?(l{L^C89aXRt4$
zzbzff%+G%#{`ov07X!rqguUbcVRAq$55ze@9uE-y8)sf>WyJC&<LLR3^Q+N&gukw(
zWAJ78e)bSr2s3nw-{NqJ&B<E}ttLTz3|IEJ08eY%GZig~{69(iRjBo)pQs<FGZO06
zY7PrK5O)vG)Geour<P~dR(UqX{Cv>E;d|-txDAjCO3QoMy5ulhwWG=!jy43i>kJ0A
z5afekA5%`>k?$+-JNKi%L$5dW#?!=e`ukB_;A;uy|C(R9*B0Em(dwRr8!!{*vmp4r
zp9y*C7&9Q)40Aw>H`iO?gb|h!_Hg6eUIFYN^8d5u0r`DA2k3olMyL}9IG<V|<blcq
zNnUHOpyK}-O+fWPH(c;CJ_~b!@XuY-i39ZBHS?nwunGKA=)2>_T+EKNpms}3mnSX@
z|CHwGe6Di3>o2XGb#7yZumUYl=LuF)I~LCx1~+F<f_9|H2GpaMb}J1>yEFXU6x>ZV
zz_}~0@8DO?<3pWae^=Y)QOs?Rv)cV@tnqGQg>Vmdv}g~LX0W}tBOU)q^gS?E-Pgi=
zub=gLjaV*QP&^3d`~1v@W&q^h@_Ah^F$ctzn+ej_q#ZqTi!He!VQW?6$FUDzNBHZm
zbLN2^fbY3-KrH^B6aV}e5W~NFO}GdAV=*9yJ$BFz{`2P0Ya<q9rZfKq*DpkOUzMRB
zr<#i1x@&Xbp_yCt-(?HV&vpLdjv~(J(c`60pQbLD-S=noOYjx+6vd4|tASUM-#sRH
z-$rqtIvUKqw(~Ppb*}OH_e%%3ftl^?(uT_ezZd@#2VnlbMZC|sAMu=AE<MlZHHqsf
z&2=hwdpu{pN4Vn0;&P2X+jW;UpJx6`zW$2v2kRLA>Jj-2fcWcyQs$Q~w=}-*yG8PC
zAjCY{Ki(t$;sW_GK<~TZf!)@EaXlzr1Mph4f875gE|`k}^7$wi=rz|mo%I3x6uDl#
z-tuyKrwtRBV?on}4`@DAy)gN%>n+k|yhlgg*6#(qB*@dVt(E*=R>;}0@tWtMU!SB-
zxK5fPJzq3m@7=mjtInfmtKOaJbk+0H^@#tf-P|6;17u(HU$Z;0A7YF8d_nHV-|_h*
ze6MDIgEifU@2jVC>dfp;;>F{Ze)E*i_AB>C^IeWFcsDWcm16!o_2$#y{(vpJWmACv
zY4X2j!H6H8kKiTiZ<=i*hFoZKdi}z8%(c;vXzK=l-!Ugn5X%QSJs=(j;`}dq-9sGc
zVgnKXi{C>#i24Gq4=5kx>cTJwMA%1n@Rz=?{J(G_J<=+A-0U|lK({Z_>~#maJ(|7y
zzV@GLwt~5L?L}2RmlFQOfARY4UhwC8JN8fyqZQR+1C`6*|2KdgdZ27X8j$-wJlpa2
z^VFQHR32A7uk$pIUhleof;u~MJ3sekYJapJUA|+%Yrjyl1OLU_R@sIV?C8?Wj{IC4
z9}JV^`qsBzw6?cjGR^qvtVa`H*Sx3Bdo;cHfUSS(s4Z+;Z>9M3>}g}^6Wx!l$Gji0
z!}AN;g7Q%F?qZw6tak?*coo<e(Yq{057v2d?Hp|2YQY|wxvLh8@b44@;`l2DM7T%y
z5dVB0*ad&(fP6hDjz5^6(F7I$&&~tO=M6`{rC&Z}uoW`Twsbk??3iQSL`_fv572&N
z-+7`LdTO(hmKj#R8{b!bti7o6VRE^AT)Js}>uB^LW;>_}rNO7*h&rF?XEfjruG2`n
zRXpM6>F#<ielJZ<y*TFt@PW*3IL86BT>3kKzJrYrBivS`0jUnq-X_(1>g5ybg?0MP
z=W<tu*GX}I<$1pDXMLVNZgZ!P#m<@A9ogUJO&V!yj&22eW&*t*c%$bT%?W5fK;1oU
zHvShEaIUy7v+U?!%p++wz5&c@`5EOULu?*r*0e`q33agQ0`Y(V|5!aJtb3{jd%!=(
z3A)q)-PZ!*ff4@;;{VxgprT|1JCvBqo;1itUa0=>SX;JwB<Fv7TRmrf3JTG*?_6Z5
z!z*oi%@k|^&L+PVcVos*d0Vx;@K+CZ9=@@TS;2~OdiARF$=}MIt^wlzL7t~~BfAMN
zaetkwP|Qs*e~~%?AC$JggIRz>*cfrg&)4eArE<j)Y)1NTm@jm0N7%N!`ml3+;h%Zy
zlx5#~!DGDQzt8zo+a<^mbz7F$hylOgO!`18T)>&|1K1BSL)u`&$zaE)`b14=MG1Dl
zl`WYC?*muxUx}_!G`hd7NB`8$;pxnK)MrQAvTAf}G~k7Ny+`~b?Bo6~-1B09`+UUz
zqkA0xd>$zO54oWFf}Qb?@<8`FK(ou5^C;lIrJ4C_?|snwT)22N{=sa|dgi8x@$%Em
zz2NQh7U(qKuDOd0yD*ovPH=uFp0~Drn$3kHH*$X7`!MJ{&Fsowvt=H6M0y}~x_UUu
z_w3fx&(rLk_hr!8bp9%Ne>3M!h#9vr%exa@@Lp<zdpGbo+Ur4b&@Qy1<GfccAa5vN
ztBy;&{seeG>%K4iTi<>W8+hK73zG17*=?41)QVQ&z3RPl+1)*lzjH@W<8k(5ZacF*
zr{ROLMV<M6=qf8&USf5`i5m32m9?Bh)LeshPcZj21MO1rQs)&_7q})6%m1BnKpg+L
z4aD(x9*EW#;U3+EdHix7*fj=-1DuKf@IjCNu^ga!P~0!%0O{>u#y*`I_G?JfS>G|i
z=5SVeY274CY{93m)|uKF&fTM0&251A?D%uGW@(D=f#3W5jx>T}$_+YmMXg5--^@Af
znr&#gs{3R&<W=`y?M%X_U6b<~jNd!`y2NAGS{D41iZATcOYb1xaAkJDJ8q&6a01^~
z{ih53rO(K}ozH=F2Hq#^+uwf0S``cM>*RgR3EaI5J~@>-g4&hbl_744d+7YHbX~6x
zsTY-p(vM$h^*5E<hV3Obi@dJbuN_3?oK;F}o9btZS2GJ<K|WY2E~wnEdvwKYpc4l?
zZyunUfI2L~U-vHfgLT9MLk<vW!Z{mo9vJ$5qy<F$kGu9GsP7x~;~TD>%z67>%<T`h
z<elufh2ynesaOur6Q;ys#b>YIm7{OR&(+@{*6VwHcXr4Pf-`rTr9;ah);ArZc0WMg
zm;VcU{MY;La4xUYl%s_|x?XB;C4Cukgfv;cFW~!d{v+7kQQ`r(wV?Iu47bkkw!if<
zeD5Xae4F2S!*pHw&Rdpxd<Q&&^PjuPQ8#iPkbkf0$`rXkaiLj%r|JP>z4!Ovplf%m
zvqEM^bhcv-^Bg+cq8*bB<bY*s$D)Ui_uUn>@ImQ7zIPhDbJ)uUcrV`%{Qq+J0C+}M
zoCn0?zdrv^JmB0tfi5+mY#@&R_OZG8T(zENzG~SAHlNw)%zf-XX1*<ba1DNkf8SIH
zj^tu-FfdGWwrVzcFLfZ;iRawjbv^Awm)3{>`#e59+5<~$-spkMgHCd8<$0Xnbu(w`
zqMA&3S~x2{qz@72ZzImLha=5Za}aG9zMs5}nJ@7^Y(%^-New4|7uHw4`<88d=QZ2(
z&g*_{<eq-~7HnxH|7Q3i|7PbB#CCB6o&6MNP%mFT-*mFWDpnTI>xA2LUdW$MiqHFV
zEU|$~=8!gAKf~wZE6D|pyZk=i_e1>SnotgV*+3lsDE3G9IR1IPVb2LY#eh8j?>rMC
z4yYIq%LAbewC!LQ0x_VKxgX8ElyS~_!6^E1n`fg1jkcxfN_u4UJ&)n@M~Iob&|s9i
zRj;uFGfgb;GnT3k#plEi6eD=8c#$})n6biYH%((_-!SX@%O8TT{yaPmzji&&V?SrF
z(Ca*>!|f9E<kAP>nZ*0d&I&7DKiyJ~ZnkARYpiY?=XB-!Pj0s)yiGa2<L%RS)w^$F
z18+L^9dEzt@jr3@4a5=pJUX+lpG%#P@EYM+&lxS~f;tCWfBbrzH*boq!>6-wyZn8#
zDeRzR>R?OLlNL9sVfHB#VSg6<&(r{sMhyOO9uVOkzq=+(>^LX>G5=Q{2sxn7hVWXx
z-`W2oJ2(>qvef08_tKn|^xG7CAc;TMUR%ig#{g^IG6P@R=su~llqve&&f%rkYX=5b
z)7|wpcl}iSl)NtARi6j0l{vPWnT|=!WM09(uFGxYuYO?_OZYud2SoW>eR#!R@5`XG
zO4AKy@~FY2@rmO<dX=Sbt>)jc+14FR*@ip$d$pqj%_l)mw~ai%`E9WG81SasK*yUe
z@#nS^L)M`YQd{U;KYp*ij(DQih_AyH-gwUSz`Bz=t!mW39Pat}H-fijdt3L<;>^!j
zTh30YWz>4PJ;R~T=jVWU4Cs*y#<ACH#ei<~z?}cbYk?^LNB6i5MBI<hdeVZ_+Y8Qr
z)2qQ2<hz-Nnr+^+kycJk+qPq@W$va16SnYm`K{xxoQ#i3bN5}B_a>RQY4@)MXY!U?
z)1G1*c+pRIb{2CZWut9n(=<z7HO~Dos@>d=rOS8>1|xi0y;;?R%JGWx`Yd^b8u3_)
zzf=1+uD6-B^Vs2sULc!!^)b8p-FE}ri36M8eS@EO*orpryr#SO^U{RE-hb0e?0qBW
zC$;nA<@;PSs(tV_{(DE;`f<WPI4=_6uX{Ure<^36>fpvcx5jRf^3oyR<CYfK$p&Nx
zu`4595MF^TfNjJB&K3tk8;~vJ*8-h1p$PZr9`b*W0lZco@VL-}4T$&YT&sLv8jUoW
z2J+=X^xtYUyrRjRyWddG?;iZ+@1Fay19GYF$)R3X&F-}lb)0-sx~-mx(0a=ZYiSr}
zi5sX7nd{2lhK{!tJsDo0pQBkSpQoa~CT&hLnbK@EyA#ahZ*orNXYmf!Tk~VgV4)BB
zy!O+a;bCW&YxeZ-Qp9xOo_X_muLGp>C!VDT{Jds9)CZ*RhfO%w(Cn{1W7l8eCG4b_
z|8{yExo4HA)(7{t5c?T@F18i*)W)1$S(jvA;_N|wuB?rkAgg>4*+6~_0QboMBR-h3
z0bwsYh-{#{7$EG=l>_`4GhOSz2>&Sl%Laniu^a#=$Q-G(B<CDj4>J3vzRrmnX6Fan
zTKWR*>J84kj2h>1t3Ql?3un$rc#al+%uIXlh0oP<Nj$mDW;bzW=N{_3aE7Dx$}#+0
zYI*EIbwc(=^28krh$ESxN6##!cCmO3hz&HV4pUFwe>T30w&T0E?xQByPc1+!mqzD1
zJNf<vw_a`aPsyhrCf}d7EcWC2eboEc&m-o${-@p_@uKF=jaGRxKMPyUJe+2Zg<Vm^
z_Xz(s`8)Y)KJi_9CP!TIbK7{dh;uCy{2Zaqk^6pGzNgEcS^0X*|069py65oEj{!a6
zj}3_Pg>_&j-;cPUYXM;`7~_FaKR~hH>%k}=_+5OEi?}{RGwtYrjk~C=iSOE*SJO0#
zGdlExI2W|0VT5ZxKKH2j3pPRTRlPT6uB4OTmx|5n55W6$K12OHxIlIb+W&0@L2bxv
zU-m{g26dy)Z_umrxjN#8<}fsG(?kq#-&72su5)hS{aUc&`;vRtVH3>X64RymG(2-J
zu^fGmOWeQxozwXEv7pDReDAgWJ={<5a}T-CH$HkZI^VUHe&Sl2&Y6-WO(mQ+kKqsh
ztpNL}XnQlM@ipUIGHsB}1Mh{@gw5UIFU-%v1J8-S;y{%9BU^AD*fj=pv4J@L$^&s5
zP}~o5z!?q@s{>BfTKS|Qmf{R(Ra2?gW~$><6J)kC_qAi9&w!OLoM_3%n61PAwFgVJ
zmvX=RKlMSg@RwaklaZbq@`To_IXAJLx|^JkKFm)1o%9pX5(BNDUOjnUyVkvTbNa!+
zch#p?Jx-oh?>@JWf%%-|Vd94Dfq3qH9p`e-TK4T1@crkpiASyOA#4XN-}{03*^2v$
zGf&*)HmW)Q^6S^ws(lUC$jngbM9wRYre_WA3C^i%U;EOUF}{;zP19IQa|UHLxK}M3
zW{Z}Nw8Am)qR987dprlk{h!wn2Z(Y(rx*~${|NuM4fMbRyWp=la6UbuZu~!a_gX7r
zcC%vo0IRzZomc1ReO6O?UXiuzoMRQ#!t<$%9se-byA6Pyb3pi5<p0ju)x#&Qqz}>`
z1pCZ(X7g{D?lan%t+Ru=P(1(f0DsrrR0F`rd>@DGK-}yV*#n<(S6)cowGrQEHv_NL
z&r8DJbxHSgotJt(@!CUHbX^PIb7yEb<dUb^+vB_ePWcEL(i1mWWlfp;auu_?Y0fY$
zLcc99=1c>#PCCD)IhMvv?2nt)&j$4Vfu*)hW-r1>&kNdF+bRCb1|s~Ud)x*(@xO=@
z<mLZ3{*nLdehxi2Hy@ZE1LX7Ke=!c&t^b2}`|Yzhr=jPZ($l5y?sIw4bII51Zz!_)
z%!L)t=KSUpiv3}{&&6(HI5=u&LgFEwji|aFo|uwua~-+<2>V#HljZ&fn_J46;DcyF
zXhS|@Df}Imtsa*npAT@SP9wg14DdXFet(#`ZsLN^a1hs1Z$8WQl=pg6&v`A6UFhy{
zgFn~w>_MB+vY4|VI@^6M&+n=>?L1yU4`(Ci7TZSlu_e?ewdv8earZd1JvctUi`C8e
zJlcK*eqYJ+T{AaR$1;Q50`{&8p$B%dfe82L{@;baVnDnGh;acw8^n9J0mr`w9@uUC
z4|9NYe8*h#Jj{9cj3(NvG#uh|!z~M~f?lU`#QHmk>-eqLY}C`9yR{Qbufa066P4Of
ze>TnYvD15qDZJKfSDGGx?@=Z`IQJL+#N-VR!Rb}^!ONYe;s1&QKAY#UAm|GuZ)4Wu
z`QZG9^!jB-Znmo1Z^Zwfb?zW7SMlF}hT@6(NzDG%?ax^C4m4-<gF$^S<atrOZJo|C
z!0ncTeIfQxI*Ym0d1&6utLWJh+B;D+5q`9nei3uZZTn{v|2fO3+#g+W8;Ed^?)muh
zzH|K7d$5hi|L$TygnxH+fH03ZpziS)kjDYK^1l#&;Urz384hXs(#Txf$0jtJ)3ATB
z74ZCmC7k_Qa}zVx=zf9kf|+m^cT>-tK6#640m}biy_embHy6^Yk#3+~ZIb6{U<=X_
z&<}l93l33t{2D92w#IXMfW6{6Ixu`rvsupN@#EwXYK&9j^57ckg)OJ=C+?r(`=9bZ
z(~Qli4rqbzH=-qKmZOD!Z$ZICD;~?P#wwoC%dVL$Gp^;t>;`tUtVvF^4eTRW49C+h
zlEq7h+hVw1A$t&7_M$y<rftKGvuzIAP#GG4bN>kcDEIrFS}?*sy64pbas0bzL5lTf
z#XsbMasQX^cfr4F49N8aJLUfX|6tbvdL4croTXO$Mkkk!ORu(id!<!xskF6CoZqIu
zE3Huc-m%x27{^{VfOf-spXG5IYUKP5eU|&^^*@Y`Lv4^cLO+koxj)#qJh459A>`*K
z?coUPG{=zGAIHDt5oveg1P}P7`7P=9y7W5uocn2ZxJge^UJ*Z$PJF1wpCPf9KKFWZ
zeIc_Bl?#VimR&=|U{rx07qBCG9o(+~?B_BUkW!C`IyJSw#CKQd*&})miFARS|98Tl
z&m-KUdprho<Ns;leXbag^Z%}OfPDXV#~*F)7`i=u8`t&0PBGs5w3^YyUsrWhaON4G
znV~bHlhEAQldp3Xnz>QkMhuU3WQtoW&uT7bb|ZcBt4eH2-5k!}qv0K;=XXyki1qpz
z)Z%V8-2J>pJpRj%mCMzi0n^|N#{D5b)MvpQm(OzXb;n;C5^-PJlK%Z^^_rPIPO_Uz
z&x&dQU+pu|`Lnj$=xH-oSjKaYis19=d#k5kfsZ#}w`;E}Wp<gJew_0unK;DSmG{G|
zNBm_E5%#*DFaG&95a)k-9oj&T=SAarpobjbT(BGecV8C=P`w`NyME4%IPcH5AV1Xa
zT5RRuzl<EPzJr-Qc%thvim|G%+!pXpVM+|}bJX<HGLO)&d!UWEVB$SKp1N%<UsJ5O
zIrzTN2K>*dFC(9K|CT=s>tLqG?|Kd9(g>8}b;<YB;(+So`kx~{U`uYh{Pz^63ax(s
za_ckjXY7JuR~y%w4eafs&#74jokwjwIM>p*Fz3MTrrN7#+gy6KOTcl}kUrLezc&*v
z)cc9B@8tjF0q278IB*vHJ8J;g2eIe8wBS$&aQwUD0bOzc+&@nT=pKLKT=)zVpRba>
zEB?;ex)y4B#c9>^bC*o8vAr+mtnP5QPysoyjG8*A&l|NLRa$DOt?Bn4T-bu*1D~h%
z)bX0!u)iMMiTQ9namT=3nA_B!QB5D#fFAc9>%jk`I3P|aTZr(Ny*S_FbJc)~ORhh_
zFT97$+)$bwfa^MD+ccgNIj58zNBh+0nCCX^buO<rY?))r>n2*sAnlt3(^2#Q;@3Iw
z&vfE}u^5o&|Bkm~p3epI@<6`-$6`Rf9^6F>IGg`V3yQ@6KPM)hN3IWMDw(Gub_V)R
zP}}SC>>g(K+2N=;5$$hD^L|xpku^SlAHRPv(%d|GAUJDDef}(1N_*1<CaK$M{rp7Y
z{%hDZyMpIsF<1HUR$@VD1HxbSLp*W5_p1C}*ymqSP6&8@fPWA(e1@OD&ub8$FGa`D
z918Qhn(@kBtsXZ$PMsx3i_YH8J`#L>9{T2T?Ukj@({o5V;eH-A;PC+e?`#917T8S=
zh{u34uk-LfD-VR<#b<(|xu7Tq#PQFI0i9<8WDA4f=bEi+2KV6nl=o$*%bK~w+4Np|
zU3NdZK5<jO!}Zt9v?6S~GQ%v!>yLY#73@ro+W>Z;xlD3HYHuxf;yd^!k6>eW)7L%1
z49S5F=m80IU1~q!AM!ire=+QXI<PbLKG%!(qh78!K;tuqgE<AwhzkFEm@_(r=18t;
zy%sHV8*}8udubc4Z*Xp<?cf|Mr2fkach0_QZ<P1{;<!hzdx!zu;-B9WipPPN|DO|o
z<^3oY<appY@K-K~dV%@)OACtmzw7@;srkTO=O}%~O8PB*cj>#Xm%^VFOQi?+IUas*
zY5ICom=RpPjkvDfs?JC&2l(!6aMzh@^n1UQj}J73IpG%0h&K_ZnXQd-|Ksq&LvT*c
zV>Z8h+~=|4ejoXG{2t7Bs^)*#b4JtCx7*x?d0uB|Czo<r^^V0>xtX&`=#Dx&;Ac;;
z1wX68e}m=~rSVnrjGszs{R(EcwF9lk=TYYMg~b6g_<fEK@cN7%6mq|a3*_M+;U3+4
z<N)2^-$@IK$AL~9K>0tkgSZaR1%G;iC&>9aL#tT}X0KeslQv83<h^+Kyy`$dyNw>a
zgxw5v>_EQ!zy8xIme2LQTE1UJy%oR21!M!{0PLXUJ~YFV*YFv!`AC{M&K3OZZ9(pL
zexUvy-$y^D<<afz+rKv#_Z{=lzvbhu_j}F{^1kZ;n*SqqBp%mZ4(X5hzt5&M__@RE
z)|u3D;m%0q1D!$Fxns_-Y9G<M<T!Rkj<k)OTUoY-GyU+~ZgW6{zc^nQ3*z{9ivQ{h
zN3lP;$8CVK0n!45f0y|{#s27ud_R`|b8{i8{lGt(56$VoZU-^^V=*Aof;;tu<?nEG
zKYQc&V*~VYq~`_CJGqt`kQ$yGpt;R@=3!HN(NUNOOx(2||5MGyMc+<ybiuRqum#0{
zC#mUA(i38)KDC!v@d&s-2Pc60HPL%-ewsNC@N{1P$WBWfzY=|yGZ?P@1suPH{1WIp
zPr1e~zOQF?h$qPI{0t}Blm5-#i$rTk9)r)2(=?l&-9^6%T{FuWwhZ&X&IvT1z<D&E
zePI8X_FX5g8;=e^4-mfJV+>F(h~cjo5ZQv)gq>nQj0fi10JsbLGyWf|1M+LZcnpZy
zf$xoo;h&og%8&n1E(qg5WCPJmh+@9?^`-0LKe>yzAM|yx1Ml~u;b1F1)2Uq!N0-@#
zd&u4Dt-;l01KNWX?MqiaXnAleH9yZ<ICVR_HX7U}6!$fI8=T2t{*u=XPqJs@_GFMl
zysqHP=4o*}{M<Dj^gZwKyx_KyvpMlhY{`3(^zxHO(XDo)W$p#%-IZ2U%}fu^4AIQ;
z;!Op%>?(RsnoC97(YcgXp3Pm8<e5!XS9p(8&ni4C_M!e0$GrRaALat#o{zoa0N6+V
zA83N)65$?Qk^lF=1LJ$7BmeKD1G^2xctCeKAnXbFOeDB_FHUtCdEb3WeSYaU{9dK?
z1-;%){<~B!cLO_<%CBCH7RwoH_`2qBa?eU|E&wm^ngC7+rpo*3*=JsToId^QKBw*4
z4LN`54Qp-Ho#Y#Asfp(<OXF1!C#dhAbA4a0#S6T*ALbeH2%XDrQEhn?4snlWiqQR3
zyWZc9rnv^6XO0+sTYE#bSLO^4m>2A8o_huTPo90urRNdo8I(P8K>2@+2S)xMae*`W
zKg3^HNBBqgFb_mM;m-4+p$*8-BO8e4fYAS=J<`(tejEIwGa=p+knX2hdSa;8;mq+g
z%LeH2YtBygpy#3c+>dgF&+XF#;LkYr^k!XqArI@!yllX^plrY|_3Q3}>%#$G0AFmP
zjdPir)e(npe&qzVK^%EW`GfeO-Y$M0oZWiXdwc5bdS94W;d+zmN@~Z{ZR^?Hwa$ub
zr;s}~5({>Mzjy#MiRwXdj;JI#i&%xvEAJm=PF*wU#4q19O%Bl6w#?o+?5P}O3suJ}
z21J~{yL$}($QC^IlMA}wANhZDk8^-7@jsRWBJ6wcf9HVGfrP(&J>r3S&2^?9C?3F-
z=l{Mdf;zzQXHHu&KjQnrGp>T%?|t2{hWA*Y-z)rDIm3H@@b45gSTIM)o)q7;$1EQ_
zpix`^TL|{8-Gz?MoUqQ`gK-i+_Om&h%}v}z{<#P4kKb!An{s-J-jC+FWdpJi=LqWS
zd7inKx)Sd2SkQBjuDI?vbHM69Irii*Y}0F+``{~k$yMkZ&737$nV9K2q%-X5&1es$
z_Q%UEIM1B8wTK-k@PB&39s|0=-ak8&^CSGl2{N(^@_#2D7~-xu@%7Y%xqUHV4miXA
zA|4p}|9Rk_0{>3@Pc{%~0HGapdbXhKAe;$^<FB57Ju}kHN1KW9*a5sh;C{^IM4TQQ
z&|ajd*W(&47<zv8Ia)9g4-aRp<fHQAM%}T21o$*R9_&n1d}w>~1;<}@(EI{3{|Dgg
z2h;d8oROd5Iv_fq{64MTF0Y#uUo;owwIy1CG$YyOGu$=Xi`JlCkJkXqA?v({p3RyC
z+mVxg%^6qrP|x7(-t1xQGh-fs|8DIhZMk_GGwP%K`91#JVd3vKaJD$m*#;WHe%>^C
z<U0GA&jEQ~F725!gH6%}@?wDUK)?ZF`9GfnMmYd3sAo-OdA?+j1Nbv>4jAF?clo|-
zLig~BalnZGX|G=C>><|cC;tv_MhlV-<Xjp*QVq!OxQY5o=j&a!Rj&u$rCjW1>R$qT
z*KK73=zyLF?(y@KzC-0<VltQ8L>LeB+%3g__h;FRFn^kPK6=64-&H+<79`v|-g!0r
zK7O{irgI9_mhcMU&%Z^y(`!KeyJe^F7U|l4wgJ7bwq=w*W2~%TfQ=Y^A<t$<|Kki`
zO^WBzF!$LA=dYn=TfuW?a?hhw9nez@h~)sy2rpwsQ2S8p^RU-*AJ)@PT*!IYa?Xz?
z^YO<P0_>yv+5KP7l9<iUE2nl$4+`RbF8}A{0Ox~e!CyL%Y(O(U&D*A1qM2uIutPUP
zFDQAOSiqSN*@5?H)vrMZkk17+Kph9>$v2*Yr^Efc_oAN7eU88TFt(r>oWxOPcBJcg
zZU}cNG25l{dQE(PuzQ6+2j(sJVOvjutMHemOuUcI@9VYOlVVad%ddC<$MCq|deWXC
zFOdtRSxD#CKKkPM?6P6Ubvr%3?7l+Z>EC!G`wKbGHJ9g6={$e*tU336`F~H?>+?_x
zSWn!qm+z16&vQQpv-hIEHG_|MfZ~95-0N9t^}=1bKsi6||Ge(Z{{jxMhVNSj#+5un
zWGVfq2JMu__fy1$O5P9o_0O&3vWq?MNBDampxYb}iveN$_g+xM|2e~zA_ummhFc52
zlc~jhnAe3P?P5pILGi1#_$BA<$gN&$sc%C(aBRamJko7F4umnl<G^#|dY!-U+@RQ?
z8i6@Joz>-X+YzpA2l)E~%#l1rEO*~me>dQPY3CT&gkptb9?pQNUm)EWEy4GBY8F8p
zkSl$#%367@Y1`G~tZMae_RFhxHP7?Co-rZ)U$dQh9@WARiGLgT>pA5sYKF59jJ;|6
zc|G^0n!TqL#Ddn5oEIh+jO5ujIzyT}Czyx5Y$5LdZVO;tI!Dh+9KufRVYa4`XXWrb
zG4BBr`<uDSv5!RfTzT&a67PRo{Jpk=(`Py7mE2iqMG0zT_>#}|Gjreclyp1hcetbn
z>-)XGgCDx?=dl{!_p>z01)=W>b9O2v4`%4q^ZDufY~?-tS>k~Bo%id=A<82<i_`kf
zE6ny1E12m~Z{PC^+Mo8f1iX(JA^wjIcpXSC@VNtjCZpyEw*~(`=8>AI3)4HK@n|;<
z{9b3$b>>^UB{hdk{hwu5_`*daZ5ck?F}8PC{~yC%Tjc=xdR{DO=Y1)duWub?%U2Hz
zW&$-gJaZ7wu$yQjF8#Spzx>yh#txhhbjSZgTZrQ?E>MO2R5y&VLj1p)@0msH(6eN6
zeE{WuX+m7x?hx<90p$BJ|Bu%Jq5sRL#pkoznA68Ebf(w!e{!gJw$9dTKSJUdJptls
z(5vN{Ny_DLeD`gi)m8kL9e_U=2R?t?S{}j|cdg^x;3iwJXEQc)9NzG#<FDS0>Uy2k
zPricQcLKg4?0t?){4&&h`F?$_co5hCwx#m{@^^BR*Q(MfnEBD}0P(=|4*0#a9-Tes
z9?df7T%z;<>Hiy#7Fq!_A9@aD?s?SgF3aVB9<%^GkG6qYaV2Mf=Ly@84`{w%@v`AO
zdw#ejuOG+U5P8KpK^Xt_z4<W!%v}or?;2ifm*zV7N*Q)An;23s3L8309q4f(%Kgzj
zZUb@r^J+omf8nnlukTvgRe+B$3&iY%IF!$6NRL+!fU|bq>rw3m_wrmU-lll(`CtCY
zrM#`rqBy|&#1XWD=ivhPaef2e4{H0TLmPO~dw8zxKeiw2h~=saTmzQ=r|*BBz7V~h
z(7tp=#Ls@gN1D6_fcrm8Z}CLdGS`CpK79Tr`a#Su277~A{cLK6vkpn=*vz`=c>$~2
z=lZj0+sXG`@;{$tg@5S#ZN!4b%m!&j%%3sCU3H(%3Pl>A-Z#T1>#pE=g~a{bIT7g!
zJ;eaw5BAy{RmT39a_WfcI-Yj`?%JVSr>_ft`8>X#yTTX{%>?D*e;j+g?&10JJ`)HB
z^m#4(KYb8Q^p-;Ue4O1u=V`%@e3u@6mO#H7Q$633&x?1HpM`r4XJWf>5%!LcY#{cU
z&k|2bKVmlHFm`}esJ(n`Z@&!wPrLsIbtHWNpCy0?gn7X=V!lVaTr?A^7$CdydO>|h
z%^jgvd0u*i*?!IjCmx_~If+iCeX`85ZMb6tc9*tA9dm7&Y=eEIivN0+%wl}gpFxVx
zcZa{n0r2nO((`BPuASr071Q$_o58<H_=mplS|IOpnxOlAs0p1X{#DcnD~Jzscy5uN
zC+yFViL`(?_IjO%e@+AHHU@OA|D69R7vTT?+^ffL^cb1hItQP@|H=R2{{9?9@hfR^
zFYx<@Yq#Lr34Al~`zYpzc%ObC7QdO{pf-?>D<4iBRXxei;u4?JZnoge##65G=WHN{
zeW3lv&vwWLeAbKH<2nGo?|e_Z<Vk7Q^c(17_#XI^8?5QzD)vzgwz7#=Sk;DkwmdP<
zDpyRfg)1gnJv-_g`zZG3#egjDHTzWs&znDb5YIQ@91}4^J#fY60?v(8l<|Ce&d$is
z>$z0_CnI|R|C|<-k3T-0%L9@Bb1&z)#~U_{wbT}#c{GFBbMgK-{_z+Pp9ur=oc~Ao
zEAB_JAj$!;{O_8e<1f93-y3y*dOy0TX7qWcf?|N`{=nbKx9;=zdJfLK_A+rC+`!iN
zZb_e!?}NWEZ+P~&m2XFbdows^-}3x%aJiK@z|7b~_^WD0Y)H93IK!j)ZP~%&{_}(R
zF5&-pkRv$X9n_ip9hx_ku1tT~`3G@8H9-?GO8T$kud`=7D`f5n_RxWE$An%yo0{iy
zGvA@-4K4+vtZ<L6$p4A=jeL)uJFI>4iz=_MX3noB?pVT{AkQISZa_0IdNxk$E}jpt
zm*-fe;pd9?*on>wI^TygdK}2v0PmyPKc54Ddz!ev2ESj<E*146_3XmcvXQtBl<)t!
z7y!<{!%UzwKiAFZ|7$;1`oR`UYhIgKerdcuOHJ+#umU5nNV79x!}G6$iL_a4!1Hy`
z2k_Vpwu|;&W6O`g!_jZkcfrlxV)rt*yA~+?`I))ip4&md1ESB=<JD`~faZT)|I>MI
zVK1z8R}Rpf*#e(GCI*NLrkFb|tC;A|G0lG-v7R}Y!=2ad<9eh21kWEXUpdRF>ZjZM
zs&VuWXWM3;fs>&&R?VR2k!lC2@3~^vk@j8dnV;=EFQ=m93Z83Ey^jAc1jl9Y1U(<L
zbT+$mbyg5v$$JBN96&on3z<0?@arGjT%H@I=dic$n`Tw3#_$|z@dEt+Y&PIIfbZje
zUhzLq2UHAjU0+;}^IYPAOKzBNRW~koEj`-JAxu@Tr!`}#`CH<!VsYlR*Qn=Tvkag6
z{ycb~_?>)v!*lrRi;r5G+?~Fg_`>&y&u5AI`dJ?D9rwWZ)#umG^}U==a&AX|58tnN
zukTfSk>;SjLT=84d6Cq9W<76fu*BVI{u>m_uCu0lTW!ti#n#BPj9b}5xshFlvI9Mf
zzKvKA$G-}`wxD65t=Yqwl}G4rYmW_c(5-hbwFwJHaz4D(>h@Jzf>|=vktzB|K0AEd
zY~ldBO^FG~9W!nI0zKz!j7^<<S+GNG(qOB}PPM{`#BpLzC;!K{8{voJFZr3(w~w>6
zjiYVD4Kw`t*d@~kde6En-~Z!zAc_UC^TAR4kM6lXkaNK9Ye2_eeShC`iSPJpo$u59
zhibiBi2Ky=jyLD*bjHr{SKOv<d+lw@zVd-x`PTcEKK&XvJ?-c3WiM+UIAHaU9k<NW
z$1L;s9X_Y6*$vn9U&jXCe8v{+y3#Ul2m2b_Ca{6JCyv>QyT}nC5AYc;)fcWY!~LZH
zJOP(H$lTJM%oa%h)%?%{aF|=bZr5^a+_BQy+Zx%+ImYIq%M^n_Vmy8y+JV=4@_lka
z89rHm7kroh-pChx27(@v_6?;tw^nsku{EP7X@`}bPvg5xZ!fas{&HKpX^u7Tt>8H+
zBY1YwNE>;{g*J~f1=<f;L*7p-_eWeX^#3%uK+mx*E*ao+lq;}>BEC=gM$eBg;p|Z%
z9555l{}KM(aDWdL{}lsN`-faWn0uY)^Lor-zy<YtaNS>dRa{H87d{=;<Kkq_%ieg|
z+F$*RWnTWkYM%JOT3>&|`!!L0FYTuFG<I{}t)2&>ot)a!mVWCwTl?Uhevf`$a1UyN
z0Dt~o)e^pwUo|D%^EmbW-DrwFV;0SsQJ26~#Q9sE*g`*VF}sULc~3^?_bXTM{I1?V
zKZ8GUU?cdC`1yZX?QZmL_6zy>b^g2c->yEQpJUQol;((dw$vhcV-fptmo?6{^;?Pm
z^pHx5NAgT+cE}Q|m*^Sh+}DA71OBdBFo$~{{u{u*2(74a`XG}nRAU!KoIldu<!1Rk
zR|-4m6#Kiw-{XH!3&i8U$AHN1a~v?N0rE6}U^fo+y!y59d|f`fM_%>We${oVyIy$^
z%(YuHIBy~UPrZ&Ey!IlsxLMuPA9yTiMc3C34#f)TIvwx6X4yNpTK1in-1l2Kr{D4B
zo6i5m4TQOVW;^v@Te!1PF~8{r>PGqj$$OaVQGfU37WC*0F^PPyf0JxNwyAv)<b8iu
z1kY&Kd_wyUp4ZH?0@B-<>02?3=RgjG!*j-c&?T0h(3dlS0S723o@~iy(U27D;Ew+6
z7xj>JVF&(93h>w5a9#UEb^&re44jK*4)NW_tHHQUSi>hf=>X!FXTe`uKmx8Xn;4*d
z!3p8d>(!p~13e(n1!Md_!as`rIsVrb|C}v!ssVby-?=j}RkL*Jzbn3~&j#1>T^w*P
z^<c%t0{;wN2i%O=Yd)`k{w1q_?p2Qg9dEqNF0QwH|KcY0aa{QxIpXNG*7lxw0yUrZ
za=rMTe~)ZIHlY1|o5G!q+ToFT`;--5*NX0d7VrXnp;PGm&oM(l%us9zX2%pKp7Jvv
z{>)zOmw}^oz{$srywHj&d(-nBV5`vRXEUq3Xz@rJ^79|t@IF7~S!L8&JhQHN_E`48
zQ9DN3@#C6#mX0hP5gw_tG1QS+e)e)^L(8zCLh7<*_<TDYUpk=cLtq`v0_5s{eWok&
zecg%i{@f7d0kBSC1G?)uLVBjCxMPQ6KDB=i|2Y4X4g5~{hddxw2iD)hd5p)Hm(n~Y
zJX(7eJQjHDhlk<&@^x{uGneW#;Q&X^U7Wdp8GK%P*RrR7W1HW64_@$|UG?63JO}J%
z+xXs_){fsdo_g1kFMYt*-?z3`-*dlLk5`xWHwk~ue(1eoLclp6@pz%UAsdvvC`P2H
zMSS0!=6W^bxqpte-$>3Uw$JK!DLWm|Xd8HD*<sFqu%9}?b3rrhBQ3dYlC9i0-`4G1
zho3X&=5vqKJLEpa0@o72-_JhqvsLpqU(cRoc)hfsHm*n)Y?Te*@6i?EpXTpg2+ryO
zF6YlB!9N4Wg~JE1Cmve>YsCR!-$)Knzi0WnD{SyZKepxMtR!FW!vDL&Ka2x8pQrwh
zdV;z7zd!YXbN{aRH(fW`)@69^qPQ(*fu!|H+i`uByYTm1OwFcygtz!W@cxV)$R9Vp
z`G$48{=Ow&{J^ey`(4|7>M3h`{4TJ31x&&9-P4wO`5pA65AgXn9rI{kr|{PfKfTv{
zKwt~-O6*Uz;5!|e9Z8;IU#I%dCpeqJp4iMj=@xUW^-A`P?VRg9zUtI;TeX3m6+Dw$
zeBI}Lsp(p;pG2-;Pc6HJ6PkN>y(sHip`UX=`}Wx}eiyPS?;#&4htmzSB+oTVbizKg
zgAjjdft$$xD~J!JJR`cHLpznV6ML%f2re8q#Hz1ZVkLw7*y{e5+M0pAY%VdSfbXqo
zX5SJzKmk49MxM1=0RD>y@%PF9g>fwYH()dC=m~lsD8m1o8i3+|*E(PhGfxA4dVw`u
zGtH#^X>U`8d>r^Xevf|#`Jeg=?e)wVZF+aufa^aYSI>|q<n!|F&2PMKo8BM>yz!c~
zp4jPl$_CosdezoH^B(pE{%?^hi2Iw~eLaV}FyH9$fcsl-I*$-<)MsgG%NA<>xz$sw
zX>T3pMw;LT37-4Ko>0#FRBl^uE4R)MbPTi%?X}Z$q5YYo<nZ+VVr#u|3jdwVJZdKa
zSBv&nX<kTYhWKxn59rLW??hlXnr6h?4i#C!)GMrl++V7CzLO0E{-1#d%m@EIzx;t!
zC#G86mCPOQW4=)5jp(cCS$Ivy*nxol+`vw(38Q~$qkeq}`;gg>ybD`px6A_K{v2XN
z4L#oi_<!~K5mrhMDc1uC{eLmo&mp%Zlq-b4?}!20Q2Uer=Qv;|{?`@%<~`-MZWF&7
z&PeO|r)mEC6PoeEzkI$&Jy&Ua!~&n^qPOQYnQM5`djric;Oq2q$rGF2eAhO<@f%Ai
z&cF4pUG@5_)^=={@99jPe%)%H`T*_*{@BRX@4RDIy`#OYaE37ci#I3-$X--K$oD-a
zpdBRcpw4GkK=b3wA)rtByc+o{qggTRM0`{E!TIT9H}d>3_F2;F_h%LyW`8ZaWQD)Z
zyZin^?X#g@C|l5;VeLQivkvlq^j>klcFqZn9rFuY%Z$w6i!ZPgXGAly0XTs2K!*D&
ze7<VsXj^sVBungPZ-nLw*?a5zkI~ap%%bY-K`@gt+n={yJbNh5)uJ~oJ7pHFiQSlb
ze#)}iV9(G(Vo4eE2_;2CdDg_47*G%H%LkG}qFT^(fOFulJ%RBZQQ`p7e;=eLL(g10
zwww3Pw}M6N1l+LzuFda9bHUNvm-2!*f;hM8ar*l$%<3fQ>$RMMgDVDvTK~p3-nEX`
zeq;5|P!pUc&%gGbZ8-Igwcm9s`Qd%XU-d%cb03fkuz`1jy}jDqD_hw3HhbI@EBqp7
zgt<U{hvZ@YojwD^oDhBf)U!vdojRob&A0fo?+{1$^KZT3JtM`96ns&;MTKwbXbnBC
zO0VgXXgq%QLHM)ND*Zr<O<yz7GSTzr_JYfGJl76P+Sm!xksZOFeD<J_yGy~k1Rhw+
z3_!uekybEox~;xyF*;N!&#|1#ti)2QW8ZjLdZyc%Y7*axtLNFlC0m(8((J*?2F@iO
z)*K@FNwZ4W+Vbj=_W!l_Ud?r#S(;`|#9U9zPw0!en9KPIRWmWuU76L{DKF7U^xk{#
z2@u{N0~`-eE1z-{Ns$zd=p<T+-iSu@qIYYackQze4nUBps+ows=*)<n2LeH2f8X-&
za_{}=pKbP(LDUklV;5atQau_>5uQWVeP)DYzUXO({!w&8Gfx(th%vXfLAoN8egBmH
z5B&h~!a!@|k+0*izVdp+Rq5;Kc;bNEWny!BHXIYeNAmh$@qlt}*n!N!b++om82k8g
z%!{SR`;dHQ>H^6NwBCGdUC=)U{WJIht>6Ql_srJ(xDEP0^H{Oz!gH%X_uR^VK@XrW
zqz8l}$!A#m5MMDb_u>J`c2>UsF?{oj)O(?Wybhdx!}i-xYz_X#M*g1YFWup@{~z4u
z>wEa4<Q}L$%O0iQ^iYB`ReF6xSSRYA@&TmtG`sK!x?ep5Ka?W7>Jx!p-_Eopv&aX4
z<7)oT3h19?w$+ko1@ncr``k;n8(>2|J4ZQY;)e7u)X%5}7Q9+<g=&q1T{>V$>PMm;
z-FK=ncU3k@z3Hm?nS^X7umh?Kh=4hi;0GudpxRH(o>M((`w;f3LF)$c#;f_cRqW1Q
z#15ai%xS94O!6GEYLR-+2MOpOhaVc?nMK$Z@5LmiAKG=<d(Fj{4qbEq7ChZTUNz;u
zv3j#Kt1W$jnxMTM=ze(Rclm*5tV{9TK63EFbuK=#y0gz+{-x(d|J-e}u6<kKi|1Bz
z=DF48AN~0n{DgH69=Xrx{sVTQ3;Id-d!85!Aol|_I?JpPbd2%{iEAgo9Iq1}f;-)Y
zzlb@y&@;j)a^xpGX1RsW3V$~r*<kb9mO>MB{N|DX+fj|UdS3mro190dO{pCR)<fSo
zHpA_|<|3(HNDp}Mijq;bc<~5Z{V{zecd&cVUUd>a?+hL9a}W79)i0;~r1L2H(y>Ki
zOYO37`$CT0|4pw=A$C!ZI<c#E-8a))IRhVX3Ax~9%p6+ElS22$pug%vN-Npb(K!vg
zXs|6DH^|E4ldYtNeI^I6H~1U5&)83}iRas~?Dhiplur=q0sOxtUoVID)z}#2F|%76
z;nPoC_T6Sed&T>TzdD$w=-A(x?<{iwy-TfC_9y7DpWLAGf%pW%Ws_iZU61crJA0L6
zgV#NLWRmX$K3?)S>3F{8v-`qXr<G`??>8X-RVSZY-D&hho{sIe0==<THiUQRym}H|
zMD~dR^nTgjFY$mW-ja_A_Q=l*hwi-pJ38hrc!FX>@)3?1^M2=u?@!QUpcwBsIj(K^
z1D`Inpx2e}^F8ksptrH@C_bfZHGZ)20730gK%Z8xB}X5~j)Pfy-bwz)xqQqh3;_(u
zYbMZ>UXvg!0UPCW%H?CIe}><qx)kRx)h8)-1+Vl^^{Q{5ZPAbCS@Nqn*0^DTHLRU)
z3#K!hDmLCqD#!ZX<W;TXt$EX8OK*qf@=>uN+NT^@H_GD7v|768eOu1n<_P*hK4BYl
z*VE23e<Hi9$TKfN_Lskhp3yw)qw4cPrjae><z;UrcdFA-{OvV&XSP_)#!6e+G7BAm
z?G14v*$m`SKPzlsHdi*d>&_#71|4uYpmXbuXZQq9O<1w~!WL|Q>9OZFf6p_U@!d0P
zgcpPh==;Ky*I^Un4+gOzI1+K;nuo-N{2P*Y#}?4}9r<1Yy?2mTI_Lgr`V4hV*st8K
z7JM0UL_5K9b|RyiKcpF!*!?*8;=J#!SmG#OAKGB?pSN1#@?C2>iGDdj&f*|DOOGV1
zlRniPzK`k_gjXpC>a{Mafm9Asc@p&{XjU;bN$!`5FYrIp^iVmT=sijB8naPb@jYcP
zycW%C5{UuSqfB2?PQ6LQ3vIg>@jY@*`%8SUru>H11MmsFk|N&C{7`PQsz=b@01psj
zbTXG^+^~Oxrf*psI}sW5u8sTif3_Jz-(Z$4egyyBK474Y8~SgyfLWiy19Ch*cOP6m
zdvK%2d25KzB=@od!dOJl4D^-FO<->`2iAEnhhv1&0pJ6|f+U;r(-psUT>H&dZu$fq
zAg}?ej^gjb3!<AI`2>>vm4~0(<Zqr@+41M@6UY~k-cT-K!$Ytm+4K8~4<6<HgD0-%
zJK+!g`TEC?EcXjF>36}Q?$IAe?2*0$PW^obe->XQUw1BE&0vSUb`?3zLVL{uEdTL@
zP2KX`=I(lKOMWyfKN0vOjTg+8e1^?A`yDxrAlDIKpZfY&&V16(t+}LLzwUS`yr7!Y
zJbo0+&rm+$L-(&;H(-kb-uTq#qD^Ze7Tr(1jq>i&0otFV_(Qm($0*Uj7XgQG{owW}
z&nvPW_$a;`5o}9y=@aY6SouKe1(Eqh_z!jQk<8%3HheYKmT9jCd{F+@Yql87S+tiA
z=(U=}aG77EyU3#`-vUiN-$Oo5bd~=lJjVO2FYQK-=;gXX4jvsVoIo+3^n`ph(O<OL
z_=ud~&1W9xt%km(JeAyU6R}?sU0=c1vvxeQ@qc?}^L9Nm@yJS^#Rr~SjM!j3_@QD5
z*$LT(9RJo@^u1z6(SPG(bcuY<>%xJk_s2iT?Okihd+@>!<Ow)aXa__y>8JR`)7Trc
z(nHs6;jWuD?}z8MU@x@icSd<H@t%AW#U}B~_!FF`10N)uF{^(s%x|k^T{^&HVW&T}
zQP9`@WbuG%lBh}bo^*7-@3~QLB{oz&s*1T(ryz{c>#dl%<i03ziTjYkBD6zA`?7t0
z0r~;^5X>(C>qb9lzn<e8?C$9NmN|y(?kmH0XoLsK*-x<$KUH%q7gM9O7@c2A??CH2
z#084|^uPn2-&3qF*};GJc%E2JcP2b9;QPz2_cnm#iyu6{w-bL^dLLaOnu|YVH>9s+
zo14-5)!22X>yhWS{Lpiox&4_f-22RC?|jZDy8nk~PH*u>4L>WNQ8du~%N9saC`ORK
zAi4`vUUL`Q0LIk$;F+}_{2YIi9#QfLS@Oy0tB0`f<nFH?$A00vieBh!*(LdsiEDRl
z1v+QmZoLEVvXA%Tzom<0m&8{Qet$jhk-8c5r^=snzXQJV8Yp5(&8yd}DX)K5JS;mv
z{N%EKPBjSf3Bc67UlN^<kE#5kV-@lVunV#YK68T{V+I~5^scFPNwP0Lgc!ne&EFFn
z?pxyVf$v@?_uR_kH7Udm+Rvt$cAC|_ls=>;@PQIyh%7xqiUDQ!^~eY4ivfBp<$O&1
z?s;DMTjcN1`-%hFv9FHXg54@US8Sf8H$QinyXVilsM{Ad7vMCv0((vVXUV~*HitW&
z{XOz^@VPDGu4jM$%%)@O_5FF+eaXLgVm6;k4+L?cVn*Qx!jJWc_Np;ZJSm&MUU44&
z<;(~+Z#Ta7BWlN$le|P<$%*g0u0Zi$kXuwNz-(xEw43~6<AwXqhte^kedO0io{z}g
z0I$A*zIkw$`o;&=j_<M-94YuWRJU~8CMAg*uYMoMsPIDQ<n-lJaxW|?wELOU=zSj1
z+4oNAXO&x4oCz-k{i(#G-fOo3I)gcb5$NA^+AIEa?0JFX)*0q!zdz(Z+w!>|(5no+
zsX1xi!Lv>ENZ{LFPqLP-F|Oz3^Cz(XFXjO9aX=poNIjUU#}(!)3{U=k_XDtc<VRSo
z^sw@IL41z<A&1(nlRHc;_pMX-%$tarKDYK`+gt}I&yzTJ0!-$a(|iFsR`Mo#&q2@6
zgx1rxJhQQ%KD8;Ep4r5&0{>68L3&^QpW+6^h0*~X(7y8yu><s%?5_nsSa;#1tv^ei
z>YVCPZn4u5Ibmm8>)|iRN6Sak?$6)y{^%8K&V8_mN9ZK<&Hm?Bauj}pCu>g&ce)qg
zM(}okKjQzuKk_FXcfhxCtV{YH>_fRi;YN~8?XYkh8M;Z9J;p%SyDal5Tj2Bbz?K87
zF&_gU@BV#aiZJ#F=5O-f*nY=~u<z3Gnpc+kbdt;SfIs~Uy;*Ytoi85P%skdj6MSy*
zN_4ws8!iTyYFEt1;~21HK8*kLiT*G2gQEW>>#~iK-$2)2%IDgyIesEsR`|T+Uiw#b
zao_6^xw}()t@Y$~Ykv~N3!R6zSoZ;DGPl;-nyXj+XGQ0c8=kuCkNf1Q4aq*Xai2Z4
z(H}mwNnby+N#DpO1b%^H1*g4iKC-VzvLD3u0qwhf0z*1a?0?JLHY9(0Mr;Y@hizK_
z;J$Sp-HJU3YKsFNxCZ_1Iu@n8<cIi->*4P%_-5UcyB=dI&Rhc@tlazwpX3?v@l}%`
z`<?~cNJ4kz2sHmBz{7$)2hIb;b0H51L-p_R8SFr4CElY>Nsr_nd*J)(r3aL6I0g^N
z-os0ZHAH)12dZNcZmc-K=TxzmZ7x`2S;bJ_(J5a~dF~l=U$?nn#0$tvWWoEigLEc8
zmm3_=-}3=|>F+imu>InLz&66~+?nhByzUoIbnwWh5B&Pu$m3Iw=Y-h`*WK_Cn+$(+
z+<k=24|pSU(=1LsNb>wmaKs?K9|is2Z+~KgGf!+t>k}Kb@u`jZIPm?ZeEZBQ!2n$D
zuROEtxyzQkK+WI<>H>ackLRVU*7Y0u`!+V_z$WWJ7f2thg%|ZZMb8b$u56R<|02iS
zjvmO~zU_36l53K0AwRMk{jvVued|8{0}p${4tx#$1FTu+kDNIOei789NEYPZJJw8`
zuUQzm<Iqd{k3~1?!h9c^{51VHG<2IyTvynWs$N>jxE|RI@sQ&H`FxXXyvKpeUj_^C
znd{`90vk}{n6T)tnagXw8*j;Vqrsc8<(nqb$3BSNB(Ga1HeP+9$^i)nRzHaP1|;*n
z@!z~2D8_)Hf9g6i1Afx+JNJgo5A|l}qd+G_FWti*yK5gly^CEAe79Bjb5*A#tIwcY
zV7Dc=l2_Sp#c%ra(3hKwy`S*KGaG~aiw`9G<34+4Bi25(5#3L$jJQvDU^RcIcF)gN
zvF(Ue?>ug$-y9~6JZu%)k66XleYWDrGxrCSU)=cUF?O2x|Bm87^2W{s0bbB~{CjJ?
z^SkF6Jl@Fb6ZsEaw;$Nzk2=u#=z=H25{EWh=jnZpTY0V%Y+G|p<m380O5wNQTp2K=
z*01otx2^(12J08btNrC*zFspbpH00}`o6yAGs|aIKg0L4+Fj{7U>!OipHR9&IDl+D
z_@Cp#ivPg|#S_Wx<ORS4<=bgD@A9SZgV|7LhMsR(H`eQ!x@70WN4X%LQfdiil2eus
zumm441An+4knY#hNB(v1!ePpPd5XTfY0Xz3QrmscRvmdvjP}%){`lNxY{O6HQ+}I#
zrxJc%w32VGcuD@6<X7@88(zovB-8r0^)rg|=VJS(ZhmINx&t1N{15GVVnaKg*g|ab
zvY(#YH2!=t_TaBe?>b*h+4R)^j(+9?_+~)#k<Hlp%;U=XGfzEU*Y8%GshpE=NBJh*
zmyaUz&)l!q?-y^%m-HBd9K-sDV9s~>6whEcy6#egdf+2sNaS)4ws}{Q{6@RyMZC{2
zkK^TbM37<VwioQ?tA*D7`7G)VW}>_4m1b79+imEXRSXYpovu#bih>Og2IzJ`xH0~N
z<G{?K@_3H?faej|sktaS%aS|D4{Vvu?D+xom(Ujm)~{Nz#nT6}pJ}vBXJ(Pth>8dD
z^e+P=R?m0^Ga{nwC7*+Ra9^+&{ly1?4G@hK|0w>|T?vn!vklsC=kI48qyL^+Iq{k3
zD?SNhHRW*ih!5nuH6ru1=vm3U{!M+agm_+$cu2m!biH)Ii1klxK+9u$r|FRmPCxco
zOc<d2fuZonJGBq&FH7#(yU=^Ydi2Fd_zOJ4*2r!=C2kBb8@+c}e=K@B@11+hJ3O?N
zhn~6KFaJ4+Exq0V-&H@SSi&(z@<ZYQ**E!&-fI9Jn!LJ$nZ?w?XlCgR=9iqK2Jt6w
zyG^Cg4BM{R*uw4DeckreY-Y?&B`(k7cEaxXS~0t5+VaJG@JI4K^i`}}x5DE4THKd#
z-;i8^aG$ns;Un^YzJnPZ;C-w4-bL|H3s~>+l_RaTb-I<17bsovfpu>g$FA1F)+xFd
z(O<Q|^8b>2Zw_^j$_@4M|6Kli=-+YYDR?Y)7hhX)G6NdPN1OV^6Y{3P{VFzA9G2#1
zvKOx+=TAJo4{0qdN4z1NM_<d{N=FD=k=#pf$j_hn<ulj)lKa=n9@x9_NB+B}!*7ZU
zCle36R{FpOr5@WLc<-&s`_3yP);)EfL3U#l&s2VH27gDGg7{JVCahrvc1ixdVmtkA
z{rMvPTNs4m{to;<#Sx10m6KWr?L&-N{*LetuX`l6*G$ruy{$HF^#pi<y7ImB#GQ~1
z=W!fA<#s)NAZi`#H}w69qM>FDlgI6#?xZ0z!sZWni+xh;o>)4`lKZMGdl-M=DE@-}
z4dMXlj<y}>5`6rQP4Lk-%qwO8nrfKcKB#5@?6)>C)?#ZXd0$v0OWiTPzUI{^Cs<5>
z%>@c)0wl#7iUmU1*JmI4drXa8luhlvk1ofaD_<k5O@5Z-OT5vH{AW&p^&UUU%q(hy
zFF$hmm)wiql6T>^l6A#aiuFZz(RKXi0o@e`3}5@i-mH0OZ`D1tfyu{(=RJ5~K=WgJ
zv-Xj_6G1Oz(fOTEoDZb?N1`*tKZ+q0KZ?HkU81diuO5A^M|eXR<LhfZdKd9z5K{!W
zL)8hz`9ZCjeBA)k-|capaQ*BtVmZ}6(El!Z4fk9IHG^Qt$nT1c6&9nutMd!Z$DU{<
z?3GxFe2P}1|MmZ-&R6?G=^X}hZTJNHF8@Hb;aJS#o9R)TJj7xj&*twkhiK^s_RjzF
zFSbN=!KwL{{t^EWJ(K=!ku9QzRrX)IG!^q{-b80e`(E-dTL7I!_wXsEe}M-A{lD=E
zSUS(z->z8qzRlKsaJzLK*kYY$PU9DXi$Q<!L+)pKd(IPYV@Fq`TgwkWb6qc+A^Fq&
zOU6VK>1WBOWM25L=>9<`dL6pHQT@=~Zh+P;$Ud=vVuE*LkDTsrR6VrUD<9fx6%Xyd
zExK#(#UJ}K{`03!Z(&H1?WyP}$-Vqg>77u%^}F@w!jxw6`}Gd;A!hA(>UjqF7%TZZ
zW!MDisq*8GO@3~xu+H13%xho0wgep1`^u?zQGf9T(I3o?oPqia%0I8P<WE8UNbUsw
z!m$L{%S>CdcBH-g+W%#B_+YB#s#BdO^jB?YE3#Sv{$81$V@;nex6<a>KF6nxT)y^9
z&PP`_@$=o(0Jf9wZ5TmrH%p!pY@zLFz0F%N#<D{PFt6l&E3Y1DssSqaejy*^eE|0b
zLfVI)#XOL={qh024{WmTy_;;!xnuZG@WBJ(B=kVX@%`3$fjsMF;=&WZkY^$1feolW
z{>=W*Vb^WhzNfYtf4mO*3%8a2l@5^3m2A4bM^DS9i~jG%9^0QL-n7?C@4H+p4tT%q
zNkRVg=c4~#mfo{}9ecz6vhXhU|FQp!<X$o?`boFwcL-AwUZ8hUZb^KoxI?@+Yx{GP
z%^3ZW@JDzByl2^dbOv~HMcywJ799CiwPM7Z%44ga031A_{Ze4LNpgAVkoMs9LEMJU
zCV$tkwZ<|(kt-HvM}L6F_k7)k?G_HN-7+hQ$<-5}8Ntp2e4XZ5IA??{7)Aa0DD<?~
zgrmdZi#B*BoDZbh?;Lh}5w#!D?;31b#Z+tlh8-+?Z`s@-R-KsO^`B1XKC~~)1cBbg
zy<jiefV})aCRal)WdnGQY`|Kc#AW#4?qf^t$M^Yhzcn4Y=sx}AFP_@l<@fBrjJ#(5
zHsiLv*Yeo@viPno;$8>g$IXW(Bhl~rdK!MZ{QYt0e$n=IWcsy|`!*c9$d4P^1s0S;
z{?YSq)jqU8O}S-%o^sRvJpH!)Y3gnM-Fwat`Waz|vg6D5lbikNq}4)e`E`mlrJrQW
zWvAq?D9&HP`^eW^49&%pviW)x11vc}-iW?MVLXa;73ZtYQF#L84>Na8f$fu1EcBEI
zc)hTDkKvDl(R!Vz;ywI){CkfBJ&v!n=-L_f=D#o-d(jXpMPGXl5OfzWEJp_jpGm79
zRJs9Q-XG{+=m!@sKz}{*^=A*0UV!fCgl2SuYRVVDE3Jz8L*K7I{V#d%Pxkfwq8L!P
zuIhB1_V~xbbmadH>p=F9QR(Qn>e0*SZRu(G?fUOG(9>_#qtB7q_psaY&j+R++uM!k
z^14U%+KPKNd=0w2;i236clbNX^-3<C{`mQ>|DpezRS)dX@Y8=8bjkj@`hmSx&cBK7
zAB1fPeg5%(LyvEJN^jt=7X67@RD4zWr1DMMsV$PPqTF)mugEu*UXsrj`uyFTGjfUi
z6tq|FLi+<#swaZx>TQ$%uUt=#yjCz<CeZt$z0br8ch1WPJeCY%cW^te7bAx&UTCLY
zY{`OQ?1(2uhyER!1)itB_+c@9Ub%cPNH6*$+XWuT(_cK$%J<ud=e+(KnzuvicCfw|
zW`g8(|G!uMQ{bmAJKUvwxs}*;>1<(iipAuE4Tc|vV!y=?`dWUw+j4w0`DHV|eQLF*
z_&ey^w~6Uq$G892$+zs^u;Kr8***Kqvimj?UYLPhmOmhwf1mhL|CV@1I{)A1{_Zis
zUzXp8UmkfZAk0WQT<@ZHQocZW`uNtb9RGE?-%x+qR%(mRdra3O>)^uptfIYeYvl}u
z6DhAFoYQ-VPH)H0?_?&$7O!U!?F%*S=L4OuSUsS<W((3Q;(j2xX0Sbv_q~RPTzr16
zl<&Q!uCIOHa;u0_BRFc1`TihyK>EJ0JNgy!FFO$GfSyliE}0K$uTRN+`1GZJDEs=9
z%ojgJ@-H7szOwKdVRj)_Cwxx#u17K}|4p(!1e-0N?QP`w&(KWRPVx#^3U))e)7e{z
z&$m6XW#2!xnO{D(1>fU)efiYmK-mP*Uw)zFTJ#qmiT3jQ-oh`GPEl;2m{2~%Tx^Q+
zgQEQ~cu00XvVFUCoIGM32X|tJf3$XLOFQ>}>$#zj{?cdaK@ja#Q!2bLtSMK%+VwuY
zWvSm!(MP<F{49Q+=E-Tc05zjt8;qO>JI~<()sJbur1why&HaGZoy7IK!2>l{TD868
z<GsdHvH#A6%!go>z|!GXkB=uG@MZm=FW3O-f}*F;2PFCz^FT=Z@bf?5|NYZH{`Zd?
z_{R<W;|Bh51OK>zf84<Ta5wP3bK-yIS;F%_{nLNq|M}lP|I<Hx_rC;>|2O|vn2E_;
zw3p7uS3ewnj{7?JyNY{y`8@skym?=@$LB5baYMgGpZGSt=A4B7Y>_V;&NO*p$Jv|s
z;CkK&p6qLbt=IG4`0u~-g!4iF*gf>VgI=>h!aFFA`SZSBFJC|O^TRs`{rmp>`tT0&
zb)Eg~`SY`fckuck&abEF9{%3>>8byZ+(9pXP~00n{a_zG=U4pG4<Eeb4l?jUEjWqi
zH2b}SJpIG-!v|TvgQD~Q_0>F3m>Ct$ijy3K&nUhg8T5ko`pnD1%jKaD{*#x5o_pwh
z2RV2_k7E4vAY!^aFVu}2LQnBLOGqY!?Q#dc=jkmzd4hdky=6fB@bBS)!uiDqFXM&(
z=pFQtg<j_`;)C+0Syr-m9KBHV*f)%}7&1~jWthd*gQ<7Vv~)P<AmjnvL;ene&wluz
zSO)a<OXQ%FnL)3*1D_u%KKMJl;5zXIy%_L;&j!(5^x^|(&K=Z^9%NB^+cUe%tv<&r
zN@C6Em#ZvwfE*FHQ{v0{R#P(CqSOF|Jm7plkFWZCUv~anC<m|SW#J`q(9ZeOA?=Gl
z^YY;5f0aDE$~K@AwIgN0;5T|Ou<#DRzN%&o_ndeeF?LWBPrVGi5W?Vs-hKM|^xxkv
zVKxi7legaNxr1Kk*FE&d1AH$$|4VovHh~^*b_4kgvA(>}pHBF9%0e9&K~A=zNERdq
ztvr?NC($nY(x%ytJ7}+oa>wc|N*)OE(CQshtyo#rSgTLbhdliKpvFIxg_p?z^cN50
zishgm9*A(ptj-<IQ0sdK{pp1MWT78EXreb^(eO8WF!7>0&|Ku&igD!EncqUqjOKiK
zj|KJfiR}?<S<75v?n6Cwnq8s#ne5@Xm5<~6d0iOFL62R0kq2B3LRsjC2UgA;WE~TV
z&aZp;BX{rz_@Ew}SQp|$eeEK0P%)mGetPnigY<c<<fn26BG$Hbj>R|4v&<oC4plp<
z^HX!Cnv#axM9a!P^kWZRrVD!c1AXqGZZh@7%uFiK|NkdGNOATRQwK8N;BAYD|K%SP
z-9a-su=-62aJLPGv!_pd$_{G!;nWw!Q^>)g4;+_g7D!Ek8j8>_3h$tx2lIL$)CHkm
zDEb%cfg(Amna{j7>aE(tbNBr$)`_7k<n^KJM$HK-;)NJ9Bx=YJ);Er@#?kcn!(YoL
z4zPOqb#w=<+(C|KCAK}Io|5xlaemD_*lexzeX35dRkOM^$3%HZWI*-Dk?*KQqh_R{
zauT!`{d;)8<=|y{p!g0%`|!!z!_~6~TIa+!tq~r`6zc)*A(*S#TOK0g-?3)tOYR_r
z9?(o(*~X@k_{QAB@?me-idpYj&9e7xCGsC@A8oVgO|9lGYRHqUSTcw_DZ0F4I{5NV
z>T>q@lLmin-KqLZYAdOq6(;X}6RN+X&a&<M#q4n%YN~xHVBW=g;8i|BUKbY5UL*q*
zlj!-M@RsSb4L#76e|pJ-?j^4i(wu!U`(Q--+9}j-k9x!X#S(IW&78k%&LCSklbtcp
zynMxIYJ3)3<Rj|*=g{+?rjIwrK05d#{o!c(NInndF_D*)4s6;+jp#Av3&0bem!_6n
z^~af`NqUA?`b;_Z4g1DOp)Keu2QS1&FUAJ-%%@qkYLGRKWd;^!Uq146YcIM3-ABPT
z=I@{|W0^Y$edU$o@n!ITa--gc{)224chUUWd_RBtxAe0}&wotrY{76_vV{7!&D3B0
zx`W*OQRjc3(Z?P5oHq4h(90Y2-FI7AWTB<#eJh;3IQQ`qIq26nF17>W0rWuImg$yY
zw@1a2Ar=|=S6jJ&eM0@6Khz6jB^P;L8GX<uKH#jS^WV2+^y9^mgVI&QEz*IW!j}{M
zy|0J9j*czJE;$9wo7JDCm5(4dU4M*zbM54~yxSTMf9k!2qJK%nc&nZ`jGZvV3t_A*
zKQN3H3w+QMBe^Xs@B#L)UtQS42Px)eX+A+i3$<qxnX9&}=lr^dH0P~F=0kaCVvhC-
zekMNrHTRpB@#hidr>v09n@m0gy--8Vi)x?L!yf-?uAg7Kd1SvdYqf0kXm+#B@_dYX
z%zfv8c8sG7f?nG%EOn%n-CYCy>?M;270&N?!3*c_(S^nFQNQ-E4-YJx_?Fc(OECS>
z7;A*C4Ln_w-YD>Zd;{Hq&fmeadLjL`Jo85IGon9FZOusbOpdU~#CI))J($N+*)+kT
z-_Yx=JfiHG>i*DUwe9mgZ@6mV6zbB{Yx)cI=m$AF^=YyL^dw}rEwbvx?6@61$f}t=
zR2v&-b>jzG_3XhG!EaWa*oy}w1JVJ-_OO@-`s#t=JDB*obx(Q2>gEiv(#6a<FCA(v
z+(~!`ZJfD!8F47{HFXEeW>ANWO<TTnsKw!hrPQlw2BT(MiLSNSKh0Wi>YCww@2YbR
zYHF*j@uMX^Prq^6FsuHgiCQf7d{CF=vuZAGa-U!Mw&;dwmQ<Y;v#^pI#!;U;#mZ(5
zv6b@&`Yi5@V&zxxK*298*u=bF*pDsjp8C3VO??CVhwetVFPn`noJ?)sWatYYM8>^s
zxi2SL%_{Z_a{j9Fq3j*tu6d_g=EgNlAHXg$>U?)Cu<Up9t(;z-l?z8fbNYL+*E)OV
zr-)Up8g1p12UrV!KuvnN&li!;=X*J+Lzlg8W$tj>H`6WJImxOPPp~CbGpwQv`Tu;9
zRa5idh|icU=mF}C`n!WaYzqc^Y!rjPXJEf;<72T`?_1qe<|a>JcaF}_6GP``c&F6o
zQ>_gCUIFb>A2Cmb^H<Fpi0qHE_&UX{nr*PyqRhKnHfLD=?3z25U?10btE4_=1+h^1
zr>z#<MT~==?>oMz!Sh~ecKWt%ndg5`Hm~u+Ro1)@`-kt7-cx0(rVX}4kskCKnehDj
zbd01&5Bxo!NH~#V!y0s66|-d3i_`wqcw0RQyTzTfL;ED3tELXHNcR-eyul^BLnAX4
zJDBUGxr6>}o5|gc#&=l+4=l1s%P1>vn!&m8*^ltx%eC!VXf^R+^z+f{BY#J`b~H~y
za|P6cK<$BM$kZoBTS?g{i?&hUuUfM6$Om(<Yr5$r5ndwNhfiP3>?O9K2P42Y?xP2E
ze(`_J(jgXKGoG2MBW=}!AyzkUpw&;Ib`ig*bjkp0S~trQpG;#`?j&pYXsVyb>)Po{
zZj6ty<<u@_ci^}0pr2VbZuhdlf5mT)e#!T@kw2IIqo&Sh=lFaL<o+D__QOf|o>>^*
z%(Swy!B$qv-1My}?&V8-p!Js82`(~e_=~t<pYs>yA@%VGdY!+IEmUl%^RMB_K<_Ag
zUm2NT^%cXcv1zzfE*@f?(v8%6#5$lceoUKYN6DsB2fh>^w{#Iaw0?ml=;?^EYc0NZ
zvc<n9cA=NR`w8|iV;&wBp5gn|kojN^GqV2+y&{LyZ`SNKqWwU%Wz}!28r7fITY1Su
zYZ!x%LagjhKiF|W4~8<(R}Knx0Q!gL7a!zxVb`?Rtb7Lg6j|?_hQ7;<p>7?Ujlb5I
zVJ6Wuc3pN%#GifJ7R-Jho~B2J9!AY9(B72BuGyB_Pn-%?rF&^!KZ$)Q#1iyV=*+qO
z)Kea8M&ErLoJ%v^uOGtRLI0mWwifOn`V({7smt^oAk=EgAE@YTvPNdA_QlM+P9~Ir
zB3<bBP&j)ZJy5uVyd5YyfA{p)EHddWTZL{GAFSkS?U0vjx9(bO*{=iNwJ|r=ny|m|
zufeJ~tLt|4a;P7S+EL9N_1<puU@Z3mI*#vi{-7_MS?tsud5o_a1M+!1_JId(pRfq?
zufn}*+NIpEmsnr~J)C*Gq(J{7%(Pe!^q)V$MuoPZU<auk?ZX3YoH;oKyS{jsRZM%&
zn%buYItw4wXHuvidFLD}pEl4c;e{l77lWBKvTf4uEkT^FI{>R|$5ym`zp!xj#8GIA
zoTt=#fv@AU2%vGWV~`zW+(rC6wK<}@>NEFM+rrt<of!FLxM?pQ=%WXE#fE>tAF7%`
z?e$b<ZsD`m%)_Rl!&Ube-9k^GYQHqYi(c)znxR$&{aZI<>*?F@Sspq+I?Zc{v}a`>
zx*n|3V_5Zq^Sv1R^`z%DQ^Wg@sY}%ymh{b&R@NEE-<V)^-y`#!T|b}tF>aOb{*@VF
z%!0&bHsM!SX%|t5o4$+({+=x?$UtvBuwp*DOs3OU_~Ce~5Eis%3Rpv#pFw@ENp!P%
z)k~;Pj(;|vo+siK=3x4418kQ1ou#kTL#>&;xxMJH<MclN0B*;hX$OJk$b~y1ygmyZ
znAuTfW%VPi{@YrY`^Llg1Jq^Ld=~M&swMbg72pTzd#|RpGKnk{<e;w}L=Uv~8yEHH
zfgX&o_xZD*Pe8_*(^|q#&K$Ciyt~h;9!{Nq>q2;fS+55IUdZiTZOPpgU~}{UQ^W6b
zl{IGr`n59iHFuD|w>Ju|3ywiwXqvOCE>Uv_);zppZD%*(D-Z*2U&tN`Vm)|6b?J#;
zKDC<WdA5A^P_H9x%8s$s_`eZhW`9%<ggj921$xfk+aK!DgPog#9;dR|1Fb4M*R)ry
zl{r+ogXk~W@6E^oa;=(Z|76ErMFV(78X1Sjy^oqW#%<kx&c3_KnwZHI-_hhgo_a9W
zF%MevW4u1^P%sxIOPu2~m-xGl-({_C@=)Kkt~`pcvPc(pRA=w^{P03w9#BkF+#gf8
zgZ}hj4-W``*3O^Y-ZEP{e*|;IR=7?R?&@<q*fAH~#kr*C_f^<zdUzJj2=a33^-6<V
zOP9-!Q_SwT&A~LY$GWX)e>**RN4<Yt=Z_!#+LA|+bz$A;0PROjvO}wK<*Y(}T{-2t
zCGY?-$EumwfTHt@4+=66>Va3;Lbr#U{}p;rvjw#?x9PJL#6WLa`JAD|-htokvk|~y
zbhhYD*>`jsScyK{wl3hT?32;?!7<cR?Xyytr<VB%pIthim^O0u2j;XeyH7oMvU%7)
z&6;hwu-#(pcB%OY8>*d)<PRd?qe}<8X3ZZ>vs&c8wHPx-|Mfn<?joN@4evlake7kN
zoa7>Zus>{|D#gCw`bpTlI*VqQ^UHjt`1jGECfMo88HrWWhnVG}exNUjYZcFfRXT2u
z&T<S(=Te<1_FMDf(#M#sicL%3X4f%uYSK4|^TYFN$H}>`u=B09DmKSwkGF6KE13se
zQ8|oxpY(U4^Lpjf^E#kke@L<r+QFhbD8xka175-d@y`}ne1pzJ&ntb7)wN@-_9OaW
zIJ;=59Rl7XfiBPO;b*olu-F$1(RHiv={O_to9O924LmJ8BYkSK<C@{V7|D6$e6WY4
z;RyX!=RT!puFk5a47Divk^0)9me`2j9UF;!fx#q+fslh<=P#0j7i2)^?}rC^e1RT4
z_<|ikt~HNOzKn8B70uJFs)^hSHNu5n0q#Qj&Gq7s@GJWVHP1u$(x^SyisR@t@i{x#
zg3Qlf;olshe||sx4Dxw`UIgu6Y1rOr6}eKdaCX<tz^7XNfvo~BtyuYitz-si?z?$b
zwu+d)*ZK3glh6+QJzpTyg9RPfbN;?|z;!wpyJPM6u#Ml8TTLapcz=caY}yqkOiK0g
z(d`Y`YwY_mW}X};o`LrM=ft$ZZr@V@o^=g<ARnjbPGl#%NB%$qek8jSz+00aP4s=s
z<(z-{Jm!{eoNpy7Miut%_Np@~qJO_KP(=TiVuYbTT<i-GqX+qBdce@<O`9sf_upoI
z>O9v~zJE~hI&z-A@FnpYvp$Z9H^|#a_Obh})1Z5BX8Mfq^>lWhxvTkWVBFHB@!fU!
ze6yL`#=rlS;^;+|BiC2gJi+G=r|Bnc1xxO?wnpbKx`P*F;E$ZYSO?@|0?nogXB=s+
zo#ySg)3ciW7VN3LhFK|`OSoiy4rb;Ey^?3atM=x&2hF`f&ueCAf!+bH>-^q#p?MqV
zJD-cA{k-alrWd+x=K|{>t|$X9Z_$~HpQ2hb*~6ZFo4tLZ9zN*D4umowd*C*pM+S=R
zK=vrM4nIw?n(I4ec*wpre>&A>&l!si<Ltt0q`MWnqSsSr!6tr!|3&*V%mX})92C*q
zdyd#?p#HNIbLAr1vktx&-A>Q9FfR2GKzsF;SAe%xRu8k>E6(3b4;I;hSDn9r4eI>v
z2lSl3SO;iMyw5&T9|SSFVi~=wX5FXuRAbxO8KPM!qVYv+J289a5Ii8CNA?c?CVl)f
zJ`ef4P|fqz9!b&P?V)tXFXVFe;@5v$0=7+k%eUkLu%WUy&1=V7-QvOI5c}r=ud$LJ
z;JyH#uR8zVwFABFps=C9hbKk>gVXt?^L-8&Ix)g*Wbwbx($o3z(|zXm@lWYBJnw#e
z^U=Rq^F??A%tCffzP_JbHUZg)?%^(v;zMc95c8s%w}T%s`&Br%{I1#rSTC{lA3lGP
z4tRn7ea`<vpJ=f!#MxWX0ht5%=_iAkW}b_d?;?Lkxj6Ke_f6s7i3bwc`Q)$2!<o&N
z;a=p|WR4KGog;3?*YW;4=<l(-@)_vI#CdXC@*}XPnypm#=|U@G&qs_|$da=b=IXCr
zH6q9(_L6}>54NHU>P8{=c^=S?wFoh>^Fgs4?Bfe+hk|^;UUL$P&o5iR9mGGHY1NrY
z@O-QLJg(E>*|g?)iidBa|Ab9o&xKi}Pq8~yyOg+-R(#qdbWbx!J9Q0Ai#t)g<Nh$b
z;{1Z$(+)E6mv}zLEYEV`iyNn~S8@WmVCMde$mdau&(GKDFH=sngq^k8Hy9y*E=)jo
z5Xyn-h-3@2Pe!wWTi}6KY{4vc(8S++J2-!+1H*VAZwH<K;mKBJ-dC=lPrnqrN_>_+
z^)b4QGYO~D+*m#8rPldRZ)Qda{vLjw^qllw_5x?T&OLBnnim_~7rMcDfV=db+i%c)
zi!Jrp46kWZT~loRRI6fNb4Qp*CJzzX0qtTb!$+tP?lgxz%~RjA)dT(->{u$2fzS?C
zPakY6rw+2pNzA_E{LMVxGpVzOIxy6OMdueT+4dc=I2de*(PhX#r!MV)=YI^&qCB0>
z&yzXwsl^ZD2WUqXy~UFG%q8wa`xUTtzPpS&5nm_{@cnbAHi8Ysz`4OksBiFjVqi@2
zG3tqX3N?25^QZV;Grm9qo^OHv3Hiu#2U{(EQlJNW=&xM@+9Oj=UTUsnLo!k93-ovX
zydNO?%ZF{<w$$HAJStmPcZiv$=yQ*2M0@!F(A#}`<RN<$U3v2t@3U6FrRGG755y0`
zd7LjKGm3LBFgy1oHscrU446q(a<P?>18v+eA8dJ0P<x!Or)lFe!dYul>{g;yq6+*&
zI~TQsyU<_hcA)3{(t(X5s245!z-sw?5gW|YKjeWT9UwcXx{KT)XhYqVpC7r_Su}4l
zb?Y)T&HJ=BPgvzaFpI130P|?IuR^<wMQ`7!q&{PR&IY`K{ts$f&;$4hniE!4GS=&i
zTHyDTYG}wExAS%5l)+ZNV5l`R`zgC!^#XG|zo48{L)~yIr?#SoSrSc>eeR;z4=nkB
z{4DcD;%nGLB-;0}0WbK%eb1loeQew#{wEiOALl$RTK;~`+V0!~yS(67Mf}1M=Jy>a
z*tz&6**yB}@o^((kpYi$n5&3SkR+d<J`UZFG9OhsWpBbF<@2nLIwP;OBCn|PmsQTT
z<Z;bTYqiGhbr#>#NG&Y(k(pU-+vi&9o4K}X^$43sO;OdX_o=Ud_Q=2LN|%fzAIto-
zveo2j=0Sh@=zHNpVN6^s1AWe~`Q4tAqyEZ2;djk}*B#{UG9URC^Adi0ie3wL+;&`K
z@2%zzvkx<Ki=J}6--aF3pKDHW`YiVI4EFH!7LN<%GYU)6O!!#aNLxB@5WDC9YOTb%
z75F@<Ujo}3%nfF46#3#6i-y^%iV0R(HU>RFju|{Gja(GsA#8za$d*%M6y;NULu3a$
zM=1LD;eikn>4}H2eR&<2l>d&NR^CDT0fU$YdSl1M&nfo2HnRt^<M&6*5qW6c7mqPh
z^mpW+ukYV?TvOPVW@@)wIL7x+z&96NF7$6Gwo+cGvTm>~82=V^66C?_heNZ$R$Vs>
zEC62v9pv~Kez<CZ6%#jM7kwWWy3pex=|N<_NxFbfVT0m<HvB>1WL59I;dk(N>EFi&
zE?q_~%&rp4Xa+2LE|hoKvhWFaUupkc_pd+uSzGTgSMl}}$2EP|8F$dly@(e&!Fr=d
z@gonjXLxrtdy7|CirT*BPv^kX)WyKpZQm^l{A|S@s&7;dklC>9yBFB1iG!FU64cYl
z9wwoEDfMZM$#It5JjY5)rdWOZ99xJztf(7rWz?gTE@L+YxKTv&W1zow1~oEU;syB+
z&!4vei65w|1>=u?!yTO41TSFA<-6efxlMPwcG}wS-C!PvW-dHp?=$w`+7sq9Xl6Ha
zSDCjJ@__iDliAXlpFhL)ZMEE`o!p0Jh%<ln7P{r+dayPy7w$#)vEq%$PG+uwy|nIF
zW*uKq>(D^`+>qBTI+pzg6F#u|_*7zt1)h@$=4#e>P0>o~tlD>jMQxqQ4voRKn!3W3
z<f2=U1<g%W&6v)g;?casbU!vgc`2PWa~peh=^*iaJMRsqh5m{k_|Ot(!0%7v^WK8L
znM<QtBb{f_@yu1wJn{5(X3yQz90GPDF>kK@25~R*2h!-k)V1UA2s2miJ;qkDN8{dA
zY{7Pm?xwbXKe-cVFTc2HJGBqsPmaOuUTPH;W5_E{vdFFu@HgTH;WN}xIHpQ0?pO_&
ze5-O2<kj1^&p@vXv08S2R73M5zTnCw!>K(UXchC=U*0wqdpg>x%RdPA2B8C^@IlqW
z_lalG(Kn8{FW<=?PWdq{2iJmCwDSI7n#e>4yIHiiM>8cfFR<;}eRv_5E3x9oXFi`L
zb6qor9$44C-`F$3Y@s{MjK9ZDkGprBcN_~iyVY$$_8>9$?x>|sZe#|{7nTAmPyX^P
zcaN^1*0B|zEQcL-UPM3p9uE2A#1S5+ac6-}4f3$s`>2|!)Mjce*Uz@d#@W`4ui5Z9
zxf^z<)OU^d++7K^$TieYr8)a->V4|O8}jMSY(r-S`c8U3jSWa2gMab=qz{E(uVD{O
z`qFPcdqguxME??IENF&7IkRXqD@`*Ad~X%}pgDwVZ(U`F)LzS;1vfag1$n`@(7*lL
z5o<be*j67r#T<lSK7(c)#ZDbJ?OJr3%I|fbOMaMQZG2MKllUvXa{!;Z>4%npH{g$O
zMy==OmABNqLFN^zP9gi*IQBxJC#mhI2j5;!4x^DBF|q-QW70RkEV14Cz0zO4lM&xG
z%iaLVvmWXC(qqBACe8QP+%?Vb(cJ%PW=!~Oe`F(^$Edq#-c4PL=FMNhW?uS<fBUNE
zKr^@Q1aqH$e9G*0=9Dn+wdD$Pf6+10wGG<+A#73pi0CgL5*wlT-0Ok(RIVWlcHuc1
za68Y(f-kjhp9h9Z-7WhaHFr^SR$Ko@{SozZE%FE8eV?EE4t}9*AoNzuqI=h_1I<KV
z&;H6T>|MvDW8~}hSm&kVmO8Z4T7G@#Gs-lBOmk~A^I|%)FB;*8a89mf)o32^nhU3R
zcjW2(8T7?|YrApA{pB=zBym+UEgyjoOK;w@+;8ks)vQY1BMm<WbLW{wtr~D)G314V
z8P%Lu|E<|2%&1e{f$ylIH$wFHSrwa^DLsl>Ma~^3r(24DR834&JtFT1%l~m3z$Z4K
z?JoPBn60Y40NUG}W<Nsv?+>6Ua*ck^-bBwM+nUK0yYSeS?qk01I?eid;xjwv!3UCu
z$l)^<J;bBWBkc7>?{zb4N<M?^L-!?Y#`XKm7KGmXS^5NX$u6;9><Y67Z{s^_Ru6u+
z<HU!QKi1rA_*!{bolkL-_kf@a^LkTu(`zw^t9}07u4R_}65H4~%xcM_l;SITECk(a
z(Tg#1#C`KZlH10Mk2&vSo3ZJ!l_Jxn%o@~8!Eo-F=8x)Y&6d+#I?XiIyerMHn(#Su
za^Qy{N#@?A9|dzTnSrwy87cqyncGawGEQB&5$wdmW@s0d?>xEx$aBKkbGxVoBBnY{
zKIPID(_S{=lIjO=yioNv{;YOirTGB9I{U4}2dcGFeVOXaqT9--)tYTJ^M_Gui0-c$
zW<FDh^GApYtELaKdTc{6{e5>6^jHpEW9Ofl<}Rf!-^YfXgGZUQ%G@>0)ziG!1<1P2
zuG#OJ@urzj!<hLwl3A{r{inH)Lzycy=A&Q-fM)h-2J~wFemJ{Pv-~vUOLx$Cj-7za
zY;nv)IkBVIgB{dU{ES@`4oOT9`<y*};L%O(>~@X}$Hvh&7M%qz#K_6DSQGj_wQhoy
zmSgw9S93p<SQ)jcs!6V#M!c+8nDZ+)+zStr9Kio;FP^eB7f)Na<n#jA<(1p$z00=v
z+ecP@lsS0NOEVBPODEiK@HTU7-)VekgQ369tl5^Db@WF017=@Cdwy0k>BKAY5%l*L
zalaG4WL^&PvH-oQ@70}q2!<5kWkC!A=7O&CT+7~srP*sI8E>a2X4N9~!Ui!w5+AsP
zK9G8L*Cz0RBg6-)m8qFFf_#0oRWG8BkUf;iFb?4SFZhA^^K0h6bamsYr?!0CEt~iG
zRU5zYiM>(Ec`6>*ki;V!wSjXc9^0t3%=P4RK<pv&KH&lQ{Jq#C`_lyG`Y{tq^L@sC
z%zls^kFEa5uReQNbKJyJv5U-eWTsFSU7|Uy(aX@Cd0n!v9zQErDm{PhGsodHOItFp
zS{&8TuB;qstMPFZ14VeMgb8x?5C;<upqX0oc{M|^Ua_!fpQnGX*_lQ9PxRHi;aSM=
z$c^Z=Zp}erMj5m2-l%+Fi}yUW>R*^w)%DnhH{Z9RnMc@wU|z9g;B{#J+Uf^BLrHV-
zCNs}!!WYc2-i6P60lR{)*nR1e&#4p7>#o<a^Gr51a~)sc1a|H>{4DvPip6~{6)~ZF
zpdaNEl4~X=QqCa#%^a(m08i&*AfGi?golS%Sbur(m(f3*1MrW}|1obsb0Yo^o)35m
zb0Yq?SImjXW0WCI>z~A@|Dl{^sGmX|U5wL&GMdLJf?f{Q?eM%gs8GM!tKYw<udi>v
zw=mWM&MLf-bF>p%7tWE#860ClzQTM%VV>g)a)xfv`@iB0s!2{u&xU6JZ|&8S@<wou
zUT1h&pE_7se`hGXe|VNWEecqX<E5OZNLRj~C-P?qXAoqumBNgo!v|SI{Y1BuIzw1H
zkqv1O(&2S5l-C9a&r4{~tH-`CEy8!#XNdQ3j(^V?n%Rw9-MPeSsGF~A9BU1ehFSB*
z1=iF!(c`^d^)Gt=f9Dy({=dRGbcQ@`?LBaP<>DoD(Cp7-o)#e;nnw)6UzriqpzNUj
z6kkt%zGB=ob>(#{M_Kld@X>2Ubm+rJbz|QN`n>bFtDoalbZ}Y(a$QV^dS;wvz@m%u
zZ}rrxCFpgEZ=;4r^#s()B##BNG=<~Fx+YTBKLuQ7a3BlFf%A~l0U7uMeAGx!QP_jl
zA1%T@#8=5f3>>{;7;>-s59I+rp=r?w{OIN248-X2zfP{R#D~i*qgtOZUqdf;{lpJm
zkcC(BQ4tNw=@Zhdg?`WQ2kFoNCMw@2oG%>uKGk4F%?C4HXOX(}J^37JHo5oYKGi1^
zBPlkdo~Nm14DVm0k3u<k>m@XhOy|!~&HLBVD^qxXdZGR(9pYe_P2{esrw{ZVsB&;R
zok6|O@gdaxfi-y@88JX^Ke3+IoAU0|oOyjUesGd_uztmaeC!h7*P%Y@t5bXF)4V>a
zpH7W4{VdJ&G4wiv&LQ2(Q$Ge7L8epG=cv!O1$;h%9ITkmF765JXJ9WwQ|nk;NFP)q
z*!wE_Aj{|%RUfZoRpOsr#3012UOSn`B~)Wo6&cyHv$>cCFS7}uEa%_9df_0ep)Owi
zh>5X5e`2q5@c!v>V8uKsp5~GCwDInZ^yAf%KQ5uap`sG}c>4nSw<cOM`-E448&}nV
z2_9<$|0jO~zLq>1<iV8}%Q6#L7;Sws`z}799<vvI8t_qZElr`f0K3+g2C;SHt%2Rt
zu`#dP>KX5Oe`T-t&(onJPm3J-v<kjiH3J*O87eA9v7eM4GwNnMKel<YW!R<Dx}Cf=
zbq2~oMo&<82mi-TfE#g^`VGsiVev#uu{Y~w{%^5eD}H~Uqf=zp66Dv~zaD4R)X2x@
z2Jf%_*f@EdG>^_wHJ&{_)6k7$-n7b@<m&0ClicVmCCi3UH@`HfCnq1G-h$}HMdYvO
z2|q>btNg0^K*60=51yefs$n4*@HlJ(KEG^pc!nMf<JEFdm;r+v*V5zPw2GVywKjDN
z1{L}{TY2vmuu#4KYWkg)Ag7JIZzXpg1vgy{b`-^SRLmR#X1gM&0Y6Y-DeAl<3r5iE
zOTFxgZv(72pYK&{-dIlmD!MhXagtS1&$xQ|5GzOCd*z}e2SvH)zH(eV%cyG#eJYdQ
zw7N;u2vZY~<Lj=8^lZ%m*P|ydM{cQvzO{xpeY|ry1HUi3X{M!_qfsKcZJXtHu2?eu
z#Y(GQGK|_&a_2i!-oM~=KgtE~uV(Md46CMJb9L!tYowpAp`2N-;Ku5`EcD*WKYgi>
z+M`cHIjE+uvXmTsUEMINqmM@Yh3c<toP}MWf3#vDx`ZCncKABdq#i(e1-~R$M2$=h
zJ*Cl)sTK6O<n>lrI^1`{)oktpL;pCaH-_KkGo-(o2L@8g9&xasO)+d)x79a+1u7TR
zHx>@xKTm^R`ZTo3l4bZON>6ZN1MjqM4D$`Z()jPy^aw6RKHI*hZn$xbCBB#%>@B80
zvgIRk*QtrTKf0rPtR;7X=N(O0;=5(^(99+Ozci>DB=4sBK;b>PgAr@WjkYB-k(;iS
z)<T_C3%TRi81`en!p{zQ$lt#|eTp2b&o4!vQ{!CfNovPfv~-A7E*i`^(3xM%vRL;7
z?`vtJ->HT^%;oS<W>+b*nK;Xa$zV;1An&qQb}0?6`xQE$Jeg`=PlIzGY;oR6Z(8EL
zd#Vp@=v;1*StHE-yy93vcvNw$QzQpHH0a?Wmjm9vZYuVd&j@?sg>ScPm}reF>DOeB
z*a~vvK0}Fokk{5QQ_Af=en2G49D(!#uW`)&*bKe~->7y`?@o<R`pnlBrG~Hh^w-Go
z0ndpvY~P6PfggpVc#YAkW1Wx&swoNNm{0Lgo{zfdv#UYxM<%~*we|QR%J0)FCyZV?
zq8c3(CqF8@!)vkSN77rB1JiHcJloRL+h@RpRGTM^D1CJ=m<hPN*CtYPuNoEA+{ljo
zvW8wR^mRUF3;pa@^U$mPq8j9PF*;E5QrhT!Ofbhlc_*EtW&JqMFSTuvjtQ`6;qn1b
z*F&pCeiqdi#}CsJL>-lOvnnU1y4m_2pIJ#`sU@hb)7+EFbxTZsb}f1RD85n*%<}~r
zIHsBBqrWG|(4YiNw61xCRg+t9rsl4NzEt@siLHyRg`GCh^>Zz`js6bJo*@^lcb7lh
zx|{ulKUC8nL;uTB_@0_3)x7wQ1?mHGM{?HC&fh=SZ82&dBo{St@^I+rRoIT@(*~h?
z!uRL%@5w<JEBEnDHKU@riyncdspN^l!}j859c{7Xci2+wQMgCFwtI=kAIf2;$z|vE
z)>?`l)bs)7=-}7qsO<>%S?3P5@#mb4x(C&^HGP+{rg_X-<IW@GmYb-#QjLN5NOe~K
zF&YFi(6M!zrN5@uv3ioF$$jUT37|Y~%K`WtUe7TnVi~@`%GJa8ew+J~x=Y_Ldnjk|
z9}*U)_PmWeo$3v;zaB!*p!?B5%9+K<Q%A=SaU7<V7$JuJsF**vSDf?0`xp5XJ-%H(
zJ_Y=f{BjQVf0b2pCsmdBUerr_PU_SK-mBg7(5+uhr><dv|5;jizUoJbr&I@^8d%kl
z$H@bBP#@s)*tv7*pxDo!T6N1($6^|(ZCOdreLXf;dsPZ?S}_l))>H4^@B8;J$MwzA
zm_>qaL`JLXM{{>;@Y|{P<?&fFhoa0hK>zF@?nB3T54P(5ybb~#sTyzejdFAudU~2K
z?8MjHVX0G}SoNAJtDDWt7ixPN<IF-?GRR8FwPu99IR28ysr%z0&Jgx4dJp?cY=QS1
zqYK3+73JeCwv+q-Ibe@hg_Z9?9`Fwm+sfgY^%g(=3GWW3P900?I=S?7+pOg(_kC0K
z`KLYaTm5B<UcPx?CDaWpVfF+0q7rJ4Vr!>Tn>Vls1IxdEF%9~&$I?TgE|MG<+XDP9
z-=}jdVRdU4Su_0UF`r^4&e3up<vgA_4DUP7sIQ9mS5EK-bhve*P>-Wp^W+ic!)&Ck
zXc{v@h-b=6hB0pnKQ}`D4_oMU;~|a*PxWgH!ZY+|kNfB$=|st;F#5(%@#8<7#LmC&
zz-L##KK3;IGkYYY-<f0P_EouD-e32vI%?%QR3n#>uLhnF|Cl*%)W5gwUPzrEwO;i3
z26$>v^Hhwx6y%^k9^(DO*r0I#eSEs?u`GPfyPf?sutm(XSXMG2kVDn`Ag^h9P&0?&
z{qykp32ZER3B9}LXn1$^D>k3!=jiQk`GJ1Gt@EvwIY#ndtCzoTQD{-XUqbw@K!Y9`
z(Ck0gMdAGy%W;8+dg~#*yXQu<s{`AVp@yhsM;Saqe}eQkvY1iN9Wyhs@J;LtvU!m@
z9PV58DodSein?vrsp!+>_tYQlT!mlCeh2cW^~h}tF;CC?_n|=%5B2L4y}(07?~fb^
z6Z3v4?%!h#^7me2PTc49<f<1vNB-~f9<QlOpQKlmcrd63xrhuL#!vgw;s^PA^b#m8
zk8Q?B{)S#mV&c@-b1eeCRe1kAekWTH^ijTJ!X8yG_s8BJSuWzC2Ig6%4q!)Bf0D<^
zRP*ok@w}V&^HblWvv^MP(huA<G~j&V8}-NqJv8LHsWVnCzcM<4IZ536M>DK^>Oh|x
z)WPhe@C<G6kY?#MjRZ609M#B2M(<zHL#lIomzlZLy7AfY?puLh-G_%<4}mK+eL5Gp
z%fTn~EuGK%y7D1)4*9_+H<1IUPYrwOvZ@+i>JprHWC!FgtDhZxmD^K8+z`ZCDRzZ6
zf*tk6f$PA#s=<va(XC}*0@)%S68}d>yvJO)!QdMMJhsfdgopJ0>eC5&E<dt3du<XI
z(K*HS`O=l=h@&q4K%EVFRnCy6w^;nInkLafyAQ>K*`L^Tb)eCjzsFwC%N}iGHd_&v
zodI`=5VJ?9y%ztZc$z)m+FOs7G5cv1eX70ZlfgH|I8k1YN^iFQQ04xN^tbE9+q@V4
zZwejRcyf=|38gRW;qK45%m($;)P|sY3OyCV7?7c+E@q942cy8h%z)Rm^8Qic#^~yy
z7TYk(>z+~{lOqSySk1dPtA@777T3K0mc`q~fUV%qhkD5GzmHEHzCV25e58}!ufO@b
z%XiP+rJm_F_0e}OvR{t6*DFUor`>YpXTS5rHO_Vm{m=Q5SNFkR;8G_($KUI)#@Kvn
zk^<bNb@ZE7)5S~y>e`z3x8R%CSz;6OPq)mqx)ypQXR{-C#$Zcv2HAm9c&&zcb7g$5
z5qzlE`-eOf+Tpwm3!hXEm(Sb67P(GT|H=*O9d2q@E_It%Poi&b;-B62I<PKkoD=w&
z=?madVb6zZ?{+YYv4(z&Mbw>w!&G2*GZ%!pQNx1ol-aR@9!KT|O{K338I~N&mie9}
z-e2)d6TJ%c$ipk`K#?z0mBi;n?|c0m?=QJ@y9$4|-M#7ipt`S8!$F;%_Q$IpRkc;B
zJ5}9T8#P9Wqn~*!ll*ESbDXAIZYzAU3EuxH?mlafbBS3B+@%f~a6Lpms$n=a`sE|7
zAvWG>8)jG;{W^8vTTAg%D`pI`g#1x>s7aqMyZ@iqJBz$!PvDoyUw|G7_061z?{8BZ
zcI%mS+_-1$SFU)CW%oVmYV&mhqD>CDP(Mlg^%K+#QBz61V(v6}6?Ry*MZD93PHNp<
zVyO+|tOU%ub`scW^<0a7Hs2CE%iLxtUTtWb;x;eZ&CekltEo3m@%}0Fs6Hb@ncv6k
zz0j9X4l~W%3dv!|-7C(+Dfn1ErRoOTuASzcpZVUljw?649xg_mmukSe?%m_hu>rhy
z>uqX7srBo)cZ)NhB4>f$y1NNHLNg&ctz|FRzv?~c$BukhX^C^#?|e;!?6!PeVMxN$
zRri`=M|W-2IICYe(wdqkT4ntNi+wcL8d}F#Z3(rl%ngr!Fwjb-aK4MX*>_4`2Rxrc
zzr>Gy;kH(1(*3sncGGuFYUiZt85dFOq`lW&zf;Re9h+*u*WS5fxy$r9UZF1ZG%?N9
z{nm13kJTJLU`zJ?ZuMs#Sp4)aoHOt_9Fx#I0QC+d8{SvPXY-HX8uXnzo`+u??ifpL
z$CuhZ%bH{_(5<WKe<~kL4gy)$zm>)ZR-Zw~{hQ9$*^BJ*gdU1#YtICAN7{?2NA*YA
z<E=W?+>M|%HG6CiUvmc+_PI>t=<ldH^~jd}_!Qmng!g`k?Y>1W;Acym-{SR_LCr0`
zplUC{FT6&D*iSqse_rzqn?Ih$yvy;9<)l8IXm#|n`kYpm-@uR1{1e$F)flg#PCk3%
zsde7CW$jnd^=Hpn%h?+?Z4-ORs3jZw$x~ahpFM9E?s0F_O<%fZ9lz3Nas7dH-bB`s
z^VU1pOgrt{Z%~JSk(mC$E%=Xn$InZvMp}KnULOf=2hRvg(tk@oxtuGnr}`rBn#|{u
zt+tVRY34viMhrmS-!spF7wOPOYU5&8?%T?P53K6MQ{SiOwL{bes`gbo)>a&P?zM5M
zft$YhsZIa(v5joKYZE_zz%IQf)^HY?xWhePzimzDA3A-yxbyD2)B|0o4(c4X?G!N`
z{fF88aby{cX(u@j@D0U%S+MEEp}>!CWp21?f)YDdGdFIMRZL_K8ThhdV%7dvjitAd
zufsXP;@{Yb8~DW!;eltCIe*on)Sqd;tM=@QU$l!)^-tQ}_CY&!UhD(Z{$|y*P5CC^
zDb)gMU#n{SRQua_P7gAI4EbEIQ(xet!Y8U@I!<1RUf)>9Smq|u^Ei@uHXqRkvAvdA
zxRb4}^aG1_FR<pXmRWV_FnXYd6k__G97n)E>#kn3?pyaQ@$)5ih5l;uzIkXPQV(qI
zmM1oAE4%2vX0IXl{!aY^(>}v@Im3UQ|GWK_eU%fxcxo#S+@=2V8Gb0c?4j9=Ez~Wa
zc*ghGiwZs5#}J0-vPyhLOr4-7EK6;5>=Sw}=tYnXD@RwhV83$mL3t9)D61`>LXGWU
zbPahX?!1=`a2|pd)KXUQ`?NDR+>iTa?L%9*gIdYY*@+$Fy;Bc;hu#O&)xBPJ-}kDj
z_D=O=bH1Y{^CY$C=gv`E{?uBbq4s-rJ@}oymc;b<+TOo{f9G>(l)pO+4^c~y1E*~H
z7>s)idYm&9*Np|35NCmBUcglJ?)mqpJm??)`|o%Is?+*UJpas7sMGpiUsb17T-y}*
zUp+NVK@9cEIMC@1{qcW$<s`@l74nMt+;mtYpwF<bq;D+rLVZ{sSMB=_>RncjP4b@_
z%>4Li!+XC2SY)r<Y@c@sbNRh$y%Y<3Jlr>??|l!g@_kl}x5hg9)05MvA3}H4POyyZ
znC>COq{DZ3ZE#TYR8;5DqFiuTV?$lX3w0^^`lb-u5#H(86u3@o$`DI@OWuZ>ciE_n
zYQXm_2Xj^Jz@Q>LEx3dJ=%9TTo>wn=hr(U-xrYS4UqpLs^R$Rh9Ac@1QTI<X`<g7N
zdTMG%<fp_YQ~OfP3*jBSKB(6nR7_zux^nq?!go+kKa4N)?~ug5uAf1CteBp-OgMXE
z^D?)6nG+v^@8hp(Hj8p?`|B+}dt?tD;dI~*!gmlI@_Z0sc5ghqgQ9n6AcvhMPE67p
z5gjRvnSOF++SQXwt0pH{N*zaHXOm;pDR#j7{maiGm)#JboZq?7M;^l8Uvvi%e9ss;
zuBJ&vbtc?HSl6I9yOi3II`Gv<ju|jJ=2_e3sr2*FrvgUTas|u{KR0pa3v1pPvq<$E
z%k_;ZUcrlz1aqiY!$;GY;Y)o&GGCieHg}N4ID5lVY5-;t7Z5|nKAi^!Mn0BWgh+&U
z_!8_@Scq~bCqJ|ZeTH=lhZ6e_umUy_%0h_k_PK-3$*<FA0G>>(ismObuOM!vCZc2x
z*!T*1biwt7FW1Z(Y-#E@G<T~pIfFduNNXnFt64+BDwBT$Q=B=1+!Vb#^eZ*1Z=nya
z(4Rb(6Zgd1ssDopZT$YGni1rT$mvkGliJ8kxi!j3FQ)f&jQil}Z7Xf{9Q=?&pE+jh
zbBUS#82fY~bFgZyWna#kvGFh1b>ixRUd-Qt<gs<;TNW#!t_J+1VgWn8%SKwuhpJUs
zXo-&}6E}~s)YgU6a&z~ZkGPBdHq3|h`k@P(xsNEhmihE@q^x;Y#+ny1Z!@&be}E5?
z)86zvcbr+hnQvxVqMiOw;)%>&VkYRE+@+qmO8l>J^jlEh!>l*WC=fQ90#k}J+r#Ix
z{rZDNX7Ia1yt%)3=tmzkh}Q5|n%<QRv-C9Qr)oa3x&=N~4nQ?s$W$AAr+6Z93Oria
z74dxh<Swh<4u%W9Sl2Ss=Uudbk>!LJ_xJlle6mO%)I~>GecdSV6Y3@K-Ll+!{9|%b
z<gT(uS_0o%{YBIoWPc(j2!^KEBuDRSV)JU^xlI=Rq01T;jH4z4{Q&;xySj_s!Sgl!
z*+=+5voforQ!L~COVm41FQA<2>e`7G+g9s1sAApJfuuDvC$E#9&<=30^e^DrV3E;X
z^vl!dpJ4VuQ`LxqZRmxQ^x^~J^deboruQ)pp4ZsD7)*d%IdNNhKQZQ(`J6W%@R{&_
z&1KO%pIhW4gd>6t#fj-7tH|ZD-(vN$4=l!KXd41QG4CVx`u)9aV`?jL2|j0aVqOsM
zo&|GZCT3;_J(|dM;yig0;WzMCl9?&${Yw0H$QpNcSk2-wR!z>bhPj|s4WokmS&@A#
zz5}nr>5m4YIeFFU#B|~h<cir{NqX#)2Xn-dfAc(t@J8XGL0*QhnNL*JIN1{GCRq*h
z_UqYEktF^OZFH|Yco`q&X`q@p$2#{hN3C_X->c_Vz<n}DH-MRN?~Y%Q2LgLYT*Plj
z=G(R{@Sf%x^rY9N<0tg|{vIE}dpr8Z7)5g6xe<JS#b2p?4UU_to-BRhZ<ZszNu2$T
z-+#jKzZ95c@;F%d!4^w0^HcR0_0`PcDfkI_zwu=>pr0<ph(g~WzL|JhGpx}mio;c-
zp`1YK!Vb%V6{Uq4-8uo?PX)9f-V(iPs1=HTJk#oy5A)i5y+b>=VZ-QmEsK8;p%x;<
z{nOAuwOEk>;M1}Rjx*%t0J&?~hn$~=*6L*!zE6H4abh!A6*2ZTbPco@ZY7>~EPr2w
z+8_FBsDEgo&RD$xZQOr+JU$8deHAr-s#VqR&!PuZli0$n39kn$*ree1XOE;kc5J!C
z{HI&wUin?k!i;|1kDfaj^g2QJ@b{-Ke9OM8Cgg6cwJe|(a~yLHs8?%grCz#qoHddc
z(aaCe;qdz#@RuTs-tWgA1#+nKBsjZfkLB)O;&=YeT{Eld`bjW1urKo0sq66mWpJtU
z$p6n9nC-s8YVet~2QI!7+k2GU(wEc?b)!d?Q~SpLo*Xo&Cl6Br<{ZNxaDD80pf?Xh
zx5uy_`(3s?rsj99xkqpO&5P77JoFi`9pFxF^cSZt(i=_wp*9I_w{9{uDClY7Gw?$s
zL(LUFqOjvA_Z?eK9UlI1&0K23&`aLm4<8ij@$!C2>Sr)wa%buD%=G~COJ4@71K)1H
za?LTyE^t-hPwmQs|GFF9tG@gzmO94#ze7oD0h?>xUukh_)~l9JVKych%RXvf$o(e3
zjoZFoK>aFphF}>@qj|5H<QwJ;@xJ=zp@Yz=yF6!?1}{&Z{uZo}yTA22@&8lrhg(fg
zVD82fa64vZFk7Yd8hK%8k&)dwyveE$AG78Yd##nZ|C+xQ>_r1xXAVFL-V#2V{h^#V
zVTmQT;V*y93^{B?EqRO@cry##g%RqEZQx;@H>g!OcisE7)xWqBj7mM)!e-mfksG@5
z3-5OhUcF<LCm!=|cX{WV>>b$0JE2FAWyf-qf0aM1z69Q(Av4Z$n`c;*ylG@;j|{f_
zcAtK_-@$+%(L4DJ-UlB7JDanEp4qieZNctmHvh}(wrI<BW`aHiAAV$sOE>9>1}nby
z8~8T&p*kq)8gmEef7?g>5%x3v6Sa(BGOD>sQ~MKPr$j{_FKWO)OSv8xXx+cvu$EId
zElYo4?a_PQb1R%`G&stDmPg*(_g3`-8~+*a0_LTj-ub-Kk^|~v2AcyPPF>hS|H3-_
zBQQ?<nCcR2;gt88NxanJr6Vm;id^Q%5l9aE*uu=Ur(imdZ0y<x_EyaUoALD%8=j+2
zw(T)J(@*WSRrhQ_^r7Qbk)N-Ef8Ms1OPu}pCzibhwvH`S?Tq)gA7dv7zMAGYv><z)
zzd{GdCri@fC_UKs_X7|7cm1Dm3SbGxDhfEo|NJ6O;V~(C)@_Y2DfCOI-=$k5*V=QJ
zrDw$bd~gTvG0Ml<+Pl-=zmb)Wh98>OEChQ5n=YSVL5(^-DE@gECngjlDn1QkbnHz6
zjISANFGU}%W}s#F;jdB`lp6Vd;OoE1-`BsvJ4ENB?}@MUZz%s5C7!CH52hKt5&3YL
zCC_~W|8!UjyG^~WCyd$h=ZGyEXleFMq^Fb1o6WwB3hIa086^KH(piBX*<!KQ#n!m!
zgCO=ozj?foe~0MG!PYnjJT*$)?Z?bVA%~v$mYpeoTV;uJ)YR;$x5zgQmPCg+kH}Xl
zdWR<b^wc-=EkeDt>V>mEHd*TXD(o{g^ys5z=2b+RmYD9->5;dy;X6b!;3E5KErnkf
z`-a-g)6_NmnDo3<`j=1GTiard#Exn5d<9!kc!xoj{9>`iw%`{YL&o;jV5_MQ_!XUZ
z;}?s3N6!KE*$s1p`Zf3agbU?mT>PN?L+nd(UDTGPk8i}5Q}>DPOP&3K`<O``-}}}I
zzTteO7$&q8`Fj*?(&W!n_m{b{kC>OguX-Ko!kWKe=k9ELd3*rjrCDshupy6u^JmBq
zJESh-!(OMx?F#?KEqq$^b^2(RC2}(?GXWVT29*Ec*ao$bvRQrx=#V%`u9Q4f?lyT5
z=8U!dewp_;NIgfnMJq<4>)S2f%-)e{*qF)GHBE+p!@rNem$~qL;8WeWjQ)It5B~_8
zhK*&;M2b3?=0nh6OUe>Ic3A4Cq$NIEXffutM^+AJX4C*M?`znBJN(@{Hg(f8TXo=(
zMNi!!H*v)hmzha%ojeK{K=!Em@!4f?u-2MVV=WHOEq;!jzGn-*y=Qa4-iLNPws#sH
p+WZ|4t?txg@*xi_BYKe6i*KB3&2vUrY6d!V_OJpk{(n_c|1Z821j7IT

literal 0
HcmV?d00001

diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 77da271fd..a6eefa6d7 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -296,33 +296,6 @@ async function saveMap() {
   window.URL.revokeObjectURL(URL);
 }
 
-// Send .map file to server [test function]
-async function sendToURL(URL = "http://localhost:8000/upload.php") {
-  if (customization) {tip("Map cannot be saved when edit mode is active, please exit the mode and retry", false, "error"); return;}
-  closeDialogs("#alert");
-
-  const blob = await getMapData();
-  const xhr = new XMLHttpRequest();
-  xhr.open("POST", URL, true);
-  //xhr.setRequestHeader("Content-Type", "blob"); // set request header
-  xhr.onload = e => console.log("onload", e.responseText);
-  xhr.onreadystatechange = () => {if (xhr.readyState === 4 && xhr.status === 200) tip(`File is sent to cloud storage`, true, "success", 7000);}
-  xhr.send(blob);
-}
-
-// Load .map file from server [test function]
-async function loadFromCloud() {
-  ldb.get("lastMap", blob => {
-    if (blob) {
-      loadMapPrompt(blob);
-    } else {
-      tip("No map stored. Save map to storage first", true, "error", 2000);
-      console.error("No map stored");
-    }
-  });
-  uploadMap(blob);
-}
-
 function saveGeoJSON_Cells() {
   let data = "{ \"type\": \"FeatureCollection\", \"features\": [\n";
   const cells = pack.cells, v = pack.vertices;
diff --git a/upload.php b/upload.php
deleted file mode 100644
index 7cf942bc7..000000000
--- a/upload.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-header("Content-type: text/plain");
-echo "received:";
-var_dump(file_get_contents('php://input'));
-print_r($_POST);
-?>
\ No newline at end of file