notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch param order of role_attribution event

Browse Source 
Standardizing on first two params for event handlers to be cli, var
This commit is contained in:
skizzerz 2016-10-18 21:56:14 -05:00
parent 95133160ab
commit 55c70570af
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gamemodes.py
View File

@ -570,7 +570,7 @@ class RandomMode(GameMode):
events.remove_listener("role_attribution", self.role_attribution) events.remove_listener("role_attribution", self.role_attribution)
events.remove_listener("chk_win", self.lovers_chk_win) 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 lpl = len(villagers) - 1
addroles = evt.data["addroles"] addroles = evt.data["addroles"]
for role in var.ROLE_GUIDE: for role in var.ROLE_GUIDE:
@ -1256,7 +1256,7 @@ class MaelstromMode(GameMode):
pl[i] = player + " (cursed)" pl[i] = player + " (cursed)"
pm(cli, nick, "Players: " + ", ".join(pl)) 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 self.chk_win_conditions = chk_win_conditions
evt.data["addroles"] = self._role_attribution(cli, var, villagers, True) evt.data["addroles"] = self._role_attribution(cli, var, villagers, True)

2
src/wolfgame.py
View File

@ -6125,7 +6125,7 @@ def start(cli, nick, chan, forced = False, restart = ""):
addroles = {} addroles = {}
event = Event("role_attribution", {"addroles": 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"] addroles = event.data["addroles"]
for index in range(len(var.ROLE_INDEX) - 1, -1, -1): for index in range(len(var.ROLE_INDEX) - 1, -1, -1):
if var.ROLE_INDEX[index] <= len(villagers): if var.ROLE_INDEX[index] <= len(villagers):