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

cleanup !time a little and tell whether it's day or night

Browse Source
This commit is contained in:
jacob1 2014-06-04 12:07:15 -04:00
parent d56e1731b2
commit ca23189939
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/wolfgame.py
View File

@ -2896,15 +2896,20 @@ def timeleft(cli, nick, chan, rest):
return return
if var.PHASE == "day": if var.PHASE == "day":
if (len(var.list_players()) <= var.SHORT_DAY_PLAYERS): if (len(var.list_players()) <= var.SHORT_DAY_PLAYERS):
remaining = var.SHORT_DAY_LIMIT_WARN+var.SHORT_DAY_LIMIT_CHANGE+int((var.DAY_START_TIME-datetime.now()).total_seconds()) remaining = (var.SHORT_DAY_LIMIT_WARN + var.SHORT_DAY_LIMIT_CHANGE
+ int((var.DAY_START_TIME - datetime.now()).total_seconds()))
else: else:
remaining = var.DAY_TIME_LIMIT_WARN+var.DAY_TIME_LIMIT_CHANGE+int((var.DAY_START_TIME-datetime.now()).total_seconds()) remaining = (var.DAY_TIME_LIMIT_WARN + var.DAY_TIME_LIMIT_CHANGE
+ int((var.DAY_START_TIME - datetime.now()).total_seconds()))
else: else:
remaining = var.NIGHT_TIME_LIMIT+int((var.NIGHT_START_TIME-datetime.now()).total_seconds()) remaining = (var.NIGHT_TIME_LIMIT
+ int((var.NIGHT_START_TIME-datetime.now()).total_seconds()))
if nick == chan: if nick == chan:
pm(cli, nick, "There is {0:0>2}:{1:0>2} remaining.".format(remaining//60,remaining%60)) pm(cli, nick, "There is {0:0>2}:{1:0>2} remaining until {2}.".format(
remaining//60, remaining%60, "sunrise" if var.PHASE=="night" else "sunset"))
else: else:
cli.msg(chan, "There is {0:0>2}:{1:0>2} remaining.".format(remaining//60,remaining%60)) cli.msg(chan, "There is {0:0>2}:{1:0>2} remaining until {2}.".format(
remaining//60, remaining%60, "sunrise" if var.PHASE=="night" else "sunset"))
@pmcmd("time") @pmcmd("time")
def timeleft_pm(cli, nick, rest): def timeleft_pm(cli, nick, rest):