Compare commits
55
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6fc8c83322 | ||
|
|
bffcb4387c | ||
|
|
01ce5dfa2d | ||
|
|
ec9108f2a3 | ||
|
|
556c11fc95 | ||
|
|
aa7679c49b | ||
|
|
9db00df88f | ||
|
|
4333aa62a6 | ||
|
|
bd743e4c48 | ||
|
|
f83fcc0e1c | ||
|
|
20b1cdc464 | ||
|
|
e3bc3e8456 | ||
|
|
a6fe755fdb | ||
|
|
959f789f24 | ||
|
|
d181e43ee3 | ||
|
|
6f89336a02 | ||
|
|
f78a1fa19f | ||
|
|
2b5ef446c1 | ||
|
|
6e02303ea8 | ||
|
|
5e2de6f7e4 | ||
|
|
2dedec5972 | ||
|
|
da7182fb6b | ||
|
|
b62311d3ed | ||
|
|
6f341a7f33 | ||
|
|
981e65e57c | ||
|
|
9c975dde79 | ||
|
|
df3d32ecd5 | ||
|
|
437921d9dd | ||
|
|
bcc01a0fe8 | ||
|
|
5ee5614fdf | ||
|
|
8338d6b3c8 | ||
|
|
7efa54e455 | ||
|
|
6e4701aecd | ||
|
|
32a4a68f92 | ||
|
|
12c6bbca51 | ||
|
|
5983a4767e | ||
|
|
794daad69c | ||
|
|
154ae25772 | ||
|
|
5e9cd0c901 | ||
|
|
22decc1bc3 | ||
|
|
ea297b2179 | ||
|
|
1733b657b5 | ||
|
|
791adfeee9 | ||
|
|
8d6a9886e1 | ||
|
|
0a4c0c5d23 | ||
|
|
731aaccf28 | ||
|
|
11a1803b91 | ||
|
|
9a3bd6d7c6 | ||
|
|
77d822a777 | ||
|
|
c8ae20184b | ||
|
|
d30bd4956d | ||
|
|
0be17d54a0 | ||
|
|
1215a68eb3 | ||
|
|
a237572ba2 | ||
|
|
8d83022679 |
+26
@@ -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 (
|
||||||
@@ -1299,6 +1314,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
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,52 @@ ACHIEVEMENTS_DATA = [
|
|||||||
"desc_pl": "Znajdź 5 słów bez błędu", "desc_ru": "Найти 5 слов подряд без ошибок", "desc_uk": "Знайти 5 слів без помилки", "desc_en": "Find 5 words without mistakes",
|
"desc_pl": "Znajdź 5 słów bez błędu", "desc_ru": "Найти 5 слов подряд без ошибок", "desc_uk": "Знайти 5 слів без помилки", "desc_en": "Find 5 words without mistakes",
|
||||||
"type": "perfect_words", "value": 5},
|
"type": "perfect_words", "value": 5},
|
||||||
|
|
||||||
|
# ===== Word Search — волны (9 новых, 11.10.2026) =====
|
||||||
|
{"code": "ws_wave_1", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pierwsza fala", "name_ru": "Первая волна", "name_uk": "Перша хвиля", "name_en": "First Wave",
|
||||||
|
"desc_pl": "Ukończ pierwszą falę (10 poziomów)", "desc_ru": "Пройти первую волну (10 уровней)", "desc_uk": "Пройти першу хвилю (10 рівнів)", "desc_en": "Complete your first wave (10 levels)",
|
||||||
|
"type": "waves_completed", "value": 1},
|
||||||
|
|
||||||
|
{"code": "ws_wave_5", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pięć fal", "name_ru": "Пять волн", "name_uk": "П'ять хвиль", "name_en": "Five Waves",
|
||||||
|
"desc_pl": "Ukończ 5 fal", "desc_ru": "Пройти 5 волн", "desc_uk": "Пройти 5 хвиль", "desc_en": "Complete 5 waves",
|
||||||
|
"type": "waves_completed", "value": 5},
|
||||||
|
|
||||||
|
{"code": "ws_wave_10", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Dziesięć fal", "name_ru": "Десять волн", "name_uk": "Десять хвиль", "name_en": "Ten Waves",
|
||||||
|
"desc_pl": "Ukończ 10 fal", "desc_ru": "Пройти 10 волн", "desc_uk": "Пройти 10 хвиль", "desc_en": "Complete 10 waves",
|
||||||
|
"type": "waves_completed", "value": 10},
|
||||||
|
|
||||||
|
{"code": "ws_wave_25", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Dwadzieścia pięć fal", "name_ru": "Двадцать пять волн", "name_uk": "Двадцять п'ять хвиль", "name_en": "Twenty-Five Waves",
|
||||||
|
"desc_pl": "Ukończ 25 fal", "desc_ru": "Пройти 25 волн", "desc_uk": "Пройти 25 хвиль", "desc_en": "Complete 25 waves",
|
||||||
|
"type": "waves_completed", "value": 25},
|
||||||
|
|
||||||
|
{"code": "ws_wave_50", "category": "wordsearch", "icon": "🌊",
|
||||||
|
"name_pl": "Pięćdziesiąt fal", "name_ru": "Пятьдесят волн", "name_uk": "П'ятдесят хвиль", "name_en": "Fifty Waves",
|
||||||
|
"desc_pl": "Ukończ 50 fal", "desc_ru": "Пройти 50 волн", "desc_uk": "Пройти 50 хвиль", "desc_en": "Complete 50 waves",
|
||||||
|
"type": "waves_completed", "value": 50},
|
||||||
|
|
||||||
|
{"code": "ws_speed_run_3", "category": "wordsearch", "icon": "⚡",
|
||||||
|
"name_pl": "Szybka seria", "name_ru": "Быстрая серия", "name_uk": "Швидка серія", "name_en": "Speed Run",
|
||||||
|
"desc_pl": "Ukończ 3 poziomy z rzędu, każdy w mniej niż 30 sekund", "desc_ru": "Пройти 3 уровня подряд, каждый быстрее 30 секунд", "desc_uk": "Пройти 3 рівні поспіль, кожен швидше 30 секунд", "desc_en": "Complete 3 levels in a row, each under 30 seconds",
|
||||||
|
"type": "ws_speed_run", "value": 3},
|
||||||
|
|
||||||
|
{"code": "ws_wave_no_hints", "category": "wordsearch", "icon": "🎯",
|
||||||
|
"name_pl": "Fala bez podpowiedzi", "name_ru": "Волна без подсказок", "name_uk": "Хвиля без підказок", "name_en": "Flawless Wave",
|
||||||
|
"desc_pl": "Ukończ całą falę (10 poziomów) bez podpowiedzi", "desc_ru": "Пройти всю волну (10 уровней) без подсказок", "desc_uk": "Пройти всю хвилю (10 рівнів) без підказок", "desc_en": "Complete a whole wave (10 levels) without hints",
|
||||||
|
"type": "ws_no_hints_streak", "value": 10},
|
||||||
|
|
||||||
|
{"code": "ws_words_1000", "category": "wordsearch", "icon": "📚",
|
||||||
|
"name_pl": "Tysiąc słów", "name_ru": "Тысяча слов", "name_uk": "Тисяча слів", "name_en": "Thousand Words",
|
||||||
|
"desc_pl": "Znajdź 1000 słów w filwordach", "desc_ru": "Найти 1000 слов в филвордах", "desc_uk": "Знайти 1000 слів у філвордах", "desc_en": "Find 1000 words in word searches",
|
||||||
|
"type": "wordsearch_words", "value": 1000},
|
||||||
|
|
||||||
|
{"code": "ws_xp_10000", "category": "wordsearch", "icon": "💎",
|
||||||
|
"name_pl": "Diament filwordów", "name_ru": "Бриллиант филвордов", "name_uk": "Діамант філвордів", "name_en": "Word Search Diamond",
|
||||||
|
"desc_pl": "Zdobądź 10 000 XP w filwordach", "desc_ru": "Набрать 10 000 XP в филвордах", "desc_uk": "Набрати 10 000 XP у філвордах", "desc_en": "Earn 10,000 XP in word searches",
|
||||||
|
"type": "wordsearch_xp", "value": 10000},
|
||||||
|
|
||||||
# ===== Sentence Builder (10) =====
|
# ===== Sentence Builder (10) =====
|
||||||
{"code": "first_sentence", "category": "sentence", "icon": "📝",
|
{"code": "first_sentence", "category": "sentence", "icon": "📝",
|
||||||
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
|
"name_pl": "Debiutant", "name_ru": "Дебютант", "name_uk": "Дебютант", "name_en": "Debutant",
|
||||||
|
|||||||
+201
-35
@@ -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:
|
||||||
@@ -88,10 +88,6 @@ async def get_level(request: Request, level_number: int):
|
|||||||
# в БД для совместимости, но больше не используется здесь.
|
# в БД для совместимости, но больше не используется здесь.
|
||||||
last_completed = user["last_completed_level"] or 0
|
last_completed = user["last_completed_level"] or 0
|
||||||
|
|
||||||
# Проверяем, что уровень доступен (не дальше следующего за пройденным)
|
|
||||||
if level_number > 1 and level_number > last_completed + 1:
|
|
||||||
raise HTTPException(403, "Level not available yet. Complete previous level first.")
|
|
||||||
|
|
||||||
# 🔧 ОБНОВЛЕНО (07.10.2026): все уровни — common (автогенерированные).
|
# 🔧 ОБНОВЛЕНО (07.10.2026): все уровни — common (автогенерированные).
|
||||||
# Ищем по level_number без created_by и без current_level.
|
# Ищем по level_number без created_by и без current_level.
|
||||||
# is_active = TRUE — чтобы черновики не показывались.
|
# is_active = TRUE — чтобы черновики не показывались.
|
||||||
@@ -105,6 +101,23 @@ async def get_level(request: Request, level_number: int):
|
|||||||
if not level:
|
if not level:
|
||||||
raise HTTPException(404, "Level not found")
|
raise HTTPException(404, "Level not found")
|
||||||
|
|
||||||
|
# 🔧 ФИКС (10.10.2026): доступ к уровню по user_seen_levels.
|
||||||
|
# Раньше проверяли level_number > last_completed + 1 — это ломало
|
||||||
|
# волновую выдачу, где уровни идут вперемешку (5×5 → 6×6 → ...).
|
||||||
|
# Теперь уровень доступен, если игрок получил его через /game/next
|
||||||
|
# (есть в user_seen_levels) или уже прошёл (completed_at IS NOT NULL).
|
||||||
|
# Проверка идёт ПОСЛЕ загрузки уровня, т.к. нужен level["id"].
|
||||||
|
already_completed = await conn.fetchval(
|
||||||
|
"SELECT 1 FROM user_progress WHERE user_id = $1 AND level_id = $2 AND completed_at IS NOT NULL",
|
||||||
|
telegram_id, level["id"]
|
||||||
|
)
|
||||||
|
seen = await conn.fetchval(
|
||||||
|
"SELECT 1 FROM user_seen_levels WHERE user_id = $1 AND level_id = $2",
|
||||||
|
telegram_id, level["id"]
|
||||||
|
)
|
||||||
|
if not seen and not already_completed:
|
||||||
|
raise HTTPException(403, "Level not available. Get it via /game/next.")
|
||||||
|
|
||||||
words = await conn.fetch(
|
words = await conn.fetch(
|
||||||
"SELECT * FROM level_words WHERE level_id = $1", level["id"]
|
"SELECT * FROM level_words WHERE level_id = $1", level["id"]
|
||||||
)
|
)
|
||||||
@@ -114,6 +127,25 @@ async def get_level(request: Request, level_number: int):
|
|||||||
telegram_id, level["id"],
|
telegram_id, level["id"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 🔧 ФИКС (10.10.2026): wave_off_by_one —
|
||||||
|
# wave/pos хранятся в момент выдачи. Если NULL — fallback.
|
||||||
|
wave_pos = await conn.fetchrow(
|
||||||
|
"SELECT current_wave, current_position_in_wave FROM user_game_progress WHERE user_id = $1",
|
||||||
|
telegram_id,
|
||||||
|
)
|
||||||
|
if wave_pos and wave_pos["current_wave"] and wave_pos["current_position_in_wave"]:
|
||||||
|
current_wave = int(wave_pos["current_wave"])
|
||||||
|
current_pos = int(wave_pos["current_position_in_wave"])
|
||||||
|
else:
|
||||||
|
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_pos = level_in_wave(global_level)
|
||||||
|
|
||||||
# 🔧 ОБНОВЛЕНО (09.10.2026): отдаём ВСЕ 4 перевода.
|
# 🔧 ОБНОВЛЕНО (09.10.2026): отдаём ВСЕ 4 перевода.
|
||||||
# Flutter сам выбирает, какой показать по context.lang.
|
# Flutter сам выбирает, какой показать по context.lang.
|
||||||
# Старое поле 'translation' оставлено для совместимости (legacy).
|
# Старое поле 'translation' оставлено для совместимости (legacy).
|
||||||
@@ -154,6 +186,10 @@ async def get_level(request: Request, level_number: int):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 🔧 ФИКС (10.10.2026): wave/pos из зафиксированных значений.
|
||||||
|
wave = current_wave
|
||||||
|
pos_in_wave = current_pos
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"level": {
|
"level": {
|
||||||
"id": level["id"],
|
"id": level["id"],
|
||||||
@@ -169,6 +205,10 @@ async def get_level(request: Request, level_number: int):
|
|||||||
"hints_used": progress["hints_used"] if progress else 0,
|
"hints_used": progress["hints_used"] if progress else 0,
|
||||||
"score": progress["score"] if progress else 0,
|
"score": progress["score"] if progress else 0,
|
||||||
},
|
},
|
||||||
|
# 🆕 (10.10.2026): волна и позиция в волне.
|
||||||
|
"wave": wave,
|
||||||
|
"position_in_wave": pos_in_wave,
|
||||||
|
"difficulty": user["difficulty"] or "medium",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -213,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
|
||||||
|
|
||||||
@@ -259,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")
|
||||||
@@ -298,15 +348,30 @@ async def complete_level(request: Request):
|
|||||||
hints_used = 0
|
hints_used = 0
|
||||||
# 🔧 НОВОЕ (08.10.2026): XP-система — результат award_xp.
|
# 🔧 НОВОЕ (08.10.2026): XP-система — результат award_xp.
|
||||||
xp_result = None
|
xp_result = None
|
||||||
|
# 🆕 (11.10.2026): волновые счётчики для достижений.
|
||||||
|
waves_completed = 0
|
||||||
|
wordsearch_xp = 0
|
||||||
|
fast_streak = 0
|
||||||
|
no_hints_streak = 0
|
||||||
|
words_found = 0
|
||||||
|
# 🆕 (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
|
||||||
)
|
)
|
||||||
@@ -361,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
|
|
||||||
hint_penalty = 1 if hints_used > 0 else 0
|
|
||||||
list_penalty = 1 if list_opened else 0
|
|
||||||
|
|
||||||
stars = max(
|
|
||||||
1,
|
|
||||||
5 - time_penalty - hint_penalty - list_penalty
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Очки в зависимости от сложности
|
||||||
|
if difficulty == "hard":
|
||||||
|
# Hard: фикс 110 (без подсказок и списка)
|
||||||
|
points = 110
|
||||||
|
else:
|
||||||
|
# Easy / Medium
|
||||||
|
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, "wordsearch", stars)
|
xp_result = await award_xp(conn, telegram_id, "wordsearch", points)
|
||||||
|
|
||||||
score = xp_result["points"] # для обратной совместимости
|
score = xp_result["points"] # для обратной совместимости
|
||||||
|
|
||||||
@@ -392,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 — глобальный.
|
||||||
@@ -449,6 +540,49 @@ async def complete_level(request: Request):
|
|||||||
) or 0
|
) or 0
|
||||||
grand_total = total_score + sentence_score + wordquiz_score + bubblewords_score
|
grand_total = total_score + sentence_score + wordquiz_score + bubblewords_score
|
||||||
|
|
||||||
|
# 🆕 (11.10.2026): волновые счётчики.
|
||||||
|
words_in_level = await conn.fetchval(
|
||||||
|
"SELECT COUNT(*) FROM level_words WHERE level_id = $1", level_id
|
||||||
|
) or 0
|
||||||
|
|
||||||
|
# Пройдено волн = current_wave - 1; если только что завершили
|
||||||
|
# 10-й уровень волны — волна пройдена (+1).
|
||||||
|
waves_completed = current_wave - 1
|
||||||
|
if current_position_in_wave == 10:
|
||||||
|
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).
|
||||||
|
wordsearch_xp = total_score
|
||||||
|
|
||||||
|
# Обновляем счётчики серий.
|
||||||
|
is_fast = completion_time is not None and int(completion_time) <= 30
|
||||||
|
await conn.execute("""
|
||||||
|
UPDATE user_game_progress
|
||||||
|
SET fast_streak = CASE WHEN $2 THEN COALESCE(fast_streak, 0) + 1 ELSE 0 END,
|
||||||
|
no_hints_streak = CASE WHEN $3 THEN COALESCE(no_hints_streak, 0) + 1 ELSE 0 END,
|
||||||
|
words_found = COALESCE(words_found, 0) + $4,
|
||||||
|
updated_at = NOW()
|
||||||
|
WHERE user_id = $1
|
||||||
|
""", telegram_id, is_fast, hints_used == 0, words_in_level)
|
||||||
|
|
||||||
|
counters = await conn.fetchrow(
|
||||||
|
"SELECT fast_streak, no_hints_streak, words_found FROM user_game_progress WHERE user_id = $1",
|
||||||
|
telegram_id,
|
||||||
|
)
|
||||||
|
fast_streak = int(counters["fast_streak"] or 0) if counters else 0
|
||||||
|
no_hints_streak = int(counters["no_hints_streak"] or 0) if counters else 0
|
||||||
|
words_found = int(counters["words_found"] or 0) if counters else 0
|
||||||
|
|
||||||
# Если уровень уже был пройден — просто возвращаем результат
|
# Если уровень уже был пройден — просто возвращаем результат
|
||||||
if already_completed:
|
if already_completed:
|
||||||
return {
|
return {
|
||||||
@@ -483,13 +617,31 @@ async def complete_level(request: Request):
|
|||||||
ach = await check_and_award_achievements(telegram_id, "perfect_words", server_perfect_streak)
|
ach = await check_and_award_achievements(telegram_id, "perfect_words", server_perfect_streak)
|
||||||
new_achievements.extend(ach)
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
|
# 🆕 (11.10.2026): волновые достижения.
|
||||||
|
ach = await check_and_award_achievements(telegram_id, "waves_completed", waves_completed)
|
||||||
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
|
ach = await check_and_award_achievements(telegram_id, "wordsearch_xp", wordsearch_xp)
|
||||||
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
|
if fast_streak >= 3:
|
||||||
|
ach = await check_and_award_achievements(telegram_id, "ws_speed_run", fast_streak)
|
||||||
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
|
if no_hints_streak >= 10:
|
||||||
|
ach = await check_and_award_achievements(telegram_id, "ws_no_hints_streak", no_hints_streak)
|
||||||
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
|
if words_found >= 1000:
|
||||||
|
ach = await check_and_award_achievements(telegram_id, "wordsearch_words", words_found)
|
||||||
|
new_achievements.extend(ach)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"score": score,
|
"score": score,
|
||||||
"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"],
|
||||||
@@ -500,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,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -535,7 +693,7 @@ async def get_next_level(request: Request):
|
|||||||
row = await conn.fetchrow(
|
row = await conn.fetchrow(
|
||||||
"""
|
"""
|
||||||
SELECT global_level_number, session_number, session_level_number,
|
SELECT global_level_number, session_number, session_level_number,
|
||||||
current_level_id
|
current_level_id, current_wave, current_position_in_wave
|
||||||
FROM user_game_progress WHERE user_id = $1
|
FROM user_game_progress WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
telegram_id,
|
telegram_id,
|
||||||
@@ -584,12 +742,17 @@ async def get_next_level(request: Request):
|
|||||||
telegram_id, active["id"],
|
telegram_id, active["id"],
|
||||||
)
|
)
|
||||||
if not done:
|
if not done:
|
||||||
|
# 🔧 ФИКС (10.10.2026): off-by-one в reuse-ветке —
|
||||||
|
# global_level уже инкрементнут при первой выдаче,
|
||||||
|
# поэтому wave/pos считаем от зафиксированных значений
|
||||||
|
# current_wave / current_position_in_wave. Fallback —
|
||||||
|
# старый расчёт для записей без этих полей.
|
||||||
return {
|
return {
|
||||||
"level_id": active["id"],
|
"level_id": active["id"],
|
||||||
"level_number": active["level_number"],
|
"level_number": active["level_number"],
|
||||||
"grid_size": active["grid_size"],
|
"grid_size": active["grid_size"],
|
||||||
"wave": wave_for_level(global_level),
|
"wave": int(row["current_wave"]) if row["current_wave"] else wave_for_level(global_level),
|
||||||
"position_in_wave": level_in_wave(global_level),
|
"position_in_wave": int(row["current_position_in_wave"]) if row["current_position_in_wave"] else level_in_wave(global_level),
|
||||||
"session_number": session_number,
|
"session_number": session_number,
|
||||||
"session_level": session_level,
|
"session_level": session_level,
|
||||||
"global_level": global_level,
|
"global_level": global_level,
|
||||||
@@ -665,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
|
||||||
|
|
||||||
@@ -677,10 +840,13 @@ async def get_next_level(request: Request):
|
|||||||
session_number = $3,
|
session_number = $3,
|
||||||
session_level_number = $4,
|
session_level_number = $4,
|
||||||
current_level_id = $5,
|
current_level_id = $5,
|
||||||
|
current_wave = $6,
|
||||||
|
current_position_in_wave = $7,
|
||||||
updated_at = NOW()
|
updated_at = NOW()
|
||||||
WHERE user_id = $1
|
WHERE user_id = $1
|
||||||
""",
|
""",
|
||||||
telegram_id, next_global, next_session, next_session_level, level_id,
|
telegram_id, next_global, next_session, next_session_level, level_id,
|
||||||
|
wave, pos_in_wave,
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
+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)"""
|
||||||
|
|||||||
+33
-35
@@ -1,64 +1,62 @@
|
|||||||
"""
|
"""Волновая структура филвордов.
|
||||||
Волновая структура филвордов.
|
|
||||||
|
|
||||||
Волна = 20 уровней (10 + 10). Волны бесконечные.
|
Волна = 10 уровней. Волны бесконечные.
|
||||||
|
|
||||||
| Волна | Первые 10 | Следующие 10 |
|
Размер сетки:
|
||||||
|-------|-----------|--------------|
|
- Волна 1: 5×5 (уровни 1–5), 6×6 (уровни 6–10).
|
||||||
| 1 | 5×5 | 6×6 |
|
- Волна 2: 6×6 (уровни 1–5), 7×7 (уровни 6–10).
|
||||||
| 2 | 5×5 | 6×6 |
|
- Волна 3+: 7×7 (уровни 1–5), 8×8 (уровни 6–10).
|
||||||
| 3 | 6×6 | 7×7 |
|
|
||||||
| 4 | 6×6 | 7×7 |
|
Позже (когда добавим режимы сложности):
|
||||||
| 5+ | 7×7 | 8×8 |
|
- Easy: всегда 5×5 (1–5) + 6×6 (6–10).
|
||||||
|
- Hard: всегда 8×8.
|
||||||
"""
|
"""
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
|
||||||
def wave_plan(wave: int) -> list[int]:
|
WAVE_SIZE = 10
|
||||||
"""Возвращает список из 20 размеров сетки для волны."""
|
HALF_WAVE = 5
|
||||||
if wave in (1, 2):
|
|
||||||
return [5] * 10 + [6] * 10
|
|
||||||
if wave in (3, 4):
|
|
||||||
return [6] * 10 + [7] * 10
|
|
||||||
return [7] * 10 + [8] * 10
|
|
||||||
|
|
||||||
|
|
||||||
def wave_for_level(global_level: int) -> int:
|
def wave_for_level(global_level: int) -> int:
|
||||||
"""Какая волна содержит этот глобальный уровень (1-based)."""
|
"""Какая волна содержит этот глобальный уровень (1-based)."""
|
||||||
if global_level < 1:
|
if global_level < 1:
|
||||||
return 1
|
return 1
|
||||||
return (global_level - 1) // 20 + 1
|
return (global_level - 1) // WAVE_SIZE + 1
|
||||||
|
|
||||||
|
|
||||||
def level_in_wave(global_level: int) -> int:
|
def level_in_wave(global_level: int) -> int:
|
||||||
"""Позиция уровня внутри волны (1..20)."""
|
"""Позиция уровня внутри волны (1..10)."""
|
||||||
return ((global_level - 1) % 20) + 1
|
return ((global_level - 1) % WAVE_SIZE) + 1
|
||||||
|
|
||||||
|
|
||||||
def grid_size_for(global_level: int) -> int:
|
def grid_size_for(global_level: int) -> int:
|
||||||
"""Размер сетки для глобального уровня."""
|
"""Размер сетки для глобального уровня."""
|
||||||
wave = wave_for_level(global_level)
|
wave = wave_for_level(global_level)
|
||||||
pos = level_in_wave(global_level)
|
pos = level_in_wave(global_level)
|
||||||
plan = wave_plan(wave)
|
|
||||||
return plan[pos - 1]
|
if wave == 1:
|
||||||
|
sizes = (5, 6)
|
||||||
|
elif wave == 2:
|
||||||
|
sizes = (6, 7)
|
||||||
|
else:
|
||||||
|
sizes = (7, 8)
|
||||||
|
|
||||||
|
return sizes[0] if pos <= HALF_WAVE else sizes[1]
|
||||||
|
|
||||||
|
|
||||||
def max_stars_for_wave() -> int:
|
def max_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