From 32a4a68f922d53190142e909d1729d905c8e1538 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Mon, 12 Oct 2026 11:15:22 +0000 Subject: [PATCH 1/3] =?UTF-8?q?[Eva]=20=D0=92=D0=BE=D0=BB=D0=BD=D1=8B:=202?= =?UTF-8?q?0=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D0=B5=D0=B9=20=E2=86=92=2010?= =?UTF-8?q?=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/waves.py | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/services/waves.py b/services/waves.py index 6645b36..1be744e 100644 --- a/services/waves.py +++ b/services/waves.py @@ -1,42 +1,53 @@ -""" -Волновая структура филвордов. +"""Волновая структура филвордов. -Волна = 20 уровней. Волны бесконечные. +Волна = 10 уровней. Волны бесконечные. Размер сетки: -- Волна 1 (обучающая): уровни 1–10 → 5×5, 11–20 → 6×6. -- Волна 2+: первые 10 уровней волны → 7×7, вторые 10 → 8×8. +- Волна 1: 5×5 (уровни 1–5), 6×6 (уровни 6–10). +- Волна 2: 6×6 (уровни 1–5), 7×7 (уровни 6–10). +- Волна 3+: 7×7 (уровни 1–5), 8×8 (уровни 6–10). + +Позже (когда добавим режимы сложности): +- Easy: всегда 5×5 (1–5) + 6×6 (6–10). +- Hard: всегда 8×8. """ from __future__ import annotations +WAVE_SIZE = 10 +HALF_WAVE = 5 + + def wave_for_level(global_level: int) -> int: """Какая волна содержит этот глобальный уровень (1-based).""" if global_level < 1: return 1 - return (global_level - 1) // 20 + 1 + return (global_level - 1) // WAVE_SIZE + 1 def level_in_wave(global_level: int) -> int: - """Позиция уровня внутри волны (1..20).""" - return ((global_level - 1) % 20) + 1 + """Позиция уровня внутри волны (1..10).""" + return ((global_level - 1) % WAVE_SIZE) + 1 def grid_size_for(global_level: int) -> int: """Размер сетки для глобального уровня.""" - # Волна 1: обучающая (5×5, потом 6×6) - if global_level <= 10: - return 5 - if global_level <= 20: - return 6 - # Волна 2+: чередование 7×7 (первые 10) и 8×8 (вторые 10) - pos_in_wave = (global_level - 1) % 20 + 1 - return 7 if pos_in_wave <= 10 else 8 + wave = wave_for_level(global_level) + pos = level_in_wave(global_level) + + 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: - """Максимум звёзд за волну (20 уровней × 5 звёзд).""" - return 20 * 5 + """Максимум звёзд за волну (10 уровней × 5 звёзд).""" + return WAVE_SIZE * 5 def wave_medal(stars_earned: int) -> str: From 6e4701aecddff823aa0794b024945ae1f4d3c541 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Mon, 12 Oct 2026 11:16:17 +0000 Subject: [PATCH 2/3] =?UTF-8?q?[Eva]=20game.py:=20=D0=B2=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B0=2020=20=E2=86=92=2010=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=D0=B9=20(3=20=D0=BC=D0=B5=D1=81=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/game.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/game.py b/routers/game.py index ff4c926..f88ba89 100644 --- a/routers/game.py +++ b/routers/game.py @@ -517,9 +517,9 @@ async def complete_level(request: Request): session_level_number = int(wave_row["session_level_number"] or 1) if wave_row else 1 # Пройдено волн = session_number - 1; если только что завершили - # 20-й уровень волны — волна пройдена (+1). + # 10-й уровень волны — волна пройдена (+1). waves_completed = session_number - 1 - if session_level_number == 20: + if session_level_number == 10: waves_completed += 1 # XP филворда = сумма score по user_progress (уже посчитана как total_score). @@ -589,7 +589,7 @@ async def complete_level(request: Request): ach = await check_and_award_achievements(telegram_id, "ws_speed_run", fast_streak) new_achievements.extend(ach) - if no_hints_streak >= 20: + if no_hints_streak >= 10: ach = await check_and_award_achievements(telegram_id, "ws_no_hints_streak", no_hints_streak) new_achievements.extend(ach) @@ -784,7 +784,7 @@ async def get_next_level(request: Request): next_global = global_level + 1 next_session_level = session_level + 1 next_session = session_number - if next_session_level > 20: + if next_session_level > 10: next_session_level = 1 next_session += 1 From 7efa54e455302b289f5262e31b47a423a9a79096 Mon Sep 17 00:00:00 2001 From: Drobysh Date: Mon, 12 Oct 2026 11:27:30 +0000 Subject: [PATCH 3/3] =?UTF-8?q?[Eva]=20=D0=92=D0=BE=D0=BB=D0=BD=D0=B0=20?= =?UTF-8?q?=3D=2010=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD=D0=B5=D0=B9:=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BE=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20ws=5Fwave=5F1=20=D0=B8=20ws=5F?= =?UTF-8?q?wave=5Fno=5Fhints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routers/achievements.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/achievements.py b/routers/achievements.py index 33f4e6d..9134392 100644 --- a/routers/achievements.py +++ b/routers/achievements.py @@ -69,7 +69,7 @@ ACHIEVEMENTS_DATA = [ # ===== 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ę (20 poziomów)", "desc_ru": "Пройти первую волну (20 уровней)", "desc_uk": "Пройти першу хвилю (20 рівнів)", "desc_en": "Complete your first wave (20 levels)", + "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": "🌊", @@ -99,8 +99,8 @@ ACHIEVEMENTS_DATA = [ {"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ę (20 poziomów) bez podpowiedzi", "desc_ru": "Пройти всю волну (20 уровней) без подсказок", "desc_uk": "Пройти всю хвилю (20 рівнів) без підказок", "desc_en": "Complete a whole wave (20 levels) without hints", - "type": "ws_no_hints_streak", "value": 20}, + "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",