Exolve v1.13

viresh-ratnakar · Apr 11, 2021 · b9d86e0 · b9d86e0
1 parent 253d1e2
commit b9d86e0
Show file tree

Hide file tree

Showing 54 changed files with 149 additions and 137 deletions.
diff --git a/exolve-from-ipuz.js b/exolve-from-ipuz.js
@@ -24,7 +24,7 @@ SOFTWARE.
 The latest code and documentation for Exolve can be found at:
 https://github.com/viresh-ratnakar/exolve
 
-Version: Exolve v1.12 April 8 2021
+Version: Exolve v1.13 April 10 2021
 */
 
 /**

diff --git a/exolve-from-puz.js b/exolve-from-puz.js
@@ -24,7 +24,7 @@ SOFTWARE.
 The latest code and documentation for Exolve can be found at:
 https://github.com/viresh-ratnakar/exolve
 
-Version: Exolve v1.12 April 8 2021
+Version: Exolve v1.13 April 10 2021
 */
 
 function exolveFromPuzNextNull(buffer, offset) {

diff --git a/exolve-m-simple.html b/exolve-m-simple.html
@@ -14,11 +14,11 @@
 
 See the full Exolve license notice in exolve-m.js.
 
-Version: Exolve v1.12 April 8 2021
+Version: Exolve v1.13 April 10 2021
 -->
 
-<link rel="stylesheet" type="text/css" href="https://viresh-ratnakar.github.io/exolve-m.css?v1.12"/>
-<script src="https://viresh-ratnakar.github.io/exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="https://viresh-ratnakar.github.io/exolve-m.css?v1.13"/>
+<script src="https://viresh-ratnakar.github.io/exolve-m.js?v1.13"></script>
 
 <title>Exolve</title>
 

diff --git a/exolve-m.css b/exolve-m.css
@@ -5,7 +5,7 @@ Copyright (c) 2019 Viresh Ratnakar
 
 See the full license notice in exolve-m.js.
 
-Version: Exolve v1.12 April 8 2021
+Version: Exolve v1.13 April 10 2021
 */
 
 @media (max-width: 500px) {

diff --git a/exolve-m.html b/exolve-m.html
@@ -10,10 +10,10 @@
 
 See the full Exolve license notice in exolve-m.js.
 
-Version: Exolve v1.12 April 8 2021
+Version: Exolve v1.13 April 10 2021
 -->
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 
 <title>Exolve (replace with puzzle title)</title>
 

diff --git a/exolve-m.js b/exolve-m.js
@@ -79,7 +79,7 @@ function Exolve(puzzleSpec,
                 visTop=0,
                 maxDim=0,
                 saveState=true) {
-  this.VERSION = 'Exolve v1.12 April 8 2021'
+  this.VERSION = 'Exolve v1.13 April 10 2021'
 
   this.puzzleText = puzzleSpec
   this.containerId = containerId
@@ -93,6 +93,20 @@ function Exolve(puzzleSpec,
   this.credits = []
   this.questionTexts = []
 
+  this.NINA_COLORS = [
+    'blue',
+    'green',
+    'aqua',
+    'fuchsia',
+    'yellow',
+    'crimson',
+    'limegreen',
+    'royalblue',
+    'mediumturquoise',
+    'mediumorchid',
+    'goldenrod',
+    'red',
+  ];
   // Each nina will be object with props: colour and list (an array containing
   // location [i,j] pairs and/or span class names).
   this.ninas = []
@@ -908,6 +922,8 @@ Exolve.prototype.answerListener = function(answer, forceUpper) {
 // last ')'.
 Exolve.prototype.redisplayQuestions = function() {
   this.questions.innerHTML = '';
+  const savedAnsList = this.answersList.slice();
+  this.answersList = [];
   for (let s of this.questionTexts) {
     let enumParse = this.parseEnum(s)
     let inputLen = enumParse.placeholder.length
@@ -977,6 +993,9 @@ Exolve.prototype.redisplayQuestions = function() {
     answer.addEventListener(
         'input', this.answerListener.bind(this, answer, forceUpper));
   }
+  for (const a of savedAnsList) {
+    if (!a.isq) this.answersList.push(a);
+  }
 }
 
 Exolve.prototype.parseSubmit = function(s) {
@@ -4918,19 +4937,6 @@ Exolve.prototype.makeColouredRect = function(row, col, colour) {
 }
 
 Exolve.prototype.redisplayNinas = function() {
-  const NINA_COLORS = [
-    'rgb(0,0,220)',
-    'rgb(0,220,0)',
-    'rgb(0,220,220)',
-    'rgb(220,0,220)',
-    'rgb(220,220,0)',
-    'rgb(220,50,50)',
-    'rgb(50,220,50)',
-    'rgb(50,50,220)',
-    'rgb(50,200,200)',
-    'rgb(200,50,200)',
-    'rgb(200,200,50)',
-  ];
   this.ninaGroup.innerHTML = '';
   this.ninaClassElements = [];
   let ninaColorIndex = 0;
@@ -4946,8 +4952,8 @@ Exolve.prototype.redisplayNinas = function() {
     }
     let colour = nina.colour;
     if (!colour) {
-      colour = NINA_COLORS[ninaColorIndex];
-      ninaColorIndex = (ninaColorIndex + 1) % NINA_COLORS.length
+      colour = this.NINA_COLORS[ninaColorIndex];
+      ninaColorIndex = (ninaColorIndex + 1) % this.NINA_COLORS.length
     }
     for (let cellOrClass of nina2) {
       if (!Array.isArray(cellOrClass)) {

diff --git a/exolve-player.html b/exolve-player.html
@@ -3,10 +3,10 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
-<script src="exolve-from-ipuz.js?v1.12"></script>
-<script src="exolve-from-puz.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
+<script src="exolve-from-ipuz.js?v1.13"></script>
+<script src="exolve-from-puz.js?v1.13"></script>
 
 <style>
 #exolve-player {

diff --git a/exolve.html b/exolve.html
@@ -112,7 +112,7 @@
                 visTop=0,
                 maxDim=0,
                 saveState=true) {
-  this.VERSION = 'Exolve v1.12 April 8 2021'
+  this.VERSION = 'Exolve v1.13 April 10 2021'
 
   this.puzzleText = puzzleSpec
   this.containerId = containerId
@@ -126,6 +126,20 @@
   this.credits = []
   this.questionTexts = []
 
+  this.NINA_COLORS = [
+    'blue',
+    'green',
+    'aqua',
+    'fuchsia',
+    'yellow',
+    'crimson',
+    'limegreen',
+    'royalblue',
+    'mediumturquoise',
+    'mediumorchid',
+    'goldenrod',
+    'red',
+  ];
   // Each nina will be object with props: colour and list (an array containing
   // location [i,j] pairs and/or span class names).
   this.ninas = []
@@ -941,6 +955,8 @@ <h2 id="${this.prefix}-title" class="xlv-title"></h2>
 // last ')'.
 Exolve.prototype.redisplayQuestions = function() {
   this.questions.innerHTML = '';
+  const savedAnsList = this.answersList.slice();
+  this.answersList = [];
   for (let s of this.questionTexts) {
     let enumParse = this.parseEnum(s)
     let inputLen = enumParse.placeholder.length
@@ -1010,6 +1026,9 @@ <h2 id="${this.prefix}-title" class="xlv-title"></h2>
     answer.addEventListener(
         'input', this.answerListener.bind(this, answer, forceUpper));
   }
+  for (const a of savedAnsList) {
+    if (!a.isq) this.answersList.push(a);
+  }
 }
 
 Exolve.prototype.parseSubmit = function(s) {
@@ -4951,19 +4970,6 @@ <h2 id="${this.prefix}-title" class="xlv-title"></h2>
 }
 
 Exolve.prototype.redisplayNinas = function() {
-  const NINA_COLORS = [
-    'rgb(0,0,220)',
-    'rgb(0,220,0)',
-    'rgb(0,220,220)',
-    'rgb(220,0,220)',
-    'rgb(220,220,0)',
-    'rgb(220,50,50)',
-    'rgb(50,220,50)',
-    'rgb(50,50,220)',
-    'rgb(50,200,200)',
-    'rgb(200,50,200)',
-    'rgb(200,200,50)',
-  ];
   this.ninaGroup.innerHTML = '';
   this.ninaClassElements = [];
   let ninaColorIndex = 0;
@@ -4979,8 +4985,8 @@ <h2 id="${this.prefix}-title" class="xlv-title"></h2>
     }
     let colour = nina.colour;
     if (!colour) {
-      colour = NINA_COLORS[ninaColorIndex];
-      ninaColorIndex = (ninaColorIndex + 1) % NINA_COLORS.length
+      colour = this.NINA_COLORS[ninaColorIndex];
+      ninaColorIndex = (ninaColorIndex + 1) % this.NINA_COLORS.length
     }
     for (let cellOrClass of nina2) {
       if (!Array.isArray(cellOrClass)) {

diff --git a/gussalufz-1-solved.html b/gussalufz-1-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Gussalufz</title>
 </head>
 

diff --git a/gussalufz-1-unsolved.html b/gussalufz-1-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Gussalufz</title>
 </head>
 

diff --git a/gussalufz-10-solved.html b/gussalufz-10-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>King's Rule</title>
 </head>
 

diff --git a/gussalufz-10-unsolved.html b/gussalufz-10-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>King's Rule</title>
 </head>
 

diff --git a/gussalufz-11-solved.html b/gussalufz-11-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Missing Instructions</title>
 </head>
 

diff --git a/gussalufz-11-unsolved.html b/gussalufz-11-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Missing Instructions</title>
 </head>
 

diff --git a/gussalufz-12-solved.html b/gussalufz-12-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Fifteen Puzzles</title>
 </head>
 

diff --git a/gussalufz-12-unsolved.html b/gussalufz-12-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Fifteen Puzzles</title>
 </head>
 

diff --git a/gussalufz-13-solved.html b/gussalufz-13-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Cursory Appearances</title>
 </head>
 

diff --git a/gussalufz-13-unsolved.html b/gussalufz-13-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Cursory Appearances</title>
 </head>
 

diff --git a/gussalufz-14-solved.html b/gussalufz-14-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Putting Two And Two Together</title>
 </head>
 

diff --git a/gussalufz-14-unsolved.html b/gussalufz-14-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Putting Two And Two Together</title>
 </head>
 

diff --git a/gussalufz-15-solved.html b/gussalufz-15-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <script src="gussalufz-15.js"></script>
 <title>Al’s Trick</title>
 </head>

diff --git a/gussalufz-15-unsolved.html b/gussalufz-15-unsolved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <script src="gussalufz-15.js"></script>
 <title>Al’s Trick</title>
 </head>

diff --git a/gussalufz-16-solved.html b/gussalufz-16-solved.html
@@ -3,8 +3,8 @@
 <head>
 <meta charset="utf-8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.12"/>
-<script src="exolve-m.js?v1.12"></script>
+<link rel="stylesheet" type="text/css" href="exolve-m.css?v1.13"/>
+<script src="exolve-m.js?v1.13"></script>
 <title>Untitled Crossword</title>
 </head>