Merge pull request #49 from LittlebearHat/main

feat: 新增抽象塔罗牌

config/controller.yaml

@@ -32,6 +32,7 @@ ai绘画:
   watchPrefix: "/"          #“看看”指令的前缀
 运势&塔罗:
   lockLuck: false           #是否锁定运势等功能的结果
+  isAbstract: false          #是否启用抽象卡组
 JMComic:            #禁漫相关功能设置
   enable: True     #全局开关
   onlyTrustUser: False #打开后，仅master授权用户可用

plugins/tarot.py

@@ -90,12 +90,14 @@ tarot = [['
           'The World.jpg']]
 
 
-def tarotChoice():
+def tarotChoice(isAbstract):
     ints = random.randint(0, 1)
     if ints == 0:
         tarots = random.choice(tarot)
         txt = tarots[0] + '\n' + 'Õýλ' + '\n' + tarots[1]
         img = 'data/pictures/tarot/TarotImages/' + tarots[3]
+        img_folder = 'AbstractImages' if isAbstract else 'TarotImages'
+        img = f'data/pictures/tarot/{img_folder}/{tarots[3]}'
         return txt, img
     if ints == 1:
         tarots = random.choice(tarot)
@@ -105,8 +107,11 @@ def tarotChoice():
             return txt, img1
         else:
             # ´ò¿ªÍ¼Ïñ
-            img = Image.open('data/pictures/tarot/TarotImages/' + tarots[3])
+            img_folder = 'AbstractImages' if isAbstract else 'TarotImages'
+            img = Image.open(f'data/pictures/tarot/{img_folder}/{tarots[3]}')
 
+            if img.mode == 'RGBA':
+                img = img.convert('RGB')
             # Ðýת180¶È
             rotated_img = img.rotate(180)
 

run/extraParts.py

@@ -78,6 +78,7 @@ def main(bot, logger):
     aiReplyCore = result1.get("chatGLM").get("aiReplyCore")
     colorfulCharacterList = os.listdir("data/colorfulAnimeCharacter")
     lockResult = controllerResult.get("运势&塔罗").get("lockLuck")
+    isAbstract = controllerResult.get("运势&塔罗").get("isAbstract")
     InternetMeme = controllerResult.get("图片相关").get("InternetMeme")
 
     global picData
@@ -677,7 +678,7 @@ def main(bot, logger):
                 event.message_chain) == "今日塔罗":
             logger.info("获取今日塔罗")
             if not lockResult:
-                txt, img = tarotChoice()
+                txt, img = tarotChoice(isAbstract)
                 logger.info("成功获取到今日塔罗")
                 await bot.send(event, [txt, Image(path=img)])
                 if aiReplyCore:
@@ -687,7 +688,7 @@ def main(bot, logger):
 
             else:
                 if event.sender.id not in luckList.get(tod).get("塔罗"):
-                    txt, img = tarotChoice()
+                    txt, img = tarotChoice(isAbstract)
                     logger.info("成功获取到今日塔罗")
                     await bot.send(event, txt)
                     await bot.send(event, Image(path=img))