diff --git a/app/bloonsa_game/static/bloonsa_game/css/append.css b/app/bloonsa_game/static/bloonsa_game/css/append.css index 8ff37f5..05d07f7 100644 --- a/app/bloonsa_game/static/bloonsa_game/css/append.css +++ b/app/bloonsa_game/static/bloonsa_game/css/append.css @@ -113,6 +113,8 @@ #global-leaderboard-iframe { height: 629px; width: 160px; - overflow: hidden; + // overflow: hidden; + // overflow-y: scroll; + // overflow-x: hidden; } diff --git a/app/bloonsa_game/static/bloonsa_game/css/leaderboard_global.css b/app/bloonsa_game/static/bloonsa_game/css/leaderboard_global.css index 33ed392..4854f2d 100644 --- a/app/bloonsa_game/static/bloonsa_game/css/leaderboard_global.css +++ b/app/bloonsa_game/static/bloonsa_game/css/leaderboard_global.css @@ -7,13 +7,14 @@ text-align: left; white-space: nowrap; margin: 0; + overflow: hidden; } .rowa { - background-color: #563EAB; + background-color: #348feb; } .rowb { - background-color: #6B0047; + background-color: #536DFE; } .glb-position { @@ -30,6 +31,7 @@ width: 160px; display: flex; flex-direction: row; + border-bottom: 4px solid #3455eb; } .glb-main-info { @@ -65,6 +67,15 @@ } .glb-rank-icon { + object-fit: contain; +} + +.glb-beaten { + color: #62eb4d; +} + +.glb-golds { + color: #fcba03; } body { diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/1.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/1.png index 9fa139b..796e6ff 100644 Binary files a/app/bloonsa_game/static/bloonsa_game/img/ranks/1.png and b/app/bloonsa_game/static/bloonsa_game/img/ranks/1.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/10.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/10.png new file mode 100644 index 0000000..abef314 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/10.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/2.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/2.png new file mode 100644 index 0000000..7f21a43 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/2.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/3.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/3.png new file mode 100644 index 0000000..f18b15e Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/3.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/4.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/4.png new file mode 100644 index 0000000..a8de3aa Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/4.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/5.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/5.png new file mode 100644 index 0000000..86d38be Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/5.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/6.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/6.png new file mode 100644 index 0000000..e92ef66 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/6.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/7.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/7.png new file mode 100644 index 0000000..93855a0 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/7.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/8.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/8.png new file mode 100644 index 0000000..15f4980 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/8.png differ diff --git a/app/bloonsa_game/static/bloonsa_game/img/ranks/9.png b/app/bloonsa_game/static/bloonsa_game/img/ranks/9.png new file mode 100644 index 0000000..2799635 Binary files /dev/null and b/app/bloonsa_game/static/bloonsa_game/img/ranks/9.png differ diff --git a/app/bloonsa_game/templates/bloonsa_game/modules/leaderboard_global.html b/app/bloonsa_game/templates/bloonsa_game/modules/leaderboard_global.html index 9a061c2..b494a22 100644 --- a/app/bloonsa_game/templates/bloonsa_game/modules/leaderboard_global.html +++ b/app/bloonsa_game/templates/bloonsa_game/modules/leaderboard_global.html @@ -4,7 +4,7 @@
{% for player in players %} -
+
@@ -18,13 +18,13 @@ - {{ player.bloonsa_levels_beaten_count }} + {{ player.bloonsa_levels_beaten_count }}
- {{ player.bloonsa_dart_glitch_count }} + {{ player.bloonsa_dart_glitch_count }}
diff --git a/app/bloonsa_game/views.py b/app/bloonsa_game/views.py index deea8f5..2e86deb 100644 --- a/app/bloonsa_game/views.py +++ b/app/bloonsa_game/views.py @@ -4,6 +4,7 @@ from django.shortcuts import render from django.views.generic import TemplateView from bloonsa_game.models import Level +from settings.settings import DEBUG from users.models import Player from users.util import bloonsa_util, actions @@ -39,7 +40,8 @@ class GameView(TemplateView): r = render(request, "bloonsa_game/game.html", context={"total_levels": total_levels,}) - r["x-frame-options"] = "sameorigin" + if DEBUG: + r["x-frame-options"] = "sameorigin" return r @@ -52,12 +54,12 @@ class LeaderboardGlobalView(TemplateView): golds=Count(F("bloonsa_level_scores__dart_glitch_ever")) ).annotate( volforce=F("clears") + F("golds") - ).order_by("-volforce")[:100] - for player in players: - print(player.bloonsa_volforce_rating) + ).order_by("-volforce")[:10] + r = render(request, "bloonsa_game/modules/leaderboard_global.html", context={ "players": players }) - r["x-frame-options"] = "sameorigin" + if DEBUG: + r["x-frame-options"] = "sameorigin" return r diff --git a/app/users/models.py b/app/users/models.py index 443077d..fc0f8b0 100644 --- a/app/users/models.py +++ b/app/users/models.py @@ -58,23 +58,21 @@ class Player(models.Model): @property def bloonsa_volforce_rating(self): - total_levels = 66396 + # TODO dont hardcode this + total_levels = 66396 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 = 80.00 + estimated_max_rank = 40.00 player_score = beaten_levels + gold_levels player_volforce = player_score * (estimated_max_rank / estimated_limit) - import random - player_volforce = random.randint(100, 2700) / 100 - return "{:.2f}".format(player_volforce) @property def bloonsa_rank(self): - return math.floor(float(self.bloonsa_volforce_rating) / 100) + 1 + return math.floor(float(self.bloonsa_volforce_rating) / 4) + 1 def __str__(self):