From a5c3f0694c7284ec966cf2fb4bfdc83dd36be4eb Mon Sep 17 00:00:00 2001 From: "Vgr E. Barry" Date: Mon, 4 Sep 2017 10:46:15 -0400 Subject: [PATCH] Update night_acted event --- src/roles/angel.py | 4 ++-- src/roles/doomsayer.py | 4 ++-- src/roles/dullahan.py | 4 ++-- src/roles/harlot.py | 4 ++-- src/roles/hunter.py | 4 ++-- src/roles/seer.py | 4 ++-- src/roles/shaman.py | 4 ++-- src/roles/succubus.py | 4 ++-- src/roles/vengefulghost.py | 5 ----- src/roles/vigilante.py | 4 ++-- src/roles/wolf.py | 4 ++-- src/wolfgame.py | 4 +++- 12 files changed, 23 insertions(+), 26 deletions(-) diff --git a/src/roles/angel.py b/src/roles/angel.py index a91ffda..2fc491a 100644 --- a/src/roles/angel.py +++ b/src/roles/angel.py @@ -90,8 +90,8 @@ def on_del_player(evt, var, user, mainrole, allroles, death_triggers): PASSED.discard(user.nick) @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in GUARDED: +def on_acted(evt, var, user, actor): + if user.nick in GUARDED: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/roles/doomsayer.py b/src/roles/doomsayer.py index 2986b8e..b7cb028 100644 --- a/src/roles/doomsayer.py +++ b/src/roles/doomsayer.py @@ -70,8 +70,8 @@ def on_rename(evt, cli, var, prefix, nick): del dictvar[prefix] @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in SEEN: +def on_acted(evt, var, user, actor): + if user.nick in SEEN: evt.data["acted"] = True @event_listener("exchange_roles") diff --git a/src/roles/dullahan.py b/src/roles/dullahan.py index 001dd1f..280eaf1 100644 --- a/src/roles/dullahan.py +++ b/src/roles/dullahan.py @@ -109,8 +109,8 @@ def on_del_player(evt, var, user, mainrole, allroles, death_triggers): evt.data["pl"] = evt.params.refresh_pl(pl) @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if users._get(nick) in KILLS: # FIXME +def on_acted(evt, var, user, actor): + if user in KILLS: evt.data["acted"] = True @event_listener("swap_player") diff --git a/src/roles/harlot.py b/src/roles/harlot.py index 0d9e2f3..e5df628 100644 --- a/src/roles/harlot.py +++ b/src/roles/harlot.py @@ -99,8 +99,8 @@ def on_transition_day_resolve_end3(evt, cli, var, victims): evt.data["dead"].append(harlot) @event_listener("night_acted") -def on_night_acted(evt, var, nick, sender): - if VISITED.get(nick): +def on_night_acted(evt, var, user, actor): + if VISITED.get(user.nick): evt.data["acted"] = True @event_listener("chk_nightdone") diff --git a/src/roles/hunter.py b/src/roles/hunter.py index f02a9cf..2289734 100644 --- a/src/roles/hunter.py +++ b/src/roles/hunter.py @@ -95,8 +95,8 @@ def on_swap(evt, var, old_user, user): PASSED.add(user) @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if users._get(nick) in KILLS: # FIXME +def on_acted(evt, var, user, actor): + if user in KILLS: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/roles/seer.py b/src/roles/seer.py index 1ef4cbd..58650b9 100644 --- a/src/roles/seer.py +++ b/src/roles/seer.py @@ -86,8 +86,8 @@ def on_del_player(evt, var, user, mainrole, allroles, death_triggers): SEEN.discard(user.nick) @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in SEEN: +def on_acted(evt, var, user, actor): + if user.nick in SEEN: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/roles/shaman.py b/src/roles/shaman.py index b153d13..3f5fa0d 100644 --- a/src/roles/shaman.py +++ b/src/roles/shaman.py @@ -142,8 +142,8 @@ def on_del_player(evt, var, user, mainrole, allroles, death_triggers): del SHAMANS[a] @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in SHAMANS: +def on_acted(evt, var, user, actor): + if user.nick in SHAMANS: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/roles/succubus.py b/src/roles/succubus.py index e97ae03..a550759 100644 --- a/src/roles/succubus.py +++ b/src/roles/succubus.py @@ -246,8 +246,8 @@ def on_transition_day_resolve_end(evt, cli, var, victims): evt.data["dead"].append(succ) @event_listener("night_acted") -def on_night_acted(evt, var, nick, sender): - if VISITED.get(nick): +def on_night_acted(evt, var, user, actor): + if VISITED.get(user.nick): evt.data["acted"] = True @event_listener("chk_nightdone") diff --git a/src/roles/vengefulghost.py b/src/roles/vengefulghost.py index e806c4f..a00fd97 100644 --- a/src/roles/vengefulghost.py +++ b/src/roles/vengefulghost.py @@ -118,11 +118,6 @@ def on_rename(evt, cli, var, prefix, nick): if prefix in KILLS: del KILLS[prefix] -@event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in KILLS: - evt.data["acted"] = True - @event_listener("transition_day_begin", priority=6) def on_transition_day_begin(evt, cli, var): # select a random target for VG if they didn't kill diff --git a/src/roles/vigilante.py b/src/roles/vigilante.py index f1bfa94..68e0008 100644 --- a/src/roles/vigilante.py +++ b/src/roles/vigilante.py @@ -88,8 +88,8 @@ def on_rename(evt, cli, var, prefix, nick): PASSED.add(nick) @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in KILLS: +def on_acted(evt, var, user, actor): + if user.nick in KILLS: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/roles/wolf.py b/src/roles/wolf.py index 74d92b7..8fa0e95 100644 --- a/src/roles/wolf.py +++ b/src/roles/wolf.py @@ -139,8 +139,8 @@ def on_rename(evt, cli, var, prefix, nick): del KILLS[prefix] @event_listener("night_acted") -def on_acted(evt, var, nick, sender): - if nick in KILLS: +def on_acted(evt, var, user, actor): + if user.nick in KILLS: evt.data["acted"] = True @event_listener("get_special") diff --git a/src/wolfgame.py b/src/wolfgame.py index 24e31c8..94a2c9e 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -3438,8 +3438,10 @@ def transition_day(cli, gameid=0): for crow, target in iter(var.OBSERVED.items()): if crow not in var.ROLES["werecrow"]: continue + actor = users._get(crow) # FIXME + user = users._get(target) # FIXME evt = Event("night_acted", {"acted": False}) - evt.dispatch(var, target, crow) + evt.dispatch(var, user, actor) if ((target in var.HVISITED and var.HVISITED[target]) 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.HEXED or target in var.CURSED or evt.data["acted"]):