nonebot-plugin-fishing2 0.0.3__py3-none-any.whl → 0.1.0__py3-none-any.whl

nonebot_plugin_fishing2/data_source.py

@@ -12,78 +12,145 @@ from nonebot_plugin_orm import get_session
 
 from .config import config
 from .model import FishingRecord, SpecialFishes
+from .fish_helper import *
 
-fishing_coin_name = config.fishing_coin_name
-fish_list = [fish["name"] for fish in config.fishes]
-can_catch_fishes = {fish["name"]: fish["weight"] for fish in config.fishes if fish["can_catch"]}
-can_buy_fishes = [fish["name"] for fish in config.fishes if fish["can_buy"]]
-can_sell_fishes = [fish["name"] for fish in config.fishes if fish["can_sell"]]
-
-def get_info(fish_name: str) -> list[MessageSegment]:
-    message = []
-    for fish in config.fishes:
-        if fish.get("name") == fish_name:
-            message1 = ""
-            message1 += f'▶ 名称：{fish_name}\n'
-            message1 += f'▶ 基准价格：{fish["price"]} {fishing_coin_name}\n'
-            message1 += f'▶ 描述：{fish["description"]}\n'
-            message1 += f'▶ {"可钓鱼获取" if fish["can_catch"] else "不可钓鱼获取"}，'
-            message1 += f'{"可购买" if fish["can_buy"] else "不可购买"}，'
-            message1 += f'{"可出售" if fish["can_sell"] else "不可出售"}'
-            message.append(MessageSegment.text(message1))
-            if fish["can_catch"]:
-                message2 = ""
-                message2 += f'▶ 钓鱼信息：\n'              
-                message2 += f'  ▷ 基础权重：{fish["weight"]}，'
-                message2 += f'上钩时间：{fish["frequency"]}s'
-                message.append(MessageSegment.text(message2))
-            if fish["can_buy"]:
-                message3 = ""
-                message3 += f'▶ 商店信息：\n'
-                message3 += f'  ▷ 出售价格：{fish["price"] * 2}，'
-                message3 += f'单份数量：{fish.get("amount") if fish.get("amount") else 1}'
-                message.append(MessageSegment.text(message3))
-            if fish.get("props") and fish["props"] != []:
-                message4 = ""
-                message4 += f'▶ 道具信息：\n'
-                message4 += f'  ▷ 道具类型：{"鱼饵" if fish["type"] == "fish" else "道具"}\n'
-                message4 += print_props(fish["props"])
-                message.append(MessageSegment.text(message4))
-            return message
-
-def adjusted_choice(adjusts: list[dict[str, Union[str, int]]] = None) -> str:
 
+async def can_fishing(user_id: str) -> bool:
+    time_now = int(time.time())
+    session = get_session()
+    async with session.begin():
+        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+        record = await session.scalar(select_user)
+        return True if not record else record.time < time_now
+
+
+async def can_catch_special_fish(probability_add: int):
+    session = get_session()
+    async with session.begin():
+        records = await session.execute(select(SpecialFishes))
+        return (
+            len(records.all()) != 0
+            and random.random() <= config.special_fish_probability + probability_add
+        )
+
+
+async def check_tools(
+    user_id: str, tools: list[str] = None, check_have: bool = True
+) -> str | None:
+    if not tools or tools == []:
+        return None
+
+    # 这是工具吗？
+    for tool in tools:
+        fish = get_fish_by_name(tool)
+        if not fish:
+            return f"你在用什么钓鱼……？{tool}？"
+
+        props = fish.props
+        if not props or props == []:
+            return f"搞啥嘞！{tool}既不是工具也不是鱼饵！"
+
+    # 如果有两个工具，是一个工具一个鱼饵吗？
+    if len(tools) == 2:
+        if get_fish_by_name(tools[0]).type == get_fish_by_name(tools[1]).type:
+            return "你为啥要用两个类型一样的东西？"
+
+    # 有吗？有吗？
+    if check_have:
+        session = get_session()
+        async with session.begin():
+            select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+            fishes_record = await session.scalar(select_user)
+            if fishes_record:
+                loads_fishes = json.loads(fishes_record.fishes)
+                for tool in tools:
+                    if tool not in loads_fishes:
+                        return f"你哪来的{tool}？"
+
+    return None
+
+
+async def remove_tools(user_id: str, tools: list[str] = None) -> None:
+    if not tools or tools == []:
+        return None
+
+    session = get_session()
+    async with session.begin():
+        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+        fishes_record = await session.scalar(select_user)
+        if fishes_record:
+            loads_fishes = json.loads(fishes_record.fishes)
+            for tool_name in tools:
+                loads_fishes[tool_name] -= 1
+                if loads_fishes[tool_name] == 0:
+                    del loads_fishes[tool_name]
+            dump_fishes = json.dumps(loads_fishes)
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(fishes=dump_fishes)
+            )
+            await session.execute(user_update)
+            await session.commit()
+        else:
+            pass
+            # raise ValueError("？你的 Check 是怎么通过的？")
+
+
+def get_adjusts_from_tools(tools: list = None) -> list:
+    no_add = 0
+    sp_add = 0
+    adjusts: list[Property] = []
+
+    if tools:
+        for tool in tools:
+            adjusts += get_fish_by_name(tool).props
+
+    for adjust in adjusts:
+        if adjust.type == "special_fish":
+            sp_add += adjust.value
+        if adjust.type == "no_fish":
+            no_add += adjust.value
+
+    return adjusts, no_add, sp_add
+
+
+def adjusted(adjusts: list[Property] = None) -> tuple:
     adjusted_fishes = copy.deepcopy(can_catch_fishes)
