notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avert convention rot per woffle

Browse Source
This commit is contained in:
Ominous 2014-12-13 19:27:09 -05:00
parent 0f6ee5c994
commit 3294c01b49
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/wolfgame.py
View File

@ -2267,11 +2267,11 @@ def leave_game(cli, nick, chan, rest):
if var.get_role(nick) != "person" and var.ROLE_REVEAL: if var.get_role(nick) != "person" and var.ROLE_REVEAL:
role = var.get_reveal_role(nick) role = var.get_reveal_role(nick)
an = "n" if role[0] in ("a", "e", "i", "o", "u") else "" 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) cli.msg(botconfig.CHANNEL, lmsg)
var.LOGGER.logMessage(("{0}, a {1}, has died of an unknown disease.").format(nick, var.get_reveal_role(nick))) var.LOGGER.logMessage(("{0}, a {1}, has died of an unknown disease.").format(nick, var.get_reveal_role(nick)))
else: 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) cli.msg(botconfig.CHANNEL, lmsg)
var.LOGGER.logMessage(("{0} has died of an unknown disease.").format(nick)) var.LOGGER.logMessage(("{0} has died of an unknown disease.").format(nick))
if var.PHASE != "join": if var.PHASE != "join":

16
settings/wolfgame.py
View File

@ -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.", "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.", "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.") "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.", 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 they are only a pile of bones and a lump in the beasts' stomaches.", "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 fell off the roof of their house and is now dead.", "\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 them, but it is too late.") "\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_RROLE = ("\u0002{0}\u0002, a{1} \u0002{2}\u0002, suddenly falls over dead before the astonished villagers.", 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 the \u0002{2}\u0002 is only a pile of bones and a lump in the beasts' stomaches.", "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, a{1} \u0002{2}\u0002, fell off the roof of their house and is now dead.", "\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 the \u0002{2}\u0002, but it is too late.") "\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 import botconfig, fnmatch