diff --git a/conquest/conquest.py b/conquest/conquest.py index 3f6558d..2e8704e 100644 --- a/conquest/conquest.py +++ b/conquest/conquest.py @@ -1,11 +1,12 @@ import json import os import pathlib +from io import BytesIO from shutil import copyfile from typing import Optional import discord -from PIL import Image, ImageColor +from PIL import Image, ImageColor, ImageOps from discord.ext.commands import Greedy from redbot.core import Config, commands from redbot.core.bot import Red @@ -169,8 +170,21 @@ class Conquest(commands.Cog): await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") return - current_numbered_jpg = self.asset_path / self.current_map / "numbered.jpg" - await ctx.send(file=discord.File(fp=current_numbered_jpg, filename="numbered_map.jpg")) + await ctx.send(file=discord.File(fp=self.data_path / self.current_map / "current.jpg", filename="current.jpg")) + await ctx.send(file=discord.File(fp=self.asset_path / self.current_map / "numbers.jpg", filename="numbers.jpg")) + + current_map = Image.open(self.data_path / self.current_map / "current.jpg") + numbers = Image.open(self.asset_path / self.current_map / "numbers.jpg").convert("L") + + inverted_map = ImageOps.invert(current_map) + + current_numbered_jpg: Image.Image = Image.composite(current_map, inverted_map, numbers) + + output_buffer = BytesIO() + current_numbered_jpg.save(output_buffer, "jpeg") + current_numbered_jpg.seek(0) + + await ctx.send(file=discord.File(fp=output_buffer, filename="numbered_map.jpg")) @conquest.command(name="take") async def _conquest_take(self, ctx: commands.Context, regions: Greedy[int], *, color: str): @@ -202,13 +216,13 @@ class Conquest(commands.Cog): current_jpg_path = self.data_path / self.current_map / "current.jpg" im = Image.open(current_jpg_path) - out: Image.Image = await self._composite_image(im, regions, color) + out: Image.Image = await self._composite_regions(im, regions, color) out.save(current_jpg_path, "jpeg") await ctx.send(file=discord.File(fp=current_jpg_path, filename="map.jpg")) - async def _composite_image(self, im, regions, color) -> Image.Image: + async def _composite_regions(self, im, regions, color) -> Image.Image: im2 = Image.new("RGB", im.size, color) diff --git a/conquest/data/assets/AxisAllies_MAP_006L.jpg b/conquest/data/assets/AxisAllies_MAP_006L.jpg new file mode 100644 index 0000000..9bb2755 Binary files /dev/null and b/conquest/data/assets/AxisAllies_MAP_006L.jpg differ diff --git a/conquest/data/assets/HoI/blank.png b/conquest/data/assets/HoI/blank.png new file mode 100644 index 0000000..7cf4e82 Binary files /dev/null and b/conquest/data/assets/HoI/blank.png differ diff --git a/conquest/data/assets/simple_blank_map/data.json b/conquest/data/assets/HoI/data.json similarity index 100% rename from conquest/data/assets/simple_blank_map/data.json rename to conquest/data/assets/HoI/data.json diff --git a/conquest/data/assets/simple_blank_map/numbered.jpg b/conquest/data/assets/HoI/numbered.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/numbered.jpg rename to conquest/data/assets/HoI/numbered.jpg diff --git a/conquest/data/assets/ck2_blank.png b/conquest/data/assets/ck2/ck2_blank.png similarity index 100% rename from conquest/data/assets/ck2_blank.png rename to conquest/data/assets/ck2/ck2_blank.png diff --git a/conquest/data/assets/ck2_numbered.png b/conquest/data/assets/ck2/ck2_numbered.png similarity index 100% rename from conquest/data/assets/ck2_numbered.png rename to conquest/data/assets/ck2/ck2_numbered.png diff --git a/conquest/data/assets/j0e88vlp28pz.png b/conquest/data/assets/j0e88vlp28pz.png new file mode 100644 index 0000000..3c97e53 Binary files /dev/null and b/conquest/data/assets/j0e88vlp28pz.png differ diff --git a/conquest/data/assets/simple_blank_map/blank.jpg b/conquest/data/assets/simple/blank.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/blank.jpg rename to conquest/data/assets/simple/blank.jpg diff --git a/conquest/data/assets/simple/data.json b/conquest/data/assets/simple/data.json new file mode 100644 index 0000000..9baa7fa --- /dev/null +++ b/conquest/data/assets/simple/data.json @@ -0,0 +1,3 @@ +{ + "region_max": 70 +} \ No newline at end of file diff --git a/conquest/data/assets/simple_blank_map/masks/1.jpg b/conquest/data/assets/simple/masks/1.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/1.jpg rename to conquest/data/assets/simple/masks/1.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/10.jpg b/conquest/data/assets/simple/masks/10.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/10.jpg rename to conquest/data/assets/simple/masks/10.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/11.jpg b/conquest/data/assets/simple/masks/11.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/11.jpg rename to conquest/data/assets/simple/masks/11.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/12.jpg b/conquest/data/assets/simple/masks/12.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/12.jpg rename to conquest/data/assets/simple/masks/12.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/13.jpg b/conquest/data/assets/simple/masks/13.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/13.jpg rename to conquest/data/assets/simple/masks/13.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/14.jpg b/conquest/data/assets/simple/masks/14.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/14.jpg rename to conquest/data/assets/simple/masks/14.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/15.jpg b/conquest/data/assets/simple/masks/15.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/15.jpg rename to conquest/data/assets/simple/masks/15.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/16.jpg b/conquest/data/assets/simple/masks/16.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/16.jpg rename to conquest/data/assets/simple/masks/16.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/17.jpg b/conquest/data/assets/simple/masks/17.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/17.jpg rename to conquest/data/assets/simple/masks/17.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/18.jpg b/conquest/data/assets/simple/masks/18.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/18.jpg rename to conquest/data/assets/simple/masks/18.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/19.jpg b/conquest/data/assets/simple/masks/19.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/19.jpg rename to conquest/data/assets/simple/masks/19.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/2.jpg b/conquest/data/assets/simple/masks/2.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/2.jpg rename to conquest/data/assets/simple/masks/2.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/20.jpg b/conquest/data/assets/simple/masks/20.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/20.jpg rename to conquest/data/assets/simple/masks/20.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/21.jpg b/conquest/data/assets/simple/masks/21.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/21.jpg rename to conquest/data/assets/simple/masks/21.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/22.jpg b/conquest/data/assets/simple/masks/22.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/22.jpg rename to conquest/data/assets/simple/masks/22.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/23.jpg b/conquest/data/assets/simple/masks/23.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/23.jpg rename to conquest/data/assets/simple/masks/23.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/24.jpg b/conquest/data/assets/simple/masks/24.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/24.jpg rename to conquest/data/assets/simple/masks/24.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/25.jpg b/conquest/data/assets/simple/masks/25.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/25.jpg rename to conquest/data/assets/simple/masks/25.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/26.jpg b/conquest/data/assets/simple/masks/26.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/26.jpg rename to conquest/data/assets/simple/masks/26.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/27.jpg b/conquest/data/assets/simple/masks/27.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/27.jpg rename to conquest/data/assets/simple/masks/27.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/28.jpg b/conquest/data/assets/simple/masks/28.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/28.jpg rename to conquest/data/assets/simple/masks/28.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/29.jpg b/conquest/data/assets/simple/masks/29.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/29.jpg rename to conquest/data/assets/simple/masks/29.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/3.jpg b/conquest/data/assets/simple/masks/3.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/3.jpg rename to conquest/data/assets/simple/masks/3.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/30.jpg b/conquest/data/assets/simple/masks/30.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/30.jpg rename to conquest/data/assets/simple/masks/30.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/31.jpg b/conquest/data/assets/simple/masks/31.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/31.jpg rename to conquest/data/assets/simple/masks/31.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/32.jpg b/conquest/data/assets/simple/masks/32.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/32.jpg rename to conquest/data/assets/simple/masks/32.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/33.jpg b/conquest/data/assets/simple/masks/33.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/33.jpg rename to conquest/data/assets/simple/masks/33.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/34.jpg b/conquest/data/assets/simple/masks/34.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/34.jpg rename to conquest/data/assets/simple/masks/34.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/35.jpg b/conquest/data/assets/simple/masks/35.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/35.jpg rename to conquest/data/assets/simple/masks/35.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/36.jpg b/conquest/data/assets/simple/masks/36.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/36.jpg rename to conquest/data/assets/simple/masks/36.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/37.jpg b/conquest/data/assets/simple/masks/37.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/37.jpg rename to conquest/data/assets/simple/masks/37.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/38.jpg b/conquest/data/assets/simple/masks/38.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/38.jpg rename to conquest/data/assets/simple/masks/38.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/39.jpg b/conquest/data/assets/simple/masks/39.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/39.jpg rename to conquest/data/assets/simple/masks/39.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/4.jpg b/conquest/data/assets/simple/masks/4.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/4.jpg rename to conquest/data/assets/simple/masks/4.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/40.jpg b/conquest/data/assets/simple/masks/40.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/40.jpg rename to conquest/data/assets/simple/masks/40.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/41.jpg b/conquest/data/assets/simple/masks/41.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/41.jpg rename to conquest/data/assets/simple/masks/41.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/42.jpg b/conquest/data/assets/simple/masks/42.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/42.jpg rename to conquest/data/assets/simple/masks/42.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/43.jpg b/conquest/data/assets/simple/masks/43.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/43.jpg rename to conquest/data/assets/simple/masks/43.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/44.jpg b/conquest/data/assets/simple/masks/44.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/44.jpg rename to conquest/data/assets/simple/masks/44.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/45.jpg b/conquest/data/assets/simple/masks/45.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/45.jpg rename to conquest/data/assets/simple/masks/45.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/46.jpg b/conquest/data/assets/simple/masks/46.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/46.jpg rename to conquest/data/assets/simple/masks/46.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/47.jpg b/conquest/data/assets/simple/masks/47.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/47.jpg rename to conquest/data/assets/simple/masks/47.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/48.jpg b/conquest/data/assets/simple/masks/48.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/48.jpg rename to conquest/data/assets/simple/masks/48.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/49.jpg b/conquest/data/assets/simple/masks/49.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/49.jpg rename to conquest/data/assets/simple/masks/49.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/5.jpg b/conquest/data/assets/simple/masks/5.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/5.jpg rename to conquest/data/assets/simple/masks/5.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/50.jpg b/conquest/data/assets/simple/masks/50.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/50.jpg rename to conquest/data/assets/simple/masks/50.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/51.jpg b/conquest/data/assets/simple/masks/51.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/51.jpg rename to conquest/data/assets/simple/masks/51.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/52.jpg b/conquest/data/assets/simple/masks/52.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/52.jpg rename to conquest/data/assets/simple/masks/52.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/53.jpg b/conquest/data/assets/simple/masks/53.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/53.jpg rename to conquest/data/assets/simple/masks/53.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/54.jpg b/conquest/data/assets/simple/masks/54.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/54.jpg rename to conquest/data/assets/simple/masks/54.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/55.jpg b/conquest/data/assets/simple/masks/55.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/55.jpg rename to conquest/data/assets/simple/masks/55.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/56.jpg b/conquest/data/assets/simple/masks/56.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/56.jpg rename to conquest/data/assets/simple/masks/56.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/57.jpg b/conquest/data/assets/simple/masks/57.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/57.jpg rename to conquest/data/assets/simple/masks/57.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/58.jpg b/conquest/data/assets/simple/masks/58.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/58.jpg rename to conquest/data/assets/simple/masks/58.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/59.jpg b/conquest/data/assets/simple/masks/59.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/59.jpg rename to conquest/data/assets/simple/masks/59.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/6.jpg b/conquest/data/assets/simple/masks/6.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/6.jpg rename to conquest/data/assets/simple/masks/6.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/60.jpg b/conquest/data/assets/simple/masks/60.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/60.jpg rename to conquest/data/assets/simple/masks/60.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/61.jpg b/conquest/data/assets/simple/masks/61.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/61.jpg rename to conquest/data/assets/simple/masks/61.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/62.jpg b/conquest/data/assets/simple/masks/62.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/62.jpg rename to conquest/data/assets/simple/masks/62.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/63.jpg b/conquest/data/assets/simple/masks/63.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/63.jpg rename to conquest/data/assets/simple/masks/63.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/64.jpg b/conquest/data/assets/simple/masks/64.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/64.jpg rename to conquest/data/assets/simple/masks/64.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/65.jpg b/conquest/data/assets/simple/masks/65.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/65.jpg rename to conquest/data/assets/simple/masks/65.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/66.jpg b/conquest/data/assets/simple/masks/66.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/66.jpg rename to conquest/data/assets/simple/masks/66.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/67.jpg b/conquest/data/assets/simple/masks/67.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/67.jpg rename to conquest/data/assets/simple/masks/67.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/68.jpg b/conquest/data/assets/simple/masks/68.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/68.jpg rename to conquest/data/assets/simple/masks/68.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/69.jpg b/conquest/data/assets/simple/masks/69.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/69.jpg rename to conquest/data/assets/simple/masks/69.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/7.jpg b/conquest/data/assets/simple/masks/7.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/7.jpg rename to conquest/data/assets/simple/masks/7.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/70.jpg b/conquest/data/assets/simple/masks/70.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/70.jpg rename to conquest/data/assets/simple/masks/70.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/8.jpg b/conquest/data/assets/simple/masks/8.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/8.jpg rename to conquest/data/assets/simple/masks/8.jpg diff --git a/conquest/data/assets/simple_blank_map/masks/9.jpg b/conquest/data/assets/simple/masks/9.jpg similarity index 100% rename from conquest/data/assets/simple_blank_map/masks/9.jpg rename to conquest/data/assets/simple/masks/9.jpg diff --git a/conquest/data/assets/simple/numbered.jpg b/conquest/data/assets/simple/numbered.jpg new file mode 100644 index 0000000..228e9bb Binary files /dev/null and b/conquest/data/assets/simple/numbered.jpg differ diff --git a/conquest/data/assets/simple/numbers.jpg b/conquest/data/assets/simple/numbers.jpg new file mode 100644 index 0000000..de87fd7 Binary files /dev/null and b/conquest/data/assets/simple/numbers.jpg differ diff --git a/conquest/data/assets/simple/numbers.png b/conquest/data/assets/simple/numbers.png new file mode 100644 index 0000000..2f72371 Binary files /dev/null and b/conquest/data/assets/simple/numbers.png differ