-    
-    if adjusts:
-        for adjust in adjusts:
-            if adjust.get("key") and adjust["key"] not in adjusted_fishes:
-                continue
-            match adjust["type"]:
-                case "normal_fish":
-                    for key, weight in can_catch_fishes.items():
-                        if weight >= 500 and key in adjusted_fishes:
-                            adjusted_fishes[key] += adjust["value"]
-                case "rare_fish":
-                    for key, weight in can_catch_fishes.items():
-                        if weight < 500 and key in adjusted_fishes:
-                            adjusted_fishes[key] += adjust["value"]
-                case "fish":
-                    adjusted_fishes[adjust["key"]] += adjust["value"]
-                case "rm_fish":
-                    adjusted_fishes.pop(adjust["key"])
-                case "special_fish":
-                    pass
-                case _:
-                    pass
-    
+
+    for adjust in adjusts:
+        if adjust.key and adjust.key not in adjusted_fishes:
+            continue
+        match adjust.type:
+            case "normal_fish":
+                for key, weight in can_catch_fishes.items():
+                    if weight >= config.rare_fish_weight and key in adjusted_fishes:
+                        adjusted_fishes[key] += adjust.value
+            case "rare_fish":
+                for key, weight in can_catch_fishes.items():
+                    if weight < config.rare_fish_weight and key in adjusted_fishes:
+                        adjusted_fishes[key] += adjust.value
+            case "fish":
+                adjusted_fishes[adjust.key] += adjust.value
+            case "rm_fish":
+                adjusted_fishes.pop(adjust.key)
+            case "special_fish" | "no_fish":
+                pass
+            case _:
+                pass
+
     adjusted_fishes_list = list(adjusted_fishes.keys())
     adjusted_weights = list(adjusted_fishes.values())
-    
+
     for i in range(len(adjusted_weights)):
         if adjusted_weights[i] < 0:
             adjusted_weights[i] = 0
