irccd: plugins/hangman/hangman.js comparison

comparison plugins/hangman/hangman.js @ 154:f554d1314208

Plugin hangman: fix formats and invalid number of tries

author	David Demelier <markand@malikania.fr>
date	Sun, 22 May 2016 23:18:26 +0200
parents	2ce88e3a4759
children	6635b9187d71

comparison

equal deleted inserted replaced

-:70da13c626de
+:f554d1314208
 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
+// Plugin information.
+info = {
+	author: "David Demelier <markand@malikania.fr>",
+	license: "ISC",
+	summary: "A hangman game for IRC",
+	version: "@IRCCD_VERSION@"
+};
 // Modules.
 var Logger = Irccd.Logger;
 var File = Irccd.File;
 var Plugin = Irccd.Plugin;
 var Server = Irccd.Server;
 var Unicode = Irccd.Unicode
 var Util = Irccd.Util;
-// Plugin information.
-info = {
-	author: "David Demelier <markand@malikania.fr>",
-	license: "ISC",
-	summary: "A hangman game for IRC",
-	version: "@IRCCD_VERSION@"
-};
 // Default options.
 Plugin.config["collaborative"] = "true";
 // Formats.
 */
 Hangman.loadWords = function ()
 {
 	var path;
-	/* User specified file? */
+	// User specified file?
 	if (Plugin.config["file"])
 		path = Plugin.config["file"];
 	else
 		path = Plugin.configPath + "words.conf";
 /**
 * Load all formats.
 */
 Hangman.loadFormats = function ()
 {
-	// --- DEPRECATED ------------------------------------------
+	// --- DEPRECATED -------------------------------------------
 	//
 	// This code will be removed.
 	//
 	// Since:	2.1.0
 	// Until:	3.0.0
 /**
 * Select the next word for the game.
 */
 Hangman.prototype.select = function ()
 {
-	/* Reload the words if empty */
+	// Reload the words if empty.
 	if (!this.words || this.words.length === 0)
 		this.words = Hangman.words.slice(0);
 	var i = Math.floor(Math.random() * this.words.length);
 	this.word = this.words[i];
 	this.words.splice(i, 1);
-	/* Fill table */
+	// Fill table.
 	this.table = {};
 	for (var j = 0; j < this.word.length; ++j)
 		this.table[this.word.charCodeAt(j)] = false;
 }
 */
 Hangman.prototype.propose = function (ch, nickname)
 {
 	var status = "found";
-	/* Check for collaborative mode */
+	// Check for collaborative mode.
 	if (Plugin.config["collaborative"] === "true") {
 		if (this.last !== undefined && this.last === nickname)
 			return "wrong-player";
 		this.last = nickname;
 			status = "wrong-word";
 		} else
 			status = "win";
 	}
-	/* Check if dead */
+	// Check if dead.
-	if (this.tries < 0)
+	if (this.tries <= 0)
 		status = "dead";
-	/* Check if win */
+	// Check if win.
 	var win = true;
 	for (var i = 0; i < this.word.length; ++i) {
 		if (!this.table[this.word.charCodeAt(i)]) {
 			win = false;
 function propose(server, channel, origin, game, proposition)
 {
 	var kw = {
 		channel: channel,
-		command: server.info().commandChar,
+		command: server.info().commandChar + Plugin.info().name,
 		nickname: Util.splituser(origin),
 		origin: origin,
 		plugin: Plugin.info().name,
 		server: server.toString()
 	};
 		server.message(channel, Util.format(Plugin.format["found"], kw));
 		break;
 	case "wrong-letter":
 	case "wrong-player":
 	case "wrong-word":
+		kw.word = proposition;
 	case "asked":
 		kw.letter = String.fromCharCode(proposition);
 		server.message(channel, Util.format(Plugin.format[st], kw));
 		break;
 	case "dead":
 function onCommand(server, origin, channel, message)
 {
 	var game = Hangman.find(server, channel);
 	var kw = {
 		channel: channel,
-		command: server.info().commandChar,
+		command: server.info().commandChar + Plugin.info().name,
 		nickname: Util.splituser(origin),
 		origin: origin,
 		plugin: Plugin.info().name,
-		server: server
+		server: server.toString()
 	};
 	if (game) {
 		var list = message.split(" \t");