Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up the time command's output some more.

Browse source
This commit is contained in:
Griatch 2017-02-12 19:11:48 +01:00
parent 008566f358
commit 22e22ffced
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
evennia/commands/default/system.py
View file

@ -650,16 +650,17 @@ class CmdTime(COMMAND_DEFAULT_CLASS):
def func(self): def func(self):
"Show server time data in a table." "Show server time data in a table."
table1 = EvTable("|wserver time","|wtime", align="l", width=78) table1 = EvTable("|wServer time","", align="l", width=78)
table1.add_row("Current server uptime", utils.time_format(gametime.uptime(), 3)) table1.add_row("Current uptime", utils.time_format(gametime.uptime(), 3))
table1.add_row("Total server running time", utils.time_format(gametime.runtime(), 2)) table1.add_row("Total runtime", utils.time_format(gametime.runtime(), 2))
table1.add_row("Server epoch (first start)", datetime.datetime.fromtimestamp(gametime.server_epoch())) table1.add_row("First start", datetime.datetime.fromtimestamp(gametime.server_epoch()))
table1.add_row("Server time stamp", datetime.datetime.now()) table1.add_row("Current time", datetime.datetime.now())
table1.reformat_column(0, width=30) table1.reformat_column(0, width=30)
table2 = EvTable("|wgame time", "|wtime (real x %g)" % gametime.TIMEFACTOR, align="l", width=77, border_top=0) table2 = EvTable("|wIn-Game time", "|wReal time x %g" % gametime.TIMEFACTOR, align="l", width=77, border_top=0)
table2.add_row("Game time epoch", datetime.datetime.fromtimestamp(gametime.game_epoch())) epochtxt = "Epoch (%s)" % ("from settings" if settings.TIME_GAME_EPOCH else "server start")
table2.add_row("Time passed in game:", utils.time_format(gametime.gametime(), 2)) table2.add_row(epochtxt, datetime.datetime.fromtimestamp(gametime.game_epoch()))
table2.add_row("Current game time", datetime.datetime.fromtimestamp(gametime.gametime(absolute=True))) table2.add_row("Total time passed:", utils.time_format(gametime.gametime(), 2))
table2.add_row("Current time ", datetime.datetime.fromtimestamp(gametime.gametime(absolute=True)))
table2.reformat_column(0, width=30) table2.reformat_column(0, width=30)
self.caller.msg(unicode(table1) + "\n" + unicode(table2)) self.caller.msg(unicode(table1) + "\n" + unicode(table2))

7
evennia/settings_default.py
View file

@ -434,10 +434,9 @@ BASE_BATCHPROCESS_PATHS = ['world', 'evennia.contrib', 'evennia.contrib.tutorial
# or slower (timefactor<1) than the real world. # or slower (timefactor<1) than the real world.
TIME_FACTOR = 2.0 TIME_FACTOR = 2.0
# The starting point of your game time (the epoch), in seconds. # The starting point of your game time (the epoch), in seconds.
# In Python a value of 0 means Jan 1 1970. All absolute game times # In Python a value of 0 means Jan 1 1970 (use negatives for earlier
# will be calculated relative to this. Defaults to the first time # start date). This will affect the returns from the utils.gametime
# the server was started. This is mainly useful if you want to # module.
# convert to real-world times.
TIME_GAME_EPOCH = None TIME_GAME_EPOCH = None
###################################################################### ######################################################################