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

Fix some \!nolynch related issues with awkward messages, inconsistent functionality, and improper interaction with vote-altering totems.

Browse Source
This commit is contained in:
skizzerz 2014-08-24 21:50:28 -05:00
parent 06f51a3731
commit b466c47026
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/wolfgame.py
View File

@ -749,7 +749,7 @@ def hurry_up(cli, gameid, change):
for v in voters: for v in voters:
weight = 1 weight = 1
imp_count = sum([1 if p == v else 0 for p in var.IMPATIENT]) imp_count = sum([1 if p == v else 0 for p in var.IMPATIENT])
pac_count = sum([1 if p == v else 0 for p in (var.PACIFISTS + var.NO_LYNCH)]) pac_count = sum([1 if p == v else 0 for p in var.PACIFISTS])
if pac_count > imp_count: if pac_count > imp_count:
weight = 0 # more pacifists than impatience totems weight = 0 # more pacifists than impatience totems
elif imp_count == pac_count and v not in var.VOTES[votee]: elif imp_count == pac_count and v not in var.VOTES[votee]:
@ -798,9 +798,14 @@ def chk_decision(cli, force = ""):
pl = var.list_players() pl = var.list_players()
avail = len(pl) - len(var.WOUNDED) - len(var.ASLEEP) avail = len(pl) - len(var.WOUNDED) - len(var.ASLEEP)
votesneeded = avail // 2 + 1 votesneeded = avail // 2 + 1
not_lynching = len(var.NO_LYNCH) + len(var.PACIFISTS) not_lynching = set(var.NO_LYNCH)
if not_lynching >= votesneeded: for p in var.PACIFISTS:
cli.msg(botconfig.CHANNEL, "The villagers have agreed to refrain from lynching for today.") if p in pl and p not in var.WOUNDED and p not in var.ASLEEP:
not_lynching.add(p)
# we only need 50%+ to not lynch, instead of an actual majority, because a tie would time out day anyway
if len(not_lynching) >= math.ceil(avail / 2):
cli.msg(botconfig.CHANNEL, "The villagers have agreed to not lynch anybody today.")
transition_night(cli) transition_night(cli)
return return
aftermessage = None aftermessage = None
@ -808,12 +813,12 @@ def chk_decision(cli, force = ""):
for votee, voters in votelist.items(): for votee, voters in votelist.items():
numvotes = 0 numvotes = 0
for v in var.IMPATIENT: for v in var.IMPATIENT:
if v in pl and v not in voters and v != votee: if v in pl and v not in voters and v != votee and v not in var.WOUNDED and v not in var.ASLEEP:
voters.append(v) voters.append(v)
for v in voters: for v in voters:
weight = 1 weight = 1
imp_count = sum([1 if p == v else 0 for p in var.IMPATIENT]) imp_count = sum([1 if p == v else 0 for p in var.IMPATIENT])
pac_count = sum([1 if p == v else 0 for p in (var.PACIFISTS + var.NO_LYNCH)]) pac_count = sum([1 if p == v else 0 for p in var.PACIFISTS])
if pac_count > imp_count: if pac_count > imp_count:
weight = 0 # more pacifists than impatience totems weight = 0 # more pacifists than impatience totems
elif imp_count == pac_count and v not in var.VOTES[votee]: elif imp_count == pac_count and v not in var.VOTES[votee]:
@ -2669,18 +2674,15 @@ def no_lynch(cli, nick, chan, rest):
if nick in var.WOUNDED: if nick in var.WOUNDED:
cli.msg(chan, "{0}: You are wounded and resting, thus you are unable to vote for the day.".format(nick)) cli.msg(chan, "{0}: You are wounded and resting, thus you are unable to vote for the day.".format(nick))
return return
if nick in var.NO_LYNCH:
var.NO_LYNCH.remove(nick)
cli.msg(chan, "{0}: You chose to vote for someone today. You may use '{1}lynch nick'.".format(nick, botconfig.CMD_CHAR))
return
candidates = var.VOTES.keys() candidates = var.VOTES.keys()
for voter in list(candidates): for voter in list(candidates):
if nick in var.VOTES[voter]: if nick in var.VOTES[voter]:
var.VOTES[voter].remove(nick) var.VOTES[voter].remove(nick)
if not var.VOTES[voter]: if not var.VOTES[voter]:
del var.VOTES[voter] del var.VOTES[voter]
if nick not in var.NO_LYNCH and nick not in var.IMPATIENT:
var.NO_LYNCH.append(nick) var.NO_LYNCH.append(nick)
cli.msg(chan, "{0}: You chose to vote for nobody.".format(nick)) cli.msg(chan, "\u0002{0}\u0002 votes to not lynch anyone today.".format(nick))
chk_decision(cli) chk_decision(cli)
return return
@ -2737,7 +2739,7 @@ def vote(cli, nick, chann_, rest):
if not var.SELF_LYNCH_ALLOWED: if not var.SELF_LYNCH_ALLOWED:
if nick == voted: if nick == voted:
if nick in var.ROLES["fool"]: if nick in var.ROLES["fool"] or nick in var.ROLES["jester"]:
cli.notice(nick, "You may not vote yourself.") cli.notice(nick, "You may not vote yourself.")
else: else:
cli.notice(nick, "Please try to save yourself.") cli.notice(nick, "Please try to save yourself.")