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

fix circular assassining redux

Browse Source
This commit is contained in:
skizzerz 2014-07-16 00:37:26 -05:00
parent cb41e0c996
commit 49c04e6dcc
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/wolfgame.py
View File

@ -1247,26 +1247,27 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True)
var.LOGGER.logBare(other, "DEAD LOVER") var.LOGGER.logBare(other, "DEAD LOVER")
del_player(cli, other, True, end_game = False) del_player(cli, other, True, end_game = False)
if nick in var.ROLES["assassin"]: if nick in var.ROLES["assassin"]:
target = var.TARGETED[nick] if nick in var.TARGETED:
del var.TARGETED[nick] target = var.TARGETED[nick]
if target != None and target in var.list_players(): del var.TARGETED[nick]
if target in var.PROTECTED: if target != None and target in var.list_players():
message = ("Before dying, \u0002{0}\u0002 quickly attempts to slit \u0002{1}\u0002's throat, " + if target in var.PROTECTED:
"however {1}'s totem emits a brilliant flash of light, causing the attempt to miss.").format(nick, target) message = ("Before dying, \u0002{0}\u0002 quickly attempts to slit \u0002{1}\u0002's throat, " +
cli.msg(botconfig.CHANNEL, message) "however {1}'s totem emits a brilliant flash of light, causing the attempt to miss.").format(nick, target)
var.LOGGER.logMessage(message.replace("\02", "")) cli.msg(botconfig.CHANNEL, message)
else: var.LOGGER.logMessage(message.replace("\02", ""))
if var.ROLE_REVEAL:
role = var.get_reveal_role(target)
an = "n" if role[0] in ("a", "e", "i", "o", "u") else ""
message = ("Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat. " +
"The village mourns the loss of a{2} \u0002{3}\u0002.").format(nick, target, an, role)
else: else:
message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target) if var.ROLE_REVEAL:
cli.msg(botconfig.CHANNEL, message) role = var.get_reveal_role(target)
var.LOGGER.logMessage(message.replace("\02", "")) an = "n" if role[0] in ("a", "e", "i", "o", "u") else ""
var.LOGGER.logBare(target, "ASSASSINATED") message = ("Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat. " +
del_player(cli, target, True, end_game = False) "The village mourns the loss of a{2} \u0002{3}\u0002.").format(nick, target, an, role)
else:
message = "Before dying, \u0002{0}\u0002 quickly slits \u0002{1}\u0002's throat.".format(nick, target)
cli.msg(botconfig.CHANNEL, message)
var.LOGGER.logMessage(message.replace("\02", ""))
var.LOGGER.logBare(target, "ASSASSINATED")
del_player(cli, target, True, end_game = False)
if nick in var.CLONED: if nick in var.CLONED:
# clone is cloning nick, so clone becomes nick's role # clone is cloning nick, so clone becomes nick's role
clone = var.CLONED[nick] clone = var.CLONED[nick]