cswimr/GalaxyCogs
cswimr/GalaxyCogs
1
1
Fork 0
Code Issues 2 Pull requests Projects Wiki Activity Actions

Merge branch 'main' of https://github.com/SeaswimmerTheFsh/GalaxyCogs

Browse source
This commit is contained in:
SeaswimmerTheFsh 2023-05-29 14:27:56 -04:00
commit 4e4d8c3b15
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
galaxy/galaxy.py
View file

@ -295,7 +295,7 @@ class Galaxy(commands.Cog):
@faq.command(name="dps")
async def faq_dps(self, ctx, member: discord.Member = None):
"""DPS Calculations/Inaccuracy"""
embed=discord.Embed(title="DPS Calculations", color=await self.bot.get_embed_color(None), description="The ``/info`` command (and by extention ``/shipinfo`` from Odin) misreports DPS, due to it calculating DPS disregarding the turret's type (kinetic, laser), causing it to assume the target ship is both hulled and has shield simultaneously. It also ignores turret overrides, custom reloads, and custom damage values. If you'd like to check ship stats accurately, you can either use the ``/ship`` command in this channel or you can use the [Galaxy Info Website](https://galaxy.wingysam.xyz/ships). Alternatively, to check turret stats, you can use the [Galaxy Info Turrets Page](https://galaxy.wingysam.xyz/turrets).")
embed=discord.Embed(title="DPS Calculations", color=await self.bot.get_embed_color(None), description="The ``/info`` command (and by extention ``/shipinfo`` from Odin) misreports DPS, due to it calculating DPS disregarding the turret's type (kinetic, laser), causing it to assume the target ship is both hulled and has shield simultaneously. It also ignores turret overrides, custom reloads, and custom damage values. If you'd like to check ship stats accurately, you can either use the ``/ship`` command in this channel or you can use the [Galaxy Info Website](https://info.galaxy.casa/ships). Alternatively, to check turret stats, you can use the [Galaxy Info Turrets Page](https://info.galaxy.casa/turrets).")
if member:
await ctx.channel.send(embed=embed, content=member.mention)
else:
@ -401,4 +401,4 @@ class Galaxy(commands.Cog):
async def faq_handler(self, ctx, error):
"""Error Handler for Galaxy."""
if isinstance(error, discord.NotFound):
return
return

6
suggestions/suggestions.py
View file

@ -78,9 +78,9 @@ class Suggestions(commands.Cog):
"Uh oh, looks like the Admins haven't added the required channel."
)
embed = discord.Embed(color=await ctx.embed_colour(), description=suggestion)
footer = [f"Suggested by {ctx.author.name}#{ctx.author.discriminator}",
footer = [f"Suggested by {ctx.author.name}#{ctx.author.discriminator} ({ctx.author.id})",
ctx.author.avatar_url]
author = [f"{ctx.author.name}#{ctx.author.discriminator} ({ctx.author.id})", ctx.author.avatar_url]
author = [f"{ctx.author.name}#{ctx.author.discriminator}", ctx.author.avatar_url]
embed.set_footer(
text=footer[0],
icon_url=footer[1]
@ -503,4 +503,4 @@ class Suggestions(commands.Cog):
await self.config.custom("SUGGESTION", server, suggestion_id).denied.set(
True
)
await ctx.tick()
await ctx.tick()