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

Fix werecrow observe not working in some instances

Browse Source
This commit is contained in:
skizzerz 2015-11-15 16:56:32 -06:00
parent 4750981b4b
commit 737f4e6184
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wolfgame.py
View File

@ -4011,6 +4011,17 @@ def transition_day(cli, gameid=0):
for victim in var.SICK: for victim in var.SICK:
pm(cli, victim, messages["player_sick"]) pm(cli, victim, messages["player_sick"])
for crow, target in iter(var.OBSERVED.items()):
if crow not in var.ROLES["werecrow"]:
continue
if ((target in var.HVISITED and var.HVISITED[target]) or target in var.SEEN or target in var.SHAMANS or
(target in var.GUARDED and var.GUARDED[target]) or target in var.OTHER_KILLS or
(target in var.PRAYED and var.PRAYED[target][0] > 0) or target in var.CHARMERS or
target in var.OBSERVED or target in var.KILLS or target in var.HEXED or target in var.CURSED):
pm(cli, crow, messages["werecrow_success"].format(target))
else:
pm(cli, crow, messages["werecrow_failure"].format(target))
if var.START_WITH_DAY and var.FIRST_DAY: if var.START_WITH_DAY and var.FIRST_DAY:
# TODO: need to message everyone their roles and give a short thing saying "it's daytime" # TODO: need to message everyone their roles and give a short thing saying "it's daytime"
# but this is good enough for now to prevent it from crashing # but this is good enough for now to prevent it from crashing
@ -4352,18 +4363,6 @@ def transition_day(cli, gameid=0):
var.ALPHA_ENABLED = False var.ALPHA_ENABLED = False
dead = [] dead = []
for crow, target in iter(var.OBSERVED.items()):
if crow not in var.ROLES["werecrow"]:
continue
if ((target in list(var.HVISITED.keys()) and var.HVISITED[target]) or # if var.HVISITED[target] is None, harlot visited self
target in var.SEEN or target in var.SHAMANS or (target in list(var.GUARDED.keys()) and var.GUARDED[target]) or
target in var.OTHER_KILLS or (target in var.PRAYED and var.PRAYED[target][0] > 0) or target in var.CHARMERS or
target in var.OBSERVED or target in var.KILLS or target in var.HEXED or target in var.CURSED):
pm(cli, crow, messages["werecrow_success"].format(target))
else:
pm(cli, crow, messages["werecrow_failure"].format(target))
vlist = copy.copy(victims) vlist = copy.copy(victims)
novictmsg = True novictmsg = True
if new_wolf: if new_wolf: