move s/key to alternate, and fix bug

index.html

@@ -43,6 +43,7 @@ <h1>Passphrase and Password Generator</h1>
               <option>Pokerware</option>
               <option>RockYou</option>
               <option>Simpsons</option>
+              <option>S/KEY</option>
               <option>Trump</option>
             </select>
           </div>
@@ -151,7 +152,6 @@ <h1>Passphrase and Password Generator</h1>
               <option>Apple, Inc.</option>
               <option>Bubble Babble</option>
               <option>Korean K-pop</option>
-              <option>S/Key</option>
               <option>Secret Ninja</option>
             </select>
           </div>
@@ -237,6 +237,7 @@ <h1>Passphrase and Password Generator</h1>
     <script src='lists/alternateRockyou.js'></script>
     <script src='lists/alternateShavian.js'></script>
     <script src='lists/alternateSimpsons.js'></script>
+    <script src='lists/alternateSkey.js'></script>
     <script src='lists/alternateTrump.js'></script>
 
     <!-- bitcoin passphrase generator -->
@@ -294,9 +295,6 @@ <h1>Passphrase and Password Generator</h1>
     <script src='lists/effStarTrek.js'></script>
     <script src='lists/effStarWars.js'></script>
 
-    <!-- pseudowords generator -->
-    <script src='lists/pseudoSKey.js'></script>
-
     <!-- emoji - on its own -->
     <script src='lists/randomEmoji.js'></script>
 

js/main.js

@@ -323,19 +323,20 @@ function generateAlternate (selection) {
       wordList = wordList.concat(alternatePokerware)    // 5304 words
       wordList = wordList.concat(alternateRockyou)      // 7776 words
       wordList = wordList.concat(alternateSimpsons)     // 5000 words
+      wordList = wordList.concat(alternateSkey)         // 2048 words
       wordList = wordList.concat(alternateTrump)        // 8192 words
       wordList = wordList.concat(bitcoinEN)             // 2048 words
       wordList = wordList.concat(dicewareEN)            // 8192 words
       wordList = wordList.concat(dicewareBeale)         // 7776 words
-      wordList = wordList.concat(dicewareNLP)           // 9072 words
+      wordList = wordList.concat(dicewareNLP[0])        // 1296 words
+      wordList = wordList.concat(dicewareNLP[1])        // 7776 words
       wordList = wordList.concat(effDistant)            // 1296 words
       wordList = wordList.concat(effGameOfThrones)      // 4000 words
       wordList = wordList.concat(effHarryPotter)        // 4000 words
       wordList = wordList.concat(effLong)               // 7776 words
       wordList = wordList.concat(effShort)              // 1296 words
       wordList = wordList.concat(effStarTrek)           // 4000 words
       wordList = wordList.concat(effStarWars)           // 4000 words
-      wordList = wordList.concat(pseudoSKey)            // 2048 words
       break
     case 'English (Deseret)':
       wordList = alternateDeseret
@@ -358,6 +359,9 @@ function generateAlternate (selection) {
     case 'Simpsons':
       wordList = alternateSimpsons
       break
+    case 'S/KEY':
+      wordList = alternateSkey
+      break
     case 'Trump':
       wordList = alternateTrump
       break
@@ -638,7 +642,6 @@ function generatePseudowords () {
   if (pseudo === 'Apple, Inc.') ret = generateApple()
   else if (pseudo === 'Bubble Babble') ret = generateBabble()
   else if (pseudo === 'Korean K-pop') ret = generateKpop()
-  else if (pseudo === 'S/Key') ret = generateSKey()
   else if (pseudo === 'Secret Ninja') ret = generateNinja()
 
   const pass = ret[0]