v1.4.26

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>
 

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;

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;

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