diff --git a/bot.py b/bot.py index 19a0dae..c55311b 100644 --- a/bot.py +++ b/bot.py @@ -7,7 +7,7 @@ nonebot.init() driver = nonebot.get_driver() driver.register_adapter(QQAdapter) # 注册QQ适配器 nonebot.load_from_toml("pyproject.toml") -logger.add("error.log", level="ERROR", format=default_format, rotation="1 week") +logger.add("src/resources/log/error.log", level="ERROR", format=default_format, rotation="1 week") from src.my_sqlite.data_init.db_connect import disconnect, init driver.on_startup(init) diff --git a/src/configs/config.py b/src/configs/config.py index 1da6b9a..efc7589 100644 --- a/src/configs/config.py +++ b/src/configs/config.py @@ -1,6 +1,4 @@ -from pathlib import Path -import nonebot -from collections import defaultdict + from pydantic import BaseModel diff --git a/src/configs/path_config.py b/src/configs/path_config.py index 68b0ef4..7d09456 100644 --- a/src/configs/path_config.py +++ b/src/configs/path_config.py @@ -1,5 +1,20 @@ +import os from pathlib import Path +path = os.getcwd()+'/src/resources/image' + + +#塔罗牌图片路径 +image_local_qq_image_path = path+'/qq_image' +#个人图片路径 +image_local_path= path+"/MaoYuNa" +#塔罗牌图片路径 +tarots_img_path = path+'/tarot/TarotImages/' +#摸摸头图片路径 +rua_png = path+'/rua/' + + + # 图片路径 IMAGE_PATH = Path() / "resources" / "image" # 语音路径 diff --git a/src/image/config/example.image.yaml b/src/image/config/example.image.yaml index 27c6a01..eab8814 100644 --- a/src/image/config/example.image.yaml +++ b/src/image/config/example.image.yaml @@ -1,8 +1,6 @@ image: app_id: "" bot_account: "" - image_local_qq_image_path: "src/image/qq_image" - image_local_path: "src/image/MaoYuNa" #SMMS图床相关配置 smms_token: "" # sm.ms图床的token smms_image_upload_history: "https://sm.ms/api/v2/upload_history" # sm.ms图床获取上传图片历史API地址 diff --git a/src/image/get_image.py b/src/image/get_image.py index 1707b24..ea50e81 100644 --- a/src/image/get_image.py +++ b/src/image/get_image.py @@ -2,12 +2,13 @@ import os import yaml import random import requests -from PIL import Image, ImageDraw +from PIL import Image, ImageDraw,ImageFont +from src.configs.path_config import image_local_path,image_local_qq_image_path,rua_png with open(os.getcwd() +'/src/image/config/image.yaml', 'r', encoding='utf-8') as f: image = yaml.load(f.read(), Loader=yaml.FullLoader).get('image') - image_local_path = image.get('image_local_path') - image_local_qq_image_path = image.get('image_local_qq_image_path') + # image_local_path = image.get('image_local_path') + # image_local_qq_image_path = image.get('image_local_qq_image_path') smms_token = image.get('smms_token') smms_image_upload_history = image.get('smms_image_upload_history') ju_he_token = image.get('ju_he_token') @@ -15,26 +16,26 @@ with open(os.getcwd() +'/src/image/config/image.yaml', 'r', encoding='utf-8') as app_id = image.get('app_id') bot_account = image.get('bot_account') -qq_image_save__path = os.getcwd()+'/'+image_local_qq_image_path +# qq_image_save__path = os.getcwd()+'/'+image_local_qq_image_path """本地图片""" def get_image_names(): image_extensions = ['.jpg', '.jpeg', '.png', '.gif', '.bmp'] # 定义常见的图片文件扩展名 image_names = [] - for root, dirs, files in os.walk(os.getcwd()+'/'+image_local_path): + for root, dirs, files in os.walk(image_local_path): for file in files: if any(file.endswith(ext) for ext in image_extensions): # 检查文件是否是图片文件 image_names.append(file) random.choice(image_names) # 随机选取一张图片 - local_image_path = os.getcwd() + '/' + image_local_path + '/' + random.choice(image_names) # 随机选取一张图片的路径 + local_image_path = image_local_path + '/' + random.choice(image_names) # 随机选取一张图片的路径 return local_image_path """获取QQ头像""" def download_qq_image(member_open_id): - if not os.path.exists(qq_image_save__path): - os.makedirs(qq_image_save__path) + if not os.path.exists(image_local_qq_image_path): + os.makedirs(image_local_qq_image_path) - save_path = qq_image_save__path + '/' + member_open_id + '.jpg' + save_path = image_local_qq_image_path + '/' + member_open_id + '.jpg' size = 640 #尺寸 40、100、140、640 url = f"https://q.qlogo.cn/qqapp/{app_id}/{member_open_id}/{size}" response = requests.get(url) # 发送 GET 请求获取图片资源 @@ -45,11 +46,11 @@ def download_qq_image(member_open_id): """获取QQ头像""" def download_qq_image_by_account(account): - if not os.path.exists(qq_image_save__path): - os.makedirs(qq_image_save__path) + if not os.path.exists(image_local_qq_image_path): + os.makedirs(image_local_qq_image_path) if account is None: account = bot_account - save_path = qq_image_save__path + '/' + account + '.jpg' + save_path = image_local_qq_image_path + '/' + account + '.jpg' size = 640 # 尺寸 40、100、140、640 url = f"https://q2.qlogo.cn/headimg_dl?dst_uin={account}&spec={size}" response = requests.get(url) # 发送 GET 请求获取图片资源 @@ -102,13 +103,11 @@ class rua(): return rua_png1 def add_gif(self): - # 获取素材路径 - png_dir = os.getcwd() +'/src/image/rua/' # 获取素材列表 - pst = os.listdir(png_dir) + pst = os.listdir(rua_png) for i in range(len(pst)): - pst[i] = png_dir + pst[i] + pst[i] = rua_png + pst[i] # 预调试好的参数,传入素材列表 jd = [[90, 90, 5, pst[0]], @@ -139,9 +138,31 @@ class rua(): gifs.append(self.add_png(jd[i])) # 文件名,是否保存所有,图片列表,fps/ms - gifs[0].save(os.getcwd() + '/' + image_local_qq_image_path + '/rua.gif', "GIF", save_all=True, append_images=gifs, duration=35, loop=0) + gifs[0].save(image_local_qq_image_path + '/rua.gif', "GIF", save_all=True, append_images=gifs, duration=35, loop=0) self.author.close() - return os.getcwd() + '/' + image_local_qq_image_path + '/rua.gif' + return image_local_qq_image_path + '/rua.gif' + +""" +图文合成 +""" +def add_text_to_image(image_path, text, output_path, font_size): + # 打开图片 + image = Image.open(image_path) + # 创建一个可用于绘制的对象 + draw = ImageDraw.Draw(image) + + # 设置字体和字体大小 + font = ImageFont.truetype("arial.ttf", font_size) # 这里使用 Arial 字体,你可以替换为其他字体文件路径 + # 设置文本的位置和颜色 + position = (50, 50) + text_color = (255, 0, 0) # 红色 + + # 在图片上绘制文本 + draw.text(position, text, font=font, fill=text_color) + + # 保存合成后的图片 + image.save(output_path) + print(f"合成后的图片已保存到 {output_path}") if __name__ == '__main__': @@ -149,4 +170,8 @@ if __name__ == '__main__': print(get_juhe_image_url()) print(get_image_names()) file_path = '8A91A2F3BE5B5AF3FEC97FB5AA6D9B38.jpg' - au = rua(file_path).add_gif() \ No newline at end of file + au = rua(file_path).add_gif() + image_path = "Justice.jpg" + text = "Hello, World!" + output_path = "output.jpg" + add_text_to_image(image_path, text, output_path, font_size=48) \ No newline at end of file diff --git a/src/my_sqlite/models/tarot.py b/src/my_sqlite/models/tarot.py index 0e121e1..aacccc6 100644 --- a/src/my_sqlite/models/tarot.py +++ b/src/my_sqlite/models/tarot.py @@ -4,9 +4,7 @@ from datetime import datetime from tortoise import fields from typing_extensions import Self from src.my_sqlite.data_init.db_connect import Model - - -tarots_img_path = os.getcwd()+'/src/image/tarot/TarotImages/' +from src.configs.path_config import tarots_img_path class MajorArcanaLog: diff --git a/src/my_sqlite/models/user.py b/src/my_sqlite/models/user.py index 2cfaa16..eb3e831 100644 --- a/src/my_sqlite/models/user.py +++ b/src/my_sqlite/models/user.py @@ -51,7 +51,7 @@ class UserList(Model): """ user_table = await cls.filter(user_id=user_id, group_id=group_id).first() if user_table: - user_table.use_time = datetime.now().date() + user_table.last_used_time = datetime.now().date() await user_table.save() else: await cls.create(user_id=user_id,group_id=group_id,last_used_time=datetime.now().date()) diff --git a/src/qq_plugins/check.py b/src/qq_plugins/check.py index 7db977b..4e9ce1a 100644 --- a/src/qq_plugins/check.py +++ b/src/qq_plugins/check.py @@ -92,7 +92,7 @@ async def github_repo(): content = "三叶草bot仓库地址\n一起来搭个机器人吧😆" msg = Message([ - MessageSegment.file_image(Path("src/image/github_repo/SanYeCao-Nonebot3.png")), + MessageSegment.file_image(Path("src/resources/image/github_repo/SanYeCao-Nonebot3.png")), MessageSegment.text(content), ]) await repository.finish(msg) diff --git a/src/qq_plugins/codeforces.py b/src/qq_plugins/codeforces.py index 14627dc..e22de8d 100644 --- a/src/qq_plugins/codeforces.py +++ b/src/qq_plugins/codeforces.py @@ -24,7 +24,7 @@ async def get_cf_rounds(): if matches["phase"] == "FINISHED": break - cf_image_path = './src/image/codeforces/cfContestQR.png' + cf_image_path = './src/resources/image/codeforces/cfContestQR.png' msg = Message([ MessageSegment.file_image(Path(cf_image_path)), MessageSegment.text(all_matches), diff --git a/src/resources/font/arial.ttf b/src/resources/font/arial.ttf new file mode 100644 index 0000000..27372d9 Binary files /dev/null and b/src/resources/font/arial.ttf differ diff --git a/src/image/MaoYuNa/001.png b/src/resources/image/MaoYuNa/001.png similarity index 100% rename from src/image/MaoYuNa/001.png rename to src/resources/image/MaoYuNa/001.png diff --git a/src/image/MaoYuNa/002.png b/src/resources/image/MaoYuNa/002.png similarity index 100% rename from src/image/MaoYuNa/002.png rename to src/resources/image/MaoYuNa/002.png diff --git a/src/image/MaoYuNa/003.png b/src/resources/image/MaoYuNa/003.png similarity index 100% rename from src/image/MaoYuNa/003.png rename to src/resources/image/MaoYuNa/003.png diff --git a/src/image/MaoYuNa/005.png b/src/resources/image/MaoYuNa/005.png similarity index 100% rename from src/image/MaoYuNa/005.png rename to src/resources/image/MaoYuNa/005.png diff --git a/src/image/MaoYuNa/006.png b/src/resources/image/MaoYuNa/006.png similarity index 100% rename from src/image/MaoYuNa/006.png rename to src/resources/image/MaoYuNa/006.png diff --git a/src/image/MaoYuNa/007.png b/src/resources/image/MaoYuNa/007.png similarity index 100% rename from src/image/MaoYuNa/007.png rename to src/resources/image/MaoYuNa/007.png diff --git a/src/image/MaoYuNa/008.png b/src/resources/image/MaoYuNa/008.png similarity index 100% rename from src/image/MaoYuNa/008.png rename to src/resources/image/MaoYuNa/008.png diff --git a/src/image/MaoYuNa/009.png b/src/resources/image/MaoYuNa/009.png similarity index 100% rename from src/image/MaoYuNa/009.png rename to src/resources/image/MaoYuNa/009.png diff --git a/src/image/MaoYuNa/010.png b/src/resources/image/MaoYuNa/010.png similarity index 100% rename from src/image/MaoYuNa/010.png rename to src/resources/image/MaoYuNa/010.png diff --git a/src/image/MaoYuNa/011.png b/src/resources/image/MaoYuNa/011.png similarity index 100% rename from src/image/MaoYuNa/011.png rename to src/resources/image/MaoYuNa/011.png diff --git a/src/image/MaoYuNa/012.png b/src/resources/image/MaoYuNa/012.png similarity index 100% rename from src/image/MaoYuNa/012.png rename to src/resources/image/MaoYuNa/012.png diff --git a/src/image/MaoYuNa/013.png b/src/resources/image/MaoYuNa/013.png similarity index 100% rename from src/image/MaoYuNa/013.png rename to src/resources/image/MaoYuNa/013.png diff --git a/src/image/MaoYuNa/014.png b/src/resources/image/MaoYuNa/014.png similarity index 100% rename from src/image/MaoYuNa/014.png rename to src/resources/image/MaoYuNa/014.png diff --git a/src/image/MaoYuNa/015.png b/src/resources/image/MaoYuNa/015.png similarity index 100% rename from src/image/MaoYuNa/015.png rename to src/resources/image/MaoYuNa/015.png diff --git a/src/image/MaoYuNa/016.png b/src/resources/image/MaoYuNa/016.png similarity index 100% rename from src/image/MaoYuNa/016.png rename to src/resources/image/MaoYuNa/016.png diff --git a/src/image/MaoYuNa/017.png b/src/resources/image/MaoYuNa/017.png similarity index 100% rename from src/image/MaoYuNa/017.png rename to src/resources/image/MaoYuNa/017.png diff --git a/src/image/MaoYuNa/018.png b/src/resources/image/MaoYuNa/018.png similarity index 100% rename from src/image/MaoYuNa/018.png rename to src/resources/image/MaoYuNa/018.png diff --git a/src/image/MaoYuNa/019.png b/src/resources/image/MaoYuNa/019.png similarity index 100% rename from src/image/MaoYuNa/019.png rename to src/resources/image/MaoYuNa/019.png diff --git a/src/image/MaoYuNa/020.png b/src/resources/image/MaoYuNa/020.png similarity index 100% rename from src/image/MaoYuNa/020.png rename to src/resources/image/MaoYuNa/020.png diff --git a/src/image/MaoYuNa/021.png b/src/resources/image/MaoYuNa/021.png similarity index 100% rename from src/image/MaoYuNa/021.png rename to src/resources/image/MaoYuNa/021.png diff --git a/src/image/MaoYuNa/022.png b/src/resources/image/MaoYuNa/022.png similarity index 100% rename from src/image/MaoYuNa/022.png rename to src/resources/image/MaoYuNa/022.png diff --git a/src/image/MaoYuNa/023.png b/src/resources/image/MaoYuNa/023.png similarity index 100% rename from src/image/MaoYuNa/023.png rename to src/resources/image/MaoYuNa/023.png diff --git a/src/image/MaoYuNa/024.png b/src/resources/image/MaoYuNa/024.png similarity index 100% rename from src/image/MaoYuNa/024.png rename to src/resources/image/MaoYuNa/024.png diff --git a/src/image/MaoYuNa/025.png b/src/resources/image/MaoYuNa/025.png similarity index 100% rename from src/image/MaoYuNa/025.png rename to src/resources/image/MaoYuNa/025.png diff --git a/src/image/MaoYuNa/026.png b/src/resources/image/MaoYuNa/026.png similarity index 100% rename from src/image/MaoYuNa/026.png rename to src/resources/image/MaoYuNa/026.png diff --git a/src/image/MaoYuNa/027.png b/src/resources/image/MaoYuNa/027.png similarity index 100% rename from src/image/MaoYuNa/027.png rename to src/resources/image/MaoYuNa/027.png diff --git a/src/image/MaoYuNa/028.png b/src/resources/image/MaoYuNa/028.png similarity index 100% rename from src/image/MaoYuNa/028.png rename to src/resources/image/MaoYuNa/028.png diff --git a/src/image/MaoYuNa/029.png b/src/resources/image/MaoYuNa/029.png similarity index 100% rename from src/image/MaoYuNa/029.png rename to src/resources/image/MaoYuNa/029.png diff --git a/src/image/MaoYuNa/030.png b/src/resources/image/MaoYuNa/030.png similarity index 100% rename from src/image/MaoYuNa/030.png rename to src/resources/image/MaoYuNa/030.png diff --git a/src/image/codeforces/cfContestQR.png b/src/resources/image/codeforces/cfContestQR.png similarity index 100% rename from src/image/codeforces/cfContestQR.png rename to src/resources/image/codeforces/cfContestQR.png diff --git a/src/image/github_repo/SanYeCao-Nonebot.png b/src/resources/image/github_repo/SanYeCao-Nonebot.png similarity index 100% rename from src/image/github_repo/SanYeCao-Nonebot.png rename to src/resources/image/github_repo/SanYeCao-Nonebot.png diff --git a/src/image/github_repo/SanYeCao-Nonebot2.jpg b/src/resources/image/github_repo/SanYeCao-Nonebot2.jpg similarity index 100% rename from src/image/github_repo/SanYeCao-Nonebot2.jpg rename to src/resources/image/github_repo/SanYeCao-Nonebot2.jpg diff --git a/src/image/github_repo/SanYeCao-Nonebot3.png b/src/resources/image/github_repo/SanYeCao-Nonebot3.png similarity index 100% rename from src/image/github_repo/SanYeCao-Nonebot3.png rename to src/resources/image/github_repo/SanYeCao-Nonebot3.png diff --git a/src/image/rua/1.png b/src/resources/image/rua/1.png similarity index 100% rename from src/image/rua/1.png rename to src/resources/image/rua/1.png diff --git a/src/image/rua/10.png b/src/resources/image/rua/10.png similarity index 100% rename from src/image/rua/10.png rename to src/resources/image/rua/10.png diff --git a/src/image/rua/2.png b/src/resources/image/rua/2.png similarity index 100% rename from src/image/rua/2.png rename to src/resources/image/rua/2.png diff --git a/src/image/rua/3.png b/src/resources/image/rua/3.png similarity index 100% rename from src/image/rua/3.png rename to src/resources/image/rua/3.png diff --git a/src/image/rua/4.png b/src/resources/image/rua/4.png similarity index 100% rename from src/image/rua/4.png rename to src/resources/image/rua/4.png diff --git a/src/image/rua/5.png b/src/resources/image/rua/5.png similarity index 100% rename from src/image/rua/5.png rename to src/resources/image/rua/5.png diff --git a/src/image/rua/6.png b/src/resources/image/rua/6.png similarity index 100% rename from src/image/rua/6.png rename to src/resources/image/rua/6.png diff --git a/src/image/rua/7.png b/src/resources/image/rua/7.png similarity index 100% rename from src/image/rua/7.png rename to src/resources/image/rua/7.png diff --git a/src/image/rua/8.png b/src/resources/image/rua/8.png similarity index 100% rename from src/image/rua/8.png rename to src/resources/image/rua/8.png diff --git a/src/image/rua/9.png b/src/resources/image/rua/9.png similarity index 100% rename from src/image/rua/9.png rename to src/resources/image/rua/9.png diff --git a/src/image/tarot/TarotImages/Ace of Coins.jpg b/src/resources/image/tarot/TarotImages/Ace of Coins.jpg similarity index 100% rename from src/image/tarot/TarotImages/Ace of Coins.jpg rename to src/resources/image/tarot/TarotImages/Ace of Coins.jpg diff --git a/src/image/tarot/TarotImages/Ace of Cups.jpg b/src/resources/image/tarot/TarotImages/Ace of Cups.jpg similarity index 100% rename from src/image/tarot/TarotImages/Ace of Cups.jpg rename to src/resources/image/tarot/TarotImages/Ace of Cups.jpg diff --git a/src/image/tarot/TarotImages/Ace of Swords.jpg b/src/resources/image/tarot/TarotImages/Ace of Swords.jpg similarity index 100% rename from src/image/tarot/TarotImages/Ace of Swords.jpg rename to src/resources/image/tarot/TarotImages/Ace of Swords.jpg diff --git a/src/image/tarot/TarotImages/Ace of Wands.jpg b/src/resources/image/tarot/TarotImages/Ace of Wands.jpg similarity index 100% rename from src/image/tarot/TarotImages/Ace of Wands.jpg rename to src/resources/image/tarot/TarotImages/Ace of Wands.jpg diff --git a/src/image/tarot/TarotImages/Death.jpg b/src/resources/image/tarot/TarotImages/Death.jpg similarity index 100% rename from src/image/tarot/TarotImages/Death.jpg rename to src/resources/image/tarot/TarotImages/Death.jpg diff --git a/src/image/tarot/TarotImages/Five of Cups.png b/src/resources/image/tarot/TarotImages/Five of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Five of Cups.png rename to src/resources/image/tarot/TarotImages/Five of Cups.png diff --git a/src/image/tarot/TarotImages/Five of Wands.png b/src/resources/image/tarot/TarotImages/Five of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/Five of Wands.png rename to src/resources/image/tarot/TarotImages/Five of Wands.png diff --git a/src/image/tarot/TarotImages/Four of Swords.png b/src/resources/image/tarot/TarotImages/Four of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/Four of Swords.png rename to src/resources/image/tarot/TarotImages/Four of Swords.png diff --git a/src/image/tarot/TarotImages/Judgement.jpg b/src/resources/image/tarot/TarotImages/Judgement.jpg similarity index 100% rename from src/image/tarot/TarotImages/Judgement.jpg rename to src/resources/image/tarot/TarotImages/Judgement.jpg diff --git a/src/image/tarot/TarotImages/Justice.jpg b/src/resources/image/tarot/TarotImages/Justice.jpg similarity index 100% rename from src/image/tarot/TarotImages/Justice.jpg rename to src/resources/image/tarot/TarotImages/Justice.jpg diff --git a/src/image/tarot/TarotImages/King of Cups.png b/src/resources/image/tarot/TarotImages/King of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/King of Cups.png rename to src/resources/image/tarot/TarotImages/King of Cups.png diff --git a/src/image/tarot/TarotImages/King of Pentacles.png b/src/resources/image/tarot/TarotImages/King of Pentacles.png similarity index 100% rename from src/image/tarot/TarotImages/King of Pentacles.png rename to src/resources/image/tarot/TarotImages/King of Pentacles.png diff --git a/src/image/tarot/TarotImages/King of Swords.png b/src/resources/image/tarot/TarotImages/King of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/King of Swords.png rename to src/resources/image/tarot/TarotImages/King of Swords.png diff --git a/src/image/tarot/TarotImages/King of Wands.png b/src/resources/image/tarot/TarotImages/King of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/King of Wands.png rename to src/resources/image/tarot/TarotImages/King of Wands.png diff --git a/src/image/tarot/TarotImages/Knight of Cups.png b/src/resources/image/tarot/TarotImages/Knight of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Knight of Cups.png rename to src/resources/image/tarot/TarotImages/Knight of Cups.png diff --git a/src/image/tarot/TarotImages/Knight of Pentacles.png b/src/resources/image/tarot/TarotImages/Knight of Pentacles.png similarity index 100% rename from src/image/tarot/TarotImages/Knight of Pentacles.png rename to src/resources/image/tarot/TarotImages/Knight of Pentacles.png diff --git a/src/image/tarot/TarotImages/Knight of Swords.png b/src/resources/image/tarot/TarotImages/Knight of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/Knight of Swords.png rename to src/resources/image/tarot/TarotImages/Knight of Swords.png diff --git a/src/image/tarot/TarotImages/Knight of Wands.png b/src/resources/image/tarot/TarotImages/Knight of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/Knight of Wands.png rename to src/resources/image/tarot/TarotImages/Knight of Wands.png diff --git a/src/image/tarot/TarotImages/Nine of Cups.png b/src/resources/image/tarot/TarotImages/Nine of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Nine of Cups.png rename to src/resources/image/tarot/TarotImages/Nine of Cups.png diff --git a/src/image/tarot/TarotImages/Page of Cups.png b/src/resources/image/tarot/TarotImages/Page of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Page of Cups.png rename to src/resources/image/tarot/TarotImages/Page of Cups.png diff --git a/src/image/tarot/TarotImages/Page of Pentacles.png b/src/resources/image/tarot/TarotImages/Page of Pentacles.png similarity index 100% rename from src/image/tarot/TarotImages/Page of Pentacles.png rename to src/resources/image/tarot/TarotImages/Page of Pentacles.png diff --git a/src/image/tarot/TarotImages/Page of Swords.png b/src/resources/image/tarot/TarotImages/Page of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/Page of Swords.png rename to src/resources/image/tarot/TarotImages/Page of Swords.png diff --git a/src/image/tarot/TarotImages/Page of Wands.png b/src/resources/image/tarot/TarotImages/Page of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/Page of Wands.png rename to src/resources/image/tarot/TarotImages/Page of Wands.png diff --git a/src/image/tarot/TarotImages/Queen of Cups.png b/src/resources/image/tarot/TarotImages/Queen of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Queen of Cups.png rename to src/resources/image/tarot/TarotImages/Queen of Cups.png diff --git a/src/image/tarot/TarotImages/Queen of Pentacles.png b/src/resources/image/tarot/TarotImages/Queen of Pentacles.png similarity index 100% rename from src/image/tarot/TarotImages/Queen of Pentacles.png rename to src/resources/image/tarot/TarotImages/Queen of Pentacles.png diff --git a/src/image/tarot/TarotImages/Queen of Swords.png b/src/resources/image/tarot/TarotImages/Queen of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/Queen of Swords.png rename to src/resources/image/tarot/TarotImages/Queen of Swords.png diff --git a/src/image/tarot/TarotImages/Queen of Wands.png b/src/resources/image/tarot/TarotImages/Queen of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/Queen of Wands.png rename to src/resources/image/tarot/TarotImages/Queen of Wands.png diff --git a/src/image/tarot/TarotImages/Six of Wands.png b/src/resources/image/tarot/TarotImages/Six of Wands.png similarity index 100% rename from src/image/tarot/TarotImages/Six of Wands.png rename to src/resources/image/tarot/TarotImages/Six of Wands.png diff --git a/src/image/tarot/TarotImages/Strength.jpg b/src/resources/image/tarot/TarotImages/Strength.jpg similarity index 100% rename from src/image/tarot/TarotImages/Strength.jpg rename to src/resources/image/tarot/TarotImages/Strength.jpg diff --git a/src/image/tarot/TarotImages/Temperance.jpg b/src/resources/image/tarot/TarotImages/Temperance.jpg similarity index 100% rename from src/image/tarot/TarotImages/Temperance.jpg rename to src/resources/image/tarot/TarotImages/Temperance.jpg diff --git a/src/image/tarot/TarotImages/Ten of Cups.png b/src/resources/image/tarot/TarotImages/Ten of Cups.png similarity index 100% rename from src/image/tarot/TarotImages/Ten of Cups.png rename to src/resources/image/tarot/TarotImages/Ten of Cups.png diff --git a/src/image/tarot/TarotImages/The Chariot.jpg b/src/resources/image/tarot/TarotImages/The Chariot.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Chariot.jpg rename to src/resources/image/tarot/TarotImages/The Chariot.jpg diff --git a/src/image/tarot/TarotImages/The Devil.jpg b/src/resources/image/tarot/TarotImages/The Devil.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Devil.jpg rename to src/resources/image/tarot/TarotImages/The Devil.jpg diff --git a/src/image/tarot/TarotImages/The Emperor.jpg b/src/resources/image/tarot/TarotImages/The Emperor.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Emperor.jpg rename to src/resources/image/tarot/TarotImages/The Emperor.jpg diff --git a/src/image/tarot/TarotImages/The Empress.jpg b/src/resources/image/tarot/TarotImages/The Empress.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Empress.jpg rename to src/resources/image/tarot/TarotImages/The Empress.jpg diff --git a/src/image/tarot/TarotImages/The Fool.jpg b/src/resources/image/tarot/TarotImages/The Fool.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Fool.jpg rename to src/resources/image/tarot/TarotImages/The Fool.jpg diff --git a/src/image/tarot/TarotImages/The Hanged Man.jpg b/src/resources/image/tarot/TarotImages/The Hanged Man.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Hanged Man.jpg rename to src/resources/image/tarot/TarotImages/The Hanged Man.jpg diff --git a/src/image/tarot/TarotImages/The Hermit.jpg b/src/resources/image/tarot/TarotImages/The Hermit.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Hermit.jpg rename to src/resources/image/tarot/TarotImages/The Hermit.jpg diff --git a/src/image/tarot/TarotImages/The Hierophant.jpg b/src/resources/image/tarot/TarotImages/The Hierophant.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Hierophant.jpg rename to src/resources/image/tarot/TarotImages/The Hierophant.jpg diff --git a/src/image/tarot/TarotImages/The High Priestess.jpg b/src/resources/image/tarot/TarotImages/The High Priestess.jpg similarity index 100% rename from src/image/tarot/TarotImages/The High Priestess.jpg rename to src/resources/image/tarot/TarotImages/The High Priestess.jpg diff --git a/src/image/tarot/TarotImages/The Lovers.jpg b/src/resources/image/tarot/TarotImages/The Lovers.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Lovers.jpg rename to src/resources/image/tarot/TarotImages/The Lovers.jpg diff --git a/src/image/tarot/TarotImages/The Magician.jpg b/src/resources/image/tarot/TarotImages/The Magician.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Magician.jpg rename to src/resources/image/tarot/TarotImages/The Magician.jpg diff --git a/src/image/tarot/TarotImages/The Moon.jpg b/src/resources/image/tarot/TarotImages/The Moon.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Moon.jpg rename to src/resources/image/tarot/TarotImages/The Moon.jpg diff --git a/src/image/tarot/TarotImages/The Star.jpg b/src/resources/image/tarot/TarotImages/The Star.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Star.jpg rename to src/resources/image/tarot/TarotImages/The Star.jpg diff --git a/src/image/tarot/TarotImages/The Sun.jpg b/src/resources/image/tarot/TarotImages/The Sun.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Sun.jpg rename to src/resources/image/tarot/TarotImages/The Sun.jpg diff --git a/src/image/tarot/TarotImages/The Tower.jpg b/src/resources/image/tarot/TarotImages/The Tower.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Tower.jpg rename to src/resources/image/tarot/TarotImages/The Tower.jpg diff --git a/src/image/tarot/TarotImages/The Wheel of Fortune.jpg b/src/resources/image/tarot/TarotImages/The Wheel of Fortune.jpg similarity index 100% rename from src/image/tarot/TarotImages/The Wheel of Fortune.jpg rename to src/resources/image/tarot/TarotImages/The Wheel of Fortune.jpg diff --git a/src/image/tarot/TarotImages/The World.jpg b/src/resources/image/tarot/TarotImages/The World.jpg similarity index 100% rename from src/image/tarot/TarotImages/The World.jpg rename to src/resources/image/tarot/TarotImages/The World.jpg diff --git a/src/image/tarot/TarotImages/Three of Swords.png b/src/resources/image/tarot/TarotImages/Three of Swords.png similarity index 100% rename from src/image/tarot/TarotImages/Three of Swords.png rename to src/resources/image/tarot/TarotImages/Three of Swords.png diff --git a/src/image/tarot/sideTarotImages/Temperance.jpg b/src/resources/image/tarot/sideTarotImages/Temperance.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/Temperance.jpg rename to src/resources/image/tarot/sideTarotImages/Temperance.jpg diff --git a/src/image/tarot/sideTarotImages/The Chariot.jpg b/src/resources/image/tarot/sideTarotImages/The Chariot.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Chariot.jpg rename to src/resources/image/tarot/sideTarotImages/The Chariot.jpg diff --git a/src/image/tarot/sideTarotImages/The Devil.jpg b/src/resources/image/tarot/sideTarotImages/The Devil.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Devil.jpg rename to src/resources/image/tarot/sideTarotImages/The Devil.jpg diff --git a/src/image/tarot/sideTarotImages/The Emperor.jpg b/src/resources/image/tarot/sideTarotImages/The Emperor.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Emperor.jpg rename to src/resources/image/tarot/sideTarotImages/The Emperor.jpg diff --git a/src/image/tarot/sideTarotImages/The Fool.jpg b/src/resources/image/tarot/sideTarotImages/The Fool.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Fool.jpg rename to src/resources/image/tarot/sideTarotImages/The Fool.jpg diff --git a/src/image/tarot/sideTarotImages/The Lovers.jpg b/src/resources/image/tarot/sideTarotImages/The Lovers.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Lovers.jpg rename to src/resources/image/tarot/sideTarotImages/The Lovers.jpg diff --git a/src/image/tarot/sideTarotImages/The Magician.jpg b/src/resources/image/tarot/sideTarotImages/The Magician.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Magician.jpg rename to src/resources/image/tarot/sideTarotImages/The Magician.jpg diff --git a/src/image/tarot/sideTarotImages/The Sun.jpg b/src/resources/image/tarot/sideTarotImages/The Sun.jpg similarity index 100% rename from src/image/tarot/sideTarotImages/The Sun.jpg rename to src/resources/image/tarot/sideTarotImages/The Sun.jpg