Change stats message

Change greeter grace period, ignore commands not founds
th3-z · Apr 14, 2018 · b26d0c5 · b26d0c5
1 parent 7f75ee4
commit b26d0c5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/magicked_admin/chatbot/chatbot.py b/magicked_admin/chatbot/chatbot.py
@@ -51,9 +51,6 @@ def command_handler(self, username, args, admin=False):
             response = command.execute(username, args, admin)
             if not self.silent:
                 self.chat.submit_message(response)
-        # What would be the best way of handling CD commands?
-        elif username != "server" and not self.silent:
-            self.chat.submit_message("Sorry, I didn't understand that request.")
 
     def execute_script(self, file_name):
         logger.debug("Executing script: " + file_name)

diff --git a/magicked_admin/chatbot/commands/event_commands.py b/magicked_admin/chatbot/commands/event_commands.py
@@ -20,7 +20,7 @@ class CommandGreeter(Command):
     def __init__(self, server, admin_only=True):
         Command.__init__(self, server, admin_only)
 
-        self.new_game_grace = 0.5 * 60
+        self.new_game_grace = 35
         self.new_game_time = datetime.datetime.now()
 
     def execute(self, username, args, admin):

diff --git a/magicked_admin/chatbot/commands/info_commands.py b/magicked_admin/chatbot/commands/info_commands.py
@@ -1,6 +1,7 @@
 from chatbot.commands.command import Command
 from server.player import Player
 from utils.time import seconds_to_hhmmss
+from utils.text import millify
 
 import datetime
 
@@ -91,16 +92,13 @@ def execute(self, username, args, admin):
         time = seconds_to_hhmmss(
             player.total_time + session_time
         )
-        message = "Stats for " + player.username + ":\n" + \
-                  "Sessions:\t\t\t" + str(player.total_logins) + "\n" + \
-                  "Play time:\t\t" + time +"\n" + \
-                  "Deaths:\t\t\t" + str(player.total_deaths) + "\n" + \
-                  "Kills:\t\t\t\t" + str(player.total_kills) + "\n" + \
-                  "Dosh earned:\t\t" + str(player.total_dosh) + "\n" + \
-                  "Dosh spent:\t\t" + str(player.total_dosh_spent) + "\n" + \
-                  "Health lost:\t\t" + str(player.total_health_lost) + "\n" + \
-                  "Dosh this game:\t" + str(player.game_dosh) + "\n" + \
-                  "Kills this wave:\t\t" + str(player.wave_kills) + "\n" + \
-                  "Dosh this wave:\t" + str(player.wave_dosh)
+        message = "Stats for {}:\n".format(player.username) +\
+                  "Total play time: {} ({} sessions)\n"\
+                      .format(time, player.total_logins) +\
+                  "Total deaths: {}\n".format(player.total_deaths) +\
+                  "Total kills: {}\n".format(millify(player.total_kills)) +\
+                  "Total dosh earned: {}\n"\
+                      .format(millify(player.total_dosh)) +\
+                  "Dosh this game: {}".format(millify(player.game_dosh))
 
         return message