From 55c70570af347078e79244980285d390d8a17604 Mon Sep 17 00:00:00 2001 From: skizzerz Date: Tue, 18 Oct 2016 21:56:14 -0500 Subject: [PATCH] Switch param order of role_attribution event Standardizing on first two params for event handlers to be cli, var --- src/gamemodes.py | 4 ++-- src/wolfgame.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gamemodes.py b/src/gamemodes.py index 3ea84b1..82c3479 100644 --- a/src/gamemodes.py +++ b/src/gamemodes.py @@ -570,7 +570,7 @@ class RandomMode(GameMode): events.remove_listener("role_attribution", self.role_attribution) events.remove_listener("chk_win", self.lovers_chk_win) - def role_attribution(self, evt, cli, chk_win_conditions, var, villagers): + def role_attribution(self, evt, cli, var, chk_win_conditions, villagers): lpl = len(villagers) - 1 addroles = evt.data["addroles"] for role in var.ROLE_GUIDE: @@ -1256,7 +1256,7 @@ class MaelstromMode(GameMode): pl[i] = player + " (cursed)" pm(cli, nick, "Players: " + ", ".join(pl)) - def role_attribution(self, evt, cli, chk_win_conditions, var, villagers): + def role_attribution(self, evt, cli, var, chk_win_conditions, villagers): self.chk_win_conditions = chk_win_conditions evt.data["addroles"] = self._role_attribution(cli, var, villagers, True) diff --git a/src/wolfgame.py b/src/wolfgame.py index eef6f23..88fe338 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -6125,7 +6125,7 @@ def start(cli, nick, chan, forced = False, restart = ""): addroles = {} event = Event("role_attribution", {"addroles": addroles}) - if event.dispatch(cli, chk_win_conditions, var, villagers): + if event.dispatch(cli, var, chk_win_conditions, villagers): addroles = event.data["addroles"] for index in range(len(var.ROLE_INDEX) - 1, -1, -1): if var.ROLE_INDEX[index] <= len(villagers):