-    
+
+    return adjusted_fishes_list, adjusted_weights
+
+
+def choice(adjusts: list[Property] = None) -> str:
+    adjusted_fishes_list, adjusted_weights = adjusted(adjusts)
     choices = random.choices(
         adjusted_fishes_list,
         weights=adjusted_weights,
@@ -92,99 +159,67 @@ def adjusted_choice(adjusts: list[dict[str, Union[str, int]]] = None) -> str:
 
 
 async def get_fish(user_id: int, tools: list = None) -> str:
-    probability_add = 0
-    adjusts: list[dict[str, Union[str, int]]] = []
-    
-    if tools:
-        for tool in tools:
-            adjusts += get_props(tool)
+    adjusts, no_add, sp_add = get_adjusts_from_tools(tools)
 
-    for adjust in adjusts:
-        if adjust["type"] == "special_fish":
-            probability_add += adjust["value"]
-            
-    if await can_catch_special_fish(probability_add):
+    if random.random() < config.no_fish_probability + no_add:
+        await asyncio.sleep(random.randint(10, 20))
+        return "QAQ你空军了，什么都没钓到"
+
+    if await can_catch_special_fish(sp_add):
         special_fish_name = await random_get_a_special_fish()
+        await asyncio.sleep(random.randint(10, 20))
         await save_special_fish(user_id, special_fish_name)
         result = f"你钓到了别人放生的 {special_fish_name}"
         return result
-    fish = adjusted_choice(adjusts)
-    sleep_time = get_frequency(fish)
+
+    fish = choice(adjusts)
+    sleep_time = get_fish_by_name(fish).sleep_time
     result = f"钓到了一条{fish}, 你把它收进了背包里"
     await asyncio.sleep(sleep_time)
     await save_fish(user_id, fish)
     return result
 
 
-def get_type(fish_name: str) -> list:
-    """获取鱼的类型"""
-    config_fishes = config.fishes
-    return next(
-        (
-            fish["type"]
-            for fish in config_fishes
-            if fish["name"] == fish_name
-        ),
-        "fish"
-    )
+def predict(tools: list = None) -> str:
+    no = config.no_fish_probability
+    sp = config.special_fish_probability
+    sp_price = config.special_fish_price
+    result = ""
 
-def get_props(fish_name: str) -> list:
-    """获取鱼的属性"""
-    config_fishes = config.fishes
-    return next(
-        (
-            fish["props"]
-            for fish in config_fishes
-            if fish["name"] == fish_name
-        ),
-        []
-    )
-def get_price(fish_name: str) -> int:
-    """获取鱼的价格"""
-    config_fishes = config.fishes
-    return next(
-        (
-            fish["price"]
-            for fish in config_fishes
-            if fish["name"] == fish_name
-        ),
-        0
-    )
-    
-def get_frequency(fish_name: str) -> int:
-    """获取鱼的冷却"""
-    config_fishes = config.fishes
-    return next(
-        (
-            fish["frequency"]
-            for fish in config_fishes
-            if fish["name"] == fish_name
-        ),
-        60
-    )
+    adjusts, no_add, sp_add = get_adjusts_from_tools(tools)
+    sp_t = min(max(sp + sp_add, 0), 1)
+    no_t = min(max(no + no_add, 0), 1)
+
+    # 拉取矫正权重
+    adjusted_fishes_list, adjusted_weights = adjusted(adjusts)
+
+    adjusted_fishes_value = []
+    for fish_name in adjusted_fishes_list:
+        fish = get_fish_by_name(fish_name)
+        adjusted_fishes_value.append(int(fish.price * fish.amount))
+
+    # 归一化
+    total_weight = sum(adjusted_weights)
+    probabilities = [w / total_weight for w in adjusted_weights]
+    expected_value = sum(v * p for v, p in zip(adjusted_fishes_value, probabilities))
+
+    result += f"鱼列表：[{', '.join(adjusted_fishes_list)}]\n"
+    result += f"概率列表: [{', '.join([str(round(w * 100, 2)) + "%" for w in probabilities])}]\n"
+    result += f"特殊鱼概率：{round(sp_t * (1 - no_t), 6)}\n"
+    result += f"空军概率：{round(no_t, 6)}\n"
+
+    # 无特殊鱼
+    expected_value = expected_value * (1 - no_t)
+    result += f"无特殊鱼时期望为：{expected_value:.3f}\n"
+
+    # 有特殊鱼
+    expected_value = expected_value * (1 - sp_t) + sp_price * sp_t * (1 - no_t)
+    result += f"有特殊鱼期望为：{expected_value:.3f}"
 
-def print_props(props: list) -> str:
-    """打印鱼的属性"""
-    result = "  ▷ 道具效果：\n"
-    for i in range(len(props)):
-        prop = props[i]
-        match prop["type"]:
-            case "normal_fish":
-                result += f"    {i + 1}. 普通鱼权重{'增加' if prop['value'] > 0 else '减少'}{prop['value']}\n"
-            case "rare_fish":
-                result += f"    {i + 1}. 稀有鱼权重{'增加' if prop['value'] > 0 else '减少'}{prop['value']}\n"
-            case "fish":
-                result += f"    {i + 1}. {prop['key']}权重{'增加' if prop['value'] > 0 else '减少'}{prop['value']}\n"
-            case "rm_fish":
-                result += f"    {i + 1}. 不会钓到{prop['key']}\n"
-            case "special_fish":
-                result += f"    {i + 1}. 特殊鱼概率{'增加' if prop['value'] > 0 else '减少'}{prop['value']}\n"
-            case _:
-                pass
     return result
 
+
 async def random_get_a_special_fish() -> str:
-    """随机返回一条别人放生的鱼"""
     session = get_session()
     async with session.begin():
         random_select = select(SpecialFishes).order_by(func.random())
@@ -192,38 +227,30 @@ async def random_get_a_special_fish() -> str:
         return data.fish
 
 
-async def can_fishing(user_id: str) -> bool:
-    """判断是否可以钓鱼"""
-    time_now = int(time.time())
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        record = await session.scalar(select_user)
-        return True if not record else record.time < time_now
-
-
-def can_free_fish() -> bool:
-    return config.special_fish_enabled
-
-
 async def check_achievement(user_id: str) -> str | None:
     session = get_session()
     async with session.begin():
-        record = await session.scalar(select(FishingRecord).where(FishingRecord.user_id == user_id))
+        record = await session.scalar(
+            select(FishingRecord).where(FishingRecord.user_id == user_id)
+        )
         if not record:
             return None
         fishing_frequency = record.frequency
         user_fishes = json.loads(record.fishes)
-        achievements = config.fishing_achievement
+        achievements = config_achievements
         result_list = []
         for achievement in achievements:
-            achievement_name = achievement["name"]
+            achievement_name = achievement.name
             if await is_exists_achievement(user_id, achievement_name):
                 continue
-            if (achievement["type"] == "fishing_frequency" and achievement["data"] <= fishing_frequency) or \
-                    (achievement["type"] == "fish_type" and achievement["data"] in user_fishes):
+            if (
+                achievement.type == "fishing_frequency"
+                and achievement.data <= fishing_frequency
+            ) or (achievement.type == "fish_type" and achievement.data in user_fishes):
                 await save_achievement(user_id, achievement_name)
-                result_list.append(f"""达成成就: {achievement_name}\n{achievement["description"]}""")
+                result_list.append(
+                    f"""达成成就: {achievement_name}\n{achievement.description}"""
+                )
         return result_list if result_list != [] else None
 
 
@@ -248,10 +275,10 @@ async def save_achievement(user_id: str, achievement_name: str):
             loads_achievements = json.loads(record.achievements)
             loads_achievements.append(achievement_name)
             dump_achievements = json.dumps(loads_achievements)
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                achievements=dump_achievements
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(achievements=dump_achievements)
             )
             await session.execute(user_update)
             await session.commit()
