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

fix players not becoming unentranced if succubus dying ends game

Browse Source
This commit is contained in:
jacob1 2015-11-25 18:59:16 -05:00
parent 99c8845118
commit d72eadf34f
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/wolfgame.py
View File

@ -3103,31 +3103,32 @@ def del_player(cli, nick, forced_death=False, devoice=True, end_game=True, death
if ret: if ret:
join_deadchat(cli, *deadchat) join_deadchat(cli, *deadchat)
del 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 # remove the player from variables if they're in there
for a,b in list(var.KILLS.items()): if ret:
for n in b: #var.KILLS can have 2 kills in a list for a,b in list(var.KILLS.items()):
if n == nick: for n in b: #var.KILLS can have 2 kills in a list
var.KILLS[a].remove(nick) if n == nick:
if a == nick or len(var.KILLS[a]) == 0: var.KILLS[a].remove(nick)
del var.KILLS[a] if a == nick or len(var.KILLS[a]) == 0:
for x in (var.OBSERVED, var.HVISITED, var.GUARDED, var.TARGETED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED): del var.KILLS[a]
for k in list(x): for x in (var.OBSERVED, var.HVISITED, var.GUARDED, var.TARGETED, var.LASTGUARDED, var.LASTGIVEN, var.LASTHEXED):
if nick in (k, x[k]): for k in list(x):
del x[k] if nick in (k, x[k]):
for x in (var.SHAMANS,): del x[k]
for k in list(x): for x in (var.SHAMANS,):
if nick in (k, x[k][0]): for k in list(x):
del x[k] if nick in (k, x[k][0]):
for k in list(var.OTHER_KILLS): del x[k]
if var.OTHER_KILLS[k] == nick: for k in list(var.OTHER_KILLS):
var.HUNTERS.discard(k) if var.OTHER_KILLS[k] == nick:
pm(cli, k, messages["hunter_discard"]) var.HUNTERS.discard(k)
del var.OTHER_KILLS[k] pm(cli, k, messages["hunter_discard"])
elif nick == k: del var.OTHER_KILLS[k]
del var.OTHER_KILLS[k] elif nick == k:
if nick in var.DISCONNECTED: del var.OTHER_KILLS[k]
del var.DISCONNECTED[nick] if nick in var.DISCONNECTED:
del var.DISCONNECTED[nick]
if nickrole == "succubus" and not var.ROLES["succubus"]: if nickrole == "succubus" and not var.ROLES["succubus"]:
while var.ENTRANCED: while var.ENTRANCED:
entranced = var.ENTRANCED.pop() entranced = var.ENTRANCED.pop()