forked from mttu-developers/konabot
全新骰子
This commit is contained in:
@ -1,11 +1,11 @@
|
||||
from typing import Optional
|
||||
from typing import Optional, Union
|
||||
from nonebot.adapters import Event as BaseEvent
|
||||
from nonebot.adapters.console.event import MessageEvent as ConsoleMessageEvent
|
||||
from nonebot.adapters.discord.event import MessageEvent as DiscordMessageEvent
|
||||
from nonebot_plugin_alconna import Alconna, Args, UniMessage, on_alconna
|
||||
|
||||
from konabot.plugins.roll_dice.roll_dice import generate_dice_image
|
||||
from konabot.plugins.roll_dice.roll_number import get_random_number, roll_number
|
||||
from konabot.plugins.roll_dice.roll_number import get_random_number, get_random_number_string, roll_number
|
||||
|
||||
evt = on_alconna(Alconna(
|
||||
"摇数字"
|
||||
@ -22,21 +22,26 @@ async def _(event: BaseEvent):
|
||||
|
||||
evt = on_alconna(Alconna(
|
||||
"摇骰子",
|
||||
Args["f1?", int]["f2?", int]
|
||||
Args["f1?", str]["f2?", str]
|
||||
), use_cmd_start=True, use_cmd_sep=False, skip_for_unmatch=True)
|
||||
|
||||
@evt.handle()
|
||||
async def _(event: BaseEvent, f1: Optional[int] = None, f2: Optional[int] = None):
|
||||
async def _(event: BaseEvent, f1: Optional[str] = None, f2: Optional[str] = None):
|
||||
# if isinstance(event, DiscordMessageEvent):
|
||||
# await evt.send(await UniMessage().text("```\n" + roll_dice() + "\n```").export())
|
||||
# elif isinstance(event, ConsoleMessageEvent):
|
||||
number = 0
|
||||
number = ""
|
||||
if(f1 is not None and f2 is not None):
|
||||
number = get_random_number(f1, f2)
|
||||
number = get_random_number_string(f1, f2)
|
||||
elif f1 is not None:
|
||||
number = get_random_number(1, f1)
|
||||
if(float(f1) > 1):
|
||||
number = get_random_number_string("1", f1)
|
||||
elif (float(f1) > 0):
|
||||
number = get_random_number_string("0", f1)
|
||||
else:
|
||||
number = get_random_number_string(f1, "0")
|
||||
else:
|
||||
number = get_random_number()
|
||||
number = get_random_number_string()
|
||||
await evt.send(await UniMessage().image(raw=await generate_dice_image(number)).export())
|
||||
# else:
|
||||
# await evt.send(await UniMessage().text(roll_dice(wide=True)).export())
|
||||
|
||||
Reference in New Issue
Block a user