Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5ee5614fdf | ||
|
|
7efa54e455 | ||
|
|
6e4701aecd | ||
|
|
32a4a68f92 | ||
|
|
5983a4767e | ||
|
|
154ae25772 | ||
|
|
22decc1bc3 | ||
|
|
1733b657b5 | ||
|
|
8d6a9886e1 | ||
|
|
731aaccf28 |
@@ -66,6 +66,52 @@ ACHIEVEMENTS_DATA = [
|
|||||||
"desc_pl": "Znajdź 5 słów bez błędu", "desc_ru": "Найти 5 слов подряд без ошибок", "desc_uk": "Знайти 5 слів без помилки", "desc_en": "Find 5 words without mistakes",
|
"desc_pl": "Znajdź 5 słów bez błędu", "desc_ru": "Найти 5 слов подряд без ошибок", "desc_uk": "Знайти 5 слів без помилки", "desc_en": "Find 5 words without mistakes",
|
||||||
"type": "perfect_words", "value": 5},
|
"type": "perfect_words", "value": 5},
|
||||||
|
|
||||||
|
# ===== Word Search — волны (9 новых, 11.10.2026) =====
|
||||||
|
{"code": "ws_wave_1", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pierwsza fala", "name_ru": "Первая волна", "name_uk": "Перша хвиля", "name_en": "First Wave",
|
||||||
|
"desc_pl": "Ukończ pierwszą falę (10 poziomów)", "desc_ru": "Пройти первую волну (10 уровней)", "desc_uk": "Пройти першу хвилю (10 рівнів)", "desc_en": "Complete your first wave (10 levels)",
|
||||||
|
"type": "waves_completed", "value": 1},
|
||||||
|
|
||||||
|
{"code": "ws_wave_5", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pięć fal", "name_ru": "Пять волн", "name_uk": "П'ять хвиль", "name_en": "Five Waves",
|
||||||
|
"desc_pl": "Ukończ 5 fal", "desc_ru": "Пройти 5 волн", "desc_uk": "Пройти 5 хвиль", "desc_en": "Complete 5 waves",
|
||||||
|
"type": "waves_completed", "value": 5},
|
||||||
|
|
||||||
|
{"code": "ws_wave_10", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Dziesięć fal", "name_ru": "Десять волн", "name_uk": "Десять хвиль", "name_en": "Ten Waves",
|
||||||
|
"desc_pl": "Ukończ 10 fal", "desc_ru": "Пройти 10 волн", "desc_uk": "Пройти 10 хвиль", "desc_en": "Complete 10 waves",
|
||||||
|
"type": "waves_completed", "value": 10},
|
||||||
|
|
||||||
|
{"code": "ws_wave_25", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Dwadzieścia pięć fal", "name_ru": "Двадцать пять волн", "name_uk": "Двадцять п'ять хвиль", "name_en": "Twenty-Five Waves",
|
||||||
|
"desc_pl": "Ukończ 25 fal", "desc_ru": "Пройти 25 волн", "desc_uk": "Пройти 25 хвиль", "desc_en": "Complete 25 waves",
|
||||||
|
"type": "waves_completed", "value": 25},
|
||||||
|
|
||||||
|
{"code": "ws_wave_50", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pięćdziesiąt fal", "name_ru": "Пятьдесят волн", "name_uk": "П'ятдесят хвиль", "name_en": "Fifty Waves",
|
||||||
|
"desc_pl": "Ukończ 50 fal", "desc_ru": "Пройти 50 волн", "desc_uk": "Пройти 50 хвиль", "desc_en": "Complete 50 waves",
|
||||||
|
"type": "waves_completed", "value": 50},
|
||||||
|
|
||||||
|
{"code": "ws_speed_run_3", "category": "wordsearch", "icon": "⚡",
|
||||||
|
"name_pl": "Szybka seria", "name_ru": "Быстрая серия", "name_uk": "Швидка серія", "name_en": "Speed Run",
|
||||||
|
"desc_pl": "Ukończ 3 poziomy z rzędu, każdy w mniej niż 30 sekund", "desc_ru": "Пройти 3 уровня подряд, каждый быстрее 30 секунд", "desc_uk": "Пройти 3 рівні поспіль, кожен швидше 30 секунд", "desc_en": "Complete 3 levels in a row, each under 30 seconds",
|
||||||
|
"type": "ws_speed_run", "value": 3},
|
||||||
|
|
||||||
|
{"code": "ws_wave_no_hints", "category": "wordsearch", "icon": "🎯",
|
||||||
|
"name_pl": "Fala bez podpowiedzi", "name_ru": "Волна без подсказок", "name_uk": "Хвиля без підказок", "name_en": "Flawless Wave",
|
||||||
|
"desc_pl": "Ukończ całą falę (10 poziomów) bez podpowiedzi", "desc_ru": "Пройти всю волну (10 уровней) без подсказок", "desc_uk": "Пройти всю хвилю (10 рівнів) без підказок", "desc_en": "Complete a whole wave (10 levels) without hints",
|
||||||
|
"type": "ws_no_hints_streak", "value": 10},
|
||||||
|
|
||||||
|
{"code": "ws_words_1000", "category": "wordsearch", "icon": "📚",
|
||||||
|
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
|
||||||
|
"desc_pl": "Znajdź 1000 słów w filwordach", "desc_ru": "Найти 1000 слов в филвордах", "desc_uk": "Знайти 1000 слів у філвордах", "desc_en": "Find 1000 words in word searches",
|
||||||
|
"type": "wordsearch_words", "value": 1000},
|
||||||
|
|
||||||
|
{"code": "ws_xp_10000", "category": "wordsearch", "icon": "💎",
|
||||||
|
"name_pl": "Diament filwordów", "name_ru": "Бриллиант филвордов", "name_uk": "Діамант філвордів", "name_en": "Word Search Diamond",
|
||||||
|
"desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches",
|
||||||
|
"type": "wordsearch_xp", "value": 10000},
|
||||||
|
|
||||||
# ===== Sentence Builder (10) =====
|
# ===== Sentence Builder (10) =====
|
||||||
{"code": "first_sentence", "category": "sentence", "icon": "📝",
|
{"code": "first_sentence", "category": "sentence", "icon": "📝",
|
||||||
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
|
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
|
||||||
|
|||||||
+79
-4
@@ -252,8 +252,18 @@ async def check_word(request: Request):
|
|||||||
continue
|
continue
|
||||||
selected_word = selected_word.lower()
|
selected_word = selected_word.lower()
|
||||||
|
|
||||||
for word in word_paths.keys():
|
# 🔧 ФИКС (11.10.2026): word_matched_by_letters_only —
|
||||||
if word.lower() == selected_word:
|
# раньше слово зачислялось только по буквам. Если те же буквы
|
||||||
|
# встречаются в другом месте сетки (например NOS вверху и внизу),
|
||||||
|
# сервер зачислял слово, хотя игрок собрал его не там.
|
||||||
|
# Теперь проверяем координаты: selected_cells должны точно
|
||||||
|
# совпасть с word_paths[word].
|
||||||
|
selected_path = [[int(cell[0]), int(cell[1])] for cell in selected_cells]
|
||||||
|
for word, path in word_paths.items():
|
||||||
|
if word.lower() != selected_word:
|
||||||
|
continue
|
||||||
|
expected_path = [[int(p[0]), int(p[1])] for p in path]
|
||||||
|
if selected_path == expected_path:
|
||||||
found_word = word
|
found_word = word
|
||||||
break
|
break
|
||||||
|
|
||||||
@@ -298,7 +308,7 @@ async def check_word(request: Request):
|
|||||||
"new_achievements": new_achievements
|
"new_achievements": new_achievements
|
||||||
}
|
}
|
||||||
|
|
||||||
return {"status": "ok", "found": False, "server_streak": 0}
|
return {"status": "ok", "found": False, "server_streak": 0, "reason": "wrong_path"}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/complete-level")
|
@router.post("/complete-level")
|
||||||
@@ -337,6 +347,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 +504,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; если только что завершили
|
||||||
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
|
waves_completed = session_number - 1
|
||||||
|
if session_level_number == 10:
|
||||||
|
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 +578,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 >= 10:
|
||||||
|
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,
|
||||||
@@ -709,7 +784,7 @@ async def get_next_level(request: Request):
|
|||||||
next_global = global_level + 1
|
next_global = global_level + 1
|
||||||
next_session_level = session_level + 1
|
next_session_level = session_level + 1
|
||||||
next_session = session_number
|
next_session = session_number
|
||||||
if next_session_level > 20:
|
if next_session_level > 10:
|
||||||
next_session_level = 1
|
next_session_level = 1
|
||||||
next_session += 1
|
next_session += 1
|
||||||
|
|
||||||
|
|||||||
+27
-17
@@ -1,3 +1,5 @@
|
|||||||
|
import random
|
||||||
|
|
||||||
from fastapi import APIRouter, Request, HTTPException
|
from fastapi import APIRouter, Request, HTTPException
|
||||||
from auth import require_auth
|
from auth import require_auth
|
||||||
from database import get_pool
|
from database import get_pool
|
||||||
@@ -6,7 +8,7 @@ router = APIRouter(prefix="/hints", tags=["hints"])
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/first-letter/{level_id}")
|
@router.get("/first-letter/{level_id}")
|
||||||
async def get_first_letter_hint(request: Request, level_id: int):
|
async def get_first_letter_hint(request: Request, level_id: int, found: str = ""):
|
||||||
"""Подсказка: показывает первую букву случайного ненайденного слова"""
|
"""Подсказка: показывает первую букву случайного ненайденного слова"""
|
||||||
telegram_id, _ = await require_auth(request)
|
telegram_id, _ = await require_auth(request)
|
||||||
|
|
||||||
@@ -53,25 +55,33 @@ async def get_first_letter_hint(request: Request, level_id: int):
|
|||||||
import json
|
import json
|
||||||
word_paths = json.loads(word_paths)
|
word_paths = json.loads(word_paths)
|
||||||
|
|
||||||
# Находим первое слово, у которого есть путь
|
# Слова уровня, у которых есть путь в word_paths
|
||||||
all_level_words = [w["word_pl"] for w in words]
|
all_level_words = [w["word_pl"] for w in words]
|
||||||
|
words_with_paths = [
|
||||||
|
w for w in all_level_words
|
||||||
|
if w in word_paths and word_paths[w]
|
||||||
|
]
|
||||||
|
|
||||||
# Ищем слово с путём (сначала основные, потом filler-слова)
|
if not words_with_paths:
|
||||||
found_word = None
|
|
||||||
first_cell = None
|
|
||||||
|
|
||||||
for word in all_level_words:
|
|
||||||
if word in word_paths and word_paths[word]:
|
|
||||||
found_word = word
|
|
||||||
first_cell = word_paths[word][0]
|
|
||||||
break
|
|
||||||
|
|
||||||
# 🔧 ФИКС (25.09.2026): hint_fake_first_cell —
|
|
||||||
# если ни у одного слова нет пути в word_paths, подсказка
|
|
||||||
# бессмысленна. Возвращаем 404, а не фейковую координату [0,0].
|
|
||||||
if not found_word:
|
|
||||||
raise HTTPException(404, "No word paths found for this level")
|
raise HTTPException(404, "No word paths found for this level")
|
||||||
|
|
||||||
|
# 🔧 ФИКС (12.10.2026): hint_shows_found_word —
|
||||||
|
# подсказка показывала уже найденное слово. Теперь фронт передаёт
|
||||||
|
# найденные слова в query-параметре found (через запятую), и мы
|
||||||
|
# исключаем их из кандидатов.
|
||||||
|
found_words = {w.strip() for w in found.split(",") if w.strip()}
|
||||||
|
remaining_words = [w for w in words_with_paths if w not in found_words]
|
||||||
|
|
||||||
|
if not remaining_words:
|
||||||
|
raise HTTPException(404, "All words found")
|
||||||
|
|
||||||
|
# 🔧 ФИКС (11.10.2026): hint_always_first_word —
|
||||||
|
# раньше всегда возвращалось первое слово списка, поэтому
|
||||||
|
# повторные нажатия давали одну и ту же букву. Теперь слово
|
||||||
|
# выбирается случайно из ещё не найденных.
|
||||||
|
found_word = random.choice(remaining_words)
|
||||||
|
first_cell = word_paths[found_word][0]
|
||||||
|
|
||||||
# 🔧 ФИКС (25.09.2026): hint_consumed_before_word_paths_check —
|
# 🔧 ФИКС (25.09.2026): hint_consumed_before_word_paths_check —
|
||||||
# инкрементим hints_used ТОЛЬКО после всех проверок.
|
# инкрементим hints_used ТОЛЬКО после всех проверок.
|
||||||
# Раньше при 404 (нет word_paths) подсказка уже была потрачена.
|
# Раньше при 404 (нет word_paths) подсказка уже была потрачена.
|
||||||
@@ -186,4 +196,4 @@ async def get_remaining_hints(request: Request, level_id: int):
|
|||||||
"max_hints": max_hints,
|
"max_hints": max_hints,
|
||||||
"hints_used": hints_used,
|
"hints_used": hints_used,
|
||||||
"remaining": remaining,
|
"remaining": remaining,
|
||||||
}
|
}
|
||||||
|
|||||||
+27
-25
@@ -1,51 +1,53 @@
|
|||||||
"""
|
"""Волновая структура филвордов.
|
||||||
Волновая структура филвордов.
|
|
||||||
|
|
||||||
Волна = 20 уровней (10 + 10). Волны бесконечные.
|
Волна = 10 уровней. Волны бесконечные.
|
||||||
|
|
||||||
| Волна | Первые 10 | Следующие 10 |
|
Размер сетки:
|
||||||
|-------|-----------|--------------|
|
- Волна 1: 5×5 (уровни 1–5), 6×6 (уровни 6–10).
|
||||||
| 1 | 5×5 | 6×6 |
|
- Волна 2: 6×6 (уровни 1–5), 7×7 (уровни 6–10).
|
||||||
| 2 | 5×5 | 6×6 |
|
- Волна 3+: 7×7 (уровни 1–5), 8×8 (уровни 6–10).
|
||||||
| 3 | 6×6 | 7×7 |
|
|
||||||
| 4 | 6×6 | 7×7 |
|
Позже (когда добавим режимы сложности):
|
||||||
| 5+ | 7×7 | 8×8 |
|
- Easy: всегда 5×5 (1–5) + 6×6 (6–10).
|
||||||
|
- Hard: всегда 8×8.
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
|
||||||
def wave_plan(wave: int) -> list[int]:
|
WAVE_SIZE = 10
|
||||||
"""Возвращает список из 20 размеров сетки для волны."""
|
HALF_WAVE = 5
|
||||||
if wave in (1, 2):
|
|
||||||
return [5] * 10 + [6] * 10
|
|
||||||
if wave in (3, 4):
|
|
||||||
return [6] * 10 + [7] * 10
|
|
||||||
return [7] * 10 + [8] * 10
|
|
||||||
|
|
||||||
|
|
||||||
def wave_for_level(global_level: int) -> int:
|
def wave_for_level(global_level: int) -> int:
|
||||||
"""Какая волна содержит этот глобальный уровень (1-based)."""
|
"""Какая волна содержит этот глобальный уровень (1-based)."""
|
||||||
if global_level < 1:
|
if global_level < 1:
|
||||||
return 1
|
return 1
|
||||||
return (global_level - 1) // 20 + 1
|
return (global_level - 1) // WAVE_SIZE + 1
|
||||||
|
|
||||||
|
|
||||||
def level_in_wave(global_level: int) -> int:
|
def level_in_wave(global_level: int) -> int:
|
||||||
"""Позиция уровня внутри волны (1..20)."""
|
"""Позиция уровня внутри волны (1..10)."""
|
||||||
return ((global_level - 1) % 20) + 1
|
return ((global_level - 1) % WAVE_SIZE) + 1
|
||||||
|
|
||||||
|
|
||||||
def grid_size_for(global_level: int) -> int:
|
def grid_size_for(global_level: int) -> int:
|
||||||
"""Размер сетки для глобального уровня."""
|
"""Размер сетки для глобального уровня."""
|
||||||
wave = wave_for_level(global_level)
|
wave = wave_for_level(global_level)
|
||||||
pos = level_in_wave(global_level)
|
pos = level_in_wave(global_level)
|
||||||
plan = wave_plan(wave)
|
|
||||||
return plan[pos - 1]
|
if wave == 1:
|
||||||
|
sizes = (5, 6)
|
||||||
|
elif wave == 2:
|
||||||
|
sizes = (6, 7)
|
||||||
|
else:
|
||||||
|
sizes = (7, 8)
|
||||||
|
|
||||||
|
return sizes[0] if pos <= HALF_WAVE else sizes[1]
|
||||||
|
|
||||||
|
|
||||||
def max_stars_for_wave() -> int:
|
def max_stars_for_wave() -> int:
|
||||||
"""Максимум звёзд за волну (20 уровней × 5 звёзд)."""
|
"""Максимум звёзд за волну (10 уровней × 5 звёзд)."""
|
||||||
return 20 * 5
|
return WAVE_SIZE * 5
|
||||||
|
|
||||||
|
|
||||||
def wave_medal(stars_earned: int) -> str:
|
def wave_medal(stars_earned: int) -> str:
|
||||||
@@ -61,4 +63,4 @@ def wave_medal(stars_earned: int) -> str:
|
|||||||
return "silver"
|
return "silver"
|
||||||
if pct >= 0.50:
|
if pct >= 0.50:
|
||||||
return "bronze"
|
return "bronze"
|
||||||
return "none"
|
return "none"
|
||||||
|
|||||||
Reference in New Issue
Block a user