From 7dc97123be50a569007ed73bfe0076e87324eeac Mon Sep 17 00:00:00 2001 From: iou1name Date: Tue, 26 Feb 2019 09:00:29 -0500 Subject: [PATCH] added seconds for <1m to day/night shift --- warbot.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/warbot.py b/warbot.py index 6613878..9acdd34 100755 --- a/warbot.py +++ b/warbot.py @@ -224,15 +224,22 @@ class WarBot(irc.IRCClient): delta = (data['Time'] - CETUS_EPOCH) % (150*60) if delta > (100*60): - status = "Night" - eta = ((150*60) - delta, 'Day') + state = "Night" + next_state = "Day" + eta = (150*60) - delta else: - status = "Day" - eta = ((100*60) - delta, 'Night') - msg = f"\x0310Cetus time\x0300: \x0312{status}\x0300 | " - msg += f"\x0310Time until \x0312{eta[1]}\x0300: " - msg += f"\x0308{eta[0]//60}m" + state = "Day" + next_state = "Night" + eta = (100*60) - delta + if eta < 60: + eta = str(eta) + 's' + else: + eta = str(eta//60) + 'm' + msg = f"\x0310Cetus time\x0300: \x0312{state}\x0300 | " + msg += f"\x0310Time until \x0312{next_state}\x0300: " + msg += f"\x0308{eta}" self.msg(channel, msg) + return def joined(self, channel):