Author SHA1 Message Date
Drobysh 118345f701 Merge pull request '[Eva] Ева, патч 21 применён — теперь ты можешь' (#40) from eva/chat-b7c183-backend into main
Reviewed-on: #40
2026-10-14 09:03:24 +00:00
Drobysh 4159d6265a [Eva] bubblewords: убираю xp_result["stars"] (KeyError) 2026-10-14 09:01:33 +00:00
Drobysh 741d1799e7 [Eva] bubblewords: bubble_perfect по новой логике 2026-10-14 09:01:21 +00:00
Drobysh 5644b5be16 [Eva] bubblewords: новая формула очков вместо звёзд 2026-10-14 09:01:12 +00:00
Drobysh e65bd5db43 [Eva] bubblewords: читаем difficulty из users 2026-10-14 09:01:02 +00:00
Drobysh 6786acb126 Merge pull request '[Eva] Ева, прочитай .gitignore' (#39) from eva/chat-c3088d-backend into main
Reviewed-on: #39
2026-10-13 17:47:26 +00:00
Drobysh 938d674b09 Merge pull request '[Eva] Ева, прочитай .gitignore' (#38) from eva/chat-c3088d-backend into main
Reviewed-on: #38
2026-10-13 16:36:33 +00:00
Drobysh 78d40364bf Merge pull request '[Eva] Ева, прочитай .gitignore' (#37) from eva/chat-c3088d-backend into main
Reviewed-on: #37
2026-10-13 12:07:23 +00:00
Drobysh 26442db954 Merge pull request '[Eva] Ева, прочитай .gitignore' (#36) from eva/chat-c3088d-backend into main
Reviewed-on: #36
2026-10-13 12:02:29 +00:00
Drobysh 50c02b7707 Merge pull request '[Eva] Ева, прочитай .gitignore' (#35) from eva/chat-c3088d-backend into main
Reviewed-on: #35
2026-10-13 11:34:18 +00:00
Drobysh 22e4eed3f5 Merge pull request '[Eva] Ева, прочитай .gitignore' (#34) from eva/chat-c3088d-backend into main
Reviewed-on: #34
2026-10-13 11:29:59 +00:00
Drobysh 8b98655716 Merge pull request '[Eva] Ева, прочитай .gitignore' (#33) from eva/chat-c3088d-backend into main
Reviewed-on: #33
2026-10-13 11:23:15 +00:00
+21 -13
View File
@@ -195,9 +195,11 @@ 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 # Читаем серверный hints_used
hints_used = await conn.fetchval( hints_used = await conn.fetchval(
@@ -206,17 +208,24 @@ async def complete_bubble_level(request: Request):
) or 0 ) or 0
hints_used = min(max(0, hints_used), 3) hints_used = min(max(0, hints_used), 3)
# 🆕 Расчёт звёзд # 🔧 НОВОЕ (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"]
await conn.execute(""" await conn.execute("""
@@ -241,7 +250,7 @@ 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))
@@ -261,7 +270,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"],