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

Fix dulla

Browse Source
This commit is contained in:
skizzerz 2017-04-01 14:06:08 -05:00
parent ffb23f587d
commit 9076872726
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/roles/dullahan.py
View File

@ -148,27 +148,28 @@ def on_exchange(evt, cli, var, actor, nick, actor_role, nick_role):
def on_chk_nightdone(evt, cli, var): def on_chk_nightdone(evt, cli, var):
spl = set(get_players()) spl = set(get_players())
evt.data["actedcount"] += len(KILLS) evt.data["actedcount"] += len(KILLS)
for d, targets in TARGETS.items(): for dullahan, targets in TARGETS.items():
if targets & spl: if targets & spl:
evt.data["nightroles"].append(dullahan) evt.data["nightroles"].append(dullahan)
@event_listener("transition_night_end", priority=2) @event_listener("transition_night_end", priority=2)
def on_transition_night_end(evt, cli, var): def on_transition_night_end(evt, cli, var):
for dullahan in var.ROLES["dullahan"]: for dullahan in var.ROLES["dullahan"]:
targets = list(TARGETS[users._get(dullahan)]) duser = users._get(dullahan) # FIXME
targets = list(TARGETS[duser])
for target in targets[:]: for target in targets[:]:
if target.nick in var.DEAD: if target.nick in var.DEAD:
targets.remove(target) # FIXME: Update when var.DEAD holds User instances targets.remove(target) # FIXME: Update when var.DEAD holds User instances
if not targets: # already all dead if not targets: # already all dead
dullahan.send("{0} {1}".format(messages["dullahan_simple"], messages["dullahan_targets_dead"])) duser.send("{0} {1}".format(messages["dullahan_simple"], messages["dullahan_targets_dead"]))
continue continue
random.shuffle(targets) random.shuffle(targets)
if dullahan.prefers_simple(): if duser.prefers_simple():
dullahan.send(messages["dullahan_simple"]) duser.send(messages["dullahan_simple"])
else: else:
dullahan.send(messages["dullahan_notify"]) duser.send(messages["dullahan_notify"])
t = messages["dullahan_targets"] if var.FIRST_NIGHT else messages["dullahan_remaining_targets"] t = messages["dullahan_targets"] if var.FIRST_NIGHT else messages["dullahan_remaining_targets"]
dullahan.send(t + ", ".join(t.nick for t in targets)) duser.send(t + ", ".join(t.nick for t in targets))
@event_listener("role_assignment") @event_listener("role_assignment")
def on_role_assignment(evt, cli, var, gamemode, pl, restart): def on_role_assignment(evt, cli, var, gamemode, pl, restart):