From 90320ba6bcae0fd30a7f046940c2840139dc3022 Mon Sep 17 00:00:00 2001 From: skizzerz Date: Mon, 25 Sep 2017 17:37:56 -0500 Subject: [PATCH] Fix issues with del_player conversion --- src/roles/wolfcub.py | 2 +- src/wolfgame.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/roles/wolfcub.py b/src/roles/wolfcub.py index c0a7a5c..e738e76 100644 --- a/src/roles/wolfcub.py +++ b/src/roles/wolfcub.py @@ -78,7 +78,7 @@ def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves): evt.stop_processing = True @event_listener("reconfigure_stats") -def on_reconfigure_stats(evt, cli, var, stats): +def on_reconfigure_stats(evt, var, stats): if "wolf cub" not in stats or stats["wolf cub"] == 0: return for role in var.WOLF_ROLES - {"wolf cub"}: diff --git a/src/wolfgame.py b/src/wolfgame.py index c2eeb6d..e2a65af 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -49,7 +49,7 @@ import src.settings as var from src.utilities import * from src import db, events, dispatcher, channels, users, hooks, logger, proxy, debuglog, errlog, plog from src.decorators import command, cmd, hook, handle_error, event_listener, COMMANDS -from src.functions import get_players, get_all_players, get_participants, get_main_role +from src.functions import get_players, get_all_players, get_participants, get_main_role, get_all_roles from src.messages import messages from src.warnings import * from src.context import IRCContext @@ -2481,7 +2481,7 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death continue # already died somehow if player.nick not in var.LOVERS[lover.nick]: continue - var.LOVERS[other].remove(player.nick) + var.LOVERS[lover.nick].remove(player.nick) if var.ROLE_REVEAL in ("on", "team"): role = get_reveal_role(lover.nick) an = "n" if role.startswith(("a", "e", "i", "o", "u")) else "" @@ -2625,7 +2625,7 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death d = dict(rs) if p in d and d[p] >= 1: d[p] -= 1 - event.dispatch(cli, var, d) + event.dispatch(var, d) if min(d.values()) >= 0: newstats.add(frozenset(d.items())) var.ROLE_STATS = frozenset(newstats) @@ -2638,7 +2638,7 @@ def del_player(player, *, forced_death=False, devoice=True, end_game=True, death deadchat.append(player) # devoice all players that died as a result, if we are in the original del_player if ismain: - mass_mode(cli, cmode, []) + channels.Main.mode(*cmode) del cmode[:] if var.PHASE == "join": if player.nick in var.GAMEMODE_VOTES: