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

Change del_player to devoice all at once in multiple-deaths scenarios

Browse Source
This commit is contained in:
Vgr E.Barry 2015-06-18 22:48:48 -04:00
parent 3cab412a9b
commit 260918555d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wolfgame.py
View File

@ -2025,7 +2025,7 @@ def chk_win(cli, end_game = True):
stop_game(cli, winner) stop_game(cli, winner)
return True return True
def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, death_triggers = True, killer_role = "", deadlist = [], original = ""): def del_player(cli, nick, forced_death = False, devoice = True, end_game = True, death_triggers = True, killer_role = "", deadlist = [], original = "", cmode = [], count = []):
""" """
Returns: False if one side won. Returns: False if one side won.
arg: forced_death = True when lynched or when the seer/wolf both don't act arg: forced_death = True when lynched or when the seer/wolf both don't act
@ -2040,7 +2040,7 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
if not var.GAME_ID or var.GAME_ID > t: if not var.GAME_ID or var.GAME_ID > t:
# either game ended, or a new game has started. # either game ended, or a new game has started.
return False return False
cmode = [] count.append(None) # if at any point you need to return before the end, make sure to remove a None from this list
ret = True ret = True
pl = var.list_players() pl = var.list_players()
for dead in deadlist: for dead in deadlist:
@ -2343,13 +2343,11 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
cmode.append(("+"+newmode, nick)) cmode.append(("+"+newmode, nick))
var.USERS[nick]["modes"].update(var.USERS[nick]["moded"]) var.USERS[nick]["modes"].update(var.USERS[nick]["moded"])
var.USERS[nick]["moded"] = set() var.USERS[nick]["moded"] = set()
mass_mode(cli, cmode, []) ret = not chk_win(cli)
return not chk_win(cli)
if var.PHASE != "join": if var.PHASE != "join":
# Died during the game, so quiet! # Died during the game, so quiet!
if var.QUIET_DEAD_PLAYERS and not is_fake_nick(nick): if var.QUIET_DEAD_PLAYERS and not is_fake_nick(nick):
cmode.append(("+{0}".format(var.QUIET_MODE), var.QUIET_PREFIX+nick+"!*@*")) cmode.append(("+{0}".format(var.QUIET_MODE), var.QUIET_PREFIX+nick+"!*@*"))
mass_mode(cli, cmode, [])
if nick not in var.DEAD: if nick not in var.DEAD:
var.DEAD.append(nick) var.DEAD.append(nick)
ret = not chk_win(cli, end_game) ret = not chk_win(cli, end_game)
@ -2396,6 +2394,12 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
chk_decision(cli) chk_decision(cli)
elif var.PHASE == "night" and ret: elif var.PHASE == "night" and ret:
chk_nightdone(cli) chk_nightdone(cli)
count.remove(None)
if not count:
mass_mode(cli, cmode, [])
cmode.clear()
return ret return ret