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

Fix voting mayor

Browse Source
This commit is contained in:
skizzerz 2016-09-08 19:07:22 -05:00
parent 20d5ede0f2
commit 0adee06b40
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wolfgame.py
View File

@ -2111,12 +2111,6 @@ def chk_decision(cli, force=""):
voters.remove(vtr) voters.remove(vtr)
if numvotes[votee] >= votesneeded or votee == force: 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: # priorities:
# 1 = displaying impatience totem messages # 1 = displaying impatience totem messages
# 3 = mayor/revealing totem # 3 = mayor/revealing totem
@ -2128,6 +2122,13 @@ def chk_decision(cli, force=""):
}, del_player=del_player) }, del_player=del_player)
if vote_evt.dispatch(cli, var, voters): if vote_evt.dispatch(cli, var, voters):
votee = vote_evt.data["votee"] 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 # roles that end the game upon being lynched
if votee in var.ROLES["fool"]: if votee in var.ROLES["fool"]:
# ends game immediately, with fool as only winner # ends game immediately, with fool as only winner