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

Fix doomsayer prematurely ending night if they're killing

Browse Source
This commit is contained in:
skizzerz 2015-10-30 01:18:18 -05:00
parent 9b23f38b65
commit 48b5104b11
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wolfgame.py
View File

@ -4841,6 +4841,11 @@ def chk_nightdone(cli):
if info[0] > 0: if info[0] > 0:
actedcount += 1 actedcount += 1
for p in var.ROLES["doomsayer"]:
if p in var.SEEN and p in var.OTHER_KILLS:
# don't count this twice
actedcount -= 1
if var.FIRST_NIGHT: if var.FIRST_NIGHT:
actedcount += len(var.MATCHMAKERS | var.CLONED.keys()) actedcount += len(var.MATCHMAKERS | var.CLONED.keys())
nightroles.extend(get_roles("matchmaker", "clone")) nightroles.extend(get_roles("matchmaker", "clone"))
@ -4848,7 +4853,7 @@ def chk_nightdone(cli):
if var.DISEASED_WOLVES: if var.DISEASED_WOLVES:
nightroles = [p for p in nightroles if p not in var.list_players(var.WOLF_ROLES - {"wolf cub", "werecrow", "doomsayer"})] nightroles = [p for p in nightroles if p not in var.list_players(var.WOLF_ROLES - {"wolf cub", "werecrow", "doomsayer"})]
# only remove 1 doomsayer instance to indicate they cannot kill but can still see # only remove 1 doomsayer instance to indicate they cannot kill but can still see
for p in var.list_players("doomsayer"): for p in var.ROLES["doomsayer"]:
nightroles.remove(p) nightroles.remove(p)
elif var.ALPHA_ENABLED: elif var.ALPHA_ENABLED:
# add in alphas that have bitten (note an alpha can kill or bite, but not both) # add in alphas that have bitten (note an alpha can kill or bite, but not both)