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

don't check votes in reaper until after killing all idlers

Browse Source
This commit is contained in:
jacob1 2017-12-04 00:01:41 -05:00
parent 837eec41ad
commit 4bbe460df3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wolfgame.py
View File

@ -2697,7 +2697,7 @@ def del_player(player, *, devoice=True, end_game=True, death_triggers=True, kill
var.CONSECRATING.discard(player.nick) var.CONSECRATING.discard(player.nick)
# note: PHASE = "day" and GAMEPHASE = "night" during transition_day; # note: PHASE = "day" and GAMEPHASE = "night" during transition_day;
# we only want to induce a lynch if it's actually day and we aren't in a chained death # we only want to induce a lynch if it's actually day and we aren't in a chained death
if var.GAMEPHASE == "day" and ismain: if var.GAMEPHASE == "day" and ismain and not end_game:
chk_decision(channels.Main.client) chk_decision(channels.Main.client)
elif var.PHASE == "night" and ret and ismain: elif var.PHASE == "night" and ret and ismain:
chk_nightdone(channels.Main.client) chk_nightdone(channels.Main.client)
@ -2739,7 +2739,7 @@ def reaper(cli, gameid):
to_warn_pm = [] to_warn_pm = []
to_kill = [] to_kill = []
for nick in list_players(): for nick in list_players():
if is_fake_nick(nick): if not is_fake_nick(nick) or nick == "2" or nick == "3":
continue continue
lst = var.LAST_SAID_TIME.get(nick, var.GAME_START_TIME) lst = var.LAST_SAID_TIME.get(nick, var.GAME_START_TIME)
tdiff = datetime.now() - lst tdiff = datetime.now() - lst
@ -2777,7 +2777,9 @@ def reaper(cli, gameid):
if var.IDLE_PENALTY: if var.IDLE_PENALTY:
add_warning(cli, nck, var.IDLE_PENALTY, botconfig.NICK, messages["idle_warning"], expires=var.IDLE_EXPIRY) add_warning(cli, nck, var.IDLE_PENALTY, botconfig.NICK, messages["idle_warning"], expires=var.IDLE_EXPIRY)
del_player(users._get(nck), end_game=False, death_triggers=False) # FIXME del_player(users._get(nck), end_game=False, death_triggers=False) # FIXME
chk_win(cli) win = chk_win(cli)
if not win and var.PHASE == "day" and var.GAMEPHASE == "day":
chk_decision(cli)
pl = list_players() pl = list_players()
x = [a for a in to_warn if a in pl] x = [a for a in to_warn if a in pl]
if x: if x: