From 40875376171b6e33678a577287833c8d70acdc6e Mon Sep 17 00:00:00 2001 From: Walter Date: Mon, 24 Feb 2025 21:56:04 +0100 Subject: [PATCH] fix volforce rating --- app/bloonsa_game/views.py | 2 +- app/users/models.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/bloonsa_game/views.py b/app/bloonsa_game/views.py index 038cea7..e0a5c9b 100644 --- a/app/bloonsa_game/views.py +++ b/app/bloonsa_game/views.py @@ -51,7 +51,7 @@ class LeaderboardGlobalView(TemplateView): clears=Count("bloonsa_level_scores", filter=Q(bloonsa_level_scores__clear=True)), golds=Count("bloonsa_level_scores", filter=Q(bloonsa_level_scores__dart_glitch_ever=True)) ).annotate( - volforce=F("clears") + F("golds") + volforce=F("clears") + (F("golds") * 0.5) ).order_by("-volforce")[:10] r = render(request, "bloonsa_game/modules/leaderboard_global.html", diff --git a/app/users/models.py b/app/users/models.py index fc0f8b0..9158760 100644 --- a/app/users/models.py +++ b/app/users/models.py @@ -63,8 +63,8 @@ class Player(models.Model): beaten_levels = self.bloonsa_levels_beaten_count gold_levels = self.bloonsa_dart_glitch_count - estimated_limit = total_levels + ((total_levels / 100) * 20) - estimated_max_rank = 40.00 + estimated_limit = total_levels + ((total_levels / 100) * 25) + estimated_max_rank = 90.00 player_score = beaten_levels + gold_levels player_volforce = player_score * (estimated_max_rank / estimated_limit) @@ -72,7 +72,7 @@ class Player(models.Model): @property def bloonsa_rank(self): - return math.floor(float(self.bloonsa_volforce_rating) / 4) + 1 + return math.floor(float(self.bloonsa_volforce_rating) / 9) + 1 def __str__(self):