From 3294c01b49bef8e5a9f3fcf3f3c935c766c03605 Mon Sep 17 00:00:00 2001 From: Ominous Date: Sat, 13 Dec 2014 19:27:09 -0500 Subject: [PATCH] Avert convention rot per woffle --- modules/wolfgame.py | 4 ++-- settings/wolfgame.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 9c643ad..93c2b1f 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -2267,11 +2267,11 @@ def leave_game(cli, nick, chan, rest): if var.get_role(nick) != "person" and var.ROLE_REVEAL: role = var.get_reveal_role(nick) an = "n" if role[0] in ("a", "e", "i", "o", "u") else "" - lmsg = random.choice(var.QUIT_MESSAGES_RROLE).format(nick, an, var.get_reveal_role(nick), population) + lmsg = random.choice(var.QUIT_MESSAGES).format(nick, an, var.get_reveal_role(nick), population) cli.msg(botconfig.CHANNEL, lmsg) var.LOGGER.logMessage(("{0}, a {1}, has died of an unknown disease.").format(nick, var.get_reveal_role(nick))) else: - lmsg = random.choice(var.QUIT_MESSAGES).format(nick, population) + lmsg = random.choice(var.QUIT_MESSAGES_NO_REVEAL).format(nick, population) cli.msg(botconfig.CHANNEL, lmsg) var.LOGGER.logMessage(("{0} has died of an unknown disease.").format(nick)) if var.PHASE != "join": diff --git a/settings/wolfgame.py b/settings/wolfgame.py index 9e7fe52..78188a2 100644 --- a/settings/wolfgame.py +++ b/settings/wolfgame.py @@ -194,14 +194,14 @@ LYNCH_MESSAGES_NO_REVEAL = ("The villagers, after much debate, finally decide on "Despite protests, the mob drags their victim to the hanging tree. \u0002{0}\u0002 succumbs to the will of the horde, and is hanged.", "Resigned to the inevitable, \u0002{0}\u0002 is led to the gallows.", "Before the rope is pulled, \u0002{0}\u0002 throws a grenade at the mob. The grenade explodes early.") -QUIT_MESSAGES = ("\u0002{0}\u0002 suddenly falls over dead before the astonished villagers.", - "A pack of wild animals sets upon \u0002{0}\u0002. Soon they are only a pile of bones and a lump in the beasts' stomaches.", - "\u0002{0}\u0002 fell off the roof of their house and is now dead.", - "\u0002{0}\u0002 is crushed to death by a falling tree. The villagers desperately try to save them, but it is too late.") -QUIT_MESSAGES_RROLE = ("\u0002{0}\u0002, a{1} \u0002{2}\u0002, suddenly falls over dead before the astonished villagers.", - "A pack of wild animals sets upon \u0002{0}\u0002. Soon the \u0002{2}\u0002 is only a pile of bones and a lump in the beasts' stomaches.", - "\u0002{0}\u0002, a{1} \u0002{2}\u0002, fell off the roof of their house and is now dead.", - "\u0002{0}\u0002 is crushed to death by a falling tree. The villagers desperately try to save the \u0002{2}\u0002, but it is too late.") +QUIT_MESSAGES= ("\u0002{0}\u0002, a{1} \u0002{2}\u0002, suddenly falls over dead before the astonished villagers.", + "A pack of wild animals sets upon \u0002{0}\u0002. Soon the \u0002{2}\u0002 is only a pile of bones and a lump in the beasts' stomaches.", + "\u0002{0}\u0002, a{1} \u0002{2}\u0002, fell off the roof of their house and is now dead.", + "\u0002{0}\u0002 is crushed to death by a falling tree. The villagers desperately try to save the \u0002{2}\u0002, but it is too late.") +QUIT_MESSAGES_NO_REVEAL = ("\u0002{0}\u0002 suddenly falls over dead before the astonished villagers.", + "A pack of wild animals sets upon \u0002{0}\u0002. Soon they are only a pile of bones and a lump in the beasts' stomaches.", + "\u0002{0}\u0002 fell off the roof of their house and is now dead.", + "\u0002{0}\u0002 is crushed to death by a falling tree. The villagers desperately try to save them, but it is too late.") import botconfig, fnmatch