diff --git a/jarvis.png b/jarvis.png index 9484aba..badffa3 100644 Binary files a/jarvis.png and b/jarvis.png differ diff --git a/jarvis.svg b/jarvis.svg index 43fe1e1..eb8b3f4 100644 --- a/jarvis.svg +++ b/jarvis.svg @@ -1,20 +1,16 @@ - + logotests - - - + + + diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 6cd17b2..6307429 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -41,7 +41,7 @@ jarvis = commands.Bot( slash = SlashCommand(jarvis, sync_commands=False, sync_on_cog_reload=True) jarvis_self = Process() -__version__ = "1.11.3" +__version__ = "1.11.4" @jarvis.event diff --git a/jarvis/cogs/util.py b/jarvis/cogs/util.py index 5f7ba35..a7a9fc5 100644 --- a/jarvis/cogs/util.py +++ b/jarvis/cogs/util.py @@ -14,7 +14,7 @@ from discord_slash.utils.manage_commands import create_choice, create_option from PIL import Image import jarvis -from jarvis import jarvis_self, logo +from jarvis import jarvis_self from jarvis.config import get_config from jarvis.data import pigpen from jarvis.data.robotcamo import emotes, hk, names @@ -67,8 +67,12 @@ class UtilCog(commands.Cog): ) @commands.cooldown(1, 30, commands.BucketType.channel) async def _logo(self, ctx: SlashContext) -> None: - lo = logo.get_logo(self.config.logo) - await ctx.send(f"```\n{lo}\n```") + with BytesIO() as image_bytes: + JARVIS_LOGO.save(image_bytes, "PNG") + image_bytes.seek(0) + logo = File(image_bytes, filename="logo.png") + + await ctx.send(file=logo) @cog_ext.cog_slash(name="rchk", description="Robot Camo HK416") async def _rchk(self, ctx: SlashContext) -> None: @@ -164,11 +168,9 @@ class UtilCog(commands.Cog): data = np.array(JARVIS_LOGO) r, g, b, a = data.T - yellow = (r == 255) & (g == 187) & (b == 0) - cyan = (r == 0) & (g == 140) & (b == 255) + fill = (r == 52) & (g == 152) & (b == 219) - data[..., :-1][yellow.T] = list(role.color.to_rgb()) - data[..., :-1][cyan.T] = list(role.color.to_rgb()) + data[..., :-1][fill.T] = list(role.color.to_rgb()) im = Image.fromarray(data) diff --git a/jarvis_small.png b/jarvis_small.png index 5e13006..b2610b3 100644 Binary files a/jarvis_small.png and b/jarvis_small.png differ