Fix bugs with words-based games

AgustinSRG · Oct 15, 2016 · fc09c09 · fc09c09
1 parent 144415e
commit fc09c09
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/src/bot-modules/games/poke-games/poke-hangman.js b/src/bot-modules/games/poke-games/poke-hangman.js
@@ -18,7 +18,7 @@ function isNotAlphanumeric(str) {
 
 function toWordId(str) {
 	if (!str) return '';
-	str = normalize(str);
+	str = normalize(str, true);
 	return str.toLowerCase().replace(/[^a-z0-9\u00f1]/g, '');
 }
 
@@ -43,7 +43,7 @@ exports.setup = function (App) {
 			this.ended = false;
 			this.said = [];
 			this.status = [];
-			let w = normalize(this.word).trim().toLowerCase();
+			let w = normalize(this.word, true).trim().toLowerCase();
 			for (let i = 0; i < w.length; i++) {
 				if (isNotAlphanumeric(w.charAt(i))) {
 					this.status.push({type: 'sep', key: w.charAt(i)});

diff --git a/src/bot-modules/games/wordgames/anagrams.translations b/src/bot-modules/games/wordgames/anagrams.translations
@@ -49,7 +49,7 @@ $12 = adivinó la palabra. La palabra era
 $13 = Puntos
 
 $lose = Sin embargo nadie ha conseguido ningún punto, por lo que no hay ganadores
-$end =¡ El juego de Anagrams ha terminado!
+$end = ¡El juego de Anagrams ha terminado!
 $grats1 = Felicidades a
 $grats2 = por ganar el juego con
 $points = puntos

diff --git a/src/bot-modules/games/wordgames/hangman.js b/src/bot-modules/games/wordgames/hangman.js
@@ -18,7 +18,7 @@ function isNotAlphanumeric(str) {
 
 function toWordId(str) {
 	if (!str) return '';
-	str = normalize(str);
+	str = normalize(str, true);
 	return str.toLowerCase().replace(/[^a-z0-9\u00f1]/g, '');
 }
 
@@ -42,7 +42,7 @@ exports.setup = function (App) {
 			this.ended = false;
 			this.said = [];
 			this.status = [];
-			let w = normalize(this.word).trim().toLowerCase();
+			let w = normalize(this.word, true).trim().toLowerCase();
 			for (let i = 0; i < w.length; i++) {
 				if (isNotAlphanumeric(w.charAt(i))) {
 					this.status.push({type: 'sep', key: w.charAt(i)});

diff --git a/src/tools/normalize.js b/src/tools/normalize.js
@@ -21,15 +21,20 @@ const normalObj = normalize_init();
 /**
  * Normalizes a string
  * @param {String} str
+ * @param {Boolean} noId
  * @returns {String} Normalized string
  */
-function normalize(str) {
+function normalize(str, noId) {
 	if (!str) return '';
 	let res = '';
 	for (let i = 0; i < str.length; i++) {
 		res += normalObj[str.charAt(i)] ? normalObj[str.charAt(i)] : str.charAt(i);
 	}
-	return Text.toId(res);
+	if (noId) {
+		return res;
+	} else {
+		return Text.toId(res);
+	}
 }
 
 module.exports = normalize;