@@ -265,16 +292,18 @@ async def save_achievement(user_id: str, achievement_name: str):
             fishes="{}",
             special_fishes="{}",
             coin=0,
-            achievements=dump_achievements
+            achievements=dump_achievements,
         )
         session.add(new_record)
         await session.commit()
 
 
 async def save_fish(user_id: str, fish_name: str) -> None:
-    """向数据库写入鱼以持久化保存"""
     time_now = int(time.time())
-    fishing_limit = config.fishing_limit
+    fishing_cooldown = random.randint(
+        config.fishing_cooldown_time_min, config.fishing_cooldown_time_max
+    )
+    amount = get_fish_by_name(fish_name).amount
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
@@ -282,48 +311,43 @@ async def save_fish(user_id: str, fish_name: str) -> None:
         if record:
             loads_fishes = json.loads(record.fishes)
             try:
-                loads_fishes[fish_name] += 1
+                loads_fishes[fish_name] += amount
             except KeyError:
-                loads_fishes[fish_name] = 1
+                loads_fishes[fish_name] = amount
             dump_fishes = json.dumps(loads_fishes)
             new_frequency = record.frequency + 1
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                time=time_now + fishing_limit,
-                frequency=new_frequency,
-                fishes=dump_fishes
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(
+                    time=time_now + fishing_cooldown,
+                    frequency=new_frequency,
+                    fishes=dump_fishes,
+                )
             )
             await session.execute(user_update)
             await session.commit()
             return
-        data = {
-            fish_name: 1
-        }
+        data = {fish_name: amount}
         dump_fishes = json.dumps(data)
         new_record = FishingRecord(
             user_id=user_id,
-            time=time_now + fishing_limit,
+            time=time_now + fishing_cooldown,
             frequency=1,
             fishes=dump_fishes,
             special_fishes="{}",
             coin=0,
-            achievements="[]"
+            achievements="[]",
         )
         session.add(new_record)
         await session.commit()
 
 
-async def can_catch_special_fish(probability_add: int):
-    session = get_session()
-    async with session.begin():
-        records = await session.execute(select(SpecialFishes))
-        return len(records.all()) != 0 and random.random() <= config.special_fish_probability + probability_add
-
-
 async def save_special_fish(user_id: str, fish_name: str) -> None:
     time_now = int(time.time())
-    fishing_limit = config.fishing_limit
+    fishing_cooldown = random.randint(
+        config.fishing_cooldown_time_min, config.fishing_cooldown_time_max
+    )
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
@@ -335,32 +359,35 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
             except KeyError:
                 loads_fishes[fish_name] = 1
             dump_fishes = json.dumps(loads_fishes)
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                time=time_now + fishing_limit,
-                frequency=record.frequency + 1,
-                special_fishes=dump_fishes
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(
+                    time=time_now + fishing_cooldown,
+                    frequency=record.frequency + 1,
+                    special_fishes=dump_fishes,
+                )
             )
             await session.execute(user_update)
         else:
-            data = {
-                fish_name: 1
-            }
+            data = {fish_name: 1}
             dump_fishes = json.dumps(data)
             new_record = FishingRecord(
                 user_id=user_id,
-                time=time_now + fishing_limit,
+                time=time_now + fishing_cooldown,
                 frequency=1,
                 fishes="{}",
                 special_fishes=dump_fishes,
                 coin=0,
-                achievements=[]
+                achievements=[],
             )
             session.add(new_record)
-        select_fish = select(SpecialFishes).where(
-            SpecialFishes.fish == fish_name
-        ).order_by(SpecialFishes.id).limit(1)
+        select_fish = (
+            select(SpecialFishes)
+            .where(SpecialFishes.fish == fish_name)
+            .order_by(SpecialFishes.id)
+            .limit(1)
+        )
         record = await session.scalar(select_fish)
         fish_id = record.id
         delete_fishes = delete(SpecialFishes).where(SpecialFishes.id == fish_id)
@@ -368,65 +395,9 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
         await session.commit()
 
 
