Compare commits
109
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
38e0c2fe80 | ||
|
|
d669b37397 | ||
|
|
d334bc958d | ||
|
|
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 | ||
|
|
b6a8783ad0 | ||
|
|
8918309501 | ||
|
|
1afc7a1654 | ||
|
|
5fc49d086d | ||
|
|
5a6b81da1d | ||
|
|
abc3a8ae7d | ||
|
|
7c43812475 | ||
|
|
3f7e7ef8d6 | ||
|
|
e7c512e50e | ||
|
|
0d6b56e5c9 | ||
|
|
4bbaa0030f | ||
|
|
99dd3765d0 | ||
|
|
929420a284 | ||
|
|
3c60cfed31 | ||
|
|
6399d3931c | ||
|
|
07d2d197fd | ||
|
|
1f7ac86ef5 | ||
|
|
16b8956b87 | ||
|
|
959b9c4e3f | ||
|
|
4355b94291 | ||
|
|
bd45071142 | ||
|
|
13fcc8240d | ||
|
|
118345f701 | ||
|
|
4159d6265a | ||
|
|
741d1799e7 | ||
|
|
5644b5be16 | ||
|
|
e65bd5db43 | ||
|
|
6786acb126 | ||
|
|
6fc8c83322 | ||
|
|
bffcb4387c | ||
|
|
01ce5dfa2d | ||
|
|
ec9108f2a3 | ||
|
|
938d674b09 | ||
|
|
556c11fc95 | ||
|
|
aa7679c49b | ||
|
|
9db00df88f | ||
|
|
4333aa62a6 | ||
|
|
bd743e4c48 | ||
|
|
f83fcc0e1c | ||
|
|
78d40364bf | ||
|
|
20b1cdc464 | ||
|
|
26442db954 | ||
|
|
e3bc3e8456 | ||
|
|
a6fe755fdb | ||
|
|
959f789f24 | ||
|
|
d181e43ee3 | ||
|
|
6f89336a02 | ||
|
|
f78a1fa19f | ||
|
|
2b5ef446c1 | ||
|
|
50c02b7707 | ||
|
|
6e02303ea8 | ||
|
|
22e4eed3f5 | ||
|
|
5e2de6f7e4 | ||
|
|
2dedec5972 | ||
|
|
8b98655716 | ||
|
|
da7182fb6b | ||
|
|
b62311d3ed | ||
|
|
6f341a7f33 | ||
|
|
981e65e57c | ||
|
|
9c975dde79 | ||
|
|
df3d32ecd5 | ||
|
|
437921d9dd | ||
|
|
bcc01a0fe8 | ||
|
|
5ee5614fdf | ||
|
|
8338d6b3c8 | ||
|
|
7efa54e455 | ||
|
|
6e4701aecd | ||
|
|
32a4a68f92 | ||
|
|
12c6bbca51 | ||
|
|
5983a4767e | ||
|
|
794daad69c | ||
|
|
154ae25772 | ||
|
|
5e9cd0c901 | ||
|
|
22decc1bc3 |
+121
@@ -229,6 +229,21 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added current_streak column to user_progress")
|
logger.info("Added current_streak column to user_progress")
|
||||||
|
|
||||||
|
# ============ Авто-миграция: добавляем wave в user_progress ============
|
||||||
|
# 🔧 НОВОЕ (13.10.2026): wave — номер волны, к которой относится
|
||||||
|
# пройденный уровень. Нужен для подсчёта wave_points (сумма очков
|
||||||
|
# за 10 уровней волны) в модалке итогов волны.
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'user_progress' AND column_name = 'wave'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE user_progress
|
||||||
|
ADD COLUMN wave INTEGER
|
||||||
|
""")
|
||||||
|
logger.info("Added wave column to user_progress")
|
||||||
|
|
||||||
# ============ sentences ============
|
# ============ sentences ============
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE TABLE IF NOT EXISTS sentences (
|
CREATE TABLE IF NOT EXISTS sentences (
|
||||||
@@ -848,6 +863,20 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added current_mistakes column to word_quiz_progress")
|
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 ============
|
# ============ bubble_words_progress ============
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE TABLE IF NOT EXISTS bubble_words_progress (
|
CREATE TABLE IF NOT EXISTS bubble_words_progress (
|
||||||
@@ -883,6 +912,87 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added current_hints_used column to bubble_words_progress")
|
logger.info("Added current_hints_used column to bubble_words_progress")
|
||||||
|
|
||||||
|
# 🔧 НОВОЕ (14.10.2026): current_list_opened — серверный счётчик
|
||||||
|
# «показать слова» для текущего уровня пузырей. Medium — 1 раз.
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'bubble_words_progress' AND column_name = 'current_list_opened'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE bubble_words_progress
|
||||||
|
ADD COLUMN current_list_opened INT DEFAULT 0
|
||||||
|
""")
|
||||||
|
logger.info("Added current_list_opened column to bubble_words_progress")
|
||||||
|
|
||||||
|
# 🔧 НОВОЕ (14.10.2026): current_level_words — состояние текущего
|
||||||
|
# уровня пузырей (слова + части + переводы). Нужно для подсказок,
|
||||||
|
# т.к. уровень генерируется на лету в /next и нигде не хранится.
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'bubble_words_progress' AND column_name = 'current_level_words'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE bubble_words_progress
|
||||||
|
ADD COLUMN current_level_words JSONB DEFAULT '[]'::jsonb
|
||||||
|
""")
|
||||||
|
logger.info("Added current_level_words column to bubble_words_progress")
|
||||||
|
|
||||||
|
# 🔧 НОВОЕ (14.10.2026): hinted_words — какие слова уже получили
|
||||||
|
# подсказку «первая часть» (для «каждый раз разное слово»).
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'bubble_words_progress' AND column_name = 'hinted_words'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE bubble_words_progress
|
||||||
|
ADD COLUMN hinted_words TEXT[] DEFAULT '{}'
|
||||||
|
""")
|
||||||
|
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 ============
|
# ============ wrong_because_explanations ============
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE TABLE IF NOT EXISTS wrong_because_explanations (
|
CREATE TABLE IF NOT EXISTS wrong_because_explanations (
|
||||||
@@ -1299,6 +1409,17 @@ async def init_db():
|
|||||||
""")
|
""")
|
||||||
logger.info("Added apple_id column to users (Pleily)")
|
logger.info("Added apple_id column to users (Pleily)")
|
||||||
|
|
||||||
|
# difficulty
|
||||||
|
col_exists = await conn.fetchval("""
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE table_name = 'users' AND column_name = 'difficulty'
|
||||||
|
""")
|
||||||
|
if not col_exists:
|
||||||
|
await conn.execute("""
|
||||||
|
ALTER TABLE users ADD COLUMN difficulty TEXT DEFAULT 'medium'
|
||||||
|
""")
|
||||||
|
logger.info("Added difficulty column to users (Pleily)")
|
||||||
|
|
||||||
# app_user_id_seq — sequence для отрицательных user_id
|
# app_user_id_seq — sequence для отрицательных user_id
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
CREATE SEQUENCE IF NOT EXISTS app_user_id_seq
|
CREATE SEQUENCE IF NOT EXISTS app_user_id_seq
|
||||||
|
|||||||
@@ -523,6 +523,7 @@
|
|||||||
| last_completed_level | integer | YES | 0 |
|
| last_completed_level | integer | YES | 0 |
|
||||||
| id | integer | NO | nextval('users_id_seq'::regclass) |
|
| id | integer | NO | nextval('users_id_seq'::regclass) |
|
||||||
| current_level | text | YES | 'A1'::text |
|
| current_level | text | YES | 'A1'::text |
|
||||||
|
| difficulty | text | YES | 'medium'::text |
|
||||||
|
|
||||||
## voice_usage
|
## voice_usage
|
||||||
|
|
||||||
|
|||||||
+147
-48
@@ -8,7 +8,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
router = APIRouter(prefix="/achievements", tags=["achievements"])
|
router = APIRouter(prefix="/achievements", tags=["achievements"])
|
||||||
|
|
||||||
# ============ Данные 52 достижений ============
|
# ============ Данные 55 достижений ============
|
||||||
ACHIEVEMENTS_DATA = [
|
ACHIEVEMENTS_DATA = [
|
||||||
# ===== Word Search (11) =====
|
# ===== Word Search (11) =====
|
||||||
{"code": "first_level", "category": "wordsearch", "icon": "🔰",
|
{"code": "first_level", "category": "wordsearch", "icon": "🔰",
|
||||||
@@ -69,7 +69,7 @@ ACHIEVEMENTS_DATA = [
|
|||||||
# ===== Word Search — волны (9 новых, 11.10.2026) =====
|
# ===== Word Search — волны (9 новых, 11.10.2026) =====
|
||||||
{"code": "ws_wave_1", "category": "wordsearch", "icon": "🌊",
|
{"code": "ws_wave_1", "category": "wordsearch", "icon": "🌊",
|
||||||
"name_pl": "Pierwsza fala", "name_ru": "Первая волна", "name_uk": "Перша хвиля", "name_en": "First Wave",
|
"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},
|
"type": "waves_completed", "value": 1},
|
||||||
|
|
||||||
{"code": "ws_wave_5", "category": "wordsearch", "icon": "🌊",
|
{"code": "ws_wave_5", "category": "wordsearch", "icon": "🌊",
|
||||||
@@ -99,8 +99,8 @@ ACHIEVEMENTS_DATA = [
|
|||||||
|
|
||||||
{"code": "ws_wave_no_hints", "category": "wordsearch", "icon": "🎯",
|
{"code": "ws_wave_no_hints", "category": "wordsearch", "icon": "🎯",
|
||||||
"name_pl": "Fala bez podpowiedzi", "name_ru": "Волна без подсказок", "name_uk": "Хвиля без підказок", "name_en": "Flawless Wave",
|
"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",
|
"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": 20},
|
"type": "ws_no_hints_streak", "value": 10},
|
||||||
|
|
||||||
{"code": "ws_words_1000", "category": "wordsearch", "icon": "📚",
|
{"code": "ws_words_1000", "category": "wordsearch", "icon": "📚",
|
||||||
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
|
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
|
||||||
@@ -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",
|
"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},
|
"type": "speed_sentence", "value": 5},
|
||||||
|
|
||||||
# ===== Word Quiz (8) =====
|
# ===== Word Quiz (20) =====
|
||||||
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
|
{"code": "quiz_10", "category": "wordquiz", "icon": "🧠",
|
||||||
"name_pl": "Myśliciel", "name_ru": "Мыслитель", "name_uk": "Мислитель", "name_en": "Thinker",
|
"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",
|
"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": "💎",
|
{"code": "quiz_perfect_10", "category": "wordquiz", "icon": "💎",
|
||||||
"name_pl": "Idealny wynik", "name_ru": "Идеальный результат", "name_uk": "Ідеальний результат", "name_en": "Perfect Score",
|
"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",
|
"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": "🔥",
|
{"code": "quiz_streak_20", "category": "wordquiz", "icon": "🔥",
|
||||||
"name_pl": "Niepowstrzymany", "name_ru": "Неудержимый", "name_uk": "Невтримний", "name_en": "Unstoppable",
|
"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",
|
"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": "⚡",
|
{"code": "quiz_speed", "category": "wordquiz", "icon": "⚡",
|
||||||
"name_pl": "Błyskawica", "name_ru": "Молния", "name_uk": "Блискавка", "name_en": "Lightning",
|
"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",
|
"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": "🚀",
|
{"code": "quiz_speed_2", "category": "wordquiz", "icon": "🚀",
|
||||||
"name_pl": "Super szybki", "name_ru": "Супер быстрый", "name_uk": "Супер швидкий", "name_en": "Super Fast",
|
"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",
|
"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": "🏆",
|
{"code": "quiz_no_mistakes", "category": "wordquiz", "icon": "🏆",
|
||||||
"name_pl": "Bezbłędny", "name_ru": "Безошибочный", "name_uk": "Безпомилковий", "name_en": "Flawless",
|
"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",
|
"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},
|
"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": "🫧",
|
{"code": "bubble_5", "category": "bubblewords", "icon": "🫧",
|
||||||
"name_pl": "Początkujący", "name_ru": "Начинающий", "name_uk": "Початківець", "name_en": "Beginner",
|
"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",
|
"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,14 +298,74 @@ ACHIEVEMENTS_DATA = [
|
|||||||
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
|
{"code": "bubble_speed", "category": "bubblewords", "icon": "🚀",
|
||||||
"name_pl": "Szybki bańki", "name_ru": "Быстрые пузыри", "name_uk": "Швидкі бульбашки", "name_en": "Fast Bubbles",
|
"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",
|
"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": "⚡",
|
{"code": "bubble_speed_30", "category": "bubblewords", "icon": "⚡",
|
||||||
"name_pl": "Bąbelkowa błyskawica", "name_ru": "Пузырьковая молния", "name_uk": "Бульбашкова блискавка", "name_en": "Bubble Lightning",
|
"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",
|
"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},
|
||||||
|
|
||||||
# ===== General (15) =====
|
{"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": "🌟",
|
{"code": "score_1000", "category": "general", "icon": "🌟",
|
||||||
"name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star",
|
"name_pl": "Wschodząca gwiazda", "name_ru": "Восходящая звезда", "name_uk": "Висхідна зірка", "name_en": "Rising Star",
|
||||||
"desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points",
|
"desc_pl": "Zdobądź 1000 punktów", "desc_ru": "Набрать 1000 очков", "desc_uk": "Набрати 1000 балів", "desc_en": "Earn 1000 points",
|
||||||
@@ -291,42 +411,7 @@ ACHIEVEMENTS_DATA = [
|
|||||||
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
|
"desc_pl": "Zmień język interfejsu", "desc_ru": "Сменить язык интерфейса", "desc_uk": "Змінити мову інтерфейсу", "desc_en": "Change interface language",
|
||||||
"type": "language_changed", "value": 1},
|
"type": "language_changed", "value": 1},
|
||||||
|
|
||||||
# 🔧 ИСПРАВЛЕНО: Заменено достижение "Открой Грамматику" на "Открой меню учителя"
|
|
||||||
{"code": "open_teacher_menu", "category": "general", "icon": "🎓",
|
|
||||||
"name_pl": "Uczeń", "name_ru": "Ученик", "name_uk": "Учень", "name_en": "Student",
|
|
||||||
"desc_pl": "Otwórz menu nauczyciela", "desc_ru": "Открыть меню учителя", "desc_uk": "Відкрити меню вчителя", "desc_en": "Open the teacher menu",
|
|
||||||
"type": "teacher_menu_opened", "value": 1},
|
|
||||||
|
|
||||||
{"code": "open_cheatsheets", "category": "general", "icon": "📝",
|
|
||||||
"name_pl": "Ciekawski", "name_ru": "Любознательный", "name_uk": "Допитливий", "name_en": "Curious",
|
|
||||||
"desc_pl": "Otwórz sekcję Ściągi", "desc_ru": "Открыть раздел Шпаргалки", "desc_uk": "Відкрити розділ Шпаргалки", "desc_en": "Open the Cheatsheets section",
|
|
||||||
"type": "cheatsheets_opened", "value": 1},
|
|
||||||
|
|
||||||
{"code": "open_pronunciation", "category": "general", "icon": "🔊",
|
|
||||||
"name_pl": "Słuchacz", "name_ru": "Слушатель", "name_uk": "Слухач", "name_en": "Listener",
|
|
||||||
"desc_pl": "Otwórz sekcję Wymowa", "desc_ru": "Открыть раздел Произношение", "desc_uk": "Відкрити розділ Вимова", "desc_en": "Open the Pronunciation section",
|
|
||||||
"type": "pronunciation_opened", "value": 1},
|
|
||||||
|
|
||||||
{"code": "open_ai_assistant", "category": "general", "icon": "🤖",
|
|
||||||
"name_pl": "Asystent AI", "name_ru": "AI-помощник", "name_uk": "AI-помічник", "name_en": "AI Assistant",
|
|
||||||
"desc_pl": "Otwórz Asystenta AI", "desc_ru": "Открыть AI-помощника", "desc_uk": "Відкрити AI-помічника", "desc_en": "Open the AI Assistant",
|
|
||||||
"type": "ai_assistant_opened", "value": 1},
|
|
||||||
|
|
||||||
{"code": "open_alphabet", "category": "general", "icon": "🔤",
|
|
||||||
"name_pl": "Alfabetysta", "name_ru": "Алфавитист", "name_uk": "Алфавітист", "name_en": "Alphabetist",
|
|
||||||
"desc_pl": "Otwórz sekcję Alfabet", "desc_ru": "Открыть раздел Алфавит", "desc_uk": "Відкрити розділ Алфавіт", "desc_en": "Open the Alphabet section",
|
|
||||||
"type": "alphabet_opened", "value": 1},
|
|
||||||
|
|
||||||
{"code": "open_rules", "category": "general", "icon": "📐",
|
|
||||||
"name_pl": "Gramatyk", "name_ru": "Грамматик", "name_uk": "Граматик", "name_en": "Grammarian",
|
|
||||||
"desc_pl": "Otwórz sekcję Zasady", "desc_ru": "Открыть раздел Правила", "desc_uk": "Відкрити розділ Правила", "desc_en": "Open the Rules section",
|
|
||||||
"type": "rules_opened", "value": 1},
|
|
||||||
|
|
||||||
# 🔧 НОВОЕ: Достижение за открытие Прогресса
|
|
||||||
{"code": "open_progress", "category": "general", "icon": "📊",
|
|
||||||
"name_pl": "Planista", "name_ru": "Планировщик", "name_uk": "Планувальник", "name_en": "Planner",
|
|
||||||
"desc_pl": "Otwórz sekcję Postęp", "desc_ru": "Открыть раздел Прогресс", "desc_uk": "Відкрити розділ Прогрес", "desc_en": "Open the Progress section",
|
|
||||||
"type": "progress_opened", "value": 1},
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@@ -369,6 +454,20 @@ async def init_achievements():
|
|||||||
requirement_value = EXCLUDED.requirement_value
|
requirement_value = EXCLUDED.requirement_value
|
||||||
""", rows)
|
""", rows)
|
||||||
|
|
||||||
|
# 🔧 Удаление осиротевших достижений (которых больше нет в ACHIEVEMENTS_DATA)
|
||||||
|
await conn.execute("""
|
||||||
|
DELETE FROM user_achievements
|
||||||
|
WHERE achievement_id IN (
|
||||||
|
SELECT id FROM achievements
|
||||||
|
WHERE code NOT IN (SELECT unnest($1::text[]))
|
||||||
|
)
|
||||||
|
""", [a["code"] for a in ACHIEVEMENTS_DATA])
|
||||||
|
|
||||||
|
await conn.execute("""
|
||||||
|
DELETE FROM achievements
|
||||||
|
WHERE code NOT IN (SELECT unnest($1::text[]))
|
||||||
|
""", [a["code"] for a in ACHIEVEMENTS_DATA])
|
||||||
|
|
||||||
logger.info(f"[achievements] init: upserted {len(rows)} achievements")
|
logger.info(f"[achievements] init: upserted {len(rows)} achievements")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+248
-31
@@ -1,5 +1,6 @@
|
|||||||
import random
|
import random
|
||||||
import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования
|
import hashlib # 🔧 НОВОЕ: импорт hashlib для стабильного хэширования
|
||||||
|
import json
|
||||||
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
|
||||||
@@ -100,7 +101,7 @@ async def get_next_bubble_level(request: Request):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
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:
|
if not user:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
@@ -114,13 +115,9 @@ async def get_next_bubble_level(request: Request):
|
|||||||
)
|
)
|
||||||
current_bubble_level = (progress["levels_completed"] if progress else 0) + 1
|
current_bubble_level = (progress["levels_completed"] if progress else 0) + 1
|
||||||
|
|
||||||
# Прогрессия по количеству слов на уровне
|
# Количество слов по сложности
|
||||||
if current_bubble_level <= 10:
|
difficulty = user["difficulty"] if "difficulty" in user.keys() else "medium"
|
||||||
num_words = random.choice([3, 4])
|
num_words = {"easy": 3, "medium": 4, "hard": 5}.get(difficulty, 4)
|
||||||
elif current_bubble_level <= 25:
|
|
||||||
num_words = random.choice([5, 6])
|
|
||||||
else:
|
|
||||||
num_words = random.choice([7, 8])
|
|
||||||
|
|
||||||
# 🔧 ФИКС (30.09.2026): csv_words_source —
|
# 🔧 ФИКС (30.09.2026): csv_words_source —
|
||||||
# источник слов переехал с level_words (старая схема level_id IS NULL)
|
# источник слов переехал с level_words (старая схема level_id IS NULL)
|
||||||
@@ -162,10 +159,172 @@ async def get_next_bubble_level(request: Request):
|
|||||||
|
|
||||||
random.shuffle(all_parts)
|
random.shuffle(all_parts)
|
||||||
|
|
||||||
|
# 🔧 НОВОЕ (14.10.2026): сохраняем состояние уровня для подсказок
|
||||||
|
# и сбрасываем счётчики подсказок/списка при новом уровне.
|
||||||
|
level_state = [
|
||||||
|
{
|
||||||
|
"word_pl": w["word_pl"],
|
||||||
|
"translation": w["translation"],
|
||||||
|
"parts": w["parts"],
|
||||||
|
}
|
||||||
|
for w in result_words
|
||||||
|
]
|
||||||
|
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, 0, 0, $2, 0, 0, $3::jsonb, '{}')
|
||||||
|
ON CONFLICT (user_id) DO UPDATE
|
||||||
|
SET current_hints_used = 0,
|
||||||
|
current_list_opened = 0,
|
||||||
|
current_level_words = $3::jsonb,
|
||||||
|
hinted_words = '{}'
|
||||||
|
""", telegram_id, current_level, json.dumps(level_state))
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"words": result_words,
|
"words": result_words,
|
||||||
"bubbles": all_parts,
|
"bubbles": all_parts,
|
||||||
"level": current_bubble_level,
|
"level": current_bubble_level,
|
||||||
|
"difficulty": user["difficulty"] or "medium",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/first-part-hint")
|
||||||
|
async def first_part_hint(request: Request):
|
||||||
|
"""Подсказка «первая часть слова» — возвращает первый пузырь одного из несобранных слов.
|
||||||
|
|
||||||
|
🔧 НОВОЕ (14.10.2026): аналог GET /hints/first-letter/{level_id} из филворда.
|
||||||
|
Лимит 3 подсказки, штраф −20 (учитывается в /complete через current_hints_used).
|
||||||
|
Hard — запрещено (400).
|
||||||
|
"""
|
||||||
|
telegram_id, _ = await require_auth(request)
|
||||||
|
body = await request.json()
|
||||||
|
found_words = set(body.get("found_words", []) or [])
|
||||||
|
|
||||||
|
pool = await get_pool()
|
||||||
|
async with pool.acquire() as conn:
|
||||||
|
user = await conn.fetchrow(
|
||||||
|
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
|
)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
if difficulty == "hard":
|
||||||
|
raise HTTPException(400, "Hints are disabled on Hard difficulty")
|
||||||
|
|
||||||
|
progress = await conn.fetchrow(
|
||||||
|
"SELECT current_hints_used, current_level_words, hinted_words "
|
||||||
|
"FROM bubble_words_progress WHERE user_id = $1",
|
||||||
|
telegram_id
|
||||||
|
)
|
||||||
|
if not progress:
|
||||||
|
raise HTTPException(404, "No active level")
|
||||||
|
|
||||||
|
hints_used = progress["current_hints_used"] or 0
|
||||||
|
if hints_used >= 3:
|
||||||
|
raise HTTPException(400, "All hints used")
|
||||||
|
|
||||||
|
raw = progress["current_level_words"]
|
||||||
|
if isinstance(raw, str):
|
||||||
|
level_words = json.loads(raw) if raw else []
|
||||||
|
else:
|
||||||
|
level_words = raw or []
|
||||||
|
|
||||||
|
raw_hinted = progress["hinted_words"]
|
||||||
|
if isinstance(raw_hinted, str):
|
||||||
|
hinted = set(json.loads(raw_hinted)) if raw_hinted else set()
|
||||||
|
else:
|
||||||
|
hinted = set(raw_hinted or [])
|
||||||
|
|
||||||
|
# Слова, которые ещё не собраны и которым ещё не давали подсказку
|
||||||
|
candidates = [
|
||||||
|
w for w in level_words
|
||||||
|
if w.get("word_pl") not in found_words and w.get("word_pl") not in hinted
|
||||||
|
]
|
||||||
|
|
||||||
|
if not candidates:
|
||||||
|
raise HTTPException(400, "All words already hinted")
|
||||||
|
|
||||||
|
chosen = random.choice(candidates)
|
||||||
|
word_pl = chosen["word_pl"]
|
||||||
|
parts = chosen.get("parts") or []
|
||||||
|
first_part = parts[0] if parts else word_pl
|
||||||
|
|
||||||
|
new_hints = hints_used + 1
|
||||||
|
new_hinted = sorted(hinted | {word_pl})
|
||||||
|
|
||||||
|
await conn.execute("""
|
||||||
|
UPDATE bubble_words_progress
|
||||||
|
SET current_hints_used = $2,
|
||||||
|
hinted_words = $3
|
||||||
|
WHERE user_id = $1
|
||||||
|
""", telegram_id, new_hints, new_hinted)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"word_pl": word_pl,
|
||||||
|
"first_part": first_part,
|
||||||
|
"hints_used_total": new_hints,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/show-words")
|
||||||
|
async def show_words(request: Request):
|
||||||
|
"""Подсказка «показать слова» — возвращает все загаданные слова с переводами.
|
||||||
|
|
||||||
|
🔧 НОВОЕ (14.10.2026): аналог show-words из филворда.
|
||||||
|
Easy — без лимита. Medium — 1 раз (−20). Hard — запрещено (400).
|
||||||
|
"""
|
||||||
|
telegram_id, _ = await require_auth(request)
|
||||||
|
|
||||||
|
pool = await get_pool()
|
||||||
|
async with pool.acquire() as conn:
|
||||||
|
user = await conn.fetchrow(
|
||||||
|
"SELECT difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
|
)
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
if difficulty == "hard":
|
||||||
|
raise HTTPException(400, "Word list is disabled on Hard difficulty")
|
||||||
|
|
||||||
|
progress = await conn.fetchrow(
|
||||||
|
"SELECT current_list_opened, current_level_words "
|
||||||
|
"FROM bubble_words_progress WHERE user_id = $1",
|
||||||
|
telegram_id
|
||||||
|
)
|
||||||
|
if not progress:
|
||||||
|
raise HTTPException(404, "No active level")
|
||||||
|
|
||||||
|
list_opened = progress["current_list_opened"] or 0
|
||||||
|
|
||||||
|
# Medium — список можно открыть только 1 раз
|
||||||
|
if difficulty == "medium" and list_opened >= 1:
|
||||||
|
raise HTTPException(400, "Word list already used on Medium difficulty")
|
||||||
|
|
||||||
|
raw = progress["current_level_words"]
|
||||||
|
if isinstance(raw, str):
|
||||||
|
level_words = json.loads(raw) if raw else []
|
||||||
|
else:
|
||||||
|
level_words = raw or []
|
||||||
|
|
||||||
|
words = [
|
||||||
|
{"word_pl": w.get("word_pl"), "translation": w.get("translation")}
|
||||||
|
for w in level_words
|
||||||
|
]
|
||||||
|
|
||||||
|
# Инкремент счётчика для Easy и Medium (Hard сюда не доходит)
|
||||||
|
new_list_opened = list_opened + 1
|
||||||
|
await conn.execute("""
|
||||||
|
UPDATE bubble_words_progress
|
||||||
|
SET current_list_opened = $2
|
||||||
|
WHERE user_id = $1
|
||||||
|
""", telegram_id, new_list_opened)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"words": words,
|
||||||
|
"list_opened_total": new_list_opened,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -184,7 +343,6 @@ async def complete_bubble_level(request: Request):
|
|||||||
body = await request.json()
|
body = await request.json()
|
||||||
words_count = body.get("words_count", 3)
|
words_count = body.get("words_count", 3)
|
||||||
completion_time = body.get("completion_time")
|
completion_time = body.get("completion_time")
|
||||||
list_opened = bool(body.get("list_opened", False))
|
|
||||||
wrong_words = int(body.get("wrong_words", 0) or 0)
|
wrong_words = int(body.get("wrong_words", 0) or 0)
|
||||||
|
|
||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
@@ -195,39 +353,76 @@ async def complete_bubble_level(request: Request):
|
|||||||
if not user_exists:
|
if not user_exists:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
current_level = await conn.fetchval(
|
user = await conn.fetchrow(
|
||||||
"SELECT current_level FROM users WHERE telegram_id = $1", telegram_id
|
"SELECT current_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
) or "A1"
|
)
|
||||||
|
current_level = user["current_level"] or "A1"
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
|
||||||
# Читаем серверный hints_used
|
# Читаем серверные счётчики (не из body)
|
||||||
hints_used = await conn.fetchval(
|
progress = await conn.fetchrow(
|
||||||
"SELECT current_hints_used FROM bubble_words_progress WHERE user_id = $1",
|
"SELECT current_hints_used, current_list_opened "
|
||||||
|
"FROM bubble_words_progress WHERE user_id = $1",
|
||||||
telegram_id
|
telegram_id
|
||||||
) or 0
|
)
|
||||||
|
hints_used = (progress["current_hints_used"] if progress else 0) or 0
|
||||||
hints_used = min(max(0, hints_used), 3)
|
hints_used = min(max(0, hints_used), 3)
|
||||||
|
list_opened = (progress["current_list_opened"] if progress else 0) or 0
|
||||||
|
|
||||||
# 🆕 Расчёт звёзд
|
# 🔧 НОВОЕ (14.10.2026): очки по формуле филворда.
|
||||||
# Старт 5. Штрафы: hints(1) + wrong_words(до 3) + time(1)
|
# Hard — фикс 110. Easy/Medium — 100 − 20×hints − 20×list + bonus.
|
||||||
time_penalty = 1 if (completion_time and completion_time > 60) else 0
|
if difficulty == "hard":
|
||||||
wrong_penalty = min(max(0, wrong_words), 3)
|
if hints_used > 0 or list_opened:
|
||||||
hint_penalty = 1 if hints_used > 0 else 0
|
raise HTTPException(
|
||||||
list_penalty = 1 if list_opened else 0
|
status_code=400,
|
||||||
stars = max(1, 5 - time_penalty - wrong_penalty - hint_penalty - list_penalty)
|
detail="Hints and word list are disabled on Hard difficulty"
|
||||||
|
)
|
||||||
|
points = 110
|
||||||
|
else:
|
||||||
|
bonus = 10 if hints_used == 0 else 0
|
||||||
|
penalty_hints = 20 * hints_used
|
||||||
|
penalty_list = 0 if difficulty == "easy" else 20 * (1 if list_opened else 0)
|
||||||
|
points = max(20, min(110, 100 - penalty_hints - penalty_list + bonus))
|
||||||
|
|
||||||
# Начисляем XP
|
# Начисляем XP
|
||||||
from services.xp import award_xp
|
from services.xp import award_xp
|
||||||
xp_result = await award_xp(conn, telegram_id, "bubbles", stars)
|
xp_result = await award_xp(conn, telegram_id, "bubbles", points)
|
||||||
score = xp_result["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("""
|
await conn.execute("""
|
||||||
INSERT INTO bubble_words_progress (user_id, levels_completed, total_score, level, current_hints_used)
|
INSERT INTO bubble_words_progress
|
||||||
VALUES ($1, 1, $2, $3, 0)
|
(user_id, levels_completed, total_score, level,
|
||||||
|
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
|
ON CONFLICT (user_id) DO UPDATE
|
||||||
SET levels_completed = bubble_words_progress.levels_completed + 1,
|
SET levels_completed = bubble_words_progress.levels_completed + 1,
|
||||||
total_score = bubble_words_progress.total_score + $2,
|
total_score = bubble_words_progress.total_score + $2,
|
||||||
level = $3,
|
level = $3,
|
||||||
current_hints_used = 0
|
current_hints_used = 0,
|
||||||
""", telegram_id, score, current_level)
|
current_list_opened = 0,
|
||||||
|
current_level_words = '[]'::jsonb,
|
||||||
|
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(
|
total_levels = await conn.fetchval(
|
||||||
@@ -241,13 +436,36 @@ async def complete_bubble_level(request: Request):
|
|||||||
]
|
]
|
||||||
if hints_used == 0:
|
if hints_used == 0:
|
||||||
achievements_to_check.append(("bubble_no_hints", 1))
|
achievements_to_check.append(("bubble_no_hints", 1))
|
||||||
if stars == 5:
|
if hints_used == 0 and not list_opened and wrong_words == 0:
|
||||||
achievements_to_check.append(("bubble_perfect", 1))
|
achievements_to_check.append(("bubble_perfect", 1))
|
||||||
if completion_time is not None and 0 < completion_time <= 45:
|
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:
|
if completion_time is not None and 0 < completion_time <= 30:
|
||||||
achievements_to_check.append(("bubble_speed_30", 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
|
from routers.achievements import check_and_award_achievements
|
||||||
new_achievements = []
|
new_achievements = []
|
||||||
@@ -261,7 +479,6 @@ async def complete_bubble_level(request: Request):
|
|||||||
"completion_time": completion_time,
|
"completion_time": completion_time,
|
||||||
"new_achievements": new_achievements,
|
"new_achievements": new_achievements,
|
||||||
# 🆕 XP-поля
|
# 🆕 XP-поля
|
||||||
"stars": xp_result["stars"],
|
|
||||||
"base_points": xp_result["base_points"],
|
"base_points": xp_result["base_points"],
|
||||||
"multiplier": xp_result["multiplier"],
|
"multiplier": xp_result["multiplier"],
|
||||||
"points": xp_result["points"],
|
"points": xp_result["points"],
|
||||||
|
|||||||
+94
-40
@@ -73,7 +73,7 @@ async def get_level(request: Request, level_number: int):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
user = await conn.fetchrow(
|
||||||
"SELECT app_language, current_level, last_completed_level, last_completed_by_level FROM users WHERE telegram_id = $1", telegram_id
|
"SELECT app_language, current_level, last_completed_level, last_completed_by_level, difficulty FROM users WHERE telegram_id = $1", telegram_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if not user:
|
if not user:
|
||||||
@@ -208,6 +208,7 @@ async def get_level(request: Request, level_number: int):
|
|||||||
# 🆕 (10.10.2026): волна и позиция в волне.
|
# 🆕 (10.10.2026): волна и позиция в волне.
|
||||||
"wave": wave,
|
"wave": wave,
|
||||||
"position_in_wave": pos_in_wave,
|
"position_in_wave": pos_in_wave,
|
||||||
|
"difficulty": user["difficulty"] or "medium",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -252,8 +253,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 +309,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")
|
||||||
@@ -343,15 +354,24 @@ async def complete_level(request: Request):
|
|||||||
fast_streak = 0
|
fast_streak = 0
|
||||||
no_hints_streak = 0
|
no_hints_streak = 0
|
||||||
words_found = 0
|
words_found = 0
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
wave_completed = False
|
||||||
|
wave_points = 0
|
||||||
|
wave_max_points = 0
|
||||||
|
wave_medal_result = "none"
|
||||||
|
current_wave = 1
|
||||||
|
current_position_in_wave = 1
|
||||||
|
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
user = await conn.fetchrow(
|
||||||
"SELECT id, telegram_id, last_completed_level, current_level FROM users WHERE telegram_id = $1",
|
"SELECT id, telegram_id, last_completed_level, current_level, difficulty FROM users WHERE telegram_id = $1",
|
||||||
telegram_id
|
telegram_id
|
||||||
)
|
)
|
||||||
if not user:
|
if not user:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
|
|
||||||
|
difficulty = user["difficulty"] or "medium"
|
||||||
|
|
||||||
level = await conn.fetchrow(
|
level = await conn.fetchrow(
|
||||||
"SELECT id, level_number, grid_size, level FROM levels WHERE id = $1", level_id
|
"SELECT id, level_number, grid_size, level FROM levels WHERE id = $1", level_id
|
||||||
)
|
)
|
||||||
@@ -406,29 +426,31 @@ async def complete_level(request: Request):
|
|||||||
hints_used = min(max(0, hints_used), 3)
|
hints_used = min(max(0, hints_used), 3)
|
||||||
|
|
||||||
# 🆕 Штрафы (филворд):
|
# 🆕 Штрафы (филворд):
|
||||||
# -1 за открытие списка слов (один раз за уровень)
|
# -20 за открытие списка слов (один раз за уровень)
|
||||||
# -1 за использование подсказки (один раз за уровень)
|
# -20 за каждую подсказку
|
||||||
# -1 за превышение времени
|
|
||||||
list_opened = bool(body.get("list_opened", False))
|
list_opened = bool(body.get("list_opened", False))
|
||||||
|
|
||||||
# Лимит времени по размеру сетки
|
# 🔧 НОВОЕ (13.10.2026): на Hard подсказки и список слов недоступны.
|
||||||
grid_size = level["grid_size"]
|
if difficulty == "hard" and (hints_used > 0 or list_opened):
|
||||||
time_limits = {5: 45, 6: 60, 7: 90, 8: 120}
|
raise HTTPException(
|
||||||
time_limit = time_limits.get(grid_size, 60)
|
status_code=400,
|
||||||
|
detail="Hints and word list are disabled on Hard difficulty"
|
||||||
|
)
|
||||||
|
|
||||||
completion_time_val = completion_time or 0
|
# Очки в зависимости от сложности
|
||||||
time_penalty = 1 if (completion_time_val > time_limit) else 0
|
if difficulty == "hard":
|
||||||
hint_penalty = 1 if hints_used > 0 else 0
|
# Hard: фикс 110 (без подсказок и списка)
|
||||||
list_penalty = 1 if list_opened else 0
|
points = 110
|
||||||
|
else:
|
||||||
stars = max(
|
# Easy / Medium
|
||||||
1,
|
bonus = 10 if hints_used == 0 else 0
|
||||||
5 - time_penalty - hint_penalty - list_penalty
|
penalty_hints = 20 * hints_used
|
||||||
)
|
penalty_list = 0 if difficulty == "easy" else 20 * (1 if list_opened else 0)
|
||||||
|
points = max(20, min(110, 100 - penalty_hints - penalty_list + bonus))
|
||||||
|
|
||||||
# Начисляем XP через единую функцию
|
# Начисляем XP через единую функцию
|
||||||
from services.xp import award_xp
|
from services.xp import award_xp
|
||||||
xp_result = await award_xp(conn, telegram_id, "wordsearch", stars)
|
xp_result = await award_xp(conn, telegram_id, "wordsearch", points)
|
||||||
|
|
||||||
score = xp_result["points"] # для обратной совместимости
|
score = xp_result["points"] # для обратной совместимости
|
||||||
|
|
||||||
@@ -437,17 +459,41 @@ async def complete_level(request: Request):
|
|||||||
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
|
# уже была создана hints.py (юзер взял подсказку → уровень не завершится).
|
||||||
# Теперь UPSERT с ON CONFLICT DO UPDATE.
|
# Теперь UPSERT с ON CONFLICT DO UPDATE.
|
||||||
# hints_used уже прочитан из БД выше (не доверяем клиенту).
|
# hints_used уже прочитан из БД выше (не доверяем клиенту).
|
||||||
|
# 🔧 ФИКС (13.10.2026): wave_off_by_one —
|
||||||
|
# session_level_number хранит позицию СЛЕДУЮЩЕГО уровня
|
||||||
|
# (уже увеличенную при выдаче), поэтому модалка волны
|
||||||
|
# срабатывала на 9-м уровне. Читаем current_wave /
|
||||||
|
# current_position_in_wave — позицию именно завершаемого уровня.
|
||||||
|
wave_row = await conn.fetchrow(
|
||||||
|
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
|
||||||
|
telegram_id,
|
||||||
|
)
|
||||||
|
if wave_row and wave_row["current_wave"] and wave_row["current_position_in_wave"]:
|
||||||
|
current_wave = int(wave_row["current_wave"])
|
||||||
|
current_position_in_wave = int(wave_row["current_position_in_wave"])
|
||||||
|
else:
|
||||||
|
# Fallback для старых записей без current_* полей.
|
||||||
|
global_level = await conn.fetchval(
|
||||||
|
"SELECT global_level_number FROM user_game_progress WHERE user_id = $1",
|
||||||
|
telegram_id,
|
||||||
|
)
|
||||||
|
global_level = int(global_level or 1)
|
||||||
|
from services.waves import wave_for_level, level_in_wave
|
||||||
|
current_wave = wave_for_level(global_level)
|
||||||
|
current_position_in_wave = level_in_wave(global_level)
|
||||||
|
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
INSERT INTO user_progress
|
INSERT INTO user_progress
|
||||||
(user_id, level_id, completed_at, hints_used, score, level, current_streak)
|
(user_id, level_id, completed_at, hints_used, score, level, current_streak, wave)
|
||||||
VALUES ($1, $2, NOW(), $3, $4, $5, 0)
|
VALUES ($1, $2, NOW(), $3, $4, $5, 0, $6)
|
||||||
ON CONFLICT (user_id, level_id) DO UPDATE
|
ON CONFLICT (user_id, level_id) DO UPDATE
|
||||||
SET completed_at = NOW(),
|
SET completed_at = NOW(),
|
||||||
hints_used = $3,
|
hints_used = $3,
|
||||||
score = $4,
|
score = $4,
|
||||||
level = $5,
|
level = $5,
|
||||||
current_streak = 0
|
current_streak = 0,
|
||||||
""", telegram_id, level_id, hints_used, score, level_name)
|
wave = $6
|
||||||
|
""", telegram_id, level_id, hints_used, score, level_name, current_wave)
|
||||||
|
|
||||||
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
# 🔧 ОБНОВЛЕНО (07.10.2026): единый счётчик progress.
|
||||||
# Обновляем только users.last_completed_level — глобальный.
|
# Обновляем только users.last_completed_level — глобальный.
|
||||||
@@ -499,19 +545,22 @@ async def complete_level(request: Request):
|
|||||||
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
||||||
) or 0
|
) or 0
|
||||||
|
|
||||||
wave_row = await conn.fetchrow(
|
# Пройдено волн = current_wave - 1; если только что завершили
|
||||||
"SELECT session_number, session_level_number FROM user_game_progress WHERE user_id = $1",
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
telegram_id,
|
waves_completed = current_wave - 1
|
||||||
)
|
if current_position_in_wave == 10:
|
||||||
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
|
waves_completed += 1
|
||||||
|
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
from services.waves import max_points_for_wave, wave_medal
|
||||||
|
wave_completed = (current_position_in_wave == 10)
|
||||||
|
wave_points = await conn.fetchval(
|
||||||
|
"SELECT COALESCE(SUM(score), 0) FROM user_progress WHERE user_id = $1 AND wave = $2",
|
||||||
|
telegram_id, current_wave,
|
||||||
|
) or 0
|
||||||
|
wave_max_points = max_points_for_wave()
|
||||||
|
wave_medal_result = wave_medal(wave_points, wave_max_points)
|
||||||
|
|
||||||
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
|
# XP филворда = сумма score по user_progress (уже посчитана как total_score).
|
||||||
wordsearch_xp = total_score
|
wordsearch_xp = total_score
|
||||||
|
|
||||||
@@ -579,7 +628,7 @@ async def complete_level(request: Request):
|
|||||||
ach = await check_and_award_achievements(telegram_id, "ws_speed_run", fast_streak)
|
ach = await check_and_award_achievements(telegram_id, "ws_speed_run", fast_streak)
|
||||||
new_achievements.extend(ach)
|
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)
|
ach = await check_and_award_achievements(telegram_id, "ws_no_hints_streak", no_hints_streak)
|
||||||
new_achievements.extend(ach)
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
@@ -593,7 +642,6 @@ async def complete_level(request: Request):
|
|||||||
"already_completed": False,
|
"already_completed": False,
|
||||||
"new_achievements": new_achievements,
|
"new_achievements": new_achievements,
|
||||||
# 🆕 XP-поля
|
# 🆕 XP-поля
|
||||||
"stars": xp_result["stars"],
|
|
||||||
"base_points": xp_result["base_points"],
|
"base_points": xp_result["base_points"],
|
||||||
"multiplier": xp_result["multiplier"],
|
"multiplier": xp_result["multiplier"],
|
||||||
"points": xp_result["points"],
|
"points": xp_result["points"],
|
||||||
@@ -604,6 +652,12 @@ async def complete_level(request: Request):
|
|||||||
"rank_key": xp_result["rank_key"],
|
"rank_key": xp_result["rank_key"],
|
||||||
"xp_in_level": xp_result["xp_in_level"],
|
"xp_in_level": xp_result["xp_in_level"],
|
||||||
"xp_needed": xp_result["xp_needed"],
|
"xp_needed": xp_result["xp_needed"],
|
||||||
|
# 🆕 (13.10.2026): итоги волны для модалки.
|
||||||
|
"wave_completed": wave_completed,
|
||||||
|
"wave_number": current_wave,
|
||||||
|
"wave_points": wave_points,
|
||||||
|
"wave_max_points": wave_max_points,
|
||||||
|
"wave_medal": wave_medal_result,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -774,7 +828,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
|
||||||
|
|
||||||
|
|||||||
+26
-16
@@ -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) подсказка уже была потрачена.
|
||||||
|
|||||||
@@ -76,6 +76,26 @@ async def set_language(request: Request):
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/set-difficulty")
|
||||||
|
async def set_difficulty(request: Request):
|
||||||
|
"""Устанавливает уровень сложности (easy/medium/hard)."""
|
||||||
|
user_id, _ = await require_auth(request)
|
||||||
|
body = await request.json()
|
||||||
|
difficulty = body.get("difficulty", "medium")
|
||||||
|
|
||||||
|
if difficulty not in {"easy", "medium", "hard"}:
|
||||||
|
raise HTTPException(400, "Unsupported difficulty")
|
||||||
|
|
||||||
|
pool = await get_pool()
|
||||||
|
async with pool.acquire() as conn:
|
||||||
|
await conn.execute(
|
||||||
|
"UPDATE users SET difficulty = $1 WHERE telegram_id = $2",
|
||||||
|
difficulty, user_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
return {"status": "ok", "difficulty": difficulty}
|
||||||
|
|
||||||
|
|
||||||
@router.post("/set-level")
|
@router.post("/set-level")
|
||||||
async def set_level(request: Request):
|
async def set_level(request: Request):
|
||||||
"""Устанавливает текущий уровень пользователя (A1, A2, B1, B2, C1, C2)"""
|
"""Устанавливает текущий уровень пользователя (A1, A2, B1, B2, C1, C2)"""
|
||||||
|
|||||||
+58
-27
@@ -14,7 +14,7 @@ async def get_next_quiz(request: Request):
|
|||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
async with pool.acquire() as conn:
|
||||||
user = await conn.fetchrow(
|
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:
|
if not user:
|
||||||
raise HTTPException(401, "User not registered")
|
raise HTTPException(401, "User not registered")
|
||||||
@@ -22,6 +22,12 @@ async def get_next_quiz(request: Request):
|
|||||||
lang = user["app_language"] or "pl"
|
lang = user["app_language"] or "pl"
|
||||||
current_level = user["current_level"] or "A1"
|
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(
|
progress = await conn.fetchrow(
|
||||||
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
|
"SELECT words_guessed, recent_words FROM word_quiz_progress WHERE user_id = $1",
|
||||||
telegram_id
|
telegram_id
|
||||||
@@ -73,7 +79,7 @@ async def get_next_quiz(request: Request):
|
|||||||
LIMIT 5
|
LIMIT 5
|
||||||
""", current_level, correct_polish, *exclude_for_wrong)
|
""", 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.
|
# 🔧 ФИКС (30.09.2026): csv_words_source — fallback тоже на csv_words.
|
||||||
wrong_words = await conn.fetch("""
|
wrong_words = await conn.fetch("""
|
||||||
SELECT word_pl
|
SELECT word_pl
|
||||||
@@ -90,7 +96,7 @@ async def get_next_quiz(request: Request):
|
|||||||
if wl not in seen:
|
if wl not in seen:
|
||||||
wrong_options.append(w["word_pl"])
|
wrong_options.append(w["word_pl"])
|
||||||
seen.add(wl)
|
seen.add(wl)
|
||||||
if len(wrong_options) >= 2:
|
if len(wrong_options) >= wrong_count:
|
||||||
break
|
break
|
||||||
|
|
||||||
recent_words = recent_words + [correct_polish] + wrong_options
|
recent_words = recent_words + [correct_polish] + wrong_options
|
||||||
@@ -107,20 +113,14 @@ async def get_next_quiz(request: Request):
|
|||||||
options = wrong_options + [correct_polish]
|
options = wrong_options + [correct_polish]
|
||||||
random.shuffle(options)
|
random.shuffle(options)
|
||||||
|
|
||||||
if total_guessed <= 10:
|
time_limit = 10 if difficulty == "hard" else None
|
||||||
difficulty = "easy"
|
|
||||||
elif total_guessed <= 30:
|
|
||||||
difficulty = "medium"
|
|
||||||
elif total_guessed <= 60:
|
|
||||||
difficulty = "hard"
|
|
||||||
else:
|
|
||||||
difficulty = "expert"
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"correct_polish": correct_polish,
|
"correct_polish": correct_polish,
|
||||||
"translation": translation,
|
"translation": translation,
|
||||||
"options": options,
|
"options": options,
|
||||||
"difficulty": difficulty,
|
"difficulty": difficulty,
|
||||||
|
"time_limit": time_limit,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -157,6 +157,17 @@ async def check_quiz_answer(request: Request):
|
|||||||
|
|
||||||
pool = await get_pool()
|
pool = await get_pool()
|
||||||
async with pool.acquire() as conn:
|
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
|
# Читаем серверный streak и mistakes
|
||||||
current_streak = await conn.fetchval(
|
current_streak = await conn.fetchval(
|
||||||
"SELECT correct_streak FROM word_quiz_progress WHERE user_id = $1",
|
"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",
|
"SELECT current_mistakes FROM word_quiz_progress WHERE user_id = $1",
|
||||||
telegram_id
|
telegram_id
|
||||||
) or 0
|
) 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:
|
if is_correct:
|
||||||
current_streak += 1
|
current_streak += 1
|
||||||
@@ -183,32 +198,41 @@ async def check_quiz_answer(request: Request):
|
|||||||
score = 0
|
score = 0
|
||||||
|
|
||||||
if is_correct:
|
if is_correct:
|
||||||
# 🆕 Расчёт звёзд для "Выбери слово"
|
# 🆕 Фиксированные очки по сложности (ChooseWord)
|
||||||
# Старт 5 звёзд. Штрафы:
|
if difficulty == "easy":
|
||||||
# -1 за каждый неверный (макс 3)
|
points = max(20, min(60, 60 - 20 * mistakes))
|
||||||
# -1 если time > 30 сек
|
elif difficulty == "medium":
|
||||||
time_penalty = 1 if (completion_time and completion_time > 30) else 0
|
points = max(20, min(80, 80 - 20 * mistakes))
|
||||||
wrong_penalty = min(mistakes, 3)
|
else: # hard
|
||||||
stars = max(1, 5 - wrong_penalty - time_penalty)
|
points = max(20, min(110, 110 - 20 * mistakes))
|
||||||
|
if completion_time is not None and completion_time > 10:
|
||||||
|
points = 20
|
||||||
|
|
||||||
# Начисляем XP
|
# Начисляем XP
|
||||||
from services.xp import award_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"]
|
score = xp_result["points"]
|
||||||
|
|
||||||
|
# no_mistakes_streak: +1 если раунд чистый, иначе сброс
|
||||||
|
if mistakes == 0:
|
||||||
|
no_mistakes_streak += 1
|
||||||
|
else:
|
||||||
|
no_mistakes_streak = 0
|
||||||
|
|
||||||
# Сбрасываем mistakes + обновляем серию
|
# Сбрасываем mistakes + обновляем серию
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
|
UPDATE word_quiz_progress SET current_mistakes = 0 WHERE user_id = $1
|
||||||
""", telegram_id)
|
""", telegram_id)
|
||||||
|
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak)
|
INSERT INTO word_quiz_progress (user_id, words_guessed, total_score, correct_streak, no_mistakes_streak)
|
||||||
VALUES ($1, 1, $2, $3)
|
VALUES ($1, 1, $2, $3, $4)
|
||||||
ON CONFLICT (user_id) DO UPDATE
|
ON CONFLICT (user_id) DO UPDATE
|
||||||
SET words_guessed = word_quiz_progress.words_guessed + 1,
|
SET words_guessed = word_quiz_progress.words_guessed + 1,
|
||||||
total_score = word_quiz_progress.total_score + $2,
|
total_score = word_quiz_progress.total_score + $2,
|
||||||
correct_streak = $3
|
correct_streak = $3,
|
||||||
""", telegram_id, score, current_streak)
|
no_mistakes_streak = $4
|
||||||
|
""", telegram_id, score, current_streak, no_mistakes_streak)
|
||||||
|
|
||||||
# 🆕 Обновляем best_streak в choose_progress
|
# 🆕 Обновляем best_streak в choose_progress
|
||||||
await conn.execute("""
|
await conn.execute("""
|
||||||
@@ -230,12 +254,20 @@ async def check_quiz_answer(request: Request):
|
|||||||
("quiz_guessed", total_guessed),
|
("quiz_guessed", total_guessed),
|
||||||
("total_score", xp_result["total_xp"]),
|
("total_score", xp_result["total_xp"]),
|
||||||
]
|
]
|
||||||
if current_streak >= 10:
|
if current_streak >= 5:
|
||||||
achievements_to_check.append(("quiz_perfect_streak", current_streak))
|
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:
|
if mistakes == 0:
|
||||||
achievements_to_check.append(("quiz_no_mistakes", 1))
|
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:
|
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:
|
else:
|
||||||
# При 3 ошибках — утешительный XP (10)
|
# При 3 ошибках — утешительный XP (10)
|
||||||
if mistakes >= 3:
|
if mistakes >= 3:
|
||||||
@@ -268,7 +300,6 @@ async def check_quiz_answer(request: Request):
|
|||||||
"correct_streak": current_streak,
|
"correct_streak": current_streak,
|
||||||
"new_achievements": new_achievements,
|
"new_achievements": new_achievements,
|
||||||
# 🆕 XP-поля
|
# 🆕 XP-поля
|
||||||
"stars": xp_result["stars"],
|
|
||||||
"base_points": xp_result["base_points"],
|
"base_points": xp_result["base_points"],
|
||||||
"multiplier": xp_result["multiplier"],
|
"multiplier": xp_result["multiplier"],
|
||||||
"points": xp_result["points"],
|
"points": xp_result["points"],
|
||||||
|
|||||||
+38
-34
@@ -1,58 +1,62 @@
|
|||||||
"""
|
"""Волновая структура филвордов.
|
||||||
Волновая структура филвордов.
|
|
||||||
|
|
||||||
Волна = 20 уровней. Волны бесконечные.
|
Волна = 10 уровней. Волны бесконечные.
|
||||||
|
|
||||||
Размер сетки задаётся блоками глобальных уровней (совпадает с БД):
|
Размер сетки:
|
||||||
| Уровни | Размер |
|
- Волна 1: 5×5 (уровни 1–5), 6×6 (уровни 6–10).
|
||||||
|-----------|--------|
|
- Волна 2: 6×6 (уровни 1–5), 7×7 (уровни 6–10).
|
||||||
| 1–25 | 5×5 |
|
- Волна 3+: 7×7 (уровни 1–5), 8×8 (уровни 6–10).
|
||||||
| 26–75 | 6×6 |
|
|
||||||
| 76–275 | 7×7 |
|
Позже (когда добавим режимы сложности):
|
||||||
| 276+ | 8×8 |
|
- Easy: всегда 5×5 (1–5) + 6×6 (6–10).
|
||||||
|
- Hard: всегда 8×8.
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
|
||||||
|
WAVE_SIZE = 10
|
||||||
|
HALF_WAVE = 5
|
||||||
|
|
||||||
|
|
||||||
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:
|
||||||
"""Размер сетки для глобального уровня (блоками: 25×5, 50×6, 200×7, 300×8)."""
|
"""Размер сетки для глобального уровня."""
|
||||||
if global_level <= 25:
|
wave = wave_for_level(global_level)
|
||||||
return 5
|
pos = level_in_wave(global_level)
|
||||||
if global_level <= 75:
|
|
||||||
return 6
|
if wave == 1:
|
||||||
if global_level <= 275:
|
sizes = (5, 6)
|
||||||
return 7
|
elif wave == 2:
|
||||||
return 8
|
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_points_for_wave() -> int:
|
||||||
"""Максимум звёзд за волну (20 уровней × 5 звёзд)."""
|
"""Максимум очков за волну: 10 уровней × 110 = 1100."""
|
||||||
return 20 * 5
|
return 10 * 110
|
||||||
|
|
||||||
|
|
||||||
def wave_medal(stars_earned: int) -> str:
|
def wave_medal(points: int, max_points: int) -> str:
|
||||||
"""
|
"""Медаль за волну: gold ≥90%, silver ≥70%, bronze ≥50%, иначе none."""
|
||||||
Медаль волны по доле звёзд.
|
pct = 100 * points / max_points if max_points > 0 else 0
|
||||||
Пороги: gold >= 90%, silver >= 70%, bronze >= 50%, else 'none'.
|
if pct >= 90:
|
||||||
"""
|
|
||||||
total = max_stars_for_wave()
|
|
||||||
pct = stars_earned / total if total > 0 else 0
|
|
||||||
if pct >= 0.90:
|
|
||||||
return "gold"
|
return "gold"
|
||||||
if pct >= 0.70:
|
if pct >= 70:
|
||||||
return "silver"
|
return "silver"
|
||||||
if pct >= 0.50:
|
if pct >= 50:
|
||||||
return "bronze"
|
return "bronze"
|
||||||
return "none"
|
return "none"
|
||||||
|
|||||||
+11
-24
@@ -35,15 +35,6 @@ GAMES = ["wordsearch", "choose", "sentence", "bubbles"]
|
|||||||
# Множитель игры дня
|
# Множитель игры дня
|
||||||
FEATURED_MULTIPLIER = 1.5
|
FEATURED_MULTIPLIER = 1.5
|
||||||
|
|
||||||
# Базовая ставка: 1 звезда = 20 XP
|
|
||||||
POINTS_PER_STAR = 20
|
|
||||||
|
|
||||||
# Максимум звёзд за уровень
|
|
||||||
MAX_STARS = 5
|
|
||||||
|
|
||||||
# Минимум звёзд за пройденный уровень
|
|
||||||
MIN_STARS = 1
|
|
||||||
|
|
||||||
# Коэффициенты баланса (настроить после первых 1000 сессий)
|
# Коэффициенты баланса (настроить после первых 1000 сессий)
|
||||||
# Применяются к base_points ДО множителя игры дня.
|
# Применяются к base_points ДО множителя игры дня.
|
||||||
GAME_XP_COEF: dict[str, float] = {
|
GAME_XP_COEF: dict[str, float] = {
|
||||||
@@ -192,7 +183,7 @@ async def award_xp(
|
|||||||
conn,
|
conn,
|
||||||
user_id: int,
|
user_id: int,
|
||||||
game: str,
|
game: str,
|
||||||
stars: int,
|
points: int,
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""
|
"""
|
||||||
Единая функция начисления опыта.
|
Единая функция начисления опыта.
|
||||||
@@ -201,11 +192,10 @@ async def award_xp(
|
|||||||
conn: asyncpg connection (уже acquired)
|
conn: asyncpg connection (уже acquired)
|
||||||
user_id: telegram_id (может быть отрицательным для Pleily)
|
user_id: telegram_id (может быть отрицательным для Pleily)
|
||||||
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
|
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
|
||||||
stars: 1..5
|
points: готовые очки за уровень (20–110), формула считается до вызова
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
{
|
{
|
||||||
"stars": int,
|
|
||||||
"base_points": int,
|
"base_points": int,
|
||||||
"multiplier": float,
|
"multiplier": float,
|
||||||
"points": int,
|
"points": int,
|
||||||
@@ -219,18 +209,16 @@ async def award_xp(
|
|||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
# 1. Валидация
|
# 1. Валидация
|
||||||
stars = max(MIN_STARS, min(MAX_STARS, int(stars)))
|
|
||||||
if game not in GAME_XP_COEF:
|
if game not in GAME_XP_COEF:
|
||||||
raise ValueError(f"Unknown game: {game}")
|
raise ValueError(f"Unknown game: {game}")
|
||||||
|
|
||||||
# 2. База
|
# 2. База с коэффициентом игры (для баланса)
|
||||||
base = stars * POINTS_PER_STAR
|
base_points = int(round(points * GAME_XP_COEF.get(game, 1.0)))
|
||||||
base = int(round(base * GAME_XP_COEF.get(game, 1.0)))
|
|
||||||
|
|
||||||
# 3. Множитель игры дня
|
# 3. Множитель игры дня
|
||||||
is_featured = (game == featured_game())
|
is_featured = (game == featured_game())
|
||||||
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
|
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
|
||||||
points = int(round(base * multiplier))
|
final_points = int(round(base_points * multiplier))
|
||||||
|
|
||||||
# 4. Читаем текущий total_xp
|
# 4. Читаем текущий total_xp
|
||||||
row = await conn.fetchrow(
|
row = await conn.fetchrow(
|
||||||
@@ -259,11 +247,11 @@ async def award_xp(
|
|||||||
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
|
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6)
|
VALUES ($1, $2, $3, $4, $5, $6)
|
||||||
""",
|
""",
|
||||||
user_id, game, stars, base, multiplier, points,
|
user_id, game, 0, base_points, multiplier, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 6. Обновляем user_profile
|
# 6. Обновляем user_profile
|
||||||
new_total = old_total + points
|
new_total = old_total + final_points
|
||||||
await conn.execute(
|
await conn.execute(
|
||||||
"""
|
"""
|
||||||
UPDATE user_profile
|
UPDATE user_profile
|
||||||
@@ -272,7 +260,7 @@ async def award_xp(
|
|||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
WHERE user_id = $1
|
WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
user_id, points,
|
user_id, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
# 7. Считаем новый уровень
|
# 7. Считаем новый уровень
|
||||||
@@ -287,14 +275,13 @@ async def award_xp(
|
|||||||
}
|
}
|
||||||
logger.info(
|
logger.info(
|
||||||
"[xp] user=%s level_up %s → %s (%s), +%s xp",
|
"[xp] user=%s level_up %s → %s (%s), +%s xp",
|
||||||
user_id, old_level, new_level, rank_key, points,
|
user_id, old_level, new_level, rank_key, final_points,
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"stars": stars,
|
"base_points": base_points,
|
||||||
"base_points": base,
|
|
||||||
"multiplier": multiplier,
|
"multiplier": multiplier,
|
||||||
"points": points,
|
"points": final_points,
|
||||||
"featured": is_featured,
|
"featured": is_featured,
|
||||||
"level_up": level_up,
|
"level_up": level_up,
|
||||||
"total_xp": new_total,
|
"total_xp": new_total,
|
||||||
|
|||||||
Reference in New Issue
Block a user