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

Add the 'phases' and 'silenced' arguments to the cmd decorator

Browse Source
This commit is contained in:
Vgr E.Barry 2015-06-04 09:44:34 -04:00
parent f1285d2237
commit b6211748a1
2 changed files with 53 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/decorators.py
View File

@ -13,7 +13,7 @@ HOOKS = defaultdict(list)
class cmd: class cmd:
def __init__(self, *cmds, raw_nick=False, admin_only=False, owner_only=False, def __init__(self, *cmds, raw_nick=False, admin_only=False, owner_only=False,
chan=True, pm=False, join=False, none=False, game=False, playing=False, roles=()): chan=True, pm=False, playing=False, silenced=False, phases=(), roles=()):
self.cmds = cmds self.cmds = cmds
self.raw_nick = raw_nick self.raw_nick = raw_nick
@ -21,10 +21,9 @@ class cmd:
self.owner_only = owner_only self.owner_only = owner_only
self.chan = chan self.chan = chan
self.pm = pm self.pm = pm
self.join = join
self.none = none
self.game = game
self.playing = playing self.playing = playing
self.silenced = silenced
self.phases = phases
self.roles = roles self.roles = roles
self.func = None self.func = None
self.aftergame = False self.aftergame = False
@ -86,34 +85,7 @@ class cmd:
if "" in self.cmds: if "" in self.cmds:
return self.func(*largs) return self.func(*largs)
if self.game and var.PHASE not in ("day", "night") + (("join",) if self.join else ()): if self.phases and var.PHASE not in self.phases:
if chan == nick:
pm(cli, nick, "No game is currently running.")
else:
cli.notice(nick, "No game is currently running.")
return
if ((self.join and self.none and var.PHASE not in ("join", "none")) or
(self.none and not self.join and var.PHASE != "none")):
if chan == nick:
pm(cli, nick, "Sorry, but the game is already running. Try again next time.")
else:
cli.notice(nick, "Sorry, but the game is already running. Try again next time.")
return
if self.join and not self.none:
if var.PHASE == "none":
if chan == nick:
pm(cli, nick, "No game is currently running.")
else:
cli.notice(nick, "No game is currently running.")
return
if var.PHASE != "join" and not self.game:
if chan == nick:
pm(cli, nick, "Werewolf is already in play.")
else:
cli.notice(nick, "Werewolf is already in play.")
return return
if self.playing and (nick not in var.list_players() or nick in var.DISCONNECTED): if self.playing and (nick not in var.list_players() or nick in var.DISCONNECTED):
@ -123,6 +95,13 @@ class cmd:
cli.notice(nick, "You're not currently playing.") cli.notice(nick, "You're not currently playing.")
return return
if self.silenced and nick in var.SILENCED:
if chan == nick:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
else:
cli.notice(nick, "You have been silenced, and are unable to use any special powers.")
return
if self.roles: if self.roles:
for role in self.roles: for role in self.roles:
if nick in var.ROLES[role]: if nick in var.ROLES[role]:

192
src/wolfgame.py
View File

