diff --git a/routers/game.py b/routers/game.py index f88ba89..4204450 100644 --- a/routers/game.py +++ b/routers/game.py @@ -416,29 +416,19 @@ async def complete_level(request: Request): hints_used = min(max(0, hints_used), 3) # πŸ†• Π¨Ρ‚Ρ€Π°Ρ„Ρ‹ (Ρ„ΠΈΠ»Π²ΠΎΡ€Π΄): - # -1 Π·Π° ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚ΠΈΠ΅ списка слов (ΠΎΠ΄ΠΈΠ½ Ρ€Π°Π· Π·Π° ΡƒΡ€ΠΎΠ²Π΅Π½ΡŒ) - # -1 Π·Π° использованиС подсказки (ΠΎΠ΄ΠΈΠ½ Ρ€Π°Π· Π·Π° ΡƒΡ€ΠΎΠ²Π΅Π½ΡŒ) - # -1 Π·Π° ΠΏΡ€Π΅Π²Ρ‹ΡˆΠ΅Π½ΠΈΠ΅ Π²Ρ€Π΅ΠΌΠ΅Π½ΠΈ + # -20 Π·Π° ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚ΠΈΠ΅ списка слов (ΠΎΠ΄ΠΈΠ½ Ρ€Π°Π· Π·Π° ΡƒΡ€ΠΎΠ²Π΅Π½ΡŒ) + # -20 Π·Π° ΠΊΠ°ΠΆΠ΄ΡƒΡŽ подсказку list_opened = bool(body.get("list_opened", False)) - # Π›ΠΈΠΌΠΈΡ‚ Π²Ρ€Π΅ΠΌΠ΅Π½ΠΈ ΠΏΠΎ Ρ€Π°Π·ΠΌΠ΅Ρ€Ρƒ сСтки - grid_size = level["grid_size"] - time_limits = {5: 45, 6: 60, 7: 90, 8: 120} - time_limit = time_limits.get(grid_size, 60) - - 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 - ) + # ΠžΡ‡ΠΊΠΈ: Π±Π°Π·Π° 100, βˆ’20 Π·Π° ΠΊΠ°ΠΆΠ΄ΡƒΡŽ подсказку, βˆ’20 Π·Π° список слов, + # +10 Ссли Π±Π΅Π· подсказок. + # Π€ΠΎΡ€ΠΌΡƒΠ»Π°: max(20, min(110, 100 - 20*hints_used - 20*list_opened + bonus)) + bonus = 10 if hints_used == 0 else 0 + points = max(20, min(110, 100 - 20 * hints_used - 20 * (1 if list_opened else 0) + bonus)) # НачисляСм 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"] # для ΠΎΠ±Ρ€Π°Ρ‚Π½ΠΎΠΉ совмСстимости