-async def get_stats(user_id: str) -> str:
-    """获取钓鱼统计信息"""
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        fishing_record = await session.scalar(select_user)
-        if fishing_record:
-            return f"🐟你钓鱼了 {fishing_record.frequency} 次"
-        return "🐟你还没有钓过鱼，快去钓鱼吧"
-
-
-def print_backpack(backpack: dict, special_backpack=None) -> str:
-    """输出背包内容"""
-    result = [
-        f"{fish_name}×{str(quantity)}"
-        for fish_name, quantity in backpack.items()
-    ]
-    if special_backpack:
-        special_result = [
-            f"{fish_name}×{str(quantity)}"
-            for fish_name, quantity in special_backpack.items()
-        ]
-        return "🎒背包:\n" + "\n".join(result) + "\n\n特殊鱼:\n" + "\n".join(special_result)
-    return "🎒背包:\n" + "\n".join(result)
-
-
-async def get_backpack(user_id: str) -> str:
-    """从数据库查询背包内容"""
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        fishes_record = await session.scalar(select_user)
-        if fishes_record:
-            load_fishes = json.loads(fishes_record.fishes)
-            sorted_fishes = {key: load_fishes[key] for key in fish_list if key in load_fishes}
-            load_special_fishes = json.loads(fishes_record.special_fishes)
-            if load_special_fishes:
-                sorted_special_fishes = {key: load_special_fishes[key] for key in sorted(load_special_fishes)}
-                return print_backpack(sorted_fishes, sorted_special_fishes)
-            return "🎒你的背包里空无一物" if sorted_fishes == {} else print_backpack(sorted_fishes)
-        return "🎒你的背包里空无一物"
-
-
 async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
-    """
-    卖鱼
-
-    参数：
-      - user_id: 用户标识符
-      - fish_name: 将要卖鱼的鱼名称
-      - quantity: 卖出鱼的数量
-
-    返回：
-      - (str): 回复的文本
-    """
     if quantity <= 0:
         return "你在卖什么 w(ﾟДﾟ)w"
-    if fish_name not in can_sell_fishes:
-        return f"这个 {fish_name} 不可以卖哦~"
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
@@ -435,23 +406,29 @@ async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
             loads_fishes = json.loads(fishes_record.fishes)
             spec_fishes = json.loads(fishes_record.special_fishes)
             if fish_name in loads_fishes and loads_fishes[fish_name] > 0:
-                fish_price = get_price(fish_name)
+                if fish_name not in can_sell_fishes:
+                    return f"这个 {fish_name} 不可以卖哦~"
                 if loads_fishes[fish_name] < quantity:
                     return f"你没有那么多 {fish_name}"
+                fish_price = get_fish_by_name(fish_name).price
                 loads_fishes[fish_name] -= quantity
                 if loads_fishes[fish_name] == 0:
                     del loads_fishes[fish_name]
                 dump_fishes = json.dumps(loads_fishes)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    coin=fishes_record.coin + fish_price * quantity,
-                    fishes=dump_fishes
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(
+                        coin=fishes_record.coin + fish_price * quantity,
+                        fishes=dump_fishes,
+                    )
                 )
                 await session.execute(user_update)
                 await session.commit()
-                return (f"你以 {fish_price} {fishing_coin_name} / 条的价格卖出了 {quantity} 条 {fish_name}, "
-                        f"你获得了 {fish_price * quantity} {fishing_coin_name}")
+                return (
+                    f"你以 {fish_price} {fishing_coin_name} / 条的价格卖出了 {quantity} 条 {fish_name}, "
+                    f"你获得了 {fish_price * quantity} {fishing_coin_name}"
+                )
             elif fish_name in spec_fishes and spec_fishes[fish_name] > 0:
                 fish_price = config.special_fish_price
                 if spec_fishes[fish_name] < quantity:
@@ -460,35 +437,35 @@ async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 if spec_fishes[fish_name] == 0:
                     del spec_fishes[fish_name]
                 dump_fishes = json.dumps(spec_fishes)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    coin=fishes_record.coin + fish_price * quantity,
-                    special_fishes=dump_fishes
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(
+                        coin=fishes_record.coin + fish_price * quantity,
+                        special_fishes=dump_fishes,
+                    )
                 )
                 await session.execute(user_update)
                 await session.commit()
-                return (f"你以 {fish_price} {fishing_coin_name} / 条的价格卖出了 {quantity} 条 {fish_name}, "
-                        f"获得了 {fish_price * quantity} {fishing_coin_name}")
-            else:         
+                return (
+                    f"你以 {fish_price} {fishing_coin_name} / 条的价格卖出了 {quantity} 条 {fish_name}, "
+                    f"获得了 {fish_price * quantity} {fishing_coin_name}"
+                )
+            else:
                 return "查无此鱼"
         else:
             return "还没钓鱼就想卖鱼?"
-        
+
 
 async def buy_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
     if quantity <= 0:
         return "别在渔具店老板面前炫耀自己的鱼 (..-˘ ˘-.#)"
     if fish_name not in can_buy_fishes:
         return "商店不卖这个！"
