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

Some commands now notice if you aren't in the game

Browse Source
This commit is contained in:
Jimmy Cao 2011-08-14 23:37:46 -05:00
parent 8339efac1f
commit 825f0935f8
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wolfgame.py
View File

@ -2233,11 +2233,14 @@ def reset_game(cli, nick, chan, rest):
@pmcmd("rules") @pmcmd("rules")
def pm_rules(cli, nick, rest): def pm_rules(cli, nick, rest):
cli.msg(nick, var.RULES) cli.notice(nick, var.RULES)
@cmd("rules") @cmd("rules")
def show_rules(cli, nick, chan, rest): def show_rules(cli, nick, chan, rest):
"""Displays the rules""" """Displays the rules"""
if var.PHASE in ("day", "night") and nick not in var.list_players():
cli.notice(nick, var.RULES)
return
cli.msg(chan, var.RULES) cli.msg(chan, var.RULES)
var.LOGGER.logMessage(var.RULES) var.LOGGER.logMessage(var.RULES)
@ -2309,6 +2312,7 @@ def is_admin(cloak):
def show_admins(cli, nick, chan, rest): def show_admins(cli, nick, chan, rest):
"""Pings the admins that are available.""" """Pings the admins that are available."""
admins = [] admins = []
pl = var.list_players()
if (var.LAST_ADMINS and if (var.LAST_ADMINS and
var.LAST_ADMINS + timedelta(seconds=var.ADMINS_RATE_LIMIT) > datetime.now()): var.LAST_ADMINS + timedelta(seconds=var.ADMINS_RATE_LIMIT) > datetime.now()):
@ -2316,6 +2320,7 @@ def show_admins(cli, nick, chan, rest):
"Please wait a while before using it again.")) "Please wait a while before using it again."))
return return
if not (var.PHASE in ("day", "night") and nick not in pl):
var.LAST_ADMINS = datetime.now() var.LAST_ADMINS = datetime.now()
if var.ADMIN_PINGING: if var.ADMIN_PINGING:
@ -2337,6 +2342,9 @@ def show_admins(cli, nick, chan, rest):
return return
admins.sort(key=lambda x: x.lower()) admins.sort(key=lambda x: x.lower())
if var.PHASE in ("day", "night") and nick not in pl:
cli.notice(nick, "Available admins: "+" ".join(admins))
else:
cli.msg(chan, "Available admins: "+" ".join(admins)) cli.msg(chan, "Available admins: "+" ".join(admins))
decorators.unhook(HOOKS, 4) decorators.unhook(HOOKS, 4)
@ -2349,6 +2357,11 @@ def show_admins(cli, nick, chan, rest):
@cmd("coin") @cmd("coin")
def coin(cli, nick, chan, rest): def coin(cli, nick, chan, rest):
"""It's a bad idea to base any decisions on this command.""" """It's a bad idea to base any decisions on this command."""
if var.PHASE in ("day", "night") and nick not in var.list_players():
cli.notice(nick, "You may not use this command right now.")
return
cli.msg(chan, "\2{0}\2 tosses a coin into the air...".format(nick)) cli.msg(chan, "\2{0}\2 tosses a coin into the air...".format(nick))
var.LOGGER.logMessage("{0} tosses a coin into the air...".format(nick)) var.LOGGER.logMessage("{0} tosses a coin into the air...".format(nick))
cmsg = "The coin lands on \2{0}\2.".format("heads" if random.random() < 0.5 else "tails") cmsg = "The coin lands on \2{0}\2.".format("heads" if random.random() < 0.5 else "tails")