2 Commits
+65
View File
@@ -337,6 +337,12 @@ async def complete_level(request: Request):
hints_used = 0 hints_used = 0
# 🔧 НОВОЕ (08.10.2026): XP-система — результат award_xp. # 🔧 НОВОЕ (08.10.2026): XP-система — результат award_xp.
xp_result = None xp_result = None
# 🆕 (11.10.2026): волновые счётчики для достижений.
waves_completed = 0
wordsearch_xp = 0
fast_streak = 0
no_hints_streak = 0
words_found = 0
async with pool.acquire() as conn: async with pool.acquire() as conn:
user = await conn.fetchrow( user = await conn.fetchrow(
@@ -488,6 +494,46 @@ async def complete_level(request: Request):
) or 0 ) or 0
grand_total = total_score + sentence_score + wordquiz_score + bubblewords_score grand_total = total_score + sentence_score + wordquiz_score + bubblewords_score
# 🆕 (11.10.2026): волновые счётчики.
words_in_level = await conn.fetchval(
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
) or 0
wave_row = await conn.fetchrow(
"SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
telegram_id,
)
session_number = int(wave_row["session_number"] or 1) if wave_row else 1
session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1
# Пройдено волн = session_number - 1; если только что завершили
# 20-й уровень волны — волна пройдена (+1).
waves_completed = session_number - 1
if session_level_number == 20:
waves_completed += 1
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
wordsearch_xp = total_score
# Обновляем счётчики серий.
is_fast = completion_time is not None and int(completion_time) <= 30
await conn.execute("""
UPDATE user_game_progress
SET fast_streak = CASE WHEN $2 THEN COALESCE(fast_streak, 0) + 1 ELSE 0 END,
no_hints_streak = CASE WHEN $3 THEN COALESCE(no_hints_streak, 0) + 1 ELSE 0 END,
words_found = COALESCE(words_found, 0) + $4,
updated_at = NOW()
WHERE user_id = $1
""", telegram_id, is_fast, hints_used == 0, words_in_level)
counters = await conn.fetchrow(
"SELECT fast_streak, no_hints_streak, words_found FROM user_game_progress WHERE user_id = $1",
telegram_id,
)
fast_streak = int(counters["fast_streak"] or 0) if counters else 0
no_hints_streak = int(counters["no_hints_streak"] or 0) if counters else 0
words_found = int(counters["words_found"] or 0) if counters else 0
# Если уровень уже был пройден — просто возвращаем результат # Если уровень уже был пройден — просто возвращаем результат
if already_completed: if already_completed:
return { return {
@@ -522,6 +568,25 @@ async def complete_level(request: Request):
ach = await check_and_award_achievements(telegram_id, "perfect_words", server_perfect_streak) ach = await check_and_award_achievements(telegram_id, "perfect_words", server_perfect_streak)
new_achievements.extend(ach) new_achievements.extend(ach)
# 🆕 (11.10.2026): волновые достижения.
ach = await check_and_award_achievements(telegram_id, "waves_completed", waves_completed)
new_achievements.extend(ach)
ach = await check_and_award_achievements(telegram_id, "wordsearch_xp", wordsearch_xp)
new_achievements.extend(ach)
if fast_streak >= 3:
ach = await check_and_award_achievements(telegram_id, "ws_speed_run", fast_streak)
new_achievements.extend(ach)
if no_hints_streak >= 20:
ach = await check_and_award_achievements(telegram_id, "ws_no_hints_streak", no_hints_streak)
new_achievements.extend(ach)
if words_found >= 1000:
ach = await check_and_award_achievements(telegram_id, "wordsearch_words", words_found)
new_achievements.extend(ach)
return { return {
"status": "ok", "status": "ok",
"score": score, "score": score,