Jocaru/echoes-of-the-ash
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

What a mess

Browse Source
This commit is contained in:
Joan
2025-11-07 15:27:13 +01:00
parent 0b79b3ae59
commit 33cc9586c2
130 changed files with 29819 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bot/combat_handlers.py
View File

@@ -2,7 +2,8 @@
Combat-related action handlers.
"""
import logging
from . import database, keyboards
from . import keyboards
from .api_client import api_client
from .utils import format_stat_bar
from data.world_loader import game_world
@@ -37,7 +38,7 @@ async def handle_combat_attack(query, user_id: int, player: dict, data: list = N
from .handlers import send_or_edit_with_image
await send_or_edit_with_image(query, text=message, reply_markup=None)
else:
combat_data = await database.get_combat(user_id)
combat_data = await api_client.get_combat(user_id)
if combat_data:
from data.npcs import NPCS
npc_def = NPCS.get(combat_data['npc_id'])
@@ -82,7 +83,7 @@ async def handle_combat_flee(query, user_id: int, player: dict, data: list = Non
from .handlers import send_or_edit_with_image
await send_or_edit_with_image(query, text=message, reply_markup=None)
else:
combat_data = await database.get_combat(user_id)
combat_data = await api_client.get_combat(user_id)
if combat_data:
from data.npcs import NPCS
npc_def = NPCS.get(combat_data['npc_id'])
@@ -124,7 +125,7 @@ async def handle_combat_use_item(query, user_id: int, player: dict, data: list):
reply_markup=None
)
else:
combat_data = await database.get_combat(user_id)
combat_data = await api_client.get_combat(user_id)
if combat_data:
from data.npcs import NPCS
npc_def = NPCS.get(combat_data['npc_id'])
@@ -143,7 +144,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, data: list = None):
"""Return to combat menu from item selection."""
await query.answer()
combat_data = await database.get_combat(user_id)
combat_data = await api_client.get_combat(user_id)
if combat_data:
from data.npcs import NPCS