-    
-    for fish in config.fishes:
-        if fish["name"] == fish_name:
-            price = fish["price"] * 2
-            amount = fish["amount"] if fish.get("amount") else 1
-            total_price = price * amount * quantity
-            break
-    
+
+    fish = get_fish_by_name(fish_name)
+    total_price = int(fish.buy_price * fish.amount * quantity)
+
     session = get_session()
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
@@ -501,34 +478,22 @@ async def buy_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 return f"你没有足够的 {fishing_coin_name}, 还需 {coin_less} {fishing_coin_name}"
             user_coin -= total_price
             try:
-                loads_fishes[fish_name] += amount * quantity
+                loads_fishes[fish_name] += fish.amount * quantity
             except KeyError:
-                loads_fishes[fish_name] = amount * quantity
+                loads_fishes[fish_name] = fish.amount * quantity
             dump_fishes = json.dumps(loads_fishes)
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                coin=user_coin,
-                fishes=dump_fishes
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(coin=user_coin, fishes=dump_fishes)
             )
             await session.execute(user_update)
             await session.commit()
-            return (f"你用 {total_price} {fishing_coin_name} 买入了 {quantity * amount} {fish_name}")
+            return f"你用 {total_price} {fishing_coin_name} 买入了 {quantity} 份 {fish_name}"
         else:
             return "不想钓鱼的人就别在渔具店逛了~"
 
 
-async def get_balance(user_id: str) -> str:
-    """获取余额"""
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        fishes_record = await session.scalar(select_user)
-        if fishes_record:
-            return f"🪙你有 {fishes_record.coin} {fishing_coin_name}"
-        return "🪙你什么也没有 :)"
-
-
 async def free_fish(user_id: str, fish_name: str) -> str:
     session = get_session()
     async with session.begin():
@@ -541,16 +506,13 @@ async def free_fish(user_id: str, fish_name: str) -> str:
                 spec_fishes[fish_name] -= 1
                 if spec_fishes[fish_name] == 0:
                     del spec_fishes[fish_name]
-                new_record = SpecialFishes(
-                    user_id=user_id,
-                    fish=fish_name
-                )
+                new_record = SpecialFishes(user_id=user_id, fish=fish_name)
                 session.add(new_record)
                 dump_fishes = json.dumps(spec_fishes)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    special_fishes=dump_fishes
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(special_fishes=dump_fishes)
                 )
                 await session.execute(user_update)
                 await session.commit()
@@ -558,24 +520,23 @@ async def free_fish(user_id: str, fish_name: str) -> str:
             else:
                 if fish_name in fish_list:
                     return "普通鱼不能放生哦~"
-                
-                if user_coin < config.special_fish_price // 2:
-                    special_fish_coin_less = str(config.special_fish_price // 2 - fishes_record.coin)
+
+                if user_coin < config.special_fish_free_price:
+                    special_fish_coin_less = str(
+                        config.special_fish_free_price - fishes_record.coin
+                    )
                     return f"你没有足够的 {fishing_coin_name}, 还需 {special_fish_coin_less} {fishing_coin_name}"
-                user_coin -= config.special_fish_price // 2
-                new_record = SpecialFishes(
-                    user_id=user_id,
-                    fish=fish_name
-                )
+                user_coin -= config.special_fish_free_price
+                new_record = SpecialFishes(user_id=user_id, fish=fish_name)
                 session.add(new_record)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    coin=user_coin
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(coin=user_coin)
                 )
                 await session.execute(user_update)
                 await session.commit()
-                return f"你花费 {config.special_fish_price // 2} {fishing_coin_name} 放生了 {fish_name}, 未来或许会被有缘人钓到呢"
+                return f"你花费 {config.special_fish_free_price} {fishing_coin_name} 放生了 {fish_name}, 未来或许会被有缘人钓到呢"
         return "你甚至还没钓过鱼"
 
 
@@ -583,7 +544,9 @@ async def lottery(user_id: str) -> str:
     """算法来自于 https://github.com/fossifer/minesweeperbot/blob/master/cards.py"""
     session = get_session()
     time_now = int(time.time())
-    fishing_limit = config.fishing_limit
+    fishing_cooldown = random.randint(
+        config.fishing_cooldown_time_min, config.fishing_cooldown_time_max
+    )
     async with session.begin():
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
         fishes_record = await session.scalar(select_user)
@@ -591,24 +554,28 @@ async def lottery(user_id: str) -> str:
             user_coin = fishes_record.coin
             if user_coin <= 30:
                 new_coin = random.randrange(1, 50)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    time=time_now + fishing_limit,
-                    coin=fishes_record.coin + new_coin,
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(
+                        time=time_now + fishing_cooldown,
+                        coin=fishes_record.coin + new_coin,
+                    )
                 )
                 await session.execute(user_update)
