diff --git a/conquest/__init__.py b/conquest/__init__.py index 5c4846a..1466d52 100644 --- a/conquest/__init__.py +++ b/conquest/__init__.py @@ -1,5 +1,11 @@ +from redbot.core import data_manager + from .conquest import Conquest -def setup(bot): - bot.add_cog(Conquest(bot)) +async def setup(bot): + cog = Conquest(bot) + data_manager.bundled_data_path(cog) + await cog.load_data() + + bot.add_cog(cog) diff --git a/conquest/conquest.py b/conquest/conquest.py index eab2b71..50618f0 100644 --- a/conquest/conquest.py +++ b/conquest/conquest.py @@ -1,7 +1,12 @@ +from io import BytesIO + +from PIL import Image from redbot.core import Config, commands from redbot.core.bot import Red +import discord import numpy as np +from redbot.core.data_manager import bundled_data_path from skimage.color import rgb2lab, rgb2gray, lab2rgb from skimage.io import imread, imshow import matplotlib.pyplot as plt @@ -23,10 +28,28 @@ class Conquest(commands.Cog): self.config.register_guild(**default_guild) + self.assets = None + async def red_delete_data_for_user(self, **kwargs): """Nothing to delete""" return + async def load_data(self): + self.assets = bundled_data_path(self) / "assets" + @commands.command() - async def conquest(self, ctx: commands.Context): - await ctx.send("Hello world") + async def conquest(self, ctx: commands.Context, region: int, color: str): + + im = Image.open(self.assets / "simple_blank_map/blank.jpg") + im2 = Image.new("RGB", im.size, color) + mask = Image.open(self.assets / f"simple_blank_map/masks/{region}.jpg").convert('L') + + out: Image.Image = Image.composite(im, im2, mask) + + output_buffer = BytesIO() + out.save(output_buffer, "jpeg") + output_buffer.seek(0) + + # TODO: Save the map in between + + await ctx.send(file=discord.File(fp=output_buffer, filename="map.jpg")) diff --git a/conquest/assets/ck2_blank.png b/conquest/data/assets/ck2_blank.png similarity index 100% rename from conquest/assets/ck2_blank.png rename to conquest/data/assets/ck2_blank.png diff --git a/conquest/assets/ck2_numbered.png b/conquest/data/assets/ck2_numbered.png similarity index 100% rename from conquest/assets/ck2_numbered.png rename to conquest/data/assets/ck2_numbered.png diff --git a/conquest/data/assets/simple_blank_map.gif b/conquest/data/assets/simple_blank_map.gif new file mode 100644 index 0000000..2ba3c58 Binary files /dev/null and b/conquest/data/assets/simple_blank_map.gif differ diff --git a/conquest/data/assets/simple_blank_map/blank.jpg b/conquest/data/assets/simple_blank_map/blank.jpg new file mode 100644 index 0000000..f8f4f07 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/blank.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/1.jpg b/conquest/data/assets/simple_blank_map/masks/1.jpg new file mode 100644 index 0000000..084384b Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/1.jpg differ diff --git a/conquest/data/assets/simple_blank_map/numbered.jpg b/conquest/data/assets/simple_blank_map/numbered.jpg new file mode 100644 index 0000000..e09e414 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/numbered.jpg differ diff --git a/conquest/data/assets/simple_blank_map/original.jpg b/conquest/data/assets/simple_blank_map/original.jpg new file mode 100644 index 0000000..19f670f Binary files /dev/null and b/conquest/data/assets/simple_blank_map/original.jpg differ