diff --git a/conquest/conquest.py b/conquest/conquest.py index 72742f7..3f6558d 100644 --- a/conquest/conquest.py +++ b/conquest/conquest.py @@ -1,15 +1,15 @@ import json +import os import pathlib -from io import BytesIO +from shutil import copyfile from typing import Optional import discord -from PIL import Image +from PIL import Image, ImageColor from discord.ext.commands import Greedy from redbot.core import Config, commands from redbot.core.bot import Red from redbot.core.data_manager import bundled_data_path, cog_data_path -from shutil import copyfile class Conquest(commands.Cog): @@ -39,6 +39,7 @@ class Conquest(commands.Cog): async def load_data(self): self.asset_path = bundled_data_path(self) / "assets" + print(self.asset_path) @commands.group() async def conquest(self, ctx: commands.Context): @@ -54,25 +55,11 @@ class Conquest(commands.Cog): List currently available maps """ maps_json = self.asset_path / "maps.json" - - async with maps_json.open() as maps: - map_list = "\n".join(map_name for map_name in maps["maps"]) - await ctx.maybe_send_embed(f"Current maps:\n{map_list}") - @conquest.command(name="current") - async def _conquest_current(self, ctx: commands.Context): - """ - Send the current map. - """ - if self.current_map: - await ctx.maybe_send_embed( - "No map is currently set. See `[p]conquestset map`" - ) - return - - current_jpg = self.data_path / self.current_map / "current.jpg" - with current_jpg.open() as map_file: - await ctx.send(file=discord.File(fp=map_file, filename="current_map.jpg")) + with maps_json.open() as maps: + maps_json = json.load(maps) + map_list = "\n".join(map_name for map_name in maps_json["maps"]) + await ctx.maybe_send_embed(f"Current maps:\n{map_list}") @conquest.group(name="set") async def conquest_set(self, ctx: commands.Context): @@ -80,8 +67,43 @@ class Conquest(commands.Cog): if ctx.invoked_subcommand is None: pass + @conquest_set.command(name="save") + async def _conquest_set_save(self, ctx: commands.Context, *, save_name): + """Save the current map to be loaded later""" + if self.current_map is None: + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") + return + + current_map_folder = self.data_path / self.current_map + current_map = current_map_folder / "current.jpg" + + if not current_map_folder.exists() or not current_map.exists(): + await ctx.maybe_send_embed("Current map doesn't exist! Try settin a new one") + return + + copyfile(current_map, current_map_folder / f"{save_name}.jpg") + await ctx.tick() + + @conquest_set.command(name="load") + async def _conquest_set_load(self, ctx: commands.Context, *, save_name): + """Load a saved map to be the current map""" + if self.current_map is None: + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") + return + + current_map_folder = self.data_path / self.current_map + current_map = current_map_folder / "current.jpg" + saved_map = current_map_folder / f"{save_name}.jpg" + + if not current_map_folder.exists() or not saved_map.exists(): + await ctx.maybe_send_embed(f"Saved map not found in the {self.current_map} folder") + return + + copyfile(saved_map, current_map) + await ctx.tick() + @conquest_set.command(name="map") - async def _conquest_set_map(self, ctx: commands.Context, mapname: str): + async def _conquest_set_map(self, ctx: commands.Context, mapname: str, reset: bool = False): """ Select a map from current available maps @@ -95,32 +117,48 @@ class Conquest(commands.Cog): return self.current_map = mapname - async with open(self.asset_path / mapname / "data.json") as mapdata: + map_data_path = self.asset_path / mapname / "data.json" + with map_data_path.open() as mapdata: self.map_data = json.load(mapdata) - current_map = self.data_path / self.current_map / "current.jpg" - if current_map.exists(): + current_map_folder = self.data_path / self.current_map + current_map = current_map_folder / "current.jpg" + + if not reset and current_map.exists(): await ctx.maybe_send_embed( - "This map is already in progress, resuming from last game" + "This map is already in progress, resuming from last game\n" + "Use `[p]conquest set map [mapname] True` to start a new game" ) else: + if not current_map_folder.exists(): + os.makedirs(current_map_folder) copyfile(self.asset_path / mapname / "blank.jpg", current_map) await ctx.tick() + @conquest.command(name="current") + async def _conquest_current(self, ctx: commands.Context): + """ + Send the current map. + """ + if self.current_map is None: + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") + return + + current_jpg = self.data_path / self.current_map / "current.jpg" + await ctx.send(file=discord.File(fp=current_jpg, filename="current_map.jpg")) + @conquest.command("blank") async def _conquest_blank(self, ctx: commands.Context): """ Print the blank version of the current map, for reference. """ if self.current_map is None: - await ctx.maybe_send_embed( - "No map is currently set. See `[p]conquest set map`" - ) + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") return - with open(self.asset_path / self.current_map / "blank.jpg") as map_file: - await ctx.send(file=discord.File(fp=map_file, filename="blank_map.jpg")) + current_blank_jpg = self.asset_path / self.current_map / "blank.jpg" + await ctx.send(file=discord.File(fp=current_blank_jpg, filename="blank_map.jpg")) @conquest.command("numbered") async def _conquest_numbered(self, ctx: commands.Context): @@ -128,18 +166,14 @@ class Conquest(commands.Cog): Print the numbered version of the current map, for reference. """ if self.current_map is None: - await ctx.maybe_send_embed( - "No map is currently set. See `[p]conquest set map`" - ) + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") return - with open(self.asset_path / self.current_map / "numbered.jpg") as map_file: - await ctx.send(file=discord.File(fp=map_file, filename="numbered_map.jpg")) + 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")) @conquest.command(name="take") - async def _conquest_take( - self, ctx: commands.Context, regions: Greedy[int], color: str - ): + async def _conquest_take(self, ctx: commands.Context, regions: Greedy[int], *, color: str): """ Claim a territory or list of territories for a specified color @@ -151,9 +185,13 @@ class Conquest(commands.Cog): return if self.current_map is None: - await ctx.maybe_send_embed( - "No map is currently set. See `[p]conquest set map`" - ) + await ctx.maybe_send_embed("No map is currently set. See `[p]conquest set map`") + return + + try: + color = ImageColor.getrgb(color) + except ValueError: + await ctx.maybe_send_embed(f"Invalid color {color}") return for region in regions: @@ -162,23 +200,22 @@ class Conquest(commands.Cog): f"Max region number is {self.map_data['region_max']}, minimum is 1" ) - im = Image.open(self.data_path / self.current_map / "current.jpg") + 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.save(self.data_path / self.current_map / "current.jpg", "jpeg") + out.save(current_jpg_path, "jpeg") - output_buffer = BytesIO() - out.save(output_buffer, "jpeg") - output_buffer.seek(0) - - await ctx.send(file=discord.File(fp=output_buffer, filename="map.jpg")) + await ctx.send(file=discord.File(fp=current_jpg_path, filename="map.jpg")) async def _composite_image(self, im, regions, color) -> Image.Image: + im2 = Image.new("RGB", im.size, color) + out = None for region in regions: mask = Image.open( - self.asset_path / f"simple_blank_map/masks/{region}.jpg" + self.asset_path / self.current_map / "masks" / f"{region}.jpg" ).convert("L") if out is None: out = Image.composite(im, im2, mask) 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/masks/10.jpg b/conquest/data/assets/simple_blank_map/masks/10.jpg new file mode 100644 index 0000000..078f526 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/10.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/11.jpg b/conquest/data/assets/simple_blank_map/masks/11.jpg new file mode 100644 index 0000000..7d8092e Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/11.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/12.jpg b/conquest/data/assets/simple_blank_map/masks/12.jpg new file mode 100644 index 0000000..89ef52a Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/12.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/13.jpg b/conquest/data/assets/simple_blank_map/masks/13.jpg new file mode 100644 index 0000000..d5bcf44 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/13.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/14.jpg b/conquest/data/assets/simple_blank_map/masks/14.jpg new file mode 100644 index 0000000..86a7c01 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/14.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/15.jpg b/conquest/data/assets/simple_blank_map/masks/15.jpg new file mode 100644 index 0000000..b18a720 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/15.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/16.jpg b/conquest/data/assets/simple_blank_map/masks/16.jpg new file mode 100644 index 0000000..1de9ab3 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/16.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/17.jpg b/conquest/data/assets/simple_blank_map/masks/17.jpg new file mode 100644 index 0000000..6f428bd Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/17.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/18.jpg b/conquest/data/assets/simple_blank_map/masks/18.jpg new file mode 100644 index 0000000..c3f13cc Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/18.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/19.jpg b/conquest/data/assets/simple_blank_map/masks/19.jpg new file mode 100644 index 0000000..bf9ec38 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/19.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/2.jpg b/conquest/data/assets/simple_blank_map/masks/2.jpg new file mode 100644 index 0000000..6edd658 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/2.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/20.jpg b/conquest/data/assets/simple_blank_map/masks/20.jpg new file mode 100644 index 0000000..39fac15 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/20.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/21.jpg b/conquest/data/assets/simple_blank_map/masks/21.jpg new file mode 100644 index 0000000..a6f2d88 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/21.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/22.jpg b/conquest/data/assets/simple_blank_map/masks/22.jpg new file mode 100644 index 0000000..a4c8057 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/22.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/23.jpg b/conquest/data/assets/simple_blank_map/masks/23.jpg new file mode 100644 index 0000000..3229d3e Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/23.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/24.jpg b/conquest/data/assets/simple_blank_map/masks/24.jpg new file mode 100644 index 0000000..413bf4a Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/24.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/25.jpg b/conquest/data/assets/simple_blank_map/masks/25.jpg new file mode 100644 index 0000000..c040946 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/25.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/26.jpg b/conquest/data/assets/simple_blank_map/masks/26.jpg new file mode 100644 index 0000000..232b004 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/26.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/27.jpg b/conquest/data/assets/simple_blank_map/masks/27.jpg new file mode 100644 index 0000000..c8229a3 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/27.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/28.jpg b/conquest/data/assets/simple_blank_map/masks/28.jpg new file mode 100644 index 0000000..d5484a1 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/28.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/29.jpg b/conquest/data/assets/simple_blank_map/masks/29.jpg new file mode 100644 index 0000000..0f138f6 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/29.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/3.jpg b/conquest/data/assets/simple_blank_map/masks/3.jpg new file mode 100644 index 0000000..112d1b0 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/3.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/30.jpg b/conquest/data/assets/simple_blank_map/masks/30.jpg new file mode 100644 index 0000000..b04de09 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/30.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/31.jpg b/conquest/data/assets/simple_blank_map/masks/31.jpg new file mode 100644 index 0000000..90812e7 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/31.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/32.jpg b/conquest/data/assets/simple_blank_map/masks/32.jpg new file mode 100644 index 0000000..fd12574 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/32.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/33.jpg b/conquest/data/assets/simple_blank_map/masks/33.jpg new file mode 100644 index 0000000..87704c5 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/33.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/34.jpg b/conquest/data/assets/simple_blank_map/masks/34.jpg new file mode 100644 index 0000000..1c610df Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/34.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/35.jpg b/conquest/data/assets/simple_blank_map/masks/35.jpg new file mode 100644 index 0000000..e86c726 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/35.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/36.jpg b/conquest/data/assets/simple_blank_map/masks/36.jpg new file mode 100644 index 0000000..7f4ad3d Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/36.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/37.jpg b/conquest/data/assets/simple_blank_map/masks/37.jpg new file mode 100644 index 0000000..c8b6b87 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/37.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/38.jpg b/conquest/data/assets/simple_blank_map/masks/38.jpg new file mode 100644 index 0000000..6fcd5a6 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/38.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/39.jpg b/conquest/data/assets/simple_blank_map/masks/39.jpg new file mode 100644 index 0000000..455f0e5 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/39.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/4.jpg b/conquest/data/assets/simple_blank_map/masks/4.jpg new file mode 100644 index 0000000..b77cc24 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/4.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/40.jpg b/conquest/data/assets/simple_blank_map/masks/40.jpg new file mode 100644 index 0000000..5692661 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/40.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/41.jpg b/conquest/data/assets/simple_blank_map/masks/41.jpg new file mode 100644 index 0000000..f0e3972 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/41.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/42.jpg b/conquest/data/assets/simple_blank_map/masks/42.jpg new file mode 100644 index 0000000..b41a652 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/42.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/43.jpg b/conquest/data/assets/simple_blank_map/masks/43.jpg new file mode 100644 index 0000000..463c17f Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/43.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/44.jpg b/conquest/data/assets/simple_blank_map/masks/44.jpg new file mode 100644 index 0000000..b2da82b Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/44.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/45.jpg b/conquest/data/assets/simple_blank_map/masks/45.jpg new file mode 100644 index 0000000..fdeca1c Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/45.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/46.jpg b/conquest/data/assets/simple_blank_map/masks/46.jpg new file mode 100644 index 0000000..6da7ec6 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/46.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/47.jpg b/conquest/data/assets/simple_blank_map/masks/47.jpg new file mode 100644 index 0000000..4e7a2a4 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/47.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/48.jpg b/conquest/data/assets/simple_blank_map/masks/48.jpg new file mode 100644 index 0000000..87223f7 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/48.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/49.jpg b/conquest/data/assets/simple_blank_map/masks/49.jpg new file mode 100644 index 0000000..d749cae Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/49.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/5.jpg b/conquest/data/assets/simple_blank_map/masks/5.jpg new file mode 100644 index 0000000..c392916 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/5.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/50.jpg b/conquest/data/assets/simple_blank_map/masks/50.jpg new file mode 100644 index 0000000..514a67f Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/50.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/51.jpg b/conquest/data/assets/simple_blank_map/masks/51.jpg new file mode 100644 index 0000000..c928321 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/51.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/52.jpg b/conquest/data/assets/simple_blank_map/masks/52.jpg new file mode 100644 index 0000000..9321238 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/52.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/53.jpg b/conquest/data/assets/simple_blank_map/masks/53.jpg new file mode 100644 index 0000000..4b36e75 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/53.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/54.jpg b/conquest/data/assets/simple_blank_map/masks/54.jpg new file mode 100644 index 0000000..b592522 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/54.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/55.jpg b/conquest/data/assets/simple_blank_map/masks/55.jpg new file mode 100644 index 0000000..5bed3a8 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/55.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/56.jpg b/conquest/data/assets/simple_blank_map/masks/56.jpg new file mode 100644 index 0000000..627473c Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/56.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/57.jpg b/conquest/data/assets/simple_blank_map/masks/57.jpg new file mode 100644 index 0000000..6e0e1e4 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/57.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/58.jpg b/conquest/data/assets/simple_blank_map/masks/58.jpg new file mode 100644 index 0000000..47e98fe Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/58.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/59.jpg b/conquest/data/assets/simple_blank_map/masks/59.jpg new file mode 100644 index 0000000..f23e469 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/59.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/6.jpg b/conquest/data/assets/simple_blank_map/masks/6.jpg new file mode 100644 index 0000000..95eb45f Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/6.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/60.jpg b/conquest/data/assets/simple_blank_map/masks/60.jpg new file mode 100644 index 0000000..c1b149e Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/60.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/61.jpg b/conquest/data/assets/simple_blank_map/masks/61.jpg new file mode 100644 index 0000000..e343d5d Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/61.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/62.jpg b/conquest/data/assets/simple_blank_map/masks/62.jpg new file mode 100644 index 0000000..413a5ad Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/62.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/63.jpg b/conquest/data/assets/simple_blank_map/masks/63.jpg new file mode 100644 index 0000000..f03435f Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/63.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/64.jpg b/conquest/data/assets/simple_blank_map/masks/64.jpg new file mode 100644 index 0000000..59e80fe Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/64.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/65.jpg b/conquest/data/assets/simple_blank_map/masks/65.jpg new file mode 100644 index 0000000..fd2cb0d Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/65.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/66.jpg b/conquest/data/assets/simple_blank_map/masks/66.jpg new file mode 100644 index 0000000..2ac9dda Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/66.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/67.jpg b/conquest/data/assets/simple_blank_map/masks/67.jpg new file mode 100644 index 0000000..e2ebdc9 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/67.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/68.jpg b/conquest/data/assets/simple_blank_map/masks/68.jpg new file mode 100644 index 0000000..535e506 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/68.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/69.jpg b/conquest/data/assets/simple_blank_map/masks/69.jpg new file mode 100644 index 0000000..6b1d010 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/69.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/7.jpg b/conquest/data/assets/simple_blank_map/masks/7.jpg new file mode 100644 index 0000000..a0202b0 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/7.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/70.jpg b/conquest/data/assets/simple_blank_map/masks/70.jpg new file mode 100644 index 0000000..a1716af Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/70.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/8.jpg b/conquest/data/assets/simple_blank_map/masks/8.jpg new file mode 100644 index 0000000..647c649 Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/8.jpg differ diff --git a/conquest/data/assets/simple_blank_map/masks/9.jpg b/conquest/data/assets/simple_blank_map/masks/9.jpg new file mode 100644 index 0000000..3bafeda Binary files /dev/null and b/conquest/data/assets/simple_blank_map/masks/9.jpg differ diff --git a/conquest/data/assets/simple_blank_map/numbered.jpg b/conquest/data/assets/simple_blank_map/numbered.jpg index e09e414..228e9bb 100644 Binary files a/conquest/data/assets/simple_blank_map/numbered.jpg and b/conquest/data/assets/simple_blank_map/numbered.jpg differ