fit nonebot.beta2

plugins/draw_card/azur_handle.py

@@ -1,9 +1,8 @@
-
-from nonebot.adapters.cqhttp import MessageSegment
+from nonebot.adapters.onebot.v11 import MessageSegment
 import random
 from .update_game_simple_info import update_simple_info
 from .util import generate_img, init_star_rst, BaseData, set_list, get_star, max_card, format_card_information
-from .config import AZUR_ONE_P, AZUR_TWO_P, AZUR_THREE_P, AZUR_FOUR_P, AZUR_FLAG, DRAW_PATH
+from .config import draw_config, DRAW_DATA_PATH
 from dataclasses import dataclass
 from .init_card_pool import init_game_pool
 try:
@@ -16,7 +15,7 @@ ALL_CHAR = []
 
 @dataclass
 class AzurChar(BaseData):
-    itype: str      # 舰娘类型
+    type_: str      # 舰娘类型
 
 
 async def azur_draw(count: int, pool_name: str):
@@ -42,22 +41,22 @@ async def update_azur_info():
 
 async def init_azur_data():
     global ALL_CHAR
-    if AZUR_FLAG:
-        with open(DRAW_PATH + 'azur.json', 'r', encoding='utf8') as f:
+    if draw_config.AZUR_FLAG:
+        with (DRAW_DATA_PATH / 'azur.json').open('r', encoding='utf8') as f:
             azur_dict = json.load(f)
         ALL_CHAR = init_game_pool('azur', azur_dict, AzurChar)
 
 
 # 抽取卡池
-def _get_azur_card(pool_name: str):
+def _get_azur_card(pool_name: str, mode: int = 1):
     global ALL_CHAR
+    azur_config = draw_config.azur
     if pool_name == '轻型':
-        itype = ['驱逐', '轻巡', '维修']
+        type_ = ['驱逐', '轻巡', '维修']
     elif pool_name == '重型':
-        itype = ['重巡', '战列', '战巡', '重炮']
+        type_ = ['重巡', '战列', '战巡', '重炮']
     else:
-        itype = ['维修', '潜艇', '重巡', '轻航', '航母']
-    star = get_star([4, 3, 2, 1], [AZUR_FOUR_P, AZUR_THREE_P, AZUR_TWO_P, AZUR_ONE_P])
-    chars = [x for x in ALL_CHAR if x.star == star and x.itype in itype and not x.limited]
+        type_ = ['维修', '潜艇', '重巡', '轻航', '航母']
+    star = get_star([4, 3, 2, 1], [azur_config.AZUR_FOUR_P, azur_config.AZUR_THREE_P, azur_config.AZUR_TWO_P, azur_config.AZUR_ONE_P])
+    chars = [x for x in ALL_CHAR if x.star == star and x.type_ in type_ and not x.limited]
     return random.choice(chars), 4 - star
-