From 47f4f77f104377cc8cab3d68d85925311a0823e8 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sat, 3 Jan 2015 15:41:16 -0500 Subject: [PATCH] check if game ends when bitten/amnesiac turn, instead of sending out PMs and continuing it --- modules/wolfgame.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/wolfgame.py b/modules/wolfgame.py index 2d03fa0..f510e2d 100644 --- a/modules/wolfgame.py +++ b/modules/wolfgame.py @@ -4804,6 +4804,10 @@ def transition_night(cli): for elder in var.ROLES["village elder"]: var.DYING.append(elder) + # game ended from bitten / amnesiac turning, narcolepsy totem expiring, or other weirdness + if chk_win(cli): + return + # send PMs ps = var.list_players() wolves = var.list_players(var.WOLFCHAT_ROLES) @@ -5269,11 +5273,6 @@ def transition_night(cli): var.LOGGER.logMessage(dmsg.replace("\02", "")) var.LOGGER.logBare("NIGHT", "BEGIN") - # cli.msg(chan, "DEBUG: "+str(var.ROLES)) - if len(var.list_players(var.WOLF_ROLES)) - len(var.ROLES["wolf cub"]) == 0 or var.DISEASED_WOLVES: # Probably something interesting going on. - chk_nightdone(cli) - chk_traitor(cli) - def cgamemode(cli, arg):