From 9076872726490239d1d7cbe7f5f05b74d232c3af Mon Sep 17 00:00:00 2001 From: skizzerz Date: Sat, 1 Apr 2017 14:06:08 -0500 Subject: [PATCH] Fix dulla --- src/roles/dullahan.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/roles/dullahan.py b/src/roles/dullahan.py index 0fb3e19..2cc9552 100644 --- a/src/roles/dullahan.py +++ b/src/roles/dullahan.py @@ -148,27 +148,28 @@ def on_exchange(evt, cli, var, actor, nick, actor_role, nick_role): def on_chk_nightdone(evt, cli, var): spl = set(get_players()) evt.data["actedcount"] += len(KILLS) - for d, targets in TARGETS.items(): + for dullahan, targets in TARGETS.items(): if targets & spl: evt.data["nightroles"].append(dullahan) @event_listener("transition_night_end", priority=2) def on_transition_night_end(evt, cli, var): 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[:]: if target.nick in var.DEAD: targets.remove(target) # FIXME: Update when var.DEAD holds User instances 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 random.shuffle(targets) - if dullahan.prefers_simple(): - dullahan.send(messages["dullahan_simple"]) + if duser.prefers_simple(): + duser.send(messages["dullahan_simple"]) else: - dullahan.send(messages["dullahan_notify"]) + duser.send(messages["dullahan_notify"]) 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") def on_role_assignment(evt, cli, var, gamemode, pl, restart):