aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMango0x45 <thomasvoss@live.com>2020-08-31 13:04:38 +0000
committerMango0x45 <thomasvoss@live.com>2020-08-31 13:04:38 +0000
commit9f48110eae4ae40d2e44a80b8065f01563d3d0b6 (patch)
treeee38e1b71c41cb6260c4ec20fd845e9d21232726
parent028187ae8a8e660605f50cf15678415003302f38 (diff)
parentd16faf4f4c5248c909886c7a514769263a30bdde (diff)
downloadsteve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar.gz
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar.bz2
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar.lz
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar.xz
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.tar.zst
steve-bot-9f48110eae4ae40d2e44a80b8065f01563d3d0b6.zip
Merge branch 'master' of https://github.com/AnInternetTroll/mcbeDiscordBot
-rwxr-xr-xcogs/src.py2
-rwxr-xr-xcogs/utils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cogs/src.py b/cogs/src.py
index 10cb824..e3192e7 100755
--- a/cogs/src.py
+++ b/cogs/src.py
@@ -207,7 +207,7 @@ async def pendingRuns(self, ctx):
embed_stats = discord.Embed(
title='Pending Run Stats',
description=
- f"Full Game Runs: {mcbe_runs}\nIndividual Level Runs: {mcbeil_runs}\nCategory Extension Runs: {mcbece_runs}\nTotal runs: {mcbe_runs+mcbeil_runs+mcbece_runs}",
+ f"Full Game Runs: {mcbe_runs}\nIndividual Level Runs: {mcbeil_runs}\nCategory Extension Runs: {mcbece_runs}\nTotal Runs: {mcbe_runs+mcbeil_runs+mcbece_runs}",
color=0x000000)
await self.bot.get_channel(
int(self.bot.config[str(ctx.message.guild.id)]["pending_channel"])
diff --git a/cogs/utils.py b/cogs/utils.py
index fdf35b5..5448843 100755
--- a/cogs/utils.py
+++ b/cogs/utils.py
@@ -382,7 +382,7 @@ class Utils(commands.Cog):
await ctx.send(f"```List of custom commands:\n{output}```")
@commands.command()
- async def retime(self, ctx, start_sec, end_sec, frames, framerate):
+ async def retime(self, ctx, start_sec, end_sec, frames=0, framerate=30):
"""Retimes a run using the start/end timestamps, leftover frames, and framerate"""
if start_sec.count(':') == 2:
start_sec = sum(