From d72eadf34f11ef75d9c5c5b9a933eed98322ef20 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Wed, 25 Nov 2015 18:59:16 -0500 Subject: [PATCH] fix players not becoming unentranced if succubus dying ends game --- src/wolfgame.py | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/wolfgame.py b/src/wolfgame.py index be66388..e5ad4f0 100644 --- a/src/wolfgame.py +++ b/src/wolfgame.py @@ -3103,31 +3103,32 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death if ret: join_deadchat(cli, *deadchat) del deadchat[:] - if var.PHASE in ("night", "day") and ret: + if var.PHASE in ("night", "day"): # remove the player from variables if they're in there - for a,b in list(var.KILLS.items()): - for n in b: #var.KILLS can have 2 kills in a list - if n == nick: - var.KILLS[a].remove(nick) - if a == nick or len(var.KILLS[a]) == 0: - del var.KILLS[a] - for x in (var.OBSERVED, var.HVISITED, var.GUARDED, var.TARGETED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED): - for k in list(x): - if nick in (k, x[k]): - del x[k] - for x in (var.SHAMANS,): - for k in list(x): - if nick in (k, x[k][0]): - del x[k] - for k in list(var.OTHER_KILLS): - if var.OTHER_KILLS[k] == nick: - var.HUNTERS.discard(k) - pm(cli, k, messages["hunter_discard"]) - del var.OTHER_KILLS[k] - elif nick == k: - del var.OTHER_KILLS[k] - if nick in var.DISCONNECTED: - del var.DISCONNECTED[nick] + if ret: + for a,b in list(var.KILLS.items()): + for n in b: #var.KILLS can have 2 kills in a list + if n == nick: + var.KILLS[a].remove(nick) + if a == nick or len(var.KILLS[a]) == 0: + del var.KILLS[a] + for x in (var.OBSERVED, var.HVISITED, var.GUARDED, var.TARGETED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED): + for k in list(x): + if nick in (k, x[k]): + del x[k] + for x in (var.SHAMANS,): + for k in list(x): + if nick in (k, x[k][0]): + del x[k] + for k in list(var.OTHER_KILLS): + if var.OTHER_KILLS[k] == nick: + var.HUNTERS.discard(k) + pm(cli, k, messages["hunter_discard"]) + del var.OTHER_KILLS[k] + elif nick == k: + del var.OTHER_KILLS[k] + if nick in var.DISCONNECTED: + del var.DISCONNECTED[nick] if nickrole == "succubus" and not var.ROLES["succubus"]: while var.ENTRANCED: entranced = var.ENTRANCED.pop()