-                await session.commit()            
+                await session.commit()
                 return f"你穷得连河神都看不下去了，给了你 {new_coin} {fishing_coin_name} w(ﾟДﾟ)w"
             new_coin = abs(user_coin) / 3
             new_coin = random.randrange(5000, 15000) / 10000 * new_coin
             new_coin = int(new_coin) if new_coin > 1 else 1
             new_coin *= random.randrange(-1, 2, 2)
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                time=time_now + fishing_limit,
-                coin=fishes_record.coin + new_coin,
+            user_update = (
+                update(FishingRecord)
+                .where(FishingRecord.user_id == user_id)
+                .values(
+                    time=time_now + fishing_cooldown,
+                    coin=fishes_record.coin + new_coin,
+                )
             )
             await session.execute(user_update)
             await session.commit()
@@ -623,15 +590,17 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
         select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
         record = await session.scalar(select_user)
         if record:
-            if fish_name == 'coin' or fish_name == fishing_coin_name:
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    coin=record.coin + quantity,
+            if fish_name == "coin" or fish_name == fishing_coin_name:
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(
+                        coin=record.coin + quantity,
+                    )
                 )
                 await session.execute(user_update)
                 await session.commit()
-                return f"使用滥权之力成功为 {user_id} {"增加" if quantity >= 0 else "减少"} {abs(quantity)} {fishing_coin_name} ヾ(≧▽≦*)o"                
+                return f"使用滥权之力成功为 {user_id} {"增加" if quantity >= 0 else "减少"} {abs(quantity)} {fishing_coin_name} ヾ(≧▽≦*)o"
             loads_fishes = json.loads(record.fishes)
             spec_fishes = json.loads(record.special_fishes)
             if fish_name in fish_list:
@@ -640,10 +609,10 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 except KeyError:
                     loads_fishes[fish_name] = quantity
                 dump_fishes = json.dumps(loads_fishes)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    fishes=dump_fishes
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(fishes=dump_fishes)
                 )
                 await session.execute(user_update)
                 await session.commit()
@@ -653,17 +622,115 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 except KeyError:
                     spec_fishes[fish_name] = quantity
                 dump_fishes = json.dumps(spec_fishes)
