update
This commit is contained in:
parent
c65b1b471c
commit
7350f5443a
4 changed files with 18 additions and 5 deletions
|
@ -16,6 +16,7 @@ from core.logger import Logger
|
||||||
from core.utils.cache import random_cache_path
|
from core.utils.cache import random_cache_path
|
||||||
from core.utils.http import get_url, download_to_cache
|
from core.utils.http import get_url, download_to_cache
|
||||||
from core.utils.text import remove_prefix
|
from core.utils.text import remove_prefix
|
||||||
|
from modules.core.su_utils import gained_petal
|
||||||
|
|
||||||
csr_link = 'https://www.chemspider.com' # ChemSpider 的链接
|
csr_link = 'https://www.chemspider.com' # ChemSpider 的链接
|
||||||
special_id = ["22398", "140526", "4509317", "4509318", "4510681", "4510778", "4512975", "4514248", "4514266", "4514293",
|
special_id = ["22398", "140526", "4509317", "4509318", "4510681", "4510778", "4512975", "4514248", "4514266", "4514293",
|
||||||
|
@ -222,7 +223,10 @@ async def chemical_code(msg: Bot.MessageSession, id=None, captcha_mode=False):
|
||||||
Logger.info(f'{wait_text} != {answer}') # 输出日志
|
Logger.info(f'{wait_text} != {answer}') # 输出日志
|
||||||
return await ans(wait, answer) # 进行下一轮检查
|
return await ans(wait, answer) # 进行下一轮检查
|
||||||
else:
|
else:
|
||||||
await wait.send_message(wait.locale.t('chemical_code.message.correct'))
|
send_ = wait.locale.t('chemical_code.message.correct')
|
||||||
|
if g_msg := gained_petal(wait, 1):
|
||||||
|
send_ += '\n' + g_msg
|
||||||
|
await wait.send_message(send_)
|
||||||
play_state[msg.target.target_id]['active'] = False # 将对象标记为非活跃状态
|
play_state[msg.target.target_id]['active'] = False # 将对象标记为非活跃状态
|
||||||
|
|
||||||
async def timer(start): # 计时器函数
|
async def timer(start): # 计时器函数
|
||||||
|
@ -247,7 +251,10 @@ async def chemical_code(msg: Bot.MessageSession, id=None, captcha_mode=False):
|
||||||
times=set_timeout))])
|
times=set_timeout))])
|
||||||
if play_state[msg.target.target_id]['active']: # 检查对象是否为活跃状态
|
if play_state[msg.target.target_id]['active']: # 检查对象是否为活跃状态
|
||||||
if result.as_display(text_only=True) == csr['name']:
|
if result.as_display(text_only=True) == csr['name']:
|
||||||
await result.send_message(msg.locale.t('chemical_code.message.correct'))
|
send_ = msg.locale.t('chemical_code.message.correct')
|
||||||
|
if g_msg := gained_petal(msg, 1):
|
||||||
|
send_ += '\n' + g_msg
|
||||||
|
await result.send_message(send_)
|
||||||
else:
|
else:
|
||||||
await result.send_message(
|
await result.send_message(
|
||||||
msg.locale.t('chemical_code.message.incorrect', answer=play_state[msg.target.target_id]["answer"]))
|
msg.locale.t('chemical_code.message.incorrect', answer=play_state[msg.target.target_id]["answer"]))
|
||||||
|
|
|
@ -103,6 +103,6 @@ async def _(msg: Bot.MessageSession):
|
||||||
qc = CoolDown('stone', msg)
|
qc = CoolDown('stone', msg)
|
||||||
c = qc.check(30)
|
c = qc.check(30)
|
||||||
if c != 0:
|
if c != 0:
|
||||||
await msg.finish(msg.locale.t('ask.message.cooldown', time=int(c)))
|
await msg.finish(msg.locale.t('stone.message.cooldown', time=int(c)))
|
||||||
qc.reset()
|
qc.reset()
|
||||||
await skip_stone(msg)
|
await skip_stone(msg)
|
||||||
|
|
|
@ -18,5 +18,6 @@
|
||||||
"coin.message.stand": "…\n…它立起来了!",
|
"coin.message.stand": "…\n…它立起来了!",
|
||||||
"coin.message.tail": "…\n…是反面!",
|
"coin.message.tail": "…\n…是反面!",
|
||||||
"stone.help.desc": "打水漂。",
|
"stone.help.desc": "打水漂。",
|
||||||
"stone.message.skip": "你扔了一块石头,漂了${count}下。"
|
"stone.message.skip": "你扔了一块石头,漂了${count}下。",
|
||||||
|
"stone.message.cooldown": "距离上次执行已过去 ${time} 秒,本命令的冷却时间为 30 秒。"
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@ from simpleeval import simple_eval
|
||||||
from core.builtins import Bot
|
from core.builtins import Bot
|
||||||
from core.component import module
|
from core.component import module
|
||||||
|
|
||||||
|
from modules.core.su_utils import gained_petal
|
||||||
|
|
||||||
no_solution = ['无解', '無解', 'none', 'n/a']
|
no_solution = ['无解', '無解', 'none', 'n/a']
|
||||||
|
|
||||||
|
|
||||||
|
@ -118,7 +120,10 @@ async def _(msg: Bot.MessageSession):
|
||||||
elif is_valid(expression):
|
elif is_valid(expression):
|
||||||
result = calc(expression)
|
result = calc(expression)
|
||||||
if result == 24 and contains_all_numbers(expression, numbers):
|
if result == 24 and contains_all_numbers(expression, numbers):
|
||||||
await answer.send_message(msg.locale.t('twenty_four.message.correct'))
|
send = msg.locale.t('twenty_four.message.correct')
|
||||||
|
if g_msg := gained_petal(msg, 1):
|
||||||
|
send += '\n' + g_msg
|
||||||
|
await answer.send_message(send)
|
||||||
else:
|
else:
|
||||||
await answer.send_message(msg.locale.t('twenty_four.message.incorrect'))
|
await answer.send_message(msg.locale.t('twenty_four.message.incorrect'))
|
||||||
else:
|
else:
|
||||||
|
|
Reference in a new issue