feat: XP foundation + waves + featured game + profile + leaderboard by total_xp
- services/xp.py: award_xp, level_for, RANKS (48), featured_game - services/waves.py: wave_plan, grid_size_for, wave_medal - routers/featured.py: GET /featured (игра дня ×1.5) - routers/users.py: POST /set-nickname, POST /set-avatar - routers/app_auth.py: /auth/me с XP-полями (level, rank_key, rank_name, xp) - routers/game.py: award_xp + 3 штрафа + POST /game/next (волны) - routers/wordquiz.py: award_xp + серии в choose_progress - routers/bubblewords.py: award_xp + 4 штрафа - routers/sentences.py: award_xp по длине предложения - routers/leaderboard.py: сортировка по total_xp, XP-поля в ответе - database.py: миграции user_profile, xp_log, choose_progress, user_seen_levels, user_game_progress, wave_results, bubble_levels, user_word_stats - main.py: подключение routers/featured Проверено: - /auth/me отдаёт level=1, rank_00, xp_in_level - /featured отдаёт wordsearch + seconds_left - /game/complete-level начисляет XP через award_xp - xp_log, user_profile заполняются - /game/next выдаёт уровень по волнам - /leaderboard сортирует по total_xp
This commit is contained in:
+305
@@ -0,0 +1,305 @@
|
||||
"""
|
||||
XP-фундамент Pleily.
|
||||
|
||||
Единая точка начисления опыта:
|
||||
- RANKS — 48 званий × 4 языка
|
||||
- level_for(total_xp) → (level, xp_in_level, xp_needed, rank_key)
|
||||
- award_xp(conn, user_id, game, stars) → dict
|
||||
|
||||
XP-кривая (по решению от 08.10.2026):
|
||||
Ур.1 → нужно 1000 XP
|
||||
Ур.2 → нужно 1500 XP
|
||||
Ур.3 → нужно 2000 XP
|
||||
...
|
||||
Ур.N → нужно 1000 + (N-1) * 500
|
||||
Ур.47 → нужно 24000 XP (потолок, потом расширим до 100)
|
||||
|
||||
Множитель ×1.5: игра дня (определяется по Europe/Warsaw).
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from typing import Optional
|
||||
from zoneinfo import ZoneInfo
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# ============ Константы ============
|
||||
|
||||
WARSAW_TZ = ZoneInfo("Europe/Warsaw")
|
||||
|
||||
# Игры по кругу (для featured)
|
||||
GAMES = ["wordsearch", "choose", "sentence", "bubbles"]
|
||||
|
||||
# Множитель игры дня
|
||||
FEATURED_MULTIPLIER = 1.5
|
||||
|
||||
# Базовая ставка: 1 звезда = 20 XP
|
||||
POINTS_PER_STAR = 20
|
||||
|
||||
# Максимум звёзд за уровень
|
||||
MAX_STARS = 5
|
||||
|
||||
# Минимум звёзд за пройденный уровень
|
||||
MIN_STARS = 1
|
||||
|
||||
# Коэффициенты баланса (настроить после первых 1000 сессий)
|
||||
# Применяются к base_points ДО множителя игры дня.
|
||||
GAME_XP_COEF: dict[str, float] = {
|
||||
"wordsearch": 1.0,
|
||||
"choose": 1.0,
|
||||
"sentence": 1.0,
|
||||
"bubbles": 1.0,
|
||||
}
|
||||
|
||||
# Максимальный уровень (потом расширим до 100)
|
||||
MAX_LEVEL = 47
|
||||
|
||||
|
||||
# ============ Звания (48 штук × 4 языка) ============
|
||||
|
||||
RANKS: list[dict] = [
|
||||
{"key": "rank_00", "pl": "Nowicjusz", "ru": "Новичок", "uk": "Новачок", "en": "Novice"},
|
||||
{"key": "rank_01", "pl": "Ciekawski", "ru": "Любопытный", "uk": "Допитливий", "en": "Curious"},
|
||||
{"key": "rank_02", "pl": "Uczeń", "ru": "Ученик", "uk": "Учень", "en": "Learner"},
|
||||
{"key": "rank_03", "pl": "Odkrywca", "ru": "Первооткрыватель", "uk": "Першовідкривач", "en": "Pioneer"},
|
||||
{"key": "rank_04", "pl": "Poszukiwacz", "ru": "Искатель", "uk": "Шукач", "en": "Seeker"},
|
||||
{"key": "rank_05", "pl": "Tropiciel", "ru": "Следопыт", "uk": "Слідопит", "en": "Pathfinder"},
|
||||
{"key": "rank_06", "pl": "Obserwator", "ru": "Наблюдатель", "uk": "Спостерігач", "en": "Observer"},
|
||||
{"key": "rank_07", "pl": "Czytelnik słów", "ru": "Читатель слов", "uk": "Читач слів", "en": "Word Reader"},
|
||||
{"key": "rank_08", "pl": "Rozmówca", "ru": "Собеседник", "uk": "Співрозмовник", "en": "Conversationalist"},
|
||||
{"key": "rank_09", "pl": "Praktyk", "ru": "Практик", "uk": "Практик", "en": "Practitioner"},
|
||||
{"key": "rank_10", "pl": "Gaduła", "ru": "Говорун", "uk": "Балакун", "en": "Chatterbox"},
|
||||
{"key": "rank_11", "pl": "Znawca liter", "ru": "Знаток букв", "uk": "Знавець літер", "en": "Letter Expert"},
|
||||
{"key": "rank_12", "pl": "Piśmienny", "ru": "Грамотей", "uk": "Грамотій", "en": "Literate"},
|
||||
{"key": "rank_13", "pl": "Badacz", "ru": "Исследователь", "uk": "Дослідник", "en": "Explorer"},
|
||||
{"key": "rank_14", "pl": "Podróżnik", "ru": "Путешественник", "uk": "Мандрівник", "en": "Traveler"},
|
||||
{"key": "rank_15", "pl": "Pewny siebie", "ru": "Уверенный", "uk": "Впевнений", "en": "Confident"},
|
||||
{"key": "rank_16", "pl": "Mól książkowy", "ru": "Книгочей", "uk": "Книголюб", "en": "Bookworm"},
|
||||
{"key": "rank_17", "pl": "Filolog", "ru": "Словесник", "uk": "Філолог", "en": "Wordsmith"},
|
||||
{"key": "rank_18", "pl": "Krasomówca", "ru": "Краснобай", "uk": "Красномовець", "en": "Smooth Talker"},
|
||||
{"key": "rank_19", "pl": "Znawca", "ru": "Знаток", "uk": "Знавець", "en": "Connoisseur"},
|
||||
{"key": "rank_20", "pl": "Mistrz podstaw", "ru": "Мастер азов", "uk": "Майстер основ", "en": "Master of Basics"},
|
||||
{"key": "rank_21", "pl": "Lingwista amator", "ru": "Лингвист-любитель", "uk": "Лінгвіст-аматор", "en": "Amateur Linguist"},
|
||||
{"key": "rank_22", "pl": "Tłumacz", "ru": "Переводчик", "uk": "Перекладач", "en": "Translator"},
|
||||
{"key": "rank_23", "pl": "Poliglota", "ru": "Полиглот", "uk": "Поліглот", "en": "Polyglot"},
|
||||
{"key": "rank_24", "pl": "Złotousty", "ru": "Златоуст", "uk": "Золотоустий", "en": "Golden Tongue"},
|
||||
{"key": "rank_25", "pl": "Mistrz słowa", "ru": "Мастер слов", "uk": "Майстер слова", "en": "Word Master"},
|
||||
{"key": "rank_26", "pl": "Ekspert", "ru": "Эксперт", "uk": "Експерт", "en": "Expert"},
|
||||
{"key": "rank_27", "pl": "Wirtuoz", "ru": "Виртуоз", "uk": "Віртуоз", "en": "Virtuoso"},
|
||||
{"key": "rank_28", "pl": "Mentor", "ru": "Наставник", "uk": "Наставник", "en": "Mentor"},
|
||||
{"key": "rank_29", "pl": "Mędrzec", "ru": "Мудрец", "uk": "Мудрець", "en": "Sage"},
|
||||
{"key": "rank_30", "pl": "Magister", "ru": "Магистр", "uk": "Магістр", "en": "Magister"},
|
||||
{"key": "rank_31", "pl": "Profesor", "ru": "Профессор", "uk": "Професор", "en": "Professor"},
|
||||
{"key": "rank_32", "pl": "Uczony", "ru": "Академик", "uk": "Академік", "en": "Academician"},
|
||||
{"key": "rank_33", "pl": "Arcymistrz", "ru": "Гроссмейстер", "uk": "Гросмейстер", "en": "Grandmaster"},
|
||||
{"key": "rank_34", "pl": "Strażnik słów", "ru": "Хранитель слов", "uk": "Хранитель слів", "en": "Keeper of Words"},
|
||||
{"key": "rank_35", "pl": "Wyrocznia", "ru": "Оракул", "uk": "Оракул", "en": "Oracle"},
|
||||
{"key": "rank_36", "pl": "Archiwista", "ru": "Архивариус", "uk": "Архіваріус", "en": "Archivist"},
|
||||
{"key": "rank_37", "pl": "Legenda", "ru": "Легенда", "uk": "Легенда", "en": "Legend"},
|
||||
{"key": "rank_38", "pl": "Tytan", "ru": "Титан", "uk": "Титан", "en": "Titan"},
|
||||
{"key": "rank_39", "pl": "Wielki Mistrz", "ru": "Великий мастер", "uk": "Великий майстер", "en": "Great Master"},
|
||||
{"key": "rank_40", "pl": "Patriarcha języka", "ru": "Патриарх языка", "uk": "Патріарх мови", "en": "Patriarch of Language"},
|
||||
{"key": "rank_41", "pl": "Gwiazda Pleily", "ru": "Звезда Pleily", "uk": "Зірка Pleily", "en": "Pleily Star"},
|
||||
{"key": "rank_42", "pl": "Supernowa", "ru": "Сверхновая", "uk": "Наднова", "en": "Supernova"},
|
||||
{"key": "rank_43", "pl": "Nieśmiertelny", "ru": "Бессмертный", "uk": "Безсмертний", "en": "Immortal"},
|
||||
{"key": "rank_44", "pl": "Najwyższy poliglota", "ru": "Верховный полиглот", "uk": "Верховний поліглот", "en": "Supreme Polyglot"},
|
||||
{"key": "rank_45", "pl": "Władca słów", "ru": "Повелитель слов", "uk": "Володар слів", "en": "Lord of Words"},
|
||||
{"key": "rank_46", "pl": "Żywa legenda", "ru": "Живая легенда", "uk": "Жива легенда", "en": "Living Legend"},
|
||||
{"key": "rank_47", "pl": "Wieczny poliglota", "ru": "Вечный полиглот", "uk": "Вічний поліглот", "en": "Eternal Polyglot"},
|
||||
]
|
||||
|
||||
# Быстрый доступ: rank_key → dict
|
||||
RANKS_BY_KEY: dict[str, dict] = {r["key"]: r for r in RANKS}
|
||||
|
||||
|
||||
# ============ Уровни ============
|
||||
|
||||
def xp_needed_for_level(level: int) -> int:
|
||||
"""Сколько XP нужно, чтобы перейти с уровня `level` на `level+1`."""
|
||||
return 1000 + (level - 1) * 500
|
||||
|
||||
|
||||
def level_for(total_xp: int) -> tuple[int, int, int, str]:
|
||||
"""
|
||||
Возвращает (level, xp_in_level, xp_needed_for_next, rank_key).
|
||||
|
||||
level — от 1 до MAX_LEVEL (47). Если XP больше, level=47, xp_in_level
|
||||
продолжает расти, но xp_needed фиксируется на 24000.
|
||||
"""
|
||||
if total_xp < 0:
|
||||
total_xp = 0
|
||||
|
||||
level = 1
|
||||
need = xp_needed_for_level(1)
|
||||
remaining = total_xp
|
||||
|
||||
while remaining >= need and level < MAX_LEVEL:
|
||||
remaining -= need
|
||||
level += 1
|
||||
need = xp_needed_for_level(level)
|
||||
|
||||
# rank_key — 0-based: level 1 → rank_00, level 2 → rank_01, ...
|
||||
rank_index = min(level - 1, len(RANKS) - 1)
|
||||
rank_key = RANKS[rank_index]["key"]
|
||||
|
||||
return level, remaining, need, rank_key
|
||||
|
||||
|
||||
def rank_for(level: int, lang: str = "ru") -> str:
|
||||
"""Название звания для уровня на языке lang."""
|
||||
idx = min(max(level - 1, 0), len(RANKS) - 1)
|
||||
rank = RANKS[idx]
|
||||
return rank.get(lang) or rank.get("en") or rank["key"]
|
||||
|
||||
|
||||
# ============ Игра дня ============
|
||||
|
||||
def featured_game(now: Optional[datetime] = None) -> str:
|
||||
"""
|
||||
Игра дня по кругу: wordsearch → choose → sentence → bubbles.
|
||||
Граница суток — Europe/Warsaw.
|
||||
"""
|
||||
if now is None:
|
||||
now = datetime.now(WARSAW_TZ)
|
||||
elif now.tzinfo is None:
|
||||
now = now.replace(tzinfo=WARSAW_TZ)
|
||||
else:
|
||||
now = now.astimezone(WARSAW_TZ)
|
||||
|
||||
return GAMES[now.date().toordinal() % 4]
|
||||
|
||||
|
||||
def featured_seconds_left(now: Optional[datetime] = None) -> int:
|
||||
"""Сколько секунд осталось до смены игры дня (до полуночи по Варшаве)."""
|
||||
if now is None:
|
||||
now = datetime.now(WARSAW_TZ)
|
||||
elif now.tzinfo is None:
|
||||
now = now.replace(tzinfo=WARSAW_TZ)
|
||||
else:
|
||||
now = now.astimezone(WARSAW_TZ)
|
||||
|
||||
tomorrow = (now + timedelta(days=1)).replace(
|
||||
hour=0, minute=0, second=0, microsecond=0
|
||||
)
|
||||
return int((tomorrow - now).total_seconds())
|
||||
|
||||
|
||||
# ============ Начисление XP ============
|
||||
|
||||
async def award_xp(
|
||||
conn,
|
||||
user_id: int,
|
||||
game: str,
|
||||
stars: int,
|
||||
) -> dict:
|
||||
"""
|
||||
Единая функция начисления опыта.
|
||||
|
||||
Args:
|
||||
conn: asyncpg connection (уже acquired)
|
||||
user_id: telegram_id (может быть отрицательным для Pleily)
|
||||
game: 'wordsearch' | 'choose' | 'sentence' | 'bubbles'
|
||||
stars: 1..5
|
||||
|
||||
Returns:
|
||||
{
|
||||
"stars": int,
|
||||
"base_points": int,
|
||||
"multiplier": float,
|
||||
"points": int,
|
||||
"featured": bool,
|
||||
"level_up": {"from": int, "to": int, "rank_key": str} | None,
|
||||
"total_xp": int, # после начисления
|
||||
"level": int, # после начисления
|
||||
"rank_key": str,
|
||||
"xp_in_level": int,
|
||||
"xp_needed": int,
|
||||
}
|
||||
"""
|
||||
# 1. Валидация
|
||||
stars = max(MIN_STARS, min(MAX_STARS, int(stars)))
|
||||
if game not in GAME_XP_COEF:
|
||||
raise ValueError(f"Unknown game: {game}")
|
||||
|
||||
# 2. База
|
||||
base = stars * POINTS_PER_STAR
|
||||
base = int(round(base * GAME_XP_COEF.get(game, 1.0)))
|
||||
|
||||
# 3. Множитель игры дня
|
||||
is_featured = (game == featured_game())
|
||||
multiplier = FEATURED_MULTIPLIER if is_featured else 1.0
|
||||
points = int(round(base * multiplier))
|
||||
|
||||
# 4. Читаем текущий total_xp
|
||||
row = await conn.fetchrow(
|
||||
"SELECT total_xp FROM user_profile WHERE user_id = $1",
|
||||
user_id,
|
||||
)
|
||||
if row is None:
|
||||
# Создаём профиль, если нет
|
||||
await conn.execute(
|
||||
"""
|
||||
INSERT INTO user_profile (user_id, total_xp, weekly_xp)
|
||||
VALUES ($1, 0, 0)
|
||||
ON CONFLICT (user_id) DO NOTHING
|
||||
""",
|
||||
user_id,
|
||||
)
|
||||
old_total = 0
|
||||
else:
|
||||
old_total = int(row["total_xp"] or 0)
|
||||
|
||||
old_level, _, _, _ = level_for(old_total)
|
||||
|
||||
# 5. Пишем в xp_log
|
||||
await conn.execute(
|
||||
"""
|
||||
INSERT INTO xp_log (user_id, game, stars, base_points, multiplier, points)
|
||||
VALUES ($1, $2, $3, $4, $5, $6)
|
||||
""",
|
||||
user_id, game, stars, base, multiplier, points,
|
||||
)
|
||||
|
||||
# 6. Обновляем user_profile
|
||||
new_total = old_total + points
|
||||
await conn.execute(
|
||||
"""
|
||||
UPDATE user_profile
|
||||
SET total_xp = total_xp + $2,
|
||||
weekly_xp = weekly_xp + $2,
|
||||
updated_at = NOW()
|
||||
WHERE user_id = $1
|
||||
""",
|
||||
user_id, points,
|
||||
)
|
||||
|
||||
# 7. Считаем новый уровень
|
||||
new_level, xp_in_level, xp_needed, rank_key = level_for(new_total)
|
||||
|
||||
level_up = None
|
||||
if new_level > old_level:
|
||||
level_up = {
|
||||
"from": old_level,
|
||||
"to": new_level,
|
||||
"rank_key": rank_key,
|
||||
}
|
||||
logger.info(
|
||||
"[xp] user=%s level_up %s → %s (%s), +%s xp",
|
||||
user_id, old_level, new_level, rank_key, points,
|
||||
)
|
||||
|
||||
return {
|
||||
"stars": stars,
|
||||
"base_points": base,
|
||||
"multiplier": multiplier,
|
||||
"points": points,
|
||||
"featured": is_featured,
|
||||
"level_up": level_up,
|
||||
"total_xp": new_total,
|
||||
"level": new_level,
|
||||
"rank_key": rank_key,
|
||||
"xp_in_level": xp_in_level,
|
||||
"xp_needed": xp_needed,
|
||||
}
|
||||
Reference in New Issue
Block a user