Update night_acted event

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):
+def on_acted(evt, var, user, actor):
-    if nick in GUARDED:
+    if user.nick in GUARDED:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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):
+def on_acted(evt, var, user, actor):
-    if nick in SEEN:
+    if user.nick in SEEN:
         evt.data["acted"] = True
 
 @event_listener("exchange_roles")

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):
+def on_acted(evt, var, user, actor):
-    if users._get(nick) in KILLS: # FIXME
+    if user in KILLS:
         evt.data["acted"] = True
 
 @event_listener("swap_player")

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):
+def on_night_acted(evt, var, user, actor):
-    if VISITED.get(nick):
+    if VISITED.get(user.nick):
         evt.data["acted"] = True
 
 @event_listener("chk_nightdone")

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):
+def on_acted(evt, var, user, actor):
-    if users._get(nick) in KILLS: # FIXME
+    if user in KILLS:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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):
+def on_acted(evt, var, user, actor):
-    if nick in SEEN:
+    if user.nick in SEEN:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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):
+def on_acted(evt, var, user, actor):
-    if nick in SHAMANS:
+    if user.nick in SHAMANS:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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):
+def on_night_acted(evt, var, user, actor):
-    if VISITED.get(nick):
+    if VISITED.get(user.nick):
         evt.data["acted"] = True
 
 @event_listener("chk_nightdone")

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

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):
+def on_acted(evt, var, user, actor):
-    if nick in KILLS:
+    if user.nick in KILLS:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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):
+def on_acted(evt, var, user, actor):
-    if nick in KILLS:
+    if user.nick in KILLS:
         evt.data["acted"] = True
 
 @event_listener("get_special")

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"]):