From 0adee06b406cda06c8ce31c8443d3765f56dca4b Mon Sep 17 00:00:00 2001 From: skizzerz Date: Thu, 8 Sep 2016 19:07:22 -0500 Subject: [PATCH] Fix voting mayor --- src/wolfgame.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index 5be0a00..24c0a09 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -2111,12 +2111,6 @@ def chk_decision(cli, force=""): voters.remove(vtr) if numvotes[votee] >= votesneeded or votee == force: - # roles that prevent any lynch from happening - if votee in var.ROLES["mayor"] and votee not in var.REVEALED_MAYORS: - lmsg = messages["mayor_reveal"].format(votee) - var.REVEALED_MAYORS.add(votee) - votee = None - # priorities: # 1 = displaying impatience totem messages # 3 = mayor/revealing totem @@ -2128,6 +2122,13 @@ def chk_decision(cli, force=""): }, del_player=del_player) if vote_evt.dispatch(cli, var, voters): votee = vote_evt.data["votee"] + # roles that prevent any lynch from happening + if votee in var.ROLES["mayor"] and votee not in var.REVEALED_MAYORS: + cli.msg(botconfig.CHANNEL, messages["mayor_reveal"].format(votee)) + var.REVEALED_MAYORS.add(votee) + event.data["transition_night"](cli) + return + # roles that end the game upon being lynched if votee in var.ROLES["fool"]: # ends game immediately, with fool as only winner