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

Remove the cli argument from chk_win

Browse Source
This commit is contained in:
Vgr E. Barry 2018-02-04 17:26:40 -05:00
parent a42da38e8e
commit a8790b439a
7 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gamemodes.py
View File

@ -106,7 +106,7 @@ class GameMode:
pass
# Here so any game mode can use it
def lovers_chk_win(self, evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def lovers_chk_win(self, evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
winner = evt.data["winner"]
if winner is not None and winner.startswith("@"):
return # fool won, lovers can't win even if they would
@ -121,7 +121,7 @@ class GameMode:
evt.data["additional_winners"] = list(lovers)
evt.data["message"] = messages["lovers_win"]
def all_dead_chk_win(self, evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def all_dead_chk_win(self, evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
if evt.data["winner"] == "no_team_wins":
evt.data["winner"] = "everyone"
evt.data["message"] = messages["everyone_died_won"]
@ -200,7 +200,7 @@ class VillagergameMode(GameMode):
events.remove_listener("transition_day_begin", self.transition_day)
events.remove_listener("retribution_kill", self.on_retribution_kill, priority=4)
def chk_win(self, evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def chk_win(self, evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
# village can only win via unanimous vote on the bot nick
# villagergame_lose should probably explain that mechanic
# Note: not implemented here since that needs to work in default too
@ -355,7 +355,7 @@ class EvilVillageMode(GameMode):
def teardown(self):
events.remove_listener("chk_win", self.chk_win)
def chk_win(self, evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def chk_win(self, evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
lsafes = len(list_players(["oracle", "seer", "guardian angel", "shaman", "hunter", "villager"]))
lcultists = len(list_players(["cultist"]))
evt.stop_processing = True
@ -780,7 +780,7 @@ class GuardianMode(GameMode):
def teardown(self):
events.remove_listener("chk_win", self.chk_win)
def chk_win(self, evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def chk_win(self, evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
lguardians = len(list_players(["guardian angel", "bodyguard"]))
if lpl < 1:

2
src/roles/piper.py
View File

@ -82,7 +82,7 @@ def charm(var, wrapper, message):
wrapper.send(messages["charm_success"].format(orig1))
@event_listener("chk_win", priority=2)
def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def on_chk_win(evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
# lpl doesn't included wounded/sick people or consecrating priests
# whereas we want to ensure EVERYONE (even wounded people) are charmed for piper win
pipers = rolemap.get("piper", set())

2
src/roles/succubus.py
View File

@ -162,7 +162,7 @@ def on_player_win(evt, var, user, role, winner, survived):
evt.data["won"] = True
@event_listener("chk_win", priority=2)
def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def on_chk_win(evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
lsuccubi = len(rolemap.get("succubus", ()))
lentranced = len([x for x in ENTRANCED if x.nick not in var.DEAD])
if lsuccubi and var.PHASE == "day" and lpl - lsuccubi == lentranced:

2
src/roles/traitor.py
View File

@ -65,7 +65,7 @@ def on_update_stats3(evt, var, player, mainrole, revealrole, allroles):
# and therefore cannot be traitor. However, we currently do not have the logic to deduce this
@event_listener("chk_win", priority=1.1)
def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def on_chk_win(evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
did_something = False
if lrealwolves == 0:
for traitor in list(rolemap["traitor"]):

2
src/roles/villager.py
View File

@ -55,7 +55,7 @@ def on_player_win(evt, var, user, role, winner, survived):
evt.data["iwon"] = survived
@event_listener("chk_win", priority=3)
def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def on_chk_win(evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
if evt.data["winner"] is not None:
return
if lrealwolves == 0:

2
src/roles/wolfcub.py
View File

@ -58,7 +58,7 @@ def on_transition_night_end(evt, var):
wofl.send_messages()
@event_listener("chk_win", priority=1)
def on_chk_win(evt, cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
def on_chk_win(evt, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
did_something = False
if lrealwolves == 0:
for wc in list(rolemap["wolf cub"]):

40
src/wolfgame.py
View File

@ -1879,7 +1879,7 @@ def chk_decision(cli, force="", end_game=True, deadlist=[]):
# so we want to show "fool" even if it's a template
lmsg = random.choice(messages["lynch_reveal"]).format(votee, "", "fool")
cli.msg(botconfig.CHANNEL, lmsg)
if chk_win(cli, winner="@" + votee):
if chk_win(winner="@" + votee):
return
deadlist.append(votee)
# Other
@ -2250,9 +2250,8 @@ def stop_game(winner="", abort=False, additional_winners=None, log=True):
return True
def chk_win(cli, end_game=True, winner=None):
def chk_win(*, end_game=True, winner=None):
""" Returns True if someone won """
chan = botconfig.CHANNEL
lpl = len(list_players())
if var.PHASE == "join":
@ -2266,7 +2265,7 @@ def chk_win(cli, end_game=True, winner=None):
var.AFTER_FLASTGAME()
var.AFTER_FLASTGAME = None
if var.ADMIN_TO_PING is not None: # It was an flastgame
cli.msg(chan, "PING! {0}".format(var.ADMIN_TO_PING))
channels.Main.send("PING! {0}".format(var.ADMIN_TO_PING))
var.ADMIN_TO_PING = None
return True
@ -2274,14 +2273,13 @@ def chk_win(cli, end_game=True, winner=None):
if var.PHASE not in var.GAME_PHASES:
return False #some other thread already ended game probably
return chk_win_conditions(cli, var.ROLES, var.MAIN_ROLES, end_game, winner)
return chk_win_conditions(var.ROLES, var.MAIN_ROLES, end_game, winner)
def chk_win_conditions(cli, rolemap, mainroles, end_game=True, winner=None):
def chk_win_conditions(rolemap, mainroles, end_game=True, winner=None):
"""Internal handler for the chk_win function."""
chan = botconfig.CHANNEL
with var.GRAVEYARD_LOCK:
if var.PHASE == "day":
pl = set(list_players()) - (var.WOUNDED | var.CONSECRATING)
pl = set(list_players()) - (var.WOUNDED | var.CONSECRATING) # TODO: Convert to users
evt = Event("get_voters", {"voters": pl})
evt.dispatch(var)
pl = evt.data["voters"]
@ -2334,7 +2332,7 @@ def chk_win_conditions(cli, rolemap, mainroles, end_game=True, winner=None):
message = messages["monster_wolf_win"].format(s)
winner = "monsters"
# TODO: convert to using users, flip priority order (so that things like fool run last, and therefore override previous win conds)
# TODO: flip priority order (so that things like fool run last, and therefore override previous win conds)
# Priorities:
# 0 = fool, other roles that end game immediately
# 1 = things that could short-circuit game ending, such as cub growing up or traitor turning
@ -2348,8 +2346,8 @@ def chk_win_conditions(cli, rolemap, mainroles, end_game=True, winner=None):
# (monster's message changes based on who would have otherwise won)
# 5 = gamemode-specific win conditions
event = Event("chk_win", {"winner": winner, "message": message, "additional_winners": None})
if not event.dispatch(cli, var, rolemap, mainroles, lpl, lwolves, lrealwolves):
return chk_win_conditions(cli, rolemap, mainroles, end_game, winner)
if not event.dispatch(var, rolemap, mainroles, lpl, lwolves, lrealwolves):
return chk_win_conditions(rolemap, mainroles, end_game, winner)
winner = event.data["winner"]
message = event.data["message"]
@ -2358,7 +2356,7 @@ def chk_win_conditions(cli, rolemap, mainroles, end_game=True, winner=None):
if end_game:
debuglog("WIN:", winner)
cli.msg(chan, message)
channels.Main.send(message)
stop_game(winner, additional_winners=event.data["additional_winners"])
return True
@ -2645,13 +2643,13 @@ def del_player(player, *, devoice=True, end_game=True, death_triggers=True, kill
cmode.append(("+" + mode, player.nick))
del var.OLD_MODES[player]
var.ALL_PLAYERS.remove(player)
ret = not chk_win(channels.Main.client) # FIXME
ret = not chk_win()
else:
# Died during the game, so quiet!
if var.QUIET_DEAD_PLAYERS and not player.is_fake:
cmode.append(("+{0}".format(var.QUIET_MODE), var.QUIET_PREFIX+player.nick+"!*@*"))
var.DEAD.add(player.nick)
ret = not chk_win(channels.Main.client, end_game) # FIXME
ret = not chk_win(end_game=end_game)
# only join to deadchat if the game isn't about to end
if ismain:
if ret:
@ -2765,7 +2763,7 @@ def reaper(cli, gameid):
if var.IDLE_PENALTY:
add_warning(cli, nck, var.IDLE_PENALTY, users.Bot.nick, messages["idle_warning"], expires=var.IDLE_EXPIRY)
del_player(user, end_game=False, death_triggers=False)
win = chk_win(cli)
win = chk_win()
if not win and var.PHASE == "day" and var.GAMEPHASE == "day":
chk_decision(cli)
pl = list_players()
@ -3744,7 +3742,7 @@ def transition_day(cli, gameid=0):
event_end = Event("transition_day_end", {"begin_day": begin_day})
event_end.dispatch(var)
if chk_win(cli): # if after the last person is killed, one side wins, then actually end the game here
if chk_win(): # if after the last person is killed, one side wins, then actually end the game here
return
event_end.data["begin_day"](cli)
@ -4251,7 +4249,7 @@ def shoot(var, wrapper, message):
del var.VOTES[cand]
break
chk_decision(wrapper.source.client)
chk_win(wrapper.source.client)
chk_win()
elif rand <= chances[0] + chances[1]:
wrapper.send(messages["gunner_miss"].format(wrapper.source.nick))
else:
@ -4320,7 +4318,7 @@ def consecrate(cli, nick, chan, rest):
pm(cli, nick, messages["consecrate_success"].format(victim))
debuglog("{0} ({1}) CONSECRATE: {2}".format(nick, get_role(nick), victim))
# consecrating can possibly cause game to end, so check for that
chk_win(cli)
chk_win()
@cmd("observe", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("werecrow", "sorcerer"))
def observe(cli, nick, chan, rest):
@ -5064,12 +5062,12 @@ def transition_night(cli):
var.TURNCOATS[amn] = ("none", -1)
debuglog("{0} REMEMBER: {1} as {2}".format(amn, amnrole, showrole))
if var.FIRST_NIGHT and chk_win(cli, end_game=False): # prevent game from ending as soon as it begins (useful for the random game mode)
if var.FIRST_NIGHT and chk_win(end_game=False): # prevent game from ending as soon as it begins (useful for the random game mode)
start(cli, users.Bot.nick, botconfig.CHANNEL, restart=var.CURRENT_GAMEMODE.name)
return
# game ended from bitten / amnesiac turning, narcolepsy totem expiring, or other weirdness
if chk_win(cli):
if chk_win():
return
# send PMs
@ -7110,7 +7108,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
var.STATS_TYPE = "accurate"
cli.msg(chan, messages["stats_accurate"].format(botconfig.CMD_CHAR))
chk_win(cli)
chk_win()
if botconfig.ALLOWED_NORMAL_MODE_COMMANDS and not botconfig.DEBUG_MODE: