modified: index.html

	modified:   main.js
	modified:   style.css
	modified:   words/words.js
	modified:   words/words_gen.rb
	new file:   words/words_start.js

Author: NNBnh

index.html

@@ -22,6 +22,7 @@
     </div>
 
     <script type="text/javascript" src="words/words.js"></script>
+    <script type="text/javascript" src="words/words_start.js"></script>
     <script type="text/javascript" src="main.js"></script>
   </body>
 </html>

main.js

@@ -1,6 +1,7 @@
 const scoreDisplay = document.getElementById("score");
 const pieces = document.getElementById("pieces");
 const warningBar = document.getElementById("warningBar");
+
 const buttonEnd = document.getElementById("buttonEnd");
 const buttonInfo = document.getElementById("buttonInfo");
 const buttonStartIcon = document.getElementById("buttonStartIcon");
@@ -39,7 +40,7 @@ function startGame() {
   score = 0;
   scoreDisplay.innerHTML = 0;
 
-  currentWord = words[Math.floor(Math.random() * words.length)].split(" ")[0];
+  currentWord = words_start[Math.floor(Math.random() * 100)];
   pieces.innerHTML = `
     <div class="piece">
       <input class="shadow" disabled value="${currentWord}" />
@@ -99,8 +100,8 @@ function checkWord(event) {
 
   const fullWord = `${currentWord} ${joinWordFormated}`;
 
-  if (! words.includes(fullWord)) { warning("Từ này không có trong từ điển"); return }
-  if (history.includes(fullWord)) { warning("Từ này đã được sử dụng"); return }
+  if (! words[currentWord].includes(joinWordFormated)) { warning("Từ này không có trong từ điển"); return }
+  if (history.includes(fullWord)                     ) { warning("Từ này đã được sử dụng");        return }
 
   history.push(fullWord);
   currentWord = joinWordFormated;
@@ -177,6 +178,8 @@ function scoreBoard() {
     <iframe class="shadow" src="https://docs.google.com/spreadsheets/d/e/2PACX-1vTgPJqsipjuAGyCwu-OpUJdbnlvqgPFHiXxBKESWwp50RbO0KaLBaJBhYwtLzHIIsUp2ll4-yZh2WGI/pubhtml?gid=1462957762&amp;single=true&amp;widget=true&amp;headers=false"></iframe>
   `;
 
+  warning();
+
   buttonEnd.classList.add("disabled");
   buttonInfo.classList.remove("disabled");
   buttonStartIcon.classList.remove("la-redo-alt");

style.css

@@ -2,7 +2,7 @@
 @import url('https://fonts.googleapis.com/css?family=Comfortaa&display=swap');
 @import url('https://fonts.googleapis.com/css?family=Lobster&display=swap');
 
-@font-face{
+@font-face {
   font-family: "Bmono";
   src: url("https://raw.githubusercontent.com/NNBnh/bmono/main/dist/bmono/woff2/bmono-regular.woff2") format("woff2");
 }
@@ -220,7 +220,7 @@ body {
 }
 
 iframe {
-  height: 80vh;
+  height: 70vh;
   width: 80vw;
   min-width: 20em;
   border-radius: 0.2em;

words/words.js

@@ -1 +1,14 @@
+#!/usr/bin/env ruby
 
+require "json"
+
+words = {}
+File.readlines("words.txt").each do |word|
+  first, last = word.split
+  words[first] = Array(words[first]) + [last]
+end
+
+words_start = words.sort_by { -_2.size } .first(100).to_h.keys
+
+File.write("words.js", "const words = #{words.to_json};")
+File.write("words_start.js", "const words_start = #{words_start};")