@ -909,7 +909,7 @@ def join_timer_handler(cli):
cli.who(botconfig.CHANNEL, "%uhsnfa") cli.who(botconfig.CHANNEL, "%uhsnfa")
@cmd("join", "j", none=True, join=True) @cmd("join", "j", phases=("none", "join"))
def join(cli, nick, chan, rest): def join(cli, nick, chan, rest):
"""Either starts a new game of Werewolf or joins an existing game that has not started yet.""" """Either starts a new game of Werewolf or joins an existing game that has not started yet."""
if var.ACCOUNTS_ONLY: if var.ACCOUNTS_ONLY:
@ -1067,7 +1067,7 @@ def kill_join(cli, chan):
var.AFTER_FLASTGAME = None var.AFTER_FLASTGAME = None
@cmd("fjoin", admin_only=True, none=True, join=True) @cmd("fjoin", admin_only=True, phases=("none", "join"))
def fjoin(cli, nick, chan, rest): def fjoin(cli, nick, chan, rest):
"""Forces someone to join a game.""" """Forces someone to join a game."""
noticed = False noticed = False
@ -1103,7 +1103,7 @@ def fjoin(cli, nick, chan, rest):
if fake: if fake:
cli.msg(chan, "\u0002{0}\u0002 used fjoin and raised the number of players to \u0002{1}\u0002.".format(nick, len(var.list_players()))) cli.msg(chan, "\u0002{0}\u0002 used fjoin and raised the number of players to \u0002{1}\u0002.".format(nick, len(var.list_players())))
@cmd("fleave", "fquit", admin_only=True, join=True, game=True) @cmd("fleave", "fquit", admin_only=True, phases=("join", "day", "night"))
def fleave(cli, nick, chan, rest): def fleave(cli, nick, chan, rest):
"""Forces someone to leave the game.""" """Forces someone to leave the game."""
if chan != botconfig.CHANNEL: if chan != botconfig.CHANNEL:
@ -1135,7 +1135,7 @@ def fleave(cli, nick, chan, rest):
del_player(cli, a, death_triggers = False) del_player(cli, a, death_triggers = False)
@cmd("fstart", admin_only=True, join=True) @cmd("fstart", admin_only=True, phases=("join",))
def fstart(cli, nick, chan, rest): def fstart(cli, nick, chan, rest):
"""Forces the game to start immediately.""" """Forces the game to start immediately."""
cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to start.".format(nick)) cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to start.".format(nick))
@ -1181,7 +1181,7 @@ def on_account(cli, rnick, acc):
if nick in var.DCED_PLAYERS.keys(): if nick in var.DCED_PLAYERS.keys():
var.PLAYERS[nick] = var.DCED_PLAYERS.pop(nick) var.PLAYERS[nick] = var.DCED_PLAYERS.pop(nick)
@cmd("stats", "players", pm=True, game=True, join=True) @cmd("stats", "players", pm=True, phases=("join", "day", "night"))
def stats(cli, nick, chan, rest): def stats(cli, nick, chan, rest):
"""Displays the player statistics.""" """Displays the player statistics."""
@ -1541,7 +1541,7 @@ def chk_decision(cli, force = ""):
transition_night(cli) transition_night(cli)
break break
@cmd("votes", pm=True, game=True, join=True) @cmd("votes", pm=True, phases=("join", "day", "night"))
def show_votes(cli, nick, chan, rest): def show_votes(cli, nick, chan, rest):
"""Displays the voting statistics.""" """Displays the voting statistics."""
@ -2542,14 +2542,10 @@ def on_join(cli, raw_nick, chan, acc="*", rname=""):
cli.msg("ChanServ", "op " + chan) cli.msg("ChanServ", "op " + chan)
@cmd("goat", game=True, playing=True) @cmd("goat", playing=True, phases=("day",))
def goat(cli, nick, chan, rest): def goat(cli, nick, chan, rest):
"""Use a goat to interact with anyone in the channel during the day.""" """Use a goat to interact with anyone in the channel during the day."""
if var.PHASE != "day":
cli.notice(nick, "You can only do that in the day.")
return
if var.GOATED and nick not in var.SPECIAL_ROLES["goat herder"]: if var.GOATED and nick not in var.SPECIAL_ROLES["goat herder"]:
cli.notice(nick, "This can only be done once per day.") cli.notice(nick, "This can only be done once per day.")
return return
@ -2908,7 +2904,7 @@ hook("quit")(lambda cli, nick, *rest: leave(cli, "quit", nick, rest[0]))
hook("kick")(lambda cli, nick, *rest: leave(cli, "kick", rest[1], rest[0])) hook("kick")(lambda cli, nick, *rest: leave(cli, "kick", rest[1], rest[0]))
@cmd("quit", "leave", join=True, game=True, playing=True) @cmd("quit", "leave", playing=True, phases=("join", "day", "night"))
def leave_game(cli, nick, chan, rest): def leave_game(cli, nick, chan, rest):
"""Quits the game.""" """Quits the game."""
if var.PHASE == "join": if var.PHASE == "join":
@ -3564,7 +3560,7 @@ def chk_nightdone(cli):
if var.PHASE == "night": # Double check if var.PHASE == "night": # Double check
transition_day(cli) transition_day(cli)
@cmd("nolynch", "nl", "novote", "nv", "abstain", "abs", game=True, playing=True) @cmd("nolynch", "nl", "novote", "nv", "abstain", "abs", playing=True, phases=("day",))
def no_lynch(cli, nick, chan, rest): def no_lynch(cli, nick, chan, rest):
"""Allows you to abstain from voting for the day.""" """Allows you to abstain from voting for the day."""
if chan == botconfig.CHANNEL: if chan == botconfig.CHANNEL:
@ -3577,9 +3573,6 @@ def no_lynch(cli, nick, chan, rest):
elif var.LIMIT_ABSTAIN and var.FIRST_DAY: elif var.LIMIT_ABSTAIN and var.FIRST_DAY:
cli.notice(nick, "The village may not abstain on the first day.") cli.notice(nick, "The village may not abstain on the first day.")
return return
elif var.PHASE != "day":
cli.notice(nick, "Lynching is only during the day. Please wait patiently for morning.")
return
elif nick in var.WOUNDED: elif nick in var.WOUNDED:
cli.msg(chan, "{0}: You are wounded and resting, thus you are unable to vote for the day.".format(nick)) cli.msg(chan, "{0}: You are wounded and resting, thus you are unable to vote for the day.".format(nick))
return return
@ -3596,7 +3589,7 @@ def no_lynch(cli, nick, chan, rest):
chk_decision(cli) chk_decision(cli)
return return
@cmd("lynch", game=True, playing=True, pm=True) @cmd("lynch", playing=True, pm=True, phases=("day",))
def lynch(cli, nick, chan, rest): def lynch(cli, nick, chan, rest):
"""Use this to vote for a candidate to be lynched.""" """Use this to vote for a candidate to be lynched."""
if not rest: if not rest:
@ -3607,10 +3600,6 @@ def lynch(cli, nick, chan, rest):
rest = re.split(" +",rest)[0].strip() rest = re.split(" +",rest)[0].strip()
if var.PHASE != "day":
cli.notice(nick, ("Lynching is only allowed during the day. "+
"Please wait patiently for morning."))
return
if nick in var.WOUNDED: if nick in var.WOUNDED:
cli.msg(chan, ("{0}: You are wounded and resting, "+ cli.msg(chan, ("{0}: You are wounded and resting, "+
"thus you are unable to vote for the day.").format(nick)) "thus you are unable to vote for the day.").format(nick))
@ -3944,11 +3933,11 @@ def check_exchange(cli, actor, nick):
return True return True
return False return False
@cmd("retract", pm=True, game=True, playing=True) @cmd("retract", pm=True, playing=True, phases=("day", "night"))
def retract(cli, nick, chan, rest): def retract(cli, nick, chan, rest):
"""Takes back your vote during the day (for whom to lynch).""" """Takes back your vote during the day (for whom to lynch)."""
if not chan in (botconfig.CHANNEL, nick): if chan not in (botconfig.CHANNEL, nick):
return return
if chan == nick: # PM, use different code if chan == nick: # PM, use different code
@ -3956,7 +3945,6 @@ def retract(cli, nick, chan, rest):
if role not in ("wolf", "werecrow", "alpha wolf", "werekitten", "hunter") and nick not in var.VENGEFUL_GHOSTS.keys(): if role not in ("wolf", "werecrow", "alpha wolf", "werekitten", "hunter") and nick not in var.VENGEFUL_GHOSTS.keys():
return return
if var.PHASE != "night": if var.PHASE != "night":
pm(cli, nick, "You may only retract at night.")
return return
if role == "werecrow": # Check if already observed if role == "werecrow": # Check if already observed
if var.OBSERVED.get(nick): if var.OBSERVED.get(nick):
@ -3986,8 +3974,6 @@ def retract(cli, nick, chan, rest):
return return
if var.PHASE != "day": if var.PHASE != "day":
cli.notice(nick, ("Lynching is only allowed during the day. "+
"Please wait patiently for morning."))
return return
if nick in var.NO_LYNCH: if nick in var.NO_LYNCH:
var.NO_LYNCH.remove(nick) var.NO_LYNCH.remove(nick)
@ -4007,17 +3993,13 @@ def retract(cli, nick, chan, rest):
else: else:
cli.notice(nick, "You haven't voted yet.") cli.notice(nick, "You haven't voted yet.")
@cmd("shoot", game=True, playing=True) @cmd("shoot", playing=True, silenced=True, phases=("day",))
def shoot(cli, nick, chan, rest): def shoot(cli, nick, chan, rest):
"""Use this to fire off a bullet at someone in the day if you have bullets.""" """Use this to fire off a bullet at someone in the day if you have bullets."""
if chan != botconfig.CHANNEL: if chan != botconfig.CHANNEL:
return return
if var.PHASE != "day":
cli.notice(nick, ("Shooting is only allowed during the day. "+
"Please wait patiently for morning."))
return
if nick not in var.GUNNERS.keys() and nick not in var.WOLF_GUNNERS.keys(): if nick not in var.GUNNERS.keys() and nick not in var.WOLF_GUNNERS.keys():
cli.notice(nick, "You don't have a gun.") cli.notice(nick, "You don't have a gun.")
return return
@ -4026,9 +4008,6 @@ def shoot(cli, nick, chan, rest):
nick in var.WOLF_GUNNERS.keys() and not var.WOLF_GUNNERS[nick])): nick in var.WOLF_GUNNERS.keys() and not var.WOLF_GUNNERS[nick])):
cli.notice(nick, "You don't have any more bullets.") cli.notice(nick, "You don't have any more bullets.")
return return
elif nick in var.SILENCED:
cli.notice(nick, "You have been silenced, and are unable to use any special powers.")
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], True) victim = get_victim(cli, nick, re.split(" +",rest)[0], True)
if not victim: if not victim:
return return
@ -4112,7 +4091,7 @@ def shoot(cli, nick, chan, rest):
@cmd("kill", chan=False, pm=True, game=True) @cmd("kill", chan=False, pm=True, phases=("night",))
def kill(cli, nick, chan, rest): def kill(cli, nick, chan, rest):
"""Kill a player. Behaviour varies depending on your role.""" """Kill a player. Behaviour varies depending on your role."""
if (nick not in var.VENGEFUL_GHOSTS.keys() and nick not in var.list_players()) or nick in var.DISCONNECTED.keys(): if (nick not in var.VENGEFUL_GHOSTS.keys() and nick not in var.list_players()) or nick in var.DISCONNECTED.keys():
@ -4131,9 +4110,6 @@ def kill(cli, nick, chan, rest):
if nick in var.VENGEFUL_GHOSTS.keys() and var.VENGEFUL_GHOSTS[nick][0] == "!": if nick in var.VENGEFUL_GHOSTS.keys() and var.VENGEFUL_GHOSTS[nick][0] == "!":
# ghost was driven away by retribution # ghost was driven away by retribution
return return
if var.PHASE != "night":
pm(cli, nick, "You may only kill people at night.")
return
if role == "hunter" and nick in var.HUNTERS and nick not in var.OTHER_KILLS: if role == "hunter" and nick in var.HUNTERS and nick not in var.OTHER_KILLS:
# they are a hunter and did not kill this night (if they killed this night, this allows them to switch) # they are a hunter and did not kill this night (if they killed this night, this allows them to switch)
pm(cli, nick, "You have already killed someone this game.") pm(cli, nick, "You have already killed someone this game.")
@ -4234,15 +4210,9 @@ def kill(cli, nick, chan, rest):
debuglog("{0} ({1}) KILL : {2} ({3})".format(nick, role, victim2, var.get_role(victim2))) debuglog("{0} ({1}) KILL : {2} ({3})".format(nick, role, victim2, var.get_role(victim2)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("guard", "protect", "save", chan=False, pm=True, game=False, playing=True, roles=("bodyguard", "guardian angel")) @cmd("guard", "protect", "save", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("bodyguard", "guardian angel"))
def guard(cli, nick, chan, rest): def guard(cli, nick, chan, rest):
"""Guard a player, preventing them from being targetted that night.""" """Guard a player, preventing them from being targetted that night."""
if var.PHASE != "night":
pm(cli, nick, "You may only protect people at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if var.GUARDED.get(nick): if var.GUARDED.get(nick):
pm(cli, nick, "You are already protecting someone tonight.") pm(cli, nick, "You are already protecting someone tonight.")
return return
@ -4278,19 +4248,10 @@ def guard(cli, nick, chan, rest):
@cmd("observe", chan=False, pm=True, game=True, playing=True, roles=("werecrow", "sorcerer")) @cmd("observe", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("werecrow", "sorcerer"))
def observe(cli, nick, chan, rest): def observe(cli, nick, chan, rest):
"""Observe a player to obtain various information.""" """Observe a player to obtain various information."""
role = var.get_role(nick) role = var.get_role(nick)
if var.PHASE != "night":
if role == "werecrow":
pm(cli, nick, "You may only transform into a crow at night.")
else:
pm(cli, nick, "You may only observe at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], False) victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
if not victim: if not victim:
return return
@ -4337,15 +4298,9 @@ def observe(cli, nick, chan, rest):
debuglog("{0} ({1}) OBSERVE: {2} ({3})".format(nick, role, victim, var.get_role(victim))) debuglog("{0} ({1}) OBSERVE: {2} ({3})".format(nick, role, victim, var.get_role(victim)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("id", chan=False, pm=True, game=True, playing=True, roles=("detective",)) @cmd("id", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("detective",))
def investigate(cli, nick, chan, rest): def investigate(cli, nick, chan, rest):
"""Investigate a player to determine their exact role.""" """Investigate a player to determine their exact role."""
if var.PHASE != "day":
pm(cli, nick, "You may only investigate people during the day.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if nick in var.INVESTIGATED: if nick in var.INVESTIGATED:
pm(cli, nick, "You may only investigate one person per round.") pm(cli, nick, "You may only investigate one person per round.")
return return
@ -4372,15 +4327,9 @@ def investigate(cli, nick, chan, rest):
"that \u0002{0}\u0002 is the detective!").format(nick)) "that \u0002{0}\u0002 is the detective!").format(nick))
debuglog("{0} ({1}) PAPER DROP".format(nick, var.get_role(nick))) debuglog("{0} ({1}) PAPER DROP".format(nick, var.get_role(nick)))
@cmd("visit", chan=False, pm=True, game=True, playing=True, roles=("harlot",)) @cmd("visit", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("harlot",))
def hvisit(cli, nick, chan, rest): def hvisit(cli, nick, chan, rest):
"""Visit a player. You will die if you visit a wolf or a target of the wolves.""" """Visit a player. You will die if you visit a wolf or a target of the wolves."""
if var.PHASE != "night":
pm(cli, nick, "You may only visit someone at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if var.HVISITED.get(nick): if var.HVISITED.get(nick):
pm(cli, nick, ("You are already spending the night "+ pm(cli, nick, ("You are already spending the night "+
"with \u0002{0}\u0002.").format(var.HVISITED[nick])) "with \u0002{0}\u0002.").format(var.HVISITED[nick]))
@ -4408,16 +4357,10 @@ def hvisit(cli, nick, chan, rest):
def is_fake_nick(who): def is_fake_nick(who):
return re.search(r"^[0-9]+$", who) return re.search(r"^[0-9]+$", who)
@cmd("see", chan=False, pm=True, game=True, playing=True, roles=("seer", "oracle", "augur")) @cmd("see", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("seer", "oracle", "augur"))
def see(cli, nick, chan, rest): def see(cli, nick, chan, rest):
"""Use your paranormal powers to determine the role or alignment of a player.""" """Use your paranormal powers to determine the role or alignment of a player."""
role = var.get_role(nick) role = var.get_role(nick)
if var.PHASE != "night":
pm(cli, nick, "You may only have visions at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if nick in var.SEEN: if nick in var.SEEN:
pm(cli, nick, "You may only have one vision per round.") pm(cli, nick, "You may only have one vision per round.")
return return
@ -4467,7 +4410,7 @@ def see(cli, nick, chan, rest):
var.SEEN.append(nick) var.SEEN.append(nick)
chk_nightdone(cli) chk_nightdone(cli)
@cmd("give", chan=False, pm=True, game=True, playing=True, roles=var.TOTEM_ORDER+("doctor",)) @cmd("give", chan=False, pm=True, playing=True, silenced=True, phases=("day", "night"), roles=var.TOTEM_ORDER+("doctor",))
def give(cli, nick, chan, rest): def give(cli, nick, chan, rest):
"""Give a totem or immunization to a player.""" """Give a totem or immunization to a player."""
role = var.get_role(nick) role = var.get_role(nick)
@ -4476,15 +4419,9 @@ def give(cli, nick, chan, rest):
elif role == "doctor": elif role == "doctor":
immunize(cli, nick, chan, rest) immunize(cli, nick, chan, rest)
@cmd("totem", chan=False, pm=True, game=True, playing=True, roles=var.TOTEM_ORDER) @cmd("totem", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=var.TOTEM_ORDER)
def totem(cli, nick, chan, rest): def totem(cli, nick, chan, rest):
"""Give a totem to a player.""" """Give a totem to a player."""
if var.PHASE != "night":
pm(cli, nick, "You may only give totems at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if nick in var.SHAMANS: if nick in var.SHAMANS:
pm(cli, nick, "You have already given out your totem this round.") pm(cli, nick, "You have already given out your totem this round.")
return return
@ -4553,15 +4490,9 @@ def totem(cli, nick, chan, rest):
debuglog("{0} ({1}) TOTEM: {2} ({3})".format(nick, role, victim, totem)) debuglog("{0} ({1}) TOTEM: {2} ({3})".format(nick, role, victim, totem))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("immunize", "immunise", chan=False, pm=True, game=True, playing=True, roles=("doctor",)) @cmd("immunize", "immunise", chan=False, pm=True, playing=True, silenced=True, phases=("day",), roles=("doctor",))
def immunize(cli, nick, chan, rest): def immunize(cli, nick, chan, rest):
"""Immunize a player, preventing them from turning into a wolf.""" """Immunize a player, preventing them from turning into a wolf."""
if var.PHASE != "day":
pm(cli, nick, "You may only immunize people during the day.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if nick in var.DOCTORS and var.DOCTORS[nick] == 0: if nick in var.DOCTORS and var.DOCTORS[nick] == 0:
pm(cli, nick, "You have run out of immunizations.") pm(cli, nick, "You have run out of immunizations.")
return return
@ -4622,18 +4553,12 @@ def get_bitten_message(nick):
"who or what the pursuer was, you woke with a start.") "who or what the pursuer was, you woke with a start.")
return message return message
@cmd("bite", chan=False, pm=True, game=True, playing=True, roles=("alpha wolf",)) @cmd("bite", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("alpha wolf",))
def bite_cmd(cli, nick, chan, rest): def bite_cmd(cli, nick, chan, rest):
"""Bite a player, turning them into a wolf after a certain number of nights.""" """Bite a player, turning them into a wolf after a certain number of nights."""
if var.PHASE != "night":
pm(cli, nick, "You may only bite at night.")
return
if nick in var.ALPHA_WOLVES and nick not in var.BITE_PREFERENCES: if nick in var.ALPHA_WOLVES and nick not in var.BITE_PREFERENCES:
pm(cli, nick, "You have already bitten someone this game.") pm(cli, nick, "You have already bitten someone this game.")
return return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if not var.ALPHA_ENABLED: if not var.ALPHA_ENABLED:
pm(cli, nick, "You may only bite someone after another wolf has died during the day.") pm(cli, nick, "You may only bite someone after another wolf has died during the day.")
return return
@ -4667,16 +4592,9 @@ def bite_cmd(cli, nick, chan, rest):
pm(cli, nick, "You have chosen to bite tonight. Whomever the wolves select to be killed tonight will be bitten instead.") pm(cli, nick, "You have chosen to bite tonight. Whomever the wolves select to be killed tonight will be bitten instead.")
debuglog("{0} ({1}) BITE: {2} ({3})".format(nick, var.get_role(nick), victim if victim else "wolves' target", vrole if vrole else "unknown")) debuglog("{0} ({1}) BITE: {2} ({3})".format(nick, var.get_role(nick), victim if victim else "wolves' target", vrole if vrole else "unknown"))
@cmd("pass", chan=False, pm=True, game=True, playing=True, roles=("hunter",)) @cmd("pass", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hunter",))
def pass_cmd(cli, nick, chan, rest): def pass_cmd(cli, nick, chan, rest):
"""Decline to kill someone for that night.""" """Decline to kill someone for that night."""
if var.PHASE != "night":
pm(cli, nick, "You may only pass at night.")
return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
if nick in var.OTHER_KILLS.keys(): if nick in var.OTHER_KILLS.keys():
del var.OTHER_KILLS[nick] del var.OTHER_KILLS[nick]
var.HUNTERS.remove(nick) var.HUNTERS.remove(nick)
@ -4687,11 +4605,10 @@ def pass_cmd(cli, nick, chan, rest):
debuglog("{0} ({1}) PASS".format(nick, var.get_role(nick))) debuglog("{0} ({1}) PASS".format(nick, var.get_role(nick)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("choose", "match", chan=False, pm=True, game=True, playing=True, roles=("matchmaker",)) @cmd("choose", "match", chan=False, pm=True, playing=True, phases=("night",), roles=("matchmaker",))
def choose(cli, nick, chan, rest): def choose(cli, nick, chan, rest):
"""Select two players to fall in love. You may select yourself as one of the lovers.""" """Select two players to fall in love. You may select yourself as one of the lovers."""
if var.PHASE != "night" or not var.FIRST_NIGHT: if not var.FIRST_NIGHT:
pm(cli, nick, "You may only choose lovers during the first night.")
return return
if nick in var.MATCHMAKERS: if nick in var.MATCHMAKERS:
pm(cli, nick, "You have already chosen lovers.") pm(cli, nick, "You have already chosen lovers.")
@ -4753,18 +4670,12 @@ def choose(cli, nick, chan, rest):
debuglog("{0} ({1}) MATCH: {2} ({3}) + {4} ({5})".format(nick, var.get_role(nick), victim, var.get_role(victim), victim2, var.get_role(victim2))) debuglog("{0} ({1}) MATCH: {2} ({3}) + {4} ({5})".format(nick, var.get_role(nick), victim, var.get_role(victim), victim2, var.get_role(victim2)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("target", chan=False, pm=True, game=True, playing=True, roles=("assassin",)) @cmd("target", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("assassin",))
def target(cli, nick, chan, rest): def target(cli, nick, chan, rest):
"""Pick a player as your target, killing them if you die.""" """Pick a player as your target, killing them if you die."""
if var.PHASE != "night":
pm(cli, nick, "You may only target people at night.")
return
if nick in var.TARGETED and var.TARGETED[nick] != None: if nick in var.TARGETED and var.TARGETED[nick] != None:
pm(cli, nick, "You have already chosen a target.") pm(cli, nick, "You have already chosen a target.")
return return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], False) victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
if not victim: if not victim:
return return
@ -4781,18 +4692,12 @@ def target(cli, nick, chan, rest):
debuglog("{0} ({1}-{2}) TARGET: {3} ({4})".format(nick, "-".join(var.get_templates(nick)), var.get_role(nick), victim, var.get_role(victim))) debuglog("{0} ({1}-{2}) TARGET: {3} ({4})".format(nick, "-".join(var.get_templates(nick)), var.get_role(nick), victim, var.get_role(victim)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("hex", chan=False, pm=True, game=True, playing=True, roles=("hag",)) @cmd("hex", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("hag",))
def hex_target(cli, nick, chan, rest): def hex_target(cli, nick, chan, rest):
"""Hex someone, preventing them from acting the next day and night.""" """Hex someone, preventing them from acting the next day and night."""
if var.PHASE != "night":
pm(cli, nick, "You may only hex at night.")
return
if nick in var.HEXED: if nick in var.HEXED:
pm(cli, nick, "You have already hexed someone tonight.") pm(cli, nick, "You have already hexed someone tonight.")
return return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], False) victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
if not victim: if not victim:
return return
@ -4821,19 +4726,13 @@ def hex_target(cli, nick, chan, rest):
debuglog("{0} ({1}) HEX: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim))) debuglog("{0} ({1}) HEX: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("curse", chan=False, pm=True, game=True, playing=True, roles=("warlock",)) @cmd("curse", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("warlock",))
def curse(cli, nick, chan, rest): def curse(cli, nick, chan, rest):
if var.PHASE != "night":
pm(cli, nick, "You may only curse at night.")
return
if nick in var.CURSED: if nick in var.CURSED:
# CONSIDER: this happens even if they choose to not curse, should maybe let them # CONSIDER: this happens even if they choose to not curse, should maybe let them
# pick again in that case instead of locking them into doing nothing. # pick again in that case instead of locking them into doing nothing.
pm(cli, nick, "You have already cursed someone tonight.") pm(cli, nick, "You have already cursed someone tonight.")
return return
if nick in var.SILENCED:
pm(cli, nick, "You have been silenced, and are unable to use any special powers.")
return
victim = get_victim(cli, nick, re.split(" +",rest)[0], False) victim = get_victim(cli, nick, re.split(" +",rest)[0], False)
if not victim: if not victim:
return return
@ -4868,11 +4767,10 @@ def curse(cli, nick, chan, rest):
debuglog("{0} ({1}) CURSE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim))) debuglog("{0} ({1}) CURSE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("clone", chan=False, pm=True, game=True, playing=True, roles=("clone",)) @cmd("clone", chan=False, pm=True, playing=True, phases=("night",), roles=("clone",))
def clone(cli, nick, chan, rest): def clone(cli, nick, chan, rest):
"""Clone another player. You will turn into their role if they die.""" """Clone another player. You will turn into their role if they die."""
if var.PHASE != "night" or not var.FIRST_NIGHT: if not var.FIRST_NIGHT:
pm(cli, nick, "You may only clone someone during the first night.")
return return
if nick in var.CLONED.keys(): if nick in var.CLONED.keys():
pm(cli, nick, "You have already chosen to clone someone.") pm(cli, nick, "You have already chosen to clone someone.")
@ -4895,18 +4793,12 @@ def clone(cli, nick, chan, rest):
debuglog("{0} ({1}) CLONE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim))) debuglog("{0} ({1}) CLONE: {2} ({3})".format(nick, var.get_role(nick), victim, var.get_role(victim)))
chk_nightdone(cli) chk_nightdone(cli)
@cmd("charm", chan=False, pm=True, game=True, playing=True, roles=("piper",)) @cmd("charm", chan=False, pm=True, playing=True, silenced=True, phases=("night",), roles=("piper",))
def charm(cli, nick, chan, rest): def charm(cli, nick, chan, rest):
"""Charm a player, slowly leading to your win!""" """Charm a player, slowly leading to your win!"""
if var.PHASE != "night":
pm(cli, nick, "You may only charm other players during the night.")
return
if nick in var.CHARMERS: if nick in var.CHARMERS:
pm(cli, nick, "You have already charmed players for tonight.") pm(cli, nick, "You have already charmed players for tonight.")
return return
if nick in var.SILENCED:
pm(cli, nick, "You are silenced, and are unable to use any special powers.")
return
pieces = re.split(" +",rest) pieces = re.split(" +",rest)
victim = pieces[0] victim = pieces[0]
@ -5783,7 +5675,7 @@ def cgamemode(cli, arg):
cli.msg(chan, "Mode \u0002{0}\u0002 not found.".format(modeargs[0])) cli.msg(chan, "Mode \u0002{0}\u0002 not found.".format(modeargs[0]))
@cmd("start", join=True) @cmd("start", phases=("join",))
def fstart(cli, nick, chan, rest): def fstart(cli, nick, chan, rest):
"""Starts a game of Werewolf.""" """Starts a game of Werewolf."""
start(cli, nick, chan) start(cli, nick, chan)
@ -6449,7 +6341,7 @@ def fdeny(cli, nick, chan, rest):
"""Deny someone from using a command.""" """Deny someone from using a command."""
allow_deny(cli, nick, chan, rest, "deny") allow_deny(cli, nick, chan, rest, "deny")
@cmd("wait", "w", join=True, playing=True) @cmd("wait", "w", playing=True, phases=("join",))
def wait(cli, nick, chan, rest): def wait(cli, nick, chan, rest):
"""Increases the wait time until !start can be used.""" """Increases the wait time until !start can be used."""
pl = var.list_players() pl = var.list_players()
@ -6482,7 +6374,7 @@ def wait(cli, nick, chan, rest):
"{1} seconds.").format(nick, var.EXTRA_WAIT)) "{1} seconds.").format(nick, var.EXTRA_WAIT))
@cmd("fwait", admin_only=True, join=True) @cmd("fwait", admin_only=True, phases=("join",))
def fwait(cli, nick, chan, rest): def fwait(cli, nick, chan, rest):
"""Forces an increase (or decrease) in wait time. Can be used with a number of seconds to wait.""" """Forces an increase (or decrease) in wait time. Can be used with a number of seconds to wait."""
@ -6509,7 +6401,7 @@ def fwait(cli, nick, chan, rest):
"s" if extra != 1 else "")) "s" if extra != 1 else ""))
@cmd("fstop", admin_only=True, game=True, join=True) @cmd("fstop", admin_only=True, phases=("join", "day", "night"))
def reset_game(cli, nick, chan, rest): def reset_game(cli, nick, chan, rest):
"""Forces the game to stop.""" """Forces the game to stop."""
cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to stop.".format(nick)) cli.msg(botconfig.CHANNEL, "\u0002{0}\u0002 has forced the game to stop.".format(nick))
@ -6742,7 +6634,7 @@ def pony(cli, nick, chan, rest):
cmsg = "The pony lands on \2{0}\2.".format(pony) cmsg = "The pony lands on \2{0}\2.".format(pony)
cli.msg(chan, cmsg) cli.msg(chan, cmsg)
@cmd("time", pm=True, game=True, join=True) @cmd("time", pm=True, phases=("join", "day", "night"))
def timeleft(cli, nick, chan, rest): def timeleft(cli, nick, chan, rest):
"""Returns the time left until the next day/night transition.""" """Returns the time left until the next day/night transition."""
@ -6866,7 +6758,7 @@ def listroles(cli, nick, chan, rest):
else: else:
cli.msg(chan, txt) cli.msg(chan, txt)
@cmd("myrole", pm=True, game=True) @cmd("myrole", pm=True, phases=("day", "night"))
def myrole(cli, nick, chan, rest): def myrole(cli, nick, chan, rest):
"""Reminds you of your current role.""" """Reminds you of your current role."""
@ -7117,7 +7009,7 @@ def my_stats(cli, nick, chan, rest):
rest = rest.split() rest = rest.split()
player_stats(cli, nick, chan, " ".join([nick] + rest)) player_stats(cli, nick, chan, " ".join([nick] + rest))
@cmd("game", join=True, playing=True) @cmd("game", playing=True, phases=("join",))
def game(cli, nick, chan, rest): def game(cli, nick, chan, rest):
"""Vote for a game mode to be picked.""" """Vote for a game mode to be picked."""
if rest: if rest:
@ -7152,7 +7044,7 @@ def game_help(args=""):
game.__doc__ = game_help game.__doc__ = game_help
@cmd("vote", "v", pm=True) @cmd("vote", "v", pm=True, phases=("join", "day"))
def vote(cli, nick, chan, rest): def vote(cli, nick, chan, rest):
"""Vote for a game mode if no game is running, or for a player to be lynched.""" """Vote for a game mode if no game is running, or for a player to be lynched."""
if rest: if rest:
@ -7265,7 +7157,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
except Exception as e: except Exception as e:
cli.msg(chan, str(type(e))+":"+str(e)) cli.msg(chan, str(type(e))+":"+str(e))
@cmd("revealroles", admin_only=True, pm=True, game=True) @cmd("revealroles", admin_only=True, pm=True, phases=("day", "night"))
def revealroles(cli, nick, chan, rest): def revealroles(cli, nick, chan, rest):
"""Reveal role information.""" """Reveal role information."""
def is_authorized(): def is_authorized():
@ -7371,7 +7263,7 @@ if botconfig.DEBUG_MODE or botconfig.ALLOWED_NORMAL_MODE_COMMANDS:
cli.notice(nick, var.break_long_message(output, " | ")) cli.notice(nick, var.break_long_message(output, " | "))
@cmd("fgame", admin_only=True, raw_nick=True, join=True) @cmd("fgame", admin_only=True, raw_nick=True, phases=("join",))
def fgame(cli, nick, chan, rest): def fgame(cli, nick, chan, rest):
"""Force a certain game mode to be picked. Disable voting for game modes upon use.""" """Force a certain game mode to be picked. Disable voting for game modes upon use."""
nick = parse_nick(nick)[0] nick = parse_nick(nick)[0]