Compare commits
32
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ccd733ba36 | ||
|
|
b7c6bd9ebe | ||
|
|
b25f27fcfe | ||
|
|
69224b546b | ||
|
|
d375a1e1ac | ||
|
|
739cda7eb8 | ||
|
|
8f96c61f29 | ||
|
|
96abab9883 | ||
|
|
689a2258c0 | ||
|
|
cc8e0e01f0 | ||
|
|
7d5e3a7d8f | ||
|
|
934e81a55a | ||
|
|
7e8c0e132e | ||
|
|
af3c634bfd | ||
|
|
7ddfc2e451 | ||
|
|
34bae9bb6a | ||
|
|
175691136e | ||
|
|
7f5fc8311c | ||
|
|
edf29cb806 | ||
|
|
279fc5f313 | ||
|
|
07eebf6fed | ||
|
|
c60f9a39c2 | ||
|
|
ced4cd1c8e | ||
|
|
25b1437e0b | ||
|
|
d77d9bdaef | ||
|
|
85a168e8d7 | ||
|
|
7204111ad6 | ||
|
|
214567383e | ||
|
|
3257b5da3b | ||
|
|
92780b247d | ||
|
|
eeb5a382c9 | ||
|
|
ab45d026dd |
+55
@@ -863,6 +863,20 @@ async def init_db():
|
||||
""")
|
||||
logger.info("Added current_mistakes column to word_quiz_progress")
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): no_mistakes_streak — серия раундов без ошибок
|
||||
# в «Выбери слово». +1 если раунд пройден без ошибок, иначе сброс в 0.
|
||||
# Нужен для достижения quiz_no_mistakes_streak.
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'word_quiz_progress' AND column_name = 'no_mistakes_streak'
|
||||
""")
|
||||
if not col_exists:
|
||||
await conn.execute("""
|
||||
ALTER TABLE word_quiz_progress
|
||||
ADD COLUMN no_mistakes_streak INTEGER DEFAULT 0
|
||||
""")
|
||||
logger.info("Added no_mistakes_streak column to word_quiz_progress")
|
||||
|
||||
# ============ bubble_words_progress ============
|
||||
await conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS bubble_words_progress (
|
||||
@@ -938,6 +952,47 @@ async def init_db():
|
||||
""")
|
||||
logger.info("Added hinted_words column to bubble_words_progress")
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): words_collected — суммарно собранных слов
|
||||
# в пузырях. Нужен для достижения bubble_words (собрать N слов).
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'bubble_words_progress' AND column_name = 'words_collected'
|
||||
""")
|
||||
if not col_exists:
|
||||
await conn.execute("""
|
||||
ALTER TABLE bubble_words_progress
|
||||
ADD COLUMN words_collected INTEGER DEFAULT 0
|
||||
""")
|
||||
logger.info("Added words_collected column to bubble_words_progress")
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): no_hints_streak — серия уровней БЕЗ подсказок
|
||||
# и без «показать слова». +1 если hints_used == 0 и not list_opened,
|
||||
# иначе сброс в 0. Нужен для достижения bubble_streak.
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'bubble_words_progress' AND column_name = 'no_hints_streak'
|
||||
""")
|
||||
if not col_exists:
|
||||
await conn.execute("""
|
||||
ALTER TABLE bubble_words_progress
|
||||
ADD COLUMN no_hints_streak INTEGER DEFAULT 0
|
||||
""")
|
||||
logger.info("Added no_hints_streak column to bubble_words_progress")
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): perfect_streak — серия идеальных уровней
|
||||
# (без подсказок + без списка + без ошибок). +1 если всё чисто,
|
||||
# иначе сброс в 0. Нужен для достижения bubble_perfect_streak.
|
||||
col_exists = await conn.fetchval("""
|
||||
SELECT 1 FROM information_schema.columns
|
||||
WHERE table_name = 'bubble_words_progress' AND column_name = 'perfect_streak'
|
||||
""")
|
||||
if not col_exists:
|
||||
await conn.execute("""
|
||||
ALTER TABLE bubble_words_progress
|
||||
ADD COLUMN perfect_streak INTEGER DEFAULT 0
|
||||
""")
|
||||
logger.info("Added perfect_streak column to bubble_words_progress")
|
||||
|
||||
# ============ wrong_because_explanations ============
|
||||
await conn.execute("""
|
||||
CREATE TABLE IF NOT EXISTS wrong_because_explanations (
|
||||
|
||||
+128
-8
@@ -163,7 +163,7 @@ ACHIEVEMENTS_DATA = [
|
||||
"desc_pl": "Ułóż zdanie w mniej niż 5 sekund", "desc_ru": "Составить предложение быстрее 5 секунд", "desc_uk": "Скласти речення швидше 5 секунд", "desc_en": "Build a sentence in under 5 seconds",
|
||||
"type": "speed_sentence", "value": 5},
|
||||
|
||||
# ===== Word Quiz (8) =====
|
||||
# ===== Word Quiz (20) =====
|
||||
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
|
||||
"name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker",
|
||||
"desc_pl": "Odgadnij 10 słów w Quiz słownym", "desc_ru": "Угадать 10 слов в Квизе слов", "desc_uk": "Відгадати 10 слів у Квізі слів", "desc_en": "Guess 10 words in Word Quiz",
|
||||
@@ -182,29 +182,89 @@ ACHIEVEMENTS_DATA = [
|
||||
{"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎",
|
||||
"name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score",
|
||||
"desc_pl": "Odgadnij 10 słów bez pomyłki", "desc_ru": "Угадать 10 слов без ошибок", "desc_uk": "Відгадати 10 слів без помилок", "desc_en": "Guess 10 words without mistakes",
|
||||
"type": "quiz_perfect_streak", "value": 10},
|
||||
"type": "quiz_correct_streak", "value": 10},
|
||||
|
||||
{"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥",
|
||||
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
|
||||
"desc_pl": "Odgadnij 20 słów z rzędu", "desc_ru": "Угадать 20 слов подряд", "desc_uk": "Відгадати 20 слів поспіль", "desc_en": "Guess 20 words in a row",
|
||||
"type": "quiz_perfect_streak", "value": 20},
|
||||
"type": "quiz_correct_streak", "value": 20},
|
||||
|
||||
{"code": "quiz_speed", "category": "wordquiz", "icon": "⚡",
|
||||
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
|
||||
"desc_pl": "Odgadnij słowo w mniej niż 3 sekundy", "desc_ru": "Угадать слово быстрее 3 секунд", "desc_uk": "Відгадати слово швидше 3 секунд", "desc_en": "Guess a word in under 3 seconds",
|
||||
"type": "quiz_speed", "value": 3},
|
||||
"type": "quiz_speed_3", "value": 3},
|
||||
|
||||
{"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀",
|
||||
"name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast",
|
||||
"desc_pl": "Odgadnij słowo w mniej niż 2 sekundy", "desc_ru": "Угадать слово быстрее 2 секунд", "desc_uk": "Відгадати слово швидше 2 секунд", "desc_en": "Guess a word in under 2 seconds",
|
||||
"type": "quiz_speed", "value": 2},
|
||||
"type": "quiz_speed_2", "value": 2},
|
||||
|
||||
{"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆",
|
||||
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
|
||||
"desc_pl": "Odgadnij słowo bez żadnej pomyłki", "desc_ru": "Угадать слово без единой ошибки", "desc_uk": "Відгадати слово без жодної помилки", "desc_en": "Guess a word without any mistakes",
|
||||
"type": "quiz_no_mistakes", "value": 1},
|
||||
|
||||
# ===== Bubble Words (8) =====
|
||||
{"code": "quiz_1", "category": "wordquiz", "icon": "🎯",
|
||||
"name_pl": "Pierwszy krok", "name_ru": "Первый шаг", "name_uk": "Перший крок", "name_en": "First Step",
|
||||
"desc_pl": "Odgadnij 1 słowo", "desc_ru": "Угадать 1 слово", "desc_uk": "Вгадати 1 слово", "desc_en": "Guess 1 word",
|
||||
"type": "quiz_guessed", "value": 1},
|
||||
|
||||
{"code": "quiz_25", "category": "wordquiz", "icon": "🎓",
|
||||
"name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student",
|
||||
"desc_pl": "Odgadnij 25 słów", "desc_ru": "Угадать 25 слов", "desc_uk": "Вгадати 25 слів", "desc_en": "Guess 25 words",
|
||||
"type": "quiz_guessed", "value": 25},
|
||||
|
||||
{"code": "quiz_200", "category": "wordquiz", "icon": "📚",
|
||||
"name_pl": "Erudyta", "name_ru": "Эрудит", "name_uk": "Ерудит", "name_en": "Erudite",
|
||||
"desc_pl": "Odgadnij 200 słów", "desc_ru": "Угадать 200 слов", "desc_uk": "Вгадати 200 слів", "desc_en": "Guess 200 words",
|
||||
"type": "quiz_guessed", "value": 200},
|
||||
|
||||
{"code": "quiz_500", "category": "wordquiz", "icon": "🌟",
|
||||
"name_pl": "Legenda", "name_ru": "Легенда", "name_uk": "Легенда", "name_en": "Legend",
|
||||
"desc_pl": "Odgadnij 500 słów", "desc_ru": "Угадать 500 слов", "desc_uk": "Вгадати 500 слів", "desc_en": "Guess 500 words",
|
||||
"type": "quiz_guessed", "value": 500},
|
||||
|
||||
{"code": "quiz_1000", "category": "wordquiz", "icon": "👑",
|
||||
"name_pl": "Guru", "name_ru": "Гуру", "name_uk": "Гуру", "name_en": "Guru",
|
||||
"desc_pl": "Odgadnij 1000 słów", "desc_ru": "Угадать 1000 слов", "desc_uk": "Вгадати 1000 слів", "desc_en": "Guess 1000 words",
|
||||
"type": "quiz_guessed", "value": 1000},
|
||||
|
||||
{"code": "quiz_correct_streak_5", "category": "wordquiz", "icon": "🔥",
|
||||
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
|
||||
"desc_pl": "5 poprawnych z rzędu", "desc_ru": "5 правильных подряд", "desc_uk": "5 правильних поспіль", "desc_en": "5 correct in a row",
|
||||
"type": "quiz_correct_streak", "value": 5},
|
||||
|
||||
{"code": "quiz_streak_30", "category": "wordquiz", "icon": "💪",
|
||||
"name_pl": "Na fali", "name_ru": "На волне", "name_uk": "На хвилі", "name_en": "On Fire",
|
||||
"desc_pl": "30 poprawnych z rzędu", "desc_ru": "30 правильных подряд", "desc_uk": "30 правильних поспіль", "desc_en": "30 correct in a row",
|
||||
"type": "quiz_correct_streak", "value": 30},
|
||||
|
||||
{"code": "quiz_streak_50", "category": "wordquiz", "icon": "🏆",
|
||||
"name_pl": "Niezwyciężony", "name_ru": "Непобедимый", "name_uk": "Непереможний", "name_en": "Invincible",
|
||||
"desc_pl": "50 poprawnych z rzędu", "desc_ru": "50 правильных подряд", "desc_uk": "50 правильних поспіль", "desc_en": "50 correct in a row",
|
||||
"type": "quiz_correct_streak", "value": 50},
|
||||
|
||||
{"code": "quiz_no_mistakes_3", "category": "wordquiz", "icon": "✨",
|
||||
"name_pl": "Czysta trójka", "name_ru": "Чистая тройка", "name_uk": "Чиста трійка", "name_en": "Clean Three",
|
||||
"desc_pl": "3 rundy bez błędu z rzędu", "desc_ru": "3 раунда без ошибок подряд", "desc_uk": "3 раунди без помилок поспіль", "desc_en": "3 rounds without mistakes in a row",
|
||||
"type": "quiz_no_mistakes_streak", "value": 3},
|
||||
|
||||
{"code": "quiz_perfect_25", "category": "wordquiz", "icon": "💎",
|
||||
"name_pl": "Perfekcjonista", "name_ru": "Перфекционист", "name_uk": "Перфекціоніст", "name_en": "Perfectionist",
|
||||
"desc_pl": "25 rund bez błędu z rzędu", "desc_ru": "25 раундов без ошибок подряд", "desc_uk": "25 раундів без помилок поспіль", "desc_en": "25 rounds without mistakes in a row",
|
||||
"type": "quiz_no_mistakes_streak", "value": 25},
|
||||
|
||||
{"code": "quiz_speed_5", "category": "wordquiz", "icon": "⚡",
|
||||
"name_pl": "Szybki", "name_ru": "Быстрый", "name_uk": "Швидкий", "name_en": "Fast",
|
||||
"desc_pl": "Odgadnij słowo w mniej niż 5 sekund", "desc_ru": "Угадать слово быстрее 5 секунд", "desc_uk": "Вгадати слово швидше 5 секунд", "desc_en": "Guess a word in under 5 seconds",
|
||||
"type": "quiz_speed_5", "value": 5},
|
||||
|
||||
{"code": "quiz_speed_1", "category": "wordquiz", "icon": "🚀",
|
||||
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
|
||||
"desc_pl": "Odgadnij słowo w mniej niż 1 sekundę", "desc_ru": "Угадать слово быстрее 1 секунды", "desc_uk": "Вгадати слово швидше 1 секунди", "desc_en": "Guess a word in under 1 second",
|
||||
"type": "quiz_speed_1", "value": 1},
|
||||
|
||||
# ===== Bubble Words (20) =====
|
||||
{"code": "bubble_5", "category": "bubblewords", "icon": "🫧",
|
||||
"name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner",
|
||||
"desc_pl": "Ukończ 5 poziomów w Bąbelkach słów", "desc_ru": "Пройти 5 уровней в Пузырях слов", "desc_uk": "Пройти 5 рівнів у Бульбашках слів", "desc_en": "Complete 5 levels in Bubble Words",
|
||||
@@ -238,12 +298,72 @@ ACHIEVEMENTS_DATA = [
|
||||
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
|
||||
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
|
||||
"desc_pl": "Ukończ poziom w mniej niż 45 sekund", "desc_ru": "Пройти уровень быстрее 45 секунд", "desc_uk": "Пройти рівень швидше 45 секунд", "desc_en": "Complete a level in under 45 seconds",
|
||||
"type": "bubble_speed", "value": 45},
|
||||
"type": "bubble_speed_45", "value": 45},
|
||||
|
||||
{"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡",
|
||||
"name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning",
|
||||
"desc_pl": "Ukończ poziom w mniej niż 30 sekund", "desc_ru": "Пройти уровень быстрее 30 секунд", "desc_uk": "Пройти рівень швидше 30 секунд", "desc_en": "Complete a level in under 30 seconds",
|
||||
"type": "bubble_speed", "value": 30},
|
||||
"type": "bubble_speed_30", "value": 30},
|
||||
|
||||
{"code": "bubble_1", "category": "bubblewords", "icon": "🫧",
|
||||
"name_pl": "Pierwszy bąbelek", "name_ru": "Первый пузырь", "name_uk": "Перша бульбашка", "name_en": "First Bubble",
|
||||
"desc_pl": "Ukończ 1 poziom w Bąbelkach słów", "desc_ru": "Пройти 1 уровень в Пузырях слов", "desc_uk": "Пройти 1 рівень у Бульбашках слів", "desc_en": "Complete 1 level in Bubble Words",
|
||||
"type": "bubble_levels", "value": 1},
|
||||
|
||||
{"code": "bubble_10", "category": "bubblewords", "icon": "🫧",
|
||||
"name_pl": "Dziesięć bąbelków", "name_ru": "Десять пузырей", "name_uk": "Десять бульбашок", "name_en": "Ten Bubbles",
|
||||
"desc_pl": "Ukończ 10 poziomów w Bąbelkach słów", "desc_ru": "Пройти 10 уровней в Пузырях слов", "desc_uk": "Пройти 10 рівнів у Бульбашках слів", "desc_en": "Complete 10 levels in Bubble Words",
|
||||
"type": "bubble_levels", "value": 10},
|
||||
|
||||
{"code": "bubble_words_25", "category": "bubblewords", "icon": "📚",
|
||||
"name_pl": "Kolekcjoner", "name_ru": "Собиратель", "name_uk": "Колекціонер", "name_en": "Collector",
|
||||
"desc_pl": "Zbierz 25 słów", "desc_ru": "Собрать 25 слов", "desc_uk": "Зібрати 25 слів", "desc_en": "Collect 25 words",
|
||||
"type": "bubble_words", "value": 25},
|
||||
|
||||
{"code": "bubble_no_mistakes", "category": "bubblewords", "icon": "✨",
|
||||
"name_pl": "Bezbłędny", "name_ru": "Без ошибок", "name_uk": "Без помилок", "name_en": "No Mistakes",
|
||||
"desc_pl": "Ukończ poziom bez żadnej pomyłki", "desc_ru": "Пройти уровень без единой ошибки", "desc_uk": "Пройти рівень без жодної помилки", "desc_en": "Complete a level without any mistakes",
|
||||
"type": "bubble_no_mistakes", "value": 1},
|
||||
|
||||
{"code": "bubble_streak_3", "category": "bubblewords", "icon": "🔥",
|
||||
"name_pl": "Seria", "name_ru": "Серия", "name_uk": "Серія", "name_en": "Streak",
|
||||
"desc_pl": "Ukończ 3 poziomy z rzędu bez podpowiedzi", "desc_ru": "Пройти 3 уровня подряд без подсказок", "desc_uk": "Пройти 3 рівні поспіль без підказок", "desc_en": "Complete 3 levels in a row without hints",
|
||||
"type": "bubble_streak", "value": 3},
|
||||
|
||||
{"code": "bubble_streak_10", "category": "bubblewords", "icon": "💪",
|
||||
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
|
||||
"desc_pl": "Ukończ 10 poziomów z rzędu bez podpowiedzi", "desc_ru": "Пройти 10 уровней подряд без подсказок", "desc_uk": "Пройти 10 рівнів поспіль без підказок", "desc_en": "Complete 10 levels in a row without hints",
|
||||
"type": "bubble_streak", "value": 10},
|
||||
|
||||
{"code": "bubble_words_100", "category": "bubblewords", "icon": "📖",
|
||||
"name_pl": "Sto słów", "name_ru": "Сто слов", "name_uk": "Сто слів", "name_en": "Hundred Words",
|
||||
"desc_pl": "Zbierz 100 słów", "desc_ru": "Собрать 100 слов", "desc_uk": "Зібрати 100 слів", "desc_en": "Collect 100 words",
|
||||
"type": "bubble_words", "value": 100},
|
||||
|
||||
{"code": "bubble_xp_1000", "category": "bubblewords", "icon": "💎",
|
||||
"name_pl": "Bąbelkowy XP", "name_ru": "Пузырьковый XP", "name_uk": "Бульбашковий XP", "name_en": "Bubble XP",
|
||||
"desc_pl": "Zdobądź 1000 XP w Bąbelkach", "desc_ru": "Набрать 1000 XP в пузырях", "desc_uk": "Набрати 1000 XP у бульбашках", "desc_en": "Earn 1000 XP in Bubbles",
|
||||
"type": "bubble_xp", "value": 1000},
|
||||
|
||||
{"code": "bubble_200", "category": "bubblewords", "icon": "👑",
|
||||
"name_pl": "Dwustu poziomów", "name_ru": "Двести уровней", "name_uk": "Двісті рівнів", "name_en": "Two Hundred Levels",
|
||||
"desc_pl": "Ukończ 200 poziomów w Bąbelkach słów", "desc_ru": "Пройти 200 уровней в Пузырях слов", "desc_uk": "Пройти 200 рівнів у Бульбашках слів", "desc_en": "Complete 200 levels in Bubble Words",
|
||||
"type": "bubble_levels", "value": 200},
|
||||
|
||||
{"code": "bubble_speed_15", "category": "bubblewords", "icon": "⚡",
|
||||
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
|
||||
"desc_pl": "Ukończ poziom w mniej niż 15 sekund", "desc_ru": "Пройти уровень быстрее 15 секунд", "desc_uk": "Пройти рівень швидше 15 секунд", "desc_en": "Complete a level in under 15 seconds",
|
||||
"type": "bubble_speed_15", "value": 15},
|
||||
|
||||
{"code": "bubble_perfect_10", "category": "bubblewords", "icon": "🌟",
|
||||
"name_pl": "Perfekcyjna seria", "name_ru": "Идеальная серия", "name_uk": "Ідеальна серія", "name_en": "Perfect Streak",
|
||||
"desc_pl": "Ukończ 10 idealnych poziomów z rzędu", "desc_ru": "Пройти 10 идеальных уровней подряд", "desc_uk": "Пройти 10 ідеальних рівнів поспіль", "desc_en": "Complete 10 perfect levels in a row",
|
||||
"type": "bubble_perfect_streak", "value": 10},
|
||||
|
||||
{"code": "bubble_words_500", "category": "bubblewords", "icon": "🏆",
|
||||
"name_pl": "Pięćset słów", "name_ru": "Пятьсот слов", "name_uk": "П'ятсот слів", "name_en": "Five Hundred Words",
|
||||
"desc_pl": "Zbierz 500 słów", "desc_ru": "Собрать 500 слов", "desc_uk": "Зібрати 500 слів", "desc_en": "Collect 500 words",
|
||||
"type": "bubble_words", "value": 500},
|
||||
|
||||
# ===== General (9) =====
|
||||
{"code": "score_1000", "category": "general", "icon": "🌟",
|
||||
|
||||
+48
-5
@@ -389,11 +389,16 @@ async def complete_bubble_level(request: Request):
|
||||
xp_result = await award_xp(conn, telegram_id, "bubbles", points)
|
||||
score = xp_result["points"]
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): флаги для накопления серий.
|
||||
no_hints_clean = 1 if (hints_used == 0 and not list_opened) else 0
|
||||
perfect_clean = 1 if (hints_used == 0 and not list_opened and wrong_words == 0) else 0
|
||||
|
||||
await conn.execute("""
|
||||
INSERT INTO bubble_words_progress
|
||||
(user_id, levels_completed, total_score, level,
|
||||
current_hints_used, current_list_opened, current_level_words, hinted_words)
|
||||
VALUES ($1, 1, $2, $3, 0, 0, '[]'::jsonb, '{}')
|
||||
current_hints_used, current_list_opened, current_level_words, hinted_words,
|
||||
words_collected, no_hints_streak, perfect_streak)
|
||||
VALUES ($1, 1, $2, $3, 0, 0, '[]'::jsonb, '{}', $4, $5, $6)
|
||||
ON CONFLICT (user_id) DO UPDATE
|
||||
SET levels_completed = bubble_words_progress.levels_completed + 1,
|
||||
total_score = bubble_words_progress.total_score + $2,
|
||||
@@ -401,8 +406,23 @@ async def complete_bubble_level(request: Request):
|
||||
current_hints_used = 0,
|
||||
current_list_opened = 0,
|
||||
current_level_words = '[]'::jsonb,
|
||||
hinted_words = '{}'
|
||||
""", telegram_id, score, current_level)
|
||||
hinted_words = '{}',
|
||||
words_collected = COALESCE(bubble_words_progress.words_collected, 0) + $4,
|
||||
no_hints_streak = CASE WHEN $5 = 1
|
||||
THEN COALESCE(bubble_words_progress.no_hints_streak, 0) + 1 ELSE 0 END,
|
||||
perfect_streak = CASE WHEN $6 = 1
|
||||
THEN COALESCE(bubble_words_progress.perfect_streak, 0) + 1 ELSE 0 END
|
||||
""", telegram_id, score, current_level, words_count, no_hints_clean, perfect_clean)
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): читаем актуальные счётчики для проверки достижений.
|
||||
stats = await conn.fetchrow("""
|
||||
SELECT words_collected, no_hints_streak, perfect_streak, total_score
|
||||
FROM bubble_words_progress WHERE user_id = $1
|
||||
""", telegram_id)
|
||||
words_collected = stats["words_collected"] or 0
|
||||
no_hints_streak = stats["no_hints_streak"] or 0
|
||||
perfect_streak = stats["perfect_streak"] or 0
|
||||
bubble_total_score = stats["total_score"] or 0
|
||||
|
||||
# Данные для достижений
|
||||
total_levels = await conn.fetchval(
|
||||
@@ -419,10 +439,33 @@ async def complete_bubble_level(request: Request):
|
||||
if hints_used == 0 and not list_opened and wrong_words == 0:
|
||||
achievements_to_check.append(("bubble_perfect", 1))
|
||||
if completion_time is not None and 0 < completion_time <= 45:
|
||||
achievements_to_check.append(("bubble_speed", 45))
|
||||
achievements_to_check.append(("bubble_speed_45", 45))
|
||||
if completion_time is not None and 0 < completion_time <= 30:
|
||||
achievements_to_check.append(("bubble_speed_30", 30))
|
||||
|
||||
# 🔧 НОВОЕ (15.10.2026): триггеры новых достижений.
|
||||
# bubble_words — всего слов собрано
|
||||
achievements_to_check.append(("bubble_words", words_collected))
|
||||
|
||||
# bubble_no_mistakes — уровень без ошибок
|
||||
if wrong_words == 0:
|
||||
achievements_to_check.append(("bubble_no_mistakes", 1))
|
||||
|
||||
# bubble_streak — серия без подсказок (если > 0)
|
||||
if no_hints_streak > 0:
|
||||
achievements_to_check.append(("bubble_streak", no_hints_streak))
|
||||
|
||||
# bubble_xp — XP в пузырях (total_score — очки именно пузырей)
|
||||
achievements_to_check.append(("bubble_xp", bubble_total_score))
|
||||
|
||||
# bubble_speed_15 — быстрее 15 сек
|
||||
if completion_time is not None and 0 < completion_time <= 15:
|
||||
achievements_to_check.append(("bubble_speed_15", 15))
|
||||
|
||||
# bubble_perfect_streak — серия идеальных (если > 0)
|
||||
if perfect_streak > 0:
|
||||
achievements_to_check.append(("bubble_perfect_streak", perfect_streak))
|
||||
|
||||
# Достижения — вне транзакции
|
||||
from routers.achievements import check_and_award_achievements
|
||||
new_achievements = []
|
||||
|
||||
+60
-29
@@ -14,7 +14,7 @@ async def get_next_quiz(request: Request):
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
user = await conn.fetchrow(
|
||||
"SELECT app_language, current_level FROM users WHERE telegram_id = $1", telegram_id
|
||||
"SELECT app_language, current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||
)
|
||||
if not user:
|
||||
raise HTTPException(401, "User not registered")
|
||||
@@ -22,6 +22,12 @@ async def get_next_quiz(request: Request):
|
||||
lang = user["app_language"] or "pl"
|
||||
current_level = user["current_level"] or "A1"
|
||||
|
||||
if lang == 'pl':
|
||||
raise HTTPException(403, "ChooseWord не поддерживает польский язык. Используйте другой язык.")
|
||||
|
||||
difficulty = user.get("difficulty") or "medium"
|
||||
wrong_count = {"easy": 2, "medium": 3, "hard": 4}.get(difficulty, 3)
|
||||
|
||||
progress = await conn.fetchrow(
|
||||
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
@@ -70,17 +76,17 @@ async def get_next_quiz(request: Request):
|
||||
FROM csv_words
|
||||
WHERE level_code = $1 AND word_pl != $2 AND word_pl NOT IN ({placeholders})
|
||||
ORDER BY RANDOM()
|
||||
LIMIT 5
|
||||
LIMIT (wrong_count + 1)
|
||||
""", current_level, correct_polish, *exclude_for_wrong)
|
||||
|
||||
if len(wrong_words) < 2:
|
||||
if len(wrong_words) < wrong_count:
|
||||
# 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words.
|
||||
wrong_words = await conn.fetch("""
|
||||
SELECT word_pl
|
||||
FROM csv_words
|
||||
WHERE level_code = $1 AND word_pl != $2
|
||||
ORDER BY RANDOM()
|
||||
LIMIT 5
|
||||
LIMIT (wrong_count + 1)
|
||||
""", current_level, correct_polish)
|
||||
|
||||
wrong_options = []
|
||||
@@ -90,7 +96,7 @@ async def get_next_quiz(request: Request):
|
||||
if wl not in seen:
|
||||
wrong_options.append(w["word_pl"])
|
||||
seen.add(wl)
|
||||
if len(wrong_options) >= 2:
|
||||
if len(wrong_options) >= wrong_count:
|
||||
break
|
||||
|
||||
recent_words = recent_words + [correct_polish] + wrong_options
|
||||
@@ -107,20 +113,14 @@ async def get_next_quiz(request: Request):
|
||||
options = wrong_options + [correct_polish]
|
||||
random.shuffle(options)
|
||||
|
||||
if total_guessed <= 10:
|
||||
difficulty = "easy"
|
||||
elif total_guessed <= 30:
|
||||
difficulty = "medium"
|
||||
elif total_guessed <= 60:
|
||||
difficulty = "hard"
|
||||
else:
|
||||
difficulty = "expert"
|
||||
time_limit = 10 if difficulty == "hard" else None
|
||||
|
||||
return {
|
||||
"correct_polish": correct_polish,
|
||||
"translation": translation,
|
||||
"options": options,
|
||||
"difficulty": difficulty,
|
||||
"time_limit": time_limit,
|
||||
}
|
||||
|
||||
|
||||
@@ -157,6 +157,17 @@ async def check_quiz_answer(request: Request):
|
||||
|
||||
pool = await get_pool()
|
||||
async with pool.acquire() as conn:
|
||||
# Проверка языка
|
||||
lang = await conn.fetchval(
|
||||
"SELECT app_language FROM users WHERE telegram_id = $1", telegram_id
|
||||
) or "pl"
|
||||
if lang == 'pl':
|
||||
raise HTTPException(403, "ChooseWord не поддерживает польский язык.")
|
||||
|
||||
difficulty = await conn.fetchval(
|
||||
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||
) or "medium"
|
||||
|
||||
# Читаем серверный streak и mistakes
|
||||
current_streak = await conn.fetchval(
|
||||
"SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1",
|
||||
@@ -166,6 +177,10 @@ async def check_quiz_answer(request: Request):
|
||||
"SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
no_mistakes_streak = await conn.fetchval(
|
||||
"SELECT no_mistakes_streak FROM word_quiz_progress WHERE user_id = $1",
|
||||
telegram_id
|
||||
) or 0
|
||||
|
||||
if is_correct:
|
||||
current_streak += 1
|
||||
@@ -183,32 +198,41 @@ async def check_quiz_answer(request: Request):
|
||||
score = 0
|
||||
|
||||
if is_correct:
|
||||
# 🆕 Расчёт звёзд для "Выбери слово"
|
||||
# Старт 5 звёзд. Штрафы:
|
||||
# -1 за каждый неверный (макс 3)
|
||||
# -1 если time > 30 сек
|
||||
time_penalty = 1 if (completion_time and completion_time > 30) else 0
|
||||
wrong_penalty = min(mistakes, 3)
|
||||
stars = max(1, 5 - wrong_penalty - time_penalty)
|
||||
# 🆕 Фиксированные очки по сложности (ChooseWord)
|
||||
if difficulty == "easy":
|
||||
points = max(20, min(60, 60 - 20 * mistakes))
|
||||
elif difficulty == "medium":
|
||||
points = max(20, min(80, 80 - 20 * mistakes))
|
||||
else: # hard
|
||||
points = max(20, min(110, 110 - 20 * mistakes))
|
||||
if completion_time is not None and completion_time > 10:
|
||||
points = 20
|
||||
|
||||
# Начисляем XP
|
||||
from services.xp import award_xp
|
||||
xp_result = await award_xp(conn, telegram_id, "choose", stars)
|
||||
xp_result = await award_xp(conn, telegram_id, "choose", points)
|
||||
score = xp_result["points"]
|
||||
|
||||
# no_mistakes_streak: +1 если раунд чистый, иначе сброс
|
||||
if mistakes == 0:
|
||||
no_mistakes_streak += 1
|
||||
else:
|
||||
no_mistakes_streak = 0
|
||||
|
||||
# Сбрасываем mistakes + обновляем серию
|
||||
await conn.execute("""
|
||||
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
|
||||
""", telegram_id)
|
||||
|
||||
await conn.execute("""
|
||||
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak)
|
||||
VALUES ($1, 1, $2, $3)
|
||||
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, no_mistakes_streak)
|
||||
VALUES ($1, 1, $2, $3, $4)
|
||||
ON CONFLICT (user_id) DO UPDATE
|
||||
SET words_guessed = word_quiz_progress.words_guessed + 1,
|
||||
total_score = word_quiz_progress.total_score + $2,
|
||||
correct_streak = $3
|
||||
""", telegram_id, score, current_streak)
|
||||
correct_streak = $3,
|
||||
no_mistakes_streak = $4
|
||||
""", telegram_id, score, current_streak, no_mistakes_streak)
|
||||
|
||||
# 🆕 Обновляем best_streak в choose_progress
|
||||
await conn.execute("""
|
||||
@@ -230,12 +254,20 @@ async def check_quiz_answer(request: Request):
|
||||
("quiz_guessed", total_guessed),
|
||||
("total_score", xp_result["total_xp"]),
|
||||
]
|
||||
if current_streak >= 10:
|
||||
achievements_to_check.append(("quiz_perfect_streak", current_streak))
|
||||
if current_streak >= 5:
|
||||
achievements_to_check.append(("quiz_correct_streak", current_streak))
|
||||
if no_mistakes_streak > 0:
|
||||
achievements_to_check.append(("quiz_no_mistakes_streak", no_mistakes_streak))
|
||||
if mistakes == 0:
|
||||
achievements_to_check.append(("quiz_no_mistakes", 1))
|
||||
if completion_time is not None and 0 < completion_time <= 5:
|
||||
achievements_to_check.append(("quiz_speed_5", 5))
|
||||
if completion_time is not None and 0 < completion_time <= 3:
|
||||
achievements_to_check.append(("quiz_speed", 3))
|
||||
achievements_to_check.append(("quiz_speed_3", 3))
|
||||
if completion_time is not None and 0 < completion_time <= 2:
|
||||
achievements_to_check.append(("quiz_speed_2", 2))
|
||||
if completion_time is not None and 0 < completion_time <= 1:
|
||||
achievements_to_check.append(("quiz_speed_1", 1))
|
||||
else:
|
||||
# При 3 ошибках — утешительный XP (10)
|
||||
if mistakes >= 3:
|
||||
@@ -268,7 +300,6 @@ async def check_quiz_answer(request: Request):
|
||||
"correct_streak": current_streak,
|
||||
"new_achievements": new_achievements,
|
||||
# 🆕 XP-поля
|
||||
"stars": xp_result["stars"],
|
||||
"base_points": xp_result["base_points"],
|
||||
"multiplier": xp_result["multiplier"],
|
||||
"points": xp_result["points"],
|
||||
|
||||
Reference in New Issue
Block a user