From b82276242915087aeabbbee813d46bf9b346883c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Thu, 4 Oct 2018 23:03:25 +0900
Subject: [PATCH] Add: make letter list

---
 src/game/typing/lib/typing_text_manager.js |  6 ++++
 src/game/typing/whac_a_mole/game.js        | 39 ++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/game/typing/lib/typing_text_manager.js b/src/game/typing/lib/typing_text_manager.js
index 7e577ad..102ef4a 100644
--- a/src/game/typing/lib/typing_text_manager.js
+++ b/src/game/typing/lib/typing_text_manager.js
@@ -34,3 +34,9 @@ TypingTextManager.prototype.makeTestContents = function(arr) {
 	this.init();
 	this.add(this.getShuffledArray(arr));
 }
+
+
+
+TypingTextManager.shuffledArray = function(arr) {
+	return Phaser.ArrayUtils.shuffle(arr);
+}
\ No newline at end of file
diff --git a/src/game/typing/whac_a_mole/game.js b/src/game/typing/whac_a_mole/game.js
index bd28e8a..03b849e 100644
--- a/src/game/typing/whac_a_mole/game.js
+++ b/src/game/typing/whac_a_mole/game.js
@@ -223,10 +223,10 @@ var TypingPractice = {
 	},
 
 	shuffleLettetFollowingFJKey: function(wordList) {
-		var typingTextMan = new TypingTextManager();
+		// var typingTextMan = new TypingTextManager();
 
 		var letters = [];
-		var shuffleLetters = typingTextMan.getShuffledArray(wordList);
+		var shuffleLetters = TypingTextManager.shuffledArray(wordList);
 		for(var i = 0; i < shuffleLetters.length; i++) {
 			if(this.isLeftHandLetter(shuffleLetters[i])) {
 				letters.push(shuffleLetters[i]);
@@ -248,6 +248,31 @@ var TypingPractice = {
 		return letters;
 	},
 
+	suffleAllLetters: function() {
+		var allLetters = [];
+		if(isKoreanTypingApp()) {
+			allLetters = koreanBasicLeftWordList;
+			allLetters = allLetters.concat(koreanBasicRightWordList);
+			allLetters = allLetters.concat(koreanBasicRightWordList);
+			allLetters = allLetters.concat(koreanLeftUpperWordList);
+			allLetters = allLetters.concat(koreanRightUpperWordList);
+			allLetters = allLetters.concat(koreanLeftLowerWordList);
+			allLetters = allLetters.concat(["ㅡ"]);	// koreanRightLowerWordList);
+			allLetters = allLetters.concat(koreanSecondFingerWordList);
+		} else {
+			allLetters = englishBasicLeftWordList;
+			allLetters = allLetters.concat(englishBasicRightWordList);
+			allLetters = allLetters.concat(englishBasicRightWordList);
+			allLetters = allLetters.concat(englishLeftUpperWordList);
+			allLetters = allLetters.concat(englishRightUpperWordList);
+			allLetters = allLetters.concat(englishLeftLowerWordList);
+			allLetters = allLetters.concat(["m");	// englishRightLowerWordList);
+			allLetters = allLetters.concat(englishSecondFingerWordList);
+		}
+
+		return TypingTextManager.shuffledArray(allLetters);
+	},
+
 	loadLetters: function() {
 		var appName = "";
 		var letters = [];
@@ -266,6 +291,11 @@ var TypingPractice = {
 
 			// letters = letters.concat(this.shuffleLettetFollowingJKey(koreanLeftUpperDoubleWordList));
 			// letters = letters.concat(this.shuffleLettetFollowingFKey(koreanRightUpperDoubleWordList));
+
+			for(var i = 0; i < 5; i++) {
+				letters = letters.concat(["ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ"]);
+				letters = letters.concat(this.suffleAllLetters());
+			}
 		}
 		else {	// isEnglishTypingApp
 			letters = letters.concat(["f", "j"]);
@@ -281,6 +311,11 @@ var TypingPractice = {
 
 			// letters = letters.concat(this.shuffleLettetFollowingJKey(englishLeftUpperDoubleWordList));
 			// letters = letters.concat(this.shuffleLettetFollowingFKey(englishRightUpperDoubleWordList));
+
+			for(var i = 0; i < 5; i++) {
+				letters = letters.concat(["f", "j", "f", "j", "f", "j", "f", "j", "f", "j"]);
+				letters = letters.concat(this.suffleAllLetters());
+			}
 		}
 
 		console.log(letters);