command handlers always take data param, handler dict
This commit is contained in:
@@ -9,7 +9,7 @@ from data.world_loader import game_world
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def handle_combat_attack(query, user_id: int, player: dict):
|
||||
async def handle_combat_attack(query, user_id: int, player: dict, data: list):
|
||||
"""Handle player attack action in combat."""
|
||||
from bot import combat
|
||||
await query.answer()
|
||||
@@ -54,7 +54,7 @@ async def handle_combat_attack(query, user_id: int, player: dict):
|
||||
await query.answer(message, show_alert=False)
|
||||
|
||||
|
||||
async def handle_combat_flee(query, user_id: int, player: dict):
|
||||
async def handle_combat_flee(query, user_id: int, player: dict, data: list):
|
||||
"""Handle flee attempt in combat."""
|
||||
from bot import combat
|
||||
await query.answer()
|
||||
@@ -99,7 +99,7 @@ async def handle_combat_flee(query, user_id: int, player: dict):
|
||||
await query.answer(message, show_alert=False)
|
||||
|
||||
|
||||
async def handle_combat_use_item_menu(query, user_id: int, player: dict):
|
||||
async def handle_combat_use_item_menu(query, user_id: int, player: dict, data: list):
|
||||
"""Show menu of items that can be used in combat."""
|
||||
await query.answer()
|
||||
keyboard = await keyboards.combat_items_keyboard(user_id)
|
||||
@@ -148,7 +148,7 @@ async def handle_combat_use_item(query, user_id: int, player: dict, data: list):
|
||||
)
|
||||
|
||||
|
||||
async def handle_combat_back(query, user_id: int, player: dict):
|
||||
async def handle_combat_back(query, user_id: int, player: dict, data: list):
|
||||
"""Return to combat menu from item selection."""
|
||||
await query.answer()
|
||||
combat_data = await database.get_combat(user_id)
|
||||
|
||||
Reference in New Issue
Block a user