nonebot-plugin-fishing2 0.0.4__py3-none-any.whl → 0.1.1__py3-none-any.whl

nonebot_plugin_fishing2/__init__.py

@@ -2,6 +2,7 @@ from nonebot import require
 
 require("nonebot_plugin_orm")  # noqa
 
+import copy
 import shlex
 from typing import Union
 
@@ -39,37 +40,43 @@ from .data_source import (
     get_shop,
     buy_fish,
     predict,
-    get_all_special_fish,
+    get_pool,
+    remove_special_fish,
 )
 from .fish_helper import fish_list, get_fish_by_name
 
 fishing_coin_name = config.fishing_coin_name
+cool_down = (
+    f"{config.fishing_cooldown_time_min}s~{config.fishing_cooldown_time_max}s"
+    if config.fishing_cooldown_time_min != config.fishing_cooldown_time_max
+    else f"{config.fishing_cooldown_time_min}s"
+)  # 浮动 CD 法力无边，有效遏制频繁钓鱼
 
 __plugin_meta__ = PluginMetadata(
     name="更好的电子钓鱼",
     description="赛博钓鱼……但是加强版本",
-    usage=f"""▶ 查询 [物品]：查询某个物品的信息
+    usage=f"""▶ 钓鱼帮助：打印本信息
+▶ 查询 [物品]：查询某个物品的信息
 ▶ 钓鱼 [鱼竿] [鱼饵]：
-  ▷ 有 {config.fishing_limit}s 的冷却
-  ▷ {config.no_fish_probability} 概率空军，{config.special_fish_probability} 概率掉到特殊鱼
+  ▷ 钓鱼后有 {cool_down} 的冷却，频繁钓鱼会触怒河神
+  ▷ {config.no_fish_probability} 概率空军，{config.special_fish_probability} 概率钓到特殊鱼
   ▷ 加参数可以使用鱼饵或鱼竿，同类物品同时只能使用一种 
-  ▷ 频繁钓鱼会触怒河神
-▶ 出售 <物品> <数量>：出售物品获得{fishing_coin_name}
-  ▷ 如果卖不出去，尝试用英文双引号框住鱼名
-▶ 购买 <物品> <份数>：购买渔具店的物品
+▶ 出售 [-i] [-s] <物品或序号> [数量]：出售物品获得{fishing_coin_name}
+  ▷ -i 按照序号卖鱼 -s 卖特殊鱼
+▶ 购买 <物品> [份数]：购买物品
 ▶ 放生 <鱼名>：给一条鱼取名并放生
   ▷ 不要放生奇怪名字的鱼
 ▶ 商店：看看渔具店都有些啥
-▶ 祈愿：向神祈愿，随机获取/损失{fishing_coin_name}
+▶ 祈愿：向神祈愿{fishing_coin_name}
 ▶ 背包：查看背包中的{fishing_coin_name}与物品
 ▶ 成就：查看拥有的成就
 ▶ 钓鱼排行榜：查看{fishing_coin_name}排行榜
 """,
     type="application",
-    homepage="https://github.com/FDCraft/nonebot-plugin-fishing2",
+    homepage="https://github.com/GLDYM/nonebot-plugin-fishing2",
     config=Config,
     supported_adapters={"~onebot.v11"},
-    extra={"author": "Polaris_Light", "version": "0.0.4", "priority": 5},
+    extra={"author": "Polaris_Light", "version": "0.1.1", "priority": 5},
 )
 
 
@@ -87,18 +94,36 @@ sell = on_command("sell", aliases={"卖鱼", "出售", "售卖"}, force_whitespa
 free_fish_cmd = on_command("free_fish", aliases={"放生", "钓鱼放生"}, force_whitespace=True, priority=5)
 lottery_cmd = on_command("lottery", aliases={"祈愿"}, force_whitespace=True, priority=5)
 achievement_cmd = on_command("achievement", aliases={"成就", "钓鱼成就"}, force_whitespace=True, priority=5)
-give_cmd = on_command("give", aliases={"赐予"}, force_whitespace=True, priority=5)
 board_cmd = on_command("board", aliases={"排行榜", "钓鱼排行榜"}, force_whitespace=True, priority=5)
 
 # hidden cmd
+give_cmd = on_command("give", aliases={"赐予"}, force_whitespace=True, priority=5)
 predict_cmd = on_command("predict", aliases={"钓鱼预测"}, force_whitespace=True, priority=5)
 pool_cmd = on_command("pool", aliases={"鱼池"}, force_whitespace=True, priority=5)
+remove_cmd = on_command("remove", aliases={"捞鱼"}, force_whitespace=True, priority=5)
 # fmt:on
 
 
 @fishing_help.handle()
-async def _():
-    await fishing_help.finish(__plugin_meta__.usage)
+async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+    user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+
+    if not is_superuser and not is_self:
+        await fishing_help.finish(__plugin_meta__.usage)
+    else:
+        messages: list[MessageSegment] = []
+        messages.append(MessageSegment.text(__plugin_meta__.usage))
+        message2 = """以下为管理员命令：
+▶ 背包 [QQ或at]：让我看看
+▶ 赐予 [-i] [-s] <QQ或at> <物品或序号> [数量]：神秘力量
+▶ 钓鱼预测 [鱼竿] [鱼饵]：预测钓鱼
+▶ 鱼池 [鱼名长度最大值] [单页长度最大值]：查看所有特殊鱼
+▶ 捞鱼 [-i] <物品或序号>：捞出鱼池内特殊鱼
+"""
+        messages.append(MessageSegment.text(message2))
+        await forward_send(bot, event, messages)
 
 
 @shop.handle()
@@ -127,19 +152,26 @@ async def _(
         )
     elif arg not in fish_list:
         await fishing_lookup.finish(MessageSegment.at(user_id) + " 查无此鱼。")
-    await forward_send(bot, event, get_fish_by_name(arg).print_info())
+
+    messages = get_fish_by_name(arg).print_info()
+    await forward_send(bot, event, messages)
     return None
 
 
 @fishing.handle()
-async def _(bot: Bot, event: Event, matcher: Matcher, arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    matcher: Matcher,
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
     if user_id in block_user_list:
         await fishing.finish()
 
     tools = shlex.split((arg.extract_plain_text()))[:2]
 
-    logger.debug(f"Fishing: {user_id} try to use {tools}")
+    logger.info(f"Fishing: {user_id} try to use {tools}")
 
     check_result = await check_tools(user_id, tools)
     if check_result:
@@ -160,6 +192,7 @@ async def _(bot: Bot, event: Event, matcher: Matcher, arg: Message = CommandArg(
             for achievement in achievements:
                 await fishing.send(achievement)
     except Exception as e:
+        result = "河神睡着了……"
         logger.error(e)
     finally:
         block_user_list.remove(user_id)
@@ -192,46 +225,85 @@ async def _(
 
 
 @pool_cmd.handle()
-async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
     is_superuser = str(user_id) in bot.config.superusers
     is_self = event.self_id == user_id
     if not is_superuser and not is_self:
         return None
 
-    message: list[MessageSegment] = []
-    pool = await get_all_special_fish()
-    message.append(MessageSegment.text(f"现在鱼池里面有 {len(pool)} 条鱼。"))
+    args = shlex.split(arg.extract_plain_text())
 
-    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}"
-            message.append(MessageSegment.text(msg))
-            msg = ""
-        else:
-            msg += f"{fish} x {num}\n"
-    else:
-        message.append(MessageSegment.text(msg))
+    match len(args):
+        case 0:
+            messages = await get_pool()
+        case 1:
+            if not args[0].isdigit():
+                await pool_cmd.finish(MessageSegment.text("你完全不看帮助是吗 ￣へ￣"))
+            messages = await get_pool(int(args[0]))
+        case 2:
+            if not args[0].isdigit() or not args[1].isdigit():
+                await pool_cmd.finish(MessageSegment.text("你完全不看帮助是吗 ￣へ￣"))
+            messages = await get_pool(int(args[0]), int(args[1]))
 
-    await forward_send(bot, event, message)
+    await forward_send(bot, event, messages)
     return None
 
 
+@remove_cmd.handle()
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
+    user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+    if not is_superuser and not is_self:
+        return None
+
+    args = shlex.split(arg.extract_plain_text())
+    as_index = False
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+
+    name_or_index = args[0]
+    result = await remove_special_fish(name_or_index, as_index)
+    await remove_cmd.finish(result)
+
+
 @backpack.handle()
-async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     user_id = event.get_user_id()
+    is_superuser = str(user_id) in bot.config.superusers
+    is_self = event.self_id == user_id
+    if not is_superuser and not is_self:
+        user_id = user_id
+    else:
+        args = shlex.split(arg.extract_plain_text())
+        target = await get_at(event)
+        if target:
+            args.insert(0, target)
+        if len(args) >= 1:
+            user_id = args[0]
+        else:
+            user_id = user_id
+
     if not config.backpack_forward:
         await backpack.finish(
-            MessageSegment.at(user_id)
-            + " \n"
+            (MessageSegment.at(user_id) + " \n")
+            if isinstance(event, GroupMessageEvent)
+            else ""
             + await get_stats(user_id)
             + "\n"
             + await get_balance(user_id)
@@ -239,17 +311,20 @@ async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
             + "\n\n".join(await get_backpack(user_id))
         )
     else:
-        message: list[MessageSegment] = []
-        message.append(MessageSegment.at(user_id))
-        message.append(await get_stats(user_id))
-        message.append(await get_balance(user_id))
+        messages: list[MessageSegment] = []
+        if isinstance(event, GroupMessageEvent):
+            messages.append(MessageSegment.at(user_id))
+        messages.append(await get_stats(user_id))
+        messages.append(await get_balance(user_id))
         backpacks = await get_backpack(user_id)
-        message += [MessageSegment.text(msg) for msg in backpacks]
-        await forward_send(bot, event, message)
+        messages += [MessageSegment.text(msg) for msg in backpacks]
+        await forward_send(bot, event, messages)
 
 
 @buy.handle()
-async def _(event: Event, arg: Message = CommandArg()):
+async def _(
+    event: Union[GroupMessageEvent, PrivateMessageEvent], arg: Message = CommandArg()
+):
     args = arg.extract_plain_text().split(" ")
     args = [x for x in args if x != ""]
 
@@ -274,36 +349,62 @@ async def _(event: Event, arg: Message = CommandArg()):
 
 
 @sell.handle()
-async def _(event: Event, arg: Message = CommandArg()):
+async def _(
+    event: Union[GroupMessageEvent, PrivateMessageEvent], arg: Message = CommandArg()
+):
     args = shlex.split(arg.extract_plain_text())
-
     user_id = event.get_user_id()
+    as_index = False
+    as_special = False
+
+    logger.info(f"Sell: {user_id} sells :{args}")
+
     if args == []:
         await sell.finish(
             MessageSegment.at(user_id)
             + " "
             + "请输入要卖出的鱼的名字和数量 (数量为1时可省略), 如 /卖鱼 小鱼 1"
         )
+
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+        if arg in ["-s", "--spec", "--special"]:
+            as_special = True
+            args.remove(arg)
+
     if len(args) == 1:
-        fish_name = args[0]
-        await sell.finish(
-            MessageSegment.at(user_id) + " " + await sell_fish(user_id, fish_name)
-        )
+        name_or_index = args[0]
+        fish_quantity = 1
     else:
-        fish_name, fish_quantity = args[0], args[1]
-        result = await sell_fish(user_id, fish_name, int(fish_quantity))
-        await sell.finish(MessageSegment.at(user_id) + " " + result)
+        name_or_index, fish_quantity = args[0], args[1]
+
+    result = await sell_fish(
+        user_id, name_or_index, int(fish_quantity), as_index, as_special
+    )
+    await sell.finish(MessageSegment.at(user_id) + " " + result)
 
 
 @free_fish_cmd.handle()
-async def _(bot: Bot, event: Event, arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    arg: Message = CommandArg(),
+):
     if not config.special_fish_enabled:
         await free_fish_cmd.finish("未开启此功能, 请联系机器人管理员")
 
     fish_name = arg.extract_plain_text()
     user_id = event.get_user_id()
 
-    if '"' in fish_name:
+    if (
+        "\u200b" in fish_name
+        or "\u200c" in fish_name
+        or "\u200d" in fish_name
+        or "\u2060" in fish_name
+        or "\ufeff" in fish_name
+    ):  # TODO: 检测特殊字符
         if isinstance(event, GroupMessageEvent):
             group_id = event.group_id
             await bot.set_group_ban(group_id=group_id, user_id=user_id, duration=1800)
@@ -321,13 +422,15 @@ async def _(bot: Bot, event: Event, arg: Message = CommandArg()):
 
 
 @lottery_cmd.handle()
-async def _(bot: Bot, event: Event, matcher: Matcher):
+async def _(
+    bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent], matcher: Matcher
+):
     user_id = event.get_user_id()
     try:
         await punish(bot, event, matcher, user_id)
         result = await lottery(user_id)
     except:
-        pass
+        result = "河神睡着了……"
     finally:
         punish_user_dict.pop(user_id, None)
     await lottery_cmd.finish(MessageSegment.at(user_id) + " " + result)
@@ -352,17 +455,27 @@ async def _(
     if not is_superuser and not is_self:
         return None
 
-    target = await get_at(event)
     args = shlex.split(arg.extract_plain_text())
+
+    for arg in copy.deepcopy(args):
+        if arg in ["-i", "--index"]:
+            as_index = True
+            args.remove(arg)
+        if arg in ["-s", "--spec", "--special"]:
+            as_special = True
+            args.remove(arg)
+
+    target = await get_at(event)
     if target:
         args.insert(0, target)
+
     if len(args) < 2 or len(args) > 3:
         await give_cmd.finish(
             "请输入用户的 id 和鱼的名字和数量 (数量为1时可省略), 如 /give 114514 开发鱼 1"
         )
     else:
         quantity = int(args[2]) if len(args) == 3 else 1
-        result = await give(args[0], args[1], quantity)
+        result = await give(args[0], args[1], quantity, as_index, as_special)
         achievements = await check_achievement(args[0])
         if achievements is not None:
             for achievement in achievements:
@@ -397,7 +510,12 @@ async def _(bot: Bot, event: Union[GroupMessageEvent, PrivateMessageEvent]):
     await board_cmd.finish(msg)
 
 
-async def punish(bot: Bot, event: Event, matcher: Matcher, user_id: int):
+async def punish(
+    bot: Bot,
+    event: Union[GroupMessageEvent, PrivateMessageEvent],
+    matcher: Matcher,
+    user_id: int,
+):
     global punish_user_dict
 
     if not await can_fishing(user_id):

nonebot_plugin_fishing2/config.py

@@ -1,12 +1,8 @@
 from pydantic import BaseModel
 from typing import List, Dict
 
-try:
-    # pydantic v2
-    from nonebot import get_plugin_config
-except ImportError:
-    # pydantic v1
-    from nonebot import get_driver
+from nonebot import get_plugin_config
+
 
 # fmt:off
 class Config(BaseModel):
@@ -126,7 +122,7 @@ class Config(BaseModel):
         {
             "type": "item",
             "name": "钛金鱼竿",
-            "price": 20,
+            "price": 40,
             "amount": 20,
             "props": [
                 {
@@ -141,12 +137,13 @@ class Config(BaseModel):
             "description": "更坚韧的鱼竿，显著提升钓上大鱼的概率。",
             "can_catch": False,
             "can_buy": True,
+            "buy_price": 40,
             "can_sell": False
         },
         {
             "type": "item",
             "name": "附魔鱼竿",
-            "price": 35,
+            "price": 20,
             "amount": 20,
             "props": [
                 {
@@ -157,7 +154,7 @@ class Config(BaseModel):
             "description": "附魔的鱼竿，大幅减少钓上垃圾的概率。",
             "can_catch": True,
             "sleep_time": 30,
-            "weight": 100,
+            "weight": 40,
             "can_buy": False,
             "can_sell": False
         },
@@ -211,7 +208,7 @@ class Config(BaseModel):
                     "value": -1
                 }
             ],
-            "description": "必定钓到特殊鱼。这是个管理员物品",
+            "description": "必定钓到特殊鱼。",
             "can_catch": False,
             "can_buy": False,
             "can_sell": False
@@ -277,7 +274,9 @@ class Config(BaseModel):
 
     fishing_coin_name: str = "绿宝石"  # 货币名称
     
-    fishing_limit: int = 60 # 每次钓鱼后，限制钓鱼的秒数
+    fishing_cooldown_time_min: int = 60 # 钓鱼冷却下限，单位为秒
+    
+    fishing_cooldown_time_max: int = 90 # 钓鱼冷却上限
     
     punish_limit: int = 3 # 短时间多次钓鱼后，禁言所需次数，防止刷屏
 
@@ -298,9 +297,5 @@ class Config(BaseModel):
     backpack_forward: bool = True # 背包是否使用聊天记录
 # fmt:on
 
-try:
-    # pydantic v2
-    config = get_plugin_config(Config)
-except:
-    # pydantic v1
-    config = Config.parse_obj(get_driver().config)
+config = get_plugin_config(Config)
+

nonebot_plugin_fishing2/data_source.py

@@ -4,7 +4,7 @@ import random
 import time
 import json
 
-from typing import Union
+from collections.abc import Hashable
 from sqlalchemy import select, update, delete
 from sqlalchemy.sql.expression import func
 from nonebot.adapters.onebot.v11 import MessageSegment
@@ -15,6 +15,23 @@ from .model import FishingRecord, SpecialFishes
 from .fish_helper import *
 
 
+def get_key_by_index(
+    dict: dict, index: int, default: Hashable | None = None
+) -> Hashable | None:
+    """Utils: get the key of OrderedDict by index.
+
+    Args:
+        dict (dict)
+        index (int)
+        default (Hashable | None, optional): default value. Defaults to None.
+
+    Returns:
+        Hashable | None: a key of dict.
+    """
+    key_list = list(dict.keys())
+    return key_list[index] if index < len(key_list) else default
+
+
 async def can_fishing(user_id: str) -> bool:
     time_now = int(time.time())
     session = get_session()
@@ -227,15 +244,6 @@ async def random_get_a_special_fish() -> str:
         return data.fish
 
 
-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 check_achievement(user_id: str) -> str | None:
     session = get_session()
     async with session.begin():
@@ -309,7 +317,9 @@ async def save_achievement(user_id: str, achievement_name: str):
 
 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():
@@ -327,7 +337,7 @@ async def save_fish(user_id: str, fish_name: str) -> None:
                 update(FishingRecord)
                 .where(FishingRecord.user_id == user_id)
                 .values(
-                    time=time_now + fishing_limit,
+                    time=time_now + fishing_cooldown,
                     frequency=new_frequency,
                     fishes=dump_fishes,
                 )
@@ -339,7 +349,7 @@ async def save_fish(user_id: str, fish_name: str) -> None:
         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="{}",
@@ -352,7 +362,9 @@ async def save_fish(user_id: str, fish_name: str) -> None:
 
 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)
@@ -368,7 +380,7 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
                 update(FishingRecord)
                 .where(FishingRecord.user_id == user_id)
                 .values(
-                    time=time_now + fishing_limit,
+                    time=time_now + fishing_cooldown,
                     frequency=record.frequency + 1,
                     special_fishes=dump_fishes,
                 )
@@ -379,7 +391,7 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
             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,
@@ -400,17 +412,44 @@ async def save_special_fish(user_id: str, fish_name: str) -> None:
         await session.commit()
 
 
-async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
+async def sell_fish(
+    user_id: str,
+    name_or_index: str,
+    quantity: int = 1,
+    as_index: bool = False,
+    as_special: bool = False,
+) -> str:
     if quantity <= 0:
         return "你在卖什么 w(ﾟДﾟ)w"
+
     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 := fishes_record:
             loads_fishes = json.loads(fishes_record.fishes)
+            loads_fishes = {
+                key: loads_fishes[key] for key in fish_list if key in loads_fishes
+            }
+
             spec_fishes = json.loads(fishes_record.special_fishes)
-            if fish_name in loads_fishes and loads_fishes[fish_name] > 0:
+            spec_fishes = dict(sorted(spec_fishes.items()))
+
+            if as_index:
+                if not name_or_index.isdigit():
+                    return "你完全不看帮助是吗 ￣へ￣"
+                load_dict = loads_fishes if not as_special else spec_fishes
+                fish_name = get_key_by_index(load_dict, int(name_or_index))
+                if not fish_name:
+                    return "查无此鱼"
+            else:
+                fish_name = name_or_index
+
+            if (
+                not as_special
+                and fish_name in loads_fishes
+                and loads_fishes[fish_name] > 0
+            ):
                 if fish_name not in can_sell_fishes:
                     return f"这个 {fish_name} 不可以卖哦~"
                 if loads_fishes[fish_name] < quantity:
@@ -430,6 +469,7 @@ async def sell_fish(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 )
                 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}"
@@ -549,7 +589,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)
@@ -561,7 +603,7 @@ async def lottery(user_id: str) -> str:
                     update(FishingRecord)
                     .where(FishingRecord.user_id == user_id)
                     .values(
-                        time=time_now + fishing_limit,
+                        time=time_now + fishing_cooldown,
                         coin=fishes_record.coin + new_coin,
                     )
                 )
@@ -576,7 +618,7 @@ async def lottery(user_id: str) -> str:
                 update(FishingRecord)
                 .where(FishingRecord.user_id == user_id)
                 .values(
-                    time=time_now + fishing_limit,
+                    time=time_now + fishing_cooldown,
                     coin=fishes_record.coin + new_coin,
                 )
             )
@@ -587,13 +629,20 @@ async def lottery(user_id: str) -> str:
             return "河神没有回应你……"
 
 
-async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
+async def give(
+    user_id: str,
+    name_or_index: str,
+    quantity: int = 1,
+    as_index: bool = False,
+    as_special: bool = False,
+) -> str:
     session = get_session()
     async with session.begin():
         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:
+
+            if name_or_index == "coin" or name_or_index == fishing_coin_name:
                 user_update = (
                     update(FishingRecord)
                     .where(FishingRecord.user_id == user_id)
@@ -604,13 +653,27 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 await session.execute(user_update)
                 await session.commit()
                 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:
+
+            if as_index:
+                if not name_or_index.isdigit():
+                    return "你完全不看帮助是吗 ￣へ￣"
+                load_dict = loads_fishes if not as_special else spec_fishes
+                fish_name = get_key_by_index(load_dict, int(name_or_index))
+                if not fish_name:
+                    return "查无此鱼，你再看看这人背包呢？"
+            else:
+                fish_name = name_or_index
+
+            if not as_special and fish_name in fish_list:
                 try:
                     loads_fishes[fish_name] += quantity
                 except KeyError:
                     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)
@@ -624,6 +687,8 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                     spec_fishes[fish_name] += quantity
                 except KeyError:
                     spec_fishes[fish_name] = quantity
+                if spec_fishes[fish_name] <= 0:
+                    del spec_fishes[fish_name]
                 dump_fishes = json.dumps(spec_fishes)
                 user_update = (
                     update(FishingRecord)
@@ -632,12 +697,97 @@ async def give(user_id: str, fish_name: str, quantity: int = 1) -> str:
                 )
                 await session.execute(user_update)
                 await session.commit()
+            
+            fish_name = (
+                fish_name[:20] + "..." + str(len(fish_name) - 20)
+                if len(fish_name) > 20
+                else fish_name
+            )
             return (
-                f"使用滥权之力成功将 {fish_name} 添加到 {user_id} 的背包之中 ヾ(≧▽≦*)o"
+                f"使用滥权之力成功为 {user_id} {"增加" if quantity >= 0 else "减少"} {abs(quantity)} 条 {fish_name} ヾ(≧▽≦*)o"
             )
         return "未查找到用户信息, 无法执行滥权操作 w(ﾟДﾟ)w"
 
 
+async def get_all_special_fish() -> dict[str, int]:
+    session = get_session()
+    async with session.begin():
+        random_select = select(SpecialFishes.fish).order_by(SpecialFishes.fish.asc())
+        data = await session.scalars(random_select)
+        pool = data.all()
+
+    result = dict()
+    for fish in pool:
+        try:
+            result[fish] += 1
+        except KeyError:
+            result[fish] = 1
+
+    return result
+
+
+async def remove_special_fish(name_or_index: str, as_index: bool = False) -> str | None:
+    pool = await get_all_special_fish()
+
+    if as_index:
+        if not name_or_index.isdigit():
+            return "你完全不看帮助是吗 ￣へ￣"
+        fish_name = get_key_by_index(pool, int(name_or_index))
+        if not fish_name:
+            return "查无此鱼"
+    else:
+        fish_name = name_or_index
+        if fish_name not in pool:
+            return "查无此鱼"
+
+    session = get_session()
+    async with session.begin():
+        delete_fishes = delete(SpecialFishes).where(SpecialFishes.fish == fish_name)
+        await session.execute(delete_fishes)
+        await session.commit()
+        
+    fish_name = (
+        fish_name[:20] + "..." + str(len(fish_name) - 20)
+        if len(fish_name) > 20
+        else fish_name
+    )
+
+    return f"已成功捞出 {fish_name}"
+
+
+async def get_pool(name_limit: int = 30, page_limit: int = 200) -> list[MessageSegment]:
+    messages: list[MessageSegment] = []
+    pool = await get_all_special_fish()
+    messages.append(
+        MessageSegment.text(f"现在鱼池里面有 {sum(list(pool.values()))} 条鱼。")
+    )
+
+    msg = "鱼池列表：\n"
+    i = 0
+    j = 1
+    for fish, num in pool.items():
+        if len(msg) > page_limit:
+            fish = (
+                fish[:name_limit] + "..." + str(len(fish) - name_limit)
+                if len(fish) > name_limit
+                else fish
+            )
+            msg += f"{i}. {fish} x {num}\n"
+            msg += f"【第 {j} 页结束】"
+            messages.append(MessageSegment.text(msg))
+            msg = ""
+            i += 1
+            j += 1
+        else:
+            fish = fish[:name_limit] + "..." if len(fish) > name_limit else fish
+            msg += f"{i}. {fish} x {num}\n"
+            i += 1
+    else:
+        messages.append(MessageSegment.text(msg))
+
+    return messages
+
+
 async def get_stats(user_id: str) -> str:
     session = get_session()
     async with session.begin():
@@ -664,33 +814,35 @@ async def get_backpack(user_id: str) -> list[str]:
         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
+            loads_fishes = json.loads(fishes_record.fishes)
+            loads_fishes = {
+                key: loads_fishes[key] for key in fish_list if key in loads_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)
+            spec_fishes: dict = json.loads(fishes_record.special_fishes)
+            if spec_fishes:
+                spec_fishes = dict(sorted(spec_fishes.items()))
+                return print_backpack(loads_fishes, spec_fishes)
             return (
                 ["🎒你的背包里空无一物"]
-                if sorted_fishes == {}
-                else print_backpack(sorted_fishes)
+                if loads_fishes == {}
+                else print_backpack(loads_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()
-    ]
+def print_backpack(backpack: dict, special_backpack: dict = None) -> list[str]:
+    i = 0
+    result = []
+    for fish_name, quantity in backpack.items():
+        result.append(f"{i}. {fish_name}×{str(quantity)}")
+        i += 1
+
     if special_backpack:
-        special_result = [
-            f"{fish_name}×{str(quantity)}"
-            for fish_name, quantity in special_backpack.items()
-        ]
+        i = 0
+        special_result: list[str] = []
+        for fish_name, quantity in special_backpack.items():
+            special_result.append(f"{i}. {fish_name}×{str(quantity)}")
+            i += 1
         return [
             "🎒普通鱼:\n" + "\n".join(result),
             "🎒特殊鱼:\n" + "\n".join(special_result),

{nonebot_plugin_fishing2-0.0.4.dist-info → nonebot_plugin_fishing2-0.1.1.dist-info}/METADATA

@@ -1,168 +1,165 @@
-Metadata-Version: 2.4
-Name: nonebot-plugin-fishing2
-Version: 0.0.4
-Summary: 更好的电子钓鱼
-Author-email: ALittleBot <160833462+C14H22O@users.noreply.github.com>, Polaris_Light <995905922@qq.com>
-License-Expression: MIT
-Project-URL: Homepage, https://github.com/FDCraft/nonebot-plugin-fishing2
-Keywords: fishing
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: nonebot2>=2.2.1
-Requires-Dist: nonebot-adapter-onebot>=2.0.0-beta.1
-Requires-Dist: pydantic>=1.10
-Requires-Dist: nonebot-plugin-localstore>=0.6.0
-Requires-Dist: sqlalchemy>=2.0.27
-Requires-Dist: aiosqlite>=0.20.0
-Requires-Dist: nonebot-plugin-orm>=0.7.1
-Dynamic: license-file
-
-<div align="center">
-  <a href="https://v2.nonebot.dev/store"><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/nbp_logo.png" width="180" height="180" alt="NoneBotPluginLogo"></a>
-  <br>
-  <p><img src="https://github.com/A-kirami/nonebot-plugin-template/blob/resources/NoneBotPlugin.svg" width="240" alt="NoneBotPluginText"></p>
-</div>
-
-<div align="center">
-
-# nonebot-plugin-fishing2
-
-_✨ 更好的电子钓鱼 ✨_
-
-<a href="./LICENSE">
-    <img src="https://img.shields.io/github/license/FDCraft/nonebot-plugin-fishing2.svg" alt="license">
-</a>
-<a href="https://pypi.python.org/pypi/nonebot-plugin-fishing2">
-    <img src="https://img.shields.io/pypi/v/nonebot-plugin-fishing2.svg" alt="pypi">
-</a>
-<img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
-
-</div>
-
-## 💿 安装
-
-<details open>
-<summary>使用 nb-cli 安装</summary>
-在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
-
-    nb plugin install nonebot-plugin-fishing2
-
-</details>
-
-<details>
-<summary>使用包管理器安装</summary>
-在 nonebot2 项目的插件目录下, 打开命令行, 根据你使用的包管理器, 输入相应的安装命令
-
-<details>
-<summary>pip</summary>
-
-    pip install nonebot-plugin-fishing2
-</details>
-<details>
-<summary>pdm</summary>
-
-    pdm add nonebot-plugin-fishing2
-</details>
-<details>
-<summary>poetry</summary>
-
-    poetry add nonebot-plugin-fishing2
-</details>
-<details>
-<summary>conda</summary>
-
-    conda install nonebot-plugin-fishing2
-</details>
-
-打开 nonebot2 项目根目录下的 `pyproject.toml` 文件, 在 `[tool.nonebot]` 部分追加写入
-
-    plugins = ["nonebot_plugin_fishing2"]
-
-</details>
-
-注意：安装过后，需在控制台输入 `nb orm upgrade` 指令以初始化数据库。本插件数据库与 [Nonebot-plugin-fishing](https://github.com/ALittleBot/nonebot-plugin-fishing) 通用，可以互换。
-
-## ⚙️ 配置
-
-在 nonebot2 项目的`.env`文件中添加下表中的配置
-
-| 配置项                   | 必填 | 说明                                                           |
-|:------------------------:|:----:|:--------------------------------------------------------------:|
-| fishes                   | 否   | 配置鱼塘内的普通鱼（大概是鱼……）                               |
-| fishing_achievement      | 否   | 配置钓鱼成就                                                   |
-| fishing_coin_name        | 否   | 填入卖鱼获取的货币名称                                         |
-| fishing_limit            | 否   | 填入每次钓鱼后，限制钓鱼的秒数                                 |
-| punish_limit             | 否   | 短时间多次钓鱼后，禁言所需次数，防止刷屏                       |
-| special_fish_enabled     | 否   | 是否启用赛博放生 & 特殊鱼（默认为否）                          |
-| special_fish_price       | 否   | 特殊鱼出售的价格                                               |
-| special_fish_free_price  | 否   | 特殊鱼放生的价格                                               |
-| special_fish_probability | 否   | 钓上特殊鱼的概率，注意这个判定在空军判定之后                   |
-| no_fish_probability      | 否   | 空军的概率                                                     |
-| rare_fish_weight         | 否   | 稀有鱼权重分界线，影响 rare_fish 属性与 normal_fish 属性的区分 |
-| buy_rate                 | 否   | 在不指定 buy_price 时，购买价格/基准价格比，应大于 1           |
-| backpack_forward         | 否   | 背包是否使用聊天记录                                           |
-
-其中 `fishes` 配置项说明如下。预设配置经过了计算以平衡，如果需要自行填表，请使用“钓鱼预测”命令进行预测。
-
-```dotenv
-FISHES='
-    [
-        {
-            "type": "fish", # 类型，必填，可用值：fish, item，同类型物品不能同时作为鱼饵
-            "name": "小鱼", # 名称，必填
-            "price": 15, # 基准价格，必填
-            "amount": 1, # 单份数量，模拟耐久
-            "props": [ # 属性，选填，作为鱼饵时改变
-                {
-                    "type": "rm_fish", # 可用值: rare_fish, normal_fish, fish, rm_fish, special_fish, no_fish
-                    "key": "小鱼", # 如果为 fish 或 rm_fish，需要填写鱼名
-                    "value": 0 # 如果为 rare_fish, normal_fish, fish，填写权重；如果为 special_fish, no_fish，填写概率
-                }
-            ],
-            "description": "一条小鱼。把它当做鱼饵可以防止钓到小鱼。", # 描述，必填
-            "can_catch": True, # 是否可以抓取，必填
-            "sleep_time": 2, # 钓上来需要的时间，默认 60
-            "weight": 1000, # 权重
-            "can_buy": True, # 是否可以购买，必填
-            "buy_price": 50, # 购买价格
-            "can_sell": True # 是否可以出售，必填
-        },
-    ]
-'
-```
-
-## 🔨 更新
-
-每一次更新后，需执行 `nb orm upgrade`。
-
-## 🎉 使用
-
-### 指令表
-
-在群聊或私聊发送“钓鱼帮助”查看本插件的帮助，或者使用[NoneBot-Plugin-PicMenu-Next](https://github.com/lgc-NB2Dev/nonebot-plugin-picmenu-next)等帮助插件查看。
-
-### 管理员指令表
-
-| 指令     | 范围 | 说明                                           |
-|:--------:|:----:|:----------------------------------------------:|
-| 钓鱼预测 | 所有 | 对钓鱼进行模拟，查看各鱼的概率与期望，便于填表 |
-| 鱼池     | 所有 | 查看数据库里面的所有特殊鱼                     |
-
-### 赛博放生
-
-当用户使用货币放生由自己取名的一条鱼后，每个用户在钓鱼时都有机会钓到那一条鱼。但此功能开关 `special_fish_enabled` 默认关闭，原因是用户生成内容如果不符合规范，可能导致出现不可预料的情况，请谨慎开启。
-
-## 📝 Todo
-
-- [x] 重写数据库逻辑（改为使用 [nonebot/plugin-orm](https://github.com/nonebot/plugin-orm)）
-- [x] 增加系统商店，卖出钓到的鱼
-- [x] 赛博放生 [#4](https://github.com/C14H22O/nonebot-plugin-fishing/issues/4) （已基本完成）
-- [ ] ~~使用 [nonebot_plugin_chikari_economy](https://github.com/mrqx0195/nonebot_plugin_chikari_economy) 经济系统~~ 
-- [x] 为鱼竿增加耐久度，耐久度为0时需重新购买鱼竿
-- [x] 为钓鱼背包添加排序
-- [x] 添加成就系统
-- [x] 买装备！
-- [ ] 支持卖与普通鱼同名的特殊鱼
-- [ ] 管理员命令：捞鱼
-- [ ] 屏蔽词库
+Metadata-Version: 2.3
+Name: nonebot-plugin-fishing2
+Version: 0.1.1
+Summary: 更好的电子钓鱼
+License: MIT
+Keywords: fishing
+Author: ALittleBot
+Author-email: 160833462+C14H22O@users.noreply.github.com
+Requires-Python: >=3.8
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: nonebot-adapter-onebot (>=2.0.0-beta.1)
+Requires-Dist: nonebot-plugin-localstore (>=0.6.0)
+Requires-Dist: nonebot-plugin-orm (>=0.7.1)
+Requires-Dist: nonebot2 (>=2.2.1)
+Requires-Dist: pydantic (>=1.10)
+Requires-Dist: sqlalchemy (>=2.0.27)
+Project-URL: Homepage, https://github.com/GLDYM/nonebot-plugin-fishing2
+Description-Content-Type: text/markdown
+
+<div align="center">
+    <a href="https://v2.nonebot.dev/store">
+    <img src="https://raw.githubusercontent.com/fllesser/nonebot-plugin-template/refs/heads/resource/.docs/NoneBotPlugin.svg" width="310" alt="logo"></a>
+
+# nonebot-plugin-fishing2
+
+_✨ 更好的电子钓鱼 ✨_
+
+<a href="./LICENSE">
+    <img src="https://img.shields.io/github/license/FDCraft/nonebot-plugin-fishing2.svg" alt="license">
+</a>
+<a href="https://pypi.python.org/pypi/nonebot-plugin-fishing2">
+    <img src="https://img.shields.io/pypi/v/nonebot-plugin-fishing2.svg" alt="pypi">
+</a>
+<img src="https://img.shields.io/badge/python-3.8+-blue.svg" alt="python">
+
+</div>
+
+## 💿 安装
+
+<details open>
+<summary>使用 nb-cli 安装</summary>
+在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装
+
+    nb plugin install nonebot-plugin-fishing2
+
+</details>
+
+<details>
+<summary>使用包管理器安装</summary>
+在 nonebot2 项目的插件目录下, 打开命令行, 根据你使用的包管理器, 输入相应的安装命令
+
+<details>
+<summary>pip</summary>
+
+    pip install nonebot-plugin-fishing2
+</details>
+<details>
+<summary>pdm</summary>
+
+    pdm add nonebot-plugin-fishing2
+</details>
+<details>
+<summary>poetry</summary>
+
+    poetry add nonebot-plugin-fishing2
+</details>
+<details>
+<summary>conda</summary>
+
+    conda install nonebot-plugin-fishing2
+</details>
+
+打开 nonebot2 项目根目录下的 `pyproject.toml` 文件, 在 `[tool.nonebot]` 部分追加写入
+
+    plugins = ["nonebot_plugin_fishing2"]
+
+</details>
+
+注意：安装过后，需在控制台输入 `nb orm upgrade` 指令以初始化数据库。本插件数据库与 [Nonebot-plugin-fishing](https://github.com/ALittleBot/nonebot-plugin-fishing) 通用，可以互换。
+
+## ⚙️ 配置
+
+在 nonebot2 项目的`.env`文件中添加下表中的配置
+
+| 配置项                    | 必填 | 说明                                                           |
+|:-------------------------:|:----:|:--------------------------------------------------------------:|
+| fishes                    | 否   | 鱼塘内的普通鱼（大概是鱼……）                                   |
+| fishing_achievement       | 否   | 钓鱼成就                                                       |
+| fishing_coin_name         | 否   | 卖鱼获取的货币名称                                             |
+| fishing_cooldown_time_min | 否   | 钓鱼冷却下限，单位为秒                                         |
+| fishing_cooldown_time_max | 否   | 钓鱼冷却上限                                                   |
+| punish_limit              | 否   | 短时间多次钓鱼后，禁言所需次数，防止刷屏                       |
+| special_fish_enabled      | 否   | 是否启用赛博放生 & 特殊鱼（默认为否）                          |
+| special_fish_price        | 否   | 特殊鱼出售的价格                                               |
+| special_fish_free_price   | 否   | 特殊鱼放生的价格                                               |
+| special_fish_probability  | 否   | 钓上特殊鱼的概率，注意这个判定在空军判定之后                   |
+| no_fish_probability       | 否   | 空军的概率                                                     |
+| rare_fish_weight          | 否   | 稀有鱼权重分界线，影响 rare_fish 属性与 normal_fish 属性的区分 |
+| buy_rate                  | 否   | 在不指定 buy_price 时，购买价格/基准价格比，应大于 1           |
+| backpack_forward          | 否   | 背包是否使用聊天记录                                           |
+
+其中 `fishes` 配置项说明如下。预设配置经过了计算以平衡，如果需要自行填表，请使用“钓鱼预测”命令进行预测。
+
+```dotenv
+FISHES='
+    [
+        {
+            "type": "fish", # 类型，必填，可用值：fish, item，同类型物品不能同时作为鱼饵
+            "name": "小鱼", # 名称，必填
+            "price": 15, # 基准价格，必填
+            "amount": 1, # 单份数量，模拟耐久
+            "props": [ # 属性，选填，作为鱼饵时改变
+                {
+                    "type": "rm_fish", # 可用值: rare_fish, normal_fish, fish, rm_fish, special_fish, no_fish
+                    "key": "小鱼", # 如果为 fish 或 rm_fish，需要填写鱼名
+                    "value": 0 # 如果为 rare_fish, normal_fish, fish，填写权重；如果为 special_fish, no_fish，填写概率
+                }
+            ],
+            "description": "一条小鱼。把它当做鱼饵可以防止钓到小鱼。", # 描述，必填
+            "can_catch": True, # 是否可以抓取，必填
+            "sleep_time": 2, # 钓上来需要的时间，默认 60
+            "weight": 1000, # 权重
+            "can_buy": True, # 是否可以购买，必填
+            "buy_price": 50, # 购买价格
+            "can_sell": True # 是否可以出售，必填
+        },
+    ]
+'
+```
+
+## 🔨 更新
+
+每一次更新后，需执行 `nb orm upgrade`。
+
+## 🎉 使用
+
+### 指令表
+
+在群聊或私聊发送“钓鱼帮助”查看本插件的帮助，或者使用[NoneBot-Plugin-PicMenu-Next](https://github.com/lgc-NB2Dev/nonebot-plugin-picmenu-next)等帮助插件查看。管理员指令默认隐藏，只能由 SUPERUSER 发送“钓鱼帮助”查看。
+
+### 赛博放生
+
+当用户使用货币放生由自己取名的一条鱼后，每个用户在钓鱼时都有机会钓到那一条鱼。但此功能开关 `special_fish_enabled` 默认关闭，原因是用户生成内容如果不符合规范，可能导致出现不可预料的情况，请谨慎开启。
+
+## 📝 Todo
+
+- [x] 重写数据库逻辑（改为使用 [nonebot/plugin-orm](https://github.com/nonebot/plugin-orm)）
+- [x] 增加系统商店，卖出钓到的鱼
+- [x] 赛博放生 [#4](https://github.com/C14H22O/nonebot-plugin-fishing/issues/4) （已基本完成）
+- [ ] ~~使用 [nonebot_plugin_chikari_economy](https://github.com/mrqx0195/nonebot_plugin_chikari_economy) 经济系统~~ 
+- [x] 为鱼竿增加耐久度，耐久度为0时需重新购买鱼竿
+- [x] 为钓鱼背包添加排序
+- [x] 添加成就系统
+- [x] 买装备！
+- [x] 支持卖与普通鱼同名的特殊鱼
+- [x] 管理员命令：捞鱼
+- [ ] 屏蔽词库
+

{nonebot_plugin_fishing2-0.0.4.dist-info → nonebot_plugin_fishing2-0.1.1.dist-info}/RECORD

@@ -1,15 +1,14 @@
-nonebot_plugin_fishing2/__init__.py,sha256=69eM0yZaNrksVda9zWygA5JBr2gAua-mBugdLWVNHgg,16507
-nonebot_plugin_fishing2/config.py,sha256=FWrOFQXv-W7VAB8T0zN4Elm_fRycUpGua8Ee9ABPSG4,9882
-nonebot_plugin_fishing2/data_source.py,sha256=A1gWZFqBh1Exmmpy6RVXw9SvdPkWNcmdjCNaxbH-QGE,29791
+nonebot_plugin_fishing2/__init__.py,sha256=P-rLNXG2ZmdfzU7UXSwWrnh4jT8OI2fsm3LPy6COrh8,20200
+nonebot_plugin_fishing2/config.py,sha256=xYDdq9Rwce8vfg-M91lUd2TfZDQnToHlI77GdpLFp-U,9751
+nonebot_plugin_fishing2/data_source.py,sha256=fbIWF4nJ1GVQ17UCue_RcEPxi_2oRmByhkveAXI_6oU,34488
 nonebot_plugin_fishing2/fish_helper.py,sha256=Rf3SX4UcM0-E6apLUbHB40I4onK-8qPZmZrsVBMnZ3I,6054
-nonebot_plugin_fishing2/model.py,sha256=_DtmxiQhJDiIvY1XOMQZ0HA-ruWY0bexWX9frdhnk0Q,752
 nonebot_plugin_fishing2/migrations/68463f3e5f33_.py,sha256=WnaV5T1uCHvYWcnepHqV9kOurDYddFUvXXfA2Rtd5Ok,776
 nonebot_plugin_fishing2/migrations/7609e6d106dd_init_db.py,sha256=tpuIfsS6yPsnGIeMPo16exsEfYZ_urgYAqlCyQ8aw-Y,1386
 nonebot_plugin_fishing2/migrations/c5ab992c9af3_add_achievements.py,sha256=KVj9ADeP03zfW4ZBDmnghbWdxLor3u1yKeho0GaddCI,1119
 nonebot_plugin_fishing2/migrations/e9015df43907_add_special_fishes_field.py,sha256=R4p9vPD5lgg4vmY2KUgF2qIlraxhPYkL93lM5l7wMZw,1094
 nonebot_plugin_fishing2/migrations/f70bdeaec7a4_add_specialfishes_table.py,sha256=DUqv9MTaOSZCBj_9oT2eY3pmWeMnyH0cPj9GyYa5Sag,1194
-nonebot_plugin_fishing2-0.0.4.dist-info/licenses/LICENSE,sha256=n-2xoOXX434-tBisMKX2-_FycV2VrmIiTP1rZvuW_fY,1091
-nonebot_plugin_fishing2-0.0.4.dist-info/METADATA,sha256=eEqw2ELRV8AHohuC-eMe2YxM-5OZptummJKA4Ky9QD4,7541
-nonebot_plugin_fishing2-0.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nonebot_plugin_fishing2-0.0.4.dist-info/top_level.txt,sha256=nSgqw96Nh44l966KEYkw0rbdyEJyzi2V7jCZ1kCZIps,24
-nonebot_plugin_fishing2-0.0.4.dist-info/RECORD,,
+nonebot_plugin_fishing2/model.py,sha256=_DtmxiQhJDiIvY1XOMQZ0HA-ruWY0bexWX9frdhnk0Q,752
+nonebot_plugin_fishing2-0.1.1.dist-info/LICENSE,sha256=n-2xoOXX434-tBisMKX2-_FycV2VrmIiTP1rZvuW_fY,1091
+nonebot_plugin_fishing2-0.1.1.dist-info/METADATA,sha256=-sV5ctEfIgmreAt6aDgmEPA6GRUeskeBk4XEpeV2JQ4,7355
+nonebot_plugin_fishing2-0.1.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+nonebot_plugin_fishing2-0.1.1.dist-info/RECORD,,

{nonebot_plugin_fishing2-0.0.4.dist-info → nonebot_plugin_fishing2-0.1.1.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any
-

nonebot_plugin_fishing2-0.0.4.dist-info/top_level.txt

@@ -1 +0,0 @@
-nonebot_plugin_fishing2