Merge branch 'master' of https://github.com/Teahouse-Studios/akari-bot
This commit is contained in:
commit
5bbec3607a
1 changed files with 7 additions and 3 deletions
|
@ -4,7 +4,6 @@ from typing import Awaitable, Callable, List, Tuple
|
|||
from core.builtins import Bot
|
||||
from core.component import module
|
||||
from core.petal import gained_petal
|
||||
from core.utils.cooldown import CoolDown
|
||||
|
||||
tic_tac_toe = module('tic_tac_toe',
|
||||
desc='{tic_tac_toe.help.desc}', developers=['Dianliang233'],
|
||||
|
@ -252,7 +251,7 @@ async def terminate(msg: Bot.MessageSession):
|
|||
if state: # 若有
|
||||
if state['active']: # 检查是否为活跃状态
|
||||
play_state[msg.target.target_id]['active'] = False # 标记为非活跃状态
|
||||
await msg.finish(msg.locale.t('game.message.stop'), quote=False)
|
||||
await msg.finish(msg.locale.t('game.message.stop'))
|
||||
else:
|
||||
await msg.finish(msg.locale.t('game.message.stop.none'))
|
||||
else:
|
||||
|
@ -287,9 +286,14 @@ async def ttt_with_bot(msg: Bot.MessageSession):
|
|||
return
|
||||
|
||||
play_state[msg.target.target_id]['active'] = False
|
||||
g_msg = ''
|
||||
if winner == 0:
|
||||
await msg.finish(format_board(board) + '\n' + msg.locale.t('tic_tac_toe.message.draw'), quote=False)
|
||||
g_msg = '\n' + gained_petal(msg, 2) if winner == 1 and game_type in ['expert', 'master'] else ''
|
||||
if winner == 1:
|
||||
if game_type == 'random' and (reward := gained_petal(msg, 1)):
|
||||
g_msg = '\n' + reward
|
||||
if game_type == 'expert' and (reward := gained_petal(msg, 2)):
|
||||
g_msg = '\n' + reward
|
||||
await msg.finish(format_board(board) + '\n' + msg.locale.t('tic_tac_toe.message.winner', winner='X' if winner == 1 else 'O') + g_msg, quote=False)
|
||||
|
||||
|
||||
|
|
Reference in a new issue