-                user_update = update(FishingRecord).where(
-                    FishingRecord.user_id == user_id
-                ).values(
-                    special_fishes=dump_fishes
+                user_update = (
+                    update(FishingRecord)
+                    .where(FishingRecord.user_id == user_id)
+                    .values(special_fishes=dump_fishes)
                 )
                 await session.execute(user_update)
                 await session.commit()
-            return f"使用滥权之力成功将 {fish_name} 添加到 {user_id} 的背包之中 ヾ(≧▽≦*)o"
+            return (
+                f"使用滥权之力成功将 {fish_name} 添加到 {user_id} 的背包之中 ヾ(≧▽≦*)o"
+            )
         return "未查找到用户信息, 无法执行滥权操作 w(ﾟДﾟ)w"
 
 
+async def get_all_special_fish() -> list[str]:
+    session = get_session()
+    async with session.begin():
+        random_select = select(SpecialFishes.fish).order_by(SpecialFishes.fish.asc())
+        data = await session.scalars(random_select)
+        result = data.all()
+        return result
+
+
+async def get_pool() -> list[MessageSegment]:
+
+    messages: list[MessageSegment] = []
+    pool = await get_all_special_fish()
+    messages.append(MessageSegment.text(f"现在鱼池里面有 {len(pool)} 条鱼。"))
+
+    result = dict()
+    for fish in pool:
+        try:
+            result[fish] += 1
+        except KeyError:
+            result[fish] = 1
+
+    msg = "鱼池列表：\n"
+    for fish, num in result.items():
+        if len(msg) > 300:
+            msg += f"{fish} x {num}"
+            messages.append(MessageSegment.text(msg))
+            msg = ""
+        else:
+            msg += f"{fish} x {num}\n"
+    else:
+        messages.append(MessageSegment.text(msg))
+
+    return messages
+
+
+async def get_stats(user_id: str) -> str:
+    session = get_session()
+    async with session.begin():
+        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+        fishing_record = await session.scalar(select_user)
+        if fishing_record:
+            return f"🐟你钓上了 {fishing_record.frequency} 条鱼"
+        return "🐟你还没有钓过鱼，快去钓鱼吧"
+
+
+async def get_balance(user_id: str) -> str:
+    session = get_session()
+    async with session.begin():
+        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+        fishes_record = await session.scalar(select_user)
+        if fishes_record:
+            return f"🪙你有 {fishes_record.coin} {fishing_coin_name}"
+        return "🪙你什么也没有 :)"
+
+
+async def get_backpack(user_id: str) -> list[str]:
+    session = get_session()
+    async with session.begin():
+        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
+        fishes_record = await session.scalar(select_user)
+        if fishes_record:
+            load_fishes = json.loads(fishes_record.fishes)
+            sorted_fishes = {
+                key: load_fishes[key] for key in fish_list if key in load_fishes
+            }
+            load_special_fishes = json.loads(fishes_record.special_fishes)
+            if load_special_fishes:
+                sorted_special_fishes = {
+                    key: load_special_fishes[key] for key in sorted(load_special_fishes)
+                }
+                return print_backpack(sorted_fishes, sorted_special_fishes)
+            return (
+                ["🎒你的背包里空无一物"]
+                if sorted_fishes == {}
+                else print_backpack(sorted_fishes)
+            )
+        return ["🎒你的背包里空无一物"]
+
+
+def print_backpack(backpack: dict, special_backpack=None) -> list[str]:
+    result = [
+        f"{fish_name}×{str(quantity)}" for fish_name, quantity in backpack.items()
+    ]
+    if special_backpack:
+        special_result = [
+            f"{fish_name}×{str(quantity)}"
+            for fish_name, quantity in special_backpack.items()
+        ]
+        return [
+            "🎒普通鱼:\n" + "\n".join(result),
+            "🎒特殊鱼:\n" + "\n".join(special_result),
+        ]
+    return ["🎒普通鱼:\n" + "\n".join(result)]
+
+
 async def get_achievements(user_id: str) -> str:
     session = get_session()
     async with session.begin():
@@ -674,10 +741,13 @@ async def get_achievements(user_id: str) -> str:
             return "已完成成就:\n" + "\n".join(achievements)
         return "你甚至还没钓过鱼 (╬▔皿▔)╯"
 
-async def get_board() -> list:
+
+async def get_board() -> list[tuple]:
     session = get_session()
     async with session.begin():
-        select_users = select(FishingRecord).order_by(FishingRecord.coin.desc()).limit(10)
+        select_users = (
+            select(FishingRecord).order_by(FishingRecord.coin.desc()).limit(10)
+        )
         record = await session.scalars(select_users)
         if record:
             top_users_list = []
@@ -687,67 +757,20 @@ async def get_board() -> list:
             return top_users_list
         return []
 
+
 def get_shop() -> list[MessageSegment]:
     messages: list[MessageSegment] = []
-    
-    messages.append(MessageSegment.text("===== 渔具店 ====="))
-    
-    for fish in config.fishes:
-        if fish.get("can_buy"):
-            name = fish["name"]
-            price = fish["price"] * 2
-            amount = fish["amount"] if fish.get("amount") else 1
-            total_price = price * amount
-            desc = fish["description"] if fish.get("description") else ""
-            messages.append(MessageSegment.text(f"商品名：{name} \n单份数量：{amount}\n单价：{price} {fishing_coin_name}\n单份总价：{total_price} {fishing_coin_name}\n描述：{desc}"))
-    
-    return messages
-    
-
-async def check_tools(user_id: str, tools: list) -> str | None:
-    # 这是工具吗？
-    for tool in tools:
-        props = get_props(tool)
-        if not props or props == []:
-            return f"搞啥嘞！{tool}既不是工具也不是鱼饵！"
 
-    # 如果有两个工具，是一个工具一个鱼饵吗？
-    if len(tools) == 2:
-        if get_type(tools[0]) == get_type(tools[1]):
-            return "你为啥要用两个类型一样的东西？"
-        
-    # 有吗？有吗？
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        fishes_record = await session.scalar(select_user)
-        if fishes_record:
-            loads_fishes = json.loads(fishes_record.fishes)
-            for tool in tools: 
-                if tool not in loads_fishes:
-                    return f"你哪来的 {tool}？"
-        
-    return None
+    messages.append(MessageSegment.text("===== 钓鱼用具店 ====="))
 
-async def remove_tools(user_id: str, tools: list[str]) -> None:
-    session = get_session()
-    async with session.begin():
-        select_user = select(FishingRecord).where(FishingRecord.user_id == user_id)
-        fishes_record = await session.scalar(select_user)
-        if fishes_record:
-            loads_fishes = json.loads(fishes_record.fishes)
-            for tool in tools:
-                loads_fishes[tool] -= 1
-                if loads_fishes[tool] == 0:
-                    del loads_fishes[tool]
-            dump_fishes = json.dumps(loads_fishes)
-            user_update = update(FishingRecord).where(
-                FishingRecord.user_id == user_id
-            ).values(
-                fishes=dump_fishes
+    for fish in config_fishes:
+        if fish.can_buy:
+            total_price = int(fish.buy_price * fish.amount)
+            messages.append(
+                MessageSegment.text(
+                    f"商品名：{fish.name} \n单份数量：{fish.amount}\n单价：{fish.buy_price} {fishing_coin_name}\n"
+                    f"单份总价：{total_price} {fishing_coin_name}\n描述：{fish.description}"
+                )
             )
-            await session.execute(user_update)
-            await session.commit()
-        else:
-            pass
-            # raise ValueError("？你的 Check 是怎么通过的？")
+
+    return messages