From e32e142742b87b6fa0c81d29b654f2af9467c7f0 Mon Sep 17 00:00:00 2001
From: "Vgr E. Barry" <vgr255@live.ca>
Date: Tue, 29 Aug 2017 20:00:33 -0400
Subject: [PATCH] Remove the cli parameter from night_acted

---
 src/roles/angel.py         | 2 +-
 src/roles/doomsayer.py     | 2 +-
 src/roles/dullahan.py      | 2 +-
 src/roles/harlot.py        | 2 +-
 src/roles/hunter.py        | 2 +-
 src/roles/seer.py          | 2 +-
 src/roles/shaman.py        | 2 +-
 src/roles/succubus.py      | 2 +-
 src/roles/vengefulghost.py | 2 +-
 src/roles/vigilante.py     | 2 +-
 src/roles/wolf.py          | 2 +-
 src/wolfgame.py            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/roles/angel.py b/src/roles/angel.py
index eeaf03c..fd24c6d 100644
--- a/src/roles/angel.py
+++ b/src/roles/angel.py
@@ -90,7 +90,7 @@ def on_del_player(evt, cli, var, nick, mainrole, allroles, death_triggers):
         PASSED.discard(nick)
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in GUARDED:
         evt.data["acted"] = True
 
diff --git a/src/roles/doomsayer.py b/src/roles/doomsayer.py
index 75c47ac..b69233b 100644
--- a/src/roles/doomsayer.py
+++ b/src/roles/doomsayer.py
@@ -69,7 +69,7 @@ def on_rename(evt, cli, var, prefix, nick):
             del dictvar[prefix]
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in SEEN:
         evt.data["acted"] = True
 
diff --git a/src/roles/dullahan.py b/src/roles/dullahan.py
index accf793..d0ad35e 100644
--- a/src/roles/dullahan.py
+++ b/src/roles/dullahan.py
@@ -109,7 +109,7 @@ def on_del_player(evt, cli, var, nick, mainrole, allroles, death_triggers):
             evt.data["pl"] = evt.params.refresh_pl(pl)
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if users._get(nick) in KILLS: # FIXME
         evt.data["acted"] = True
 
diff --git a/src/roles/harlot.py b/src/roles/harlot.py
index f05ee85..933bafa 100644
--- a/src/roles/harlot.py
+++ b/src/roles/harlot.py
@@ -98,7 +98,7 @@ def on_transition_day_resolve_end3(evt, cli, var, victims):
             evt.data["dead"].append(harlot)
 
 @event_listener("night_acted")
-def on_night_acted(evt, cli, var, nick, sender):
+def on_night_acted(evt, var, nick, sender):
     if VISITED.get(nick):
         evt.data["acted"] = True
 
diff --git a/src/roles/hunter.py b/src/roles/hunter.py
index ee7ab2f..79ee97f 100644
--- a/src/roles/hunter.py
+++ b/src/roles/hunter.py
@@ -96,7 +96,7 @@ def on_swap(evt, var, old_user, user):
         PASSED.add(user)
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if users._get(nick) in KILLS: # FIXME
         evt.data["acted"] = True
 
diff --git a/src/roles/seer.py b/src/roles/seer.py
index b3b9be8..23fe47f 100644
--- a/src/roles/seer.py
+++ b/src/roles/seer.py
@@ -85,7 +85,7 @@ def on_del_player(evt, cli, var, nick, mainrole, allroles, death_triggers):
     SEEN.discard(nick)
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in SEEN:
         evt.data["acted"] = True
 
diff --git a/src/roles/shaman.py b/src/roles/shaman.py
index ea7f105..ae11a8d 100644
--- a/src/roles/shaman.py
+++ b/src/roles/shaman.py
@@ -141,7 +141,7 @@ def on_del_player(evt, cli, var, nick, mainrole, allroles, death_triggers):
             del SHAMANS[a]
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in SHAMANS:
         evt.data["acted"] = True
 
diff --git a/src/roles/succubus.py b/src/roles/succubus.py
index 6ded32e..02739ac 100644
--- a/src/roles/succubus.py
+++ b/src/roles/succubus.py
@@ -245,7 +245,7 @@ def on_transition_day_resolve_end(evt, cli, var, victims):
                     evt.data["dead"].append(succ)
 
 @event_listener("night_acted")
-def on_night_acted(evt, cli, var, nick, sender):
+def on_night_acted(evt, var, nick, sender):
     if VISITED.get(nick):
         evt.data["acted"] = True
 
diff --git a/src/roles/vengefulghost.py b/src/roles/vengefulghost.py
index fe640f1..d691022 100644
--- a/src/roles/vengefulghost.py
+++ b/src/roles/vengefulghost.py
@@ -119,7 +119,7 @@ def on_rename(evt, cli, var, prefix, nick):
         del KILLS[prefix]
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in KILLS:
         evt.data["acted"] = True
 
diff --git a/src/roles/vigilante.py b/src/roles/vigilante.py
index 1a820d9..07ef61d 100644
--- a/src/roles/vigilante.py
+++ b/src/roles/vigilante.py
@@ -87,7 +87,7 @@ def on_rename(evt, cli, var, prefix, nick):
         PASSED.add(nick)
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in KILLS:
         evt.data["acted"] = True
 
diff --git a/src/roles/wolf.py b/src/roles/wolf.py
index 3b19c1b..daffdd7 100644
--- a/src/roles/wolf.py
+++ b/src/roles/wolf.py
@@ -141,7 +141,7 @@ def on_rename(evt, cli, var, prefix, nick):
         del KILLS[prefix]
 
 @event_listener("night_acted")
-def on_acted(evt, cli, var, nick, sender):
+def on_acted(evt, var, nick, sender):
     if nick in KILLS:
         evt.data["acted"] = True
 
diff --git a/src/wolfgame.py b/src/wolfgame.py
index 159c0c0..9fb33d6 100644
--- a/src/wolfgame.py
+++ b/src/wolfgame.py
@@ -3438,7 +3438,7 @@ def transition_day(cli, gameid=0):
         if crow not in var.ROLES["werecrow"]:
             continue
         evt = Event("night_acted", {"acted": False})
-        evt.dispatch(cli, var, target, crow)
+        evt.dispatch(var, target, crow)
         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"]):