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

Don't fire desperation totem if the person with the totem lynches themselves last. Closes #54

Browse Source
This commit is contained in:
skizzerz 2014-07-24 21:55:43 -05:00
parent 9f5b30aa95
commit f185556680
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/wolfgame.py
View File

@ -810,23 +810,24 @@ def chk_decision(cli):
# roles that eliminate other players upon being lynched # roles that eliminate other players upon being lynched
# note that lovers, assassin, clone, and vengeful ghost are handled in del_player() since they trigger on more than just lynch # note that lovers, assassin, clone, and vengeful ghost are handled in del_player() since they trigger on more than just lynch
elif votee in var.DESPERATE: elif votee in var.DESPERATE:
# Also kill the very last person to vote them # Also kill the very last person to vote them, unless they voted themselves last in which case nobody else dies
target = voters[-1] target = voters[-1]
if var.ROLE_REVEAL: if target != votee:
r1 = var.get_reveal_role(target) if var.ROLE_REVEAL:
an1 = "n" if r1[0] in ("a", "e", "i", "o", "u") else "" r1 = var.get_reveal_role(target)
tmsg = ("As the noose is being fitted, \u0002{0}\u0002's totem emits a brilliant flash of light. " + an1 = "n" if r1[0] in ("a", "e", "i", "o", "u") else ""
"When the villagers are able to see again, they discover that \u0002{1}\u0002, " + tmsg = ("As the noose is being fitted, \u0002{0}\u0002's totem emits a brilliant flash of light. " +
"a{2} \u0002{3}\u0002, has fallen over dead.").format(votee, target, an1, r1) "When the villagers are able to see again, they discover that \u0002{1}\u0002, " +
else: "a{2} \u0002{3}\u0002, has fallen over dead.").format(votee, target, an1, r1)
tmsg = ("As the noose is being fitted, \u0002{0}\u0002's totem emits a brilliant flash of light. " + else:
"When the villagers are able to see again, they discover that \u0002{1}\u0002 " + tmsg = ("As the noose is being fitted, \u0002{0}\u0002's totem emits a brilliant flash of light. " +
"has fallen over dead.").format(votee, target) "When the villagers are able to see again, they discover that \u0002{1}\u0002 " +
var.LOGGER.logMessage(tmsg.replace("\02", "")) "has fallen over dead.").format(votee, target)
var.LOGGER.logBare(votee, "ACTIVATED DESPERATION TOTEM") var.LOGGER.logMessage(tmsg.replace("\02", ""))
var.LOGGER.logBare(target, "DESPERATION TOTEM TARGET") var.LOGGER.logBare(votee, "ACTIVATED DESPERATION TOTEM")
cli.msg(botconfig.CHANNEL, tmsg) var.LOGGER.logBare(target, "DESPERATION TOTEM TARGET")
del_player(cli, target, True, end_game = False) # do not end game just yet, we have more killin's to do! cli.msg(botconfig.CHANNEL, tmsg)
del_player(cli, target, True, end_game = False) # do not end game just yet, we have more killin's to do!
if votee in var.ROLES["mad scientist"]: if votee in var.ROLES["mad scientist"]:
# kills the 2 players adjacent to them in the original players listing (in order of !joining) # kills the 2 players adjacent to them in the original players listing (in order of !joining)
# if those players are already dead, nothing happens # if those players are already